Commit 77acdbbf authored by Camil Staps's avatar Camil Staps 🐧

Make work on the master compiler

parent 58381750
Pipeline #16909 passed with stage
in 18 minutes and 32 seconds
Subproject commit 003941f85601dad7c64bd975b04281571307c424 Subproject commit b5525a596368e5c56dab54b011c5ef486275096f
...@@ -18,10 +18,8 @@ import Clean.Types.Parse ...@@ -18,10 +18,8 @@ import Clean.Types.Parse
import Clean.Types.Unify import Clean.Types.Unify
import Clean.Types.Util import Clean.Types.Util
import Control.Applicative import Control.Applicative
import Control.Monad => qualified join import Control.Monad
import Data.Error import Data.Error
import qualified Data.Foldable as Foldable
from Data.Foldable import class Foldable
from Data.Func import $, hyperstrict, instance Functor ((->) r), mapSt, seqSt, on, `on` from Data.Func import $, hyperstrict, instance Functor ((->) r), mapSt, seqSt, on, `on`
import Data.Functor import Data.Functor
from Data.List import permutations from Data.List import permutations
...@@ -33,7 +31,8 @@ import System.File ...@@ -33,7 +31,8 @@ import System.File
import System.Options import System.Options
import System.Process import System.Process
import System.Time import System.Time
from Text import class Text(concat,join,split,startsWith,toLowerCase), instance Text String, <+ import qualified Text
from Text import class Text(concat,split,startsWith,toLowerCase), instance Text String, <+
import Text.GenJSON import Text.GenJSON
import Cloogle.API import Cloogle.API
...@@ -171,7 +170,7 @@ Start w ...@@ -171,7 +170,7 @@ Start w
# opts = parseOptions optionDescription args zero # opts = parseOptions optionDescription args zero
| isError opts | isError opts
# (io,w) = stdio w # (io,w) = stdio w
# io = io <<< join "\n" (fromError opts) <<< "\n" # io = io <<< 'Text'.join "\n" (fromError opts) <<< "\n"
# (_,w) = fclose io w # (_,w) = fclose io w
= w = w
# opts = fromOk opts # opts = fromOk opts
......
#!/bin/bash #!/bin/bash
set -ev set -ev
install_clean.sh 'base lib-platform lib-tcpip' 2018-11-21 install_clean.sh 'base lib-platform lib-tcpip' 2018-12-05
PACKAGES="patch jq unzip z3" PACKAGES="patch jq unzip z3"
apt-get update -qq apt-get update -qq
......
...@@ -10,7 +10,7 @@ import StdString ...@@ -10,7 +10,7 @@ import StdString
import StdTuple import StdTuple
import Clean.Types import Clean.Types
import Control.Monad => qualified join import Control.Monad
import Data.Either import Data.Either
import Data.Error import Data.Error
from Data.Func import $, hyperstrict, mapSt from Data.Func import $, hyperstrict, mapSt
...@@ -20,7 +20,8 @@ import Data.Maybe ...@@ -20,7 +20,8 @@ import Data.Maybe
import System.CommandLine import System.CommandLine
import System.File import System.File
import System.Options import System.Options
from Text import class Text(join,startsWith), instance Text String import qualified Text
from Text import class Text, instance Text String
import Text.GenJSON import Text.GenJSON
import Regex.Match import Regex.Match
...@@ -83,7 +84,7 @@ Start w ...@@ -83,7 +84,7 @@ Start w
# ([prog:args], w) = getCommandLine w # ([prog:args], w) = getCommandLine w
# opts = parseOptions optionDescription args zero # opts = parseOptions optionDescription args zero
| isError opts | isError opts
# err = stderr <<< join "\n" (fromError opts) <<< "\n" # err = stderr <<< 'Text'.join "\n" (fromError opts) <<< "\n"
# (_,w) = fclose err w # (_,w) = fclose err w
= w = w
# opts = fromOk opts # opts = fromOk opts
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment