Make work on the master compiler

Cloogle @ b5525a59

-Subproject commit 003941f85601dad7c64bd975b04281571307c424
+Subproject commit b5525a596368e5c56dab54b011c5ef486275096f

backend/CloogleServer.icl

@@ -18,10 +18,8 @@ import Clean.Types.Parse
 import Clean.Types.Unify
 import Clean.Types.Util
 import Control.Applicative
-import Control.Monad => qualified join
+import Control.Monad
 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`
 import Data.Functor
 from Data.List import permutations
@@ -33,7 +31,8 @@ import System.File
 import System.Options
 import System.Process
 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 Cloogle.API
@@ -171,7 +170,7 @@ Start w
 # opts = parseOptions optionDescription args zero
 | isError opts
 	# (io,w) = stdio w
-	# io = io <<< join "\n" (fromError opts) <<< "\n"
+	# io = io <<< 'Text'.join "\n" (fromError opts) <<< "\n"
 	# (_,w) = fclose io w
 	= w
 # opts = fromOk opts

backend/build.sh

 #!/bin/bash
 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"
 apt-get update -qq

backend/builddb.icl

@@ -10,7 +10,7 @@ import StdString
 import StdTuple
 
 import Clean.Types
-import Control.Monad => qualified join
+import Control.Monad
 import Data.Either
 import Data.Error
 from Data.Func import $, hyperstrict, mapSt
@@ -20,7 +20,8 @@ import Data.Maybe
 import System.CommandLine
 import System.File
 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 Regex.Match
@@ -83,7 +84,7 @@ Start w
 # ([prog:args], w) = getCommandLine w
 # opts = parseOptions optionDescription args zero
 | isError opts
-	# err = stderr <<< join "\n" (fromError opts) <<< "\n"
+	# err = stderr <<< 'Text'.join "\n" (fromError opts) <<< "\n"
 	# (_,w) = fclose err w
 	= w
 # opts = fromOk opts