From a3412f121648f8c637b78834a2f017a5ad6b7312 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Sun, 3 Apr 2016 22:51:45 +0200 Subject: Use genShow from genLibTest instead of gPrint (can show -> type) --- compile.c | 3 ++- iclean.icl | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compile.c b/compile.c index fcfc45c..1411d94 100644 --- a/compile.c +++ b/compile.c @@ -71,7 +71,8 @@ int64_t compile(CleanString path, CleanString module) { char cmd[182]; snprintf(cmd, 182, "cd \"%s\" && clm -I $CLEAN_HOME/lib/StdLib -I " "$CLEAN_HOME/lib/Generics -I $CLEAN_HOME/lib/Dynamics -dynamics " - "-ms -nw -b -nt %s -o %s", pathchars, modulechars, modulechars); + "-I $CLEAN_HOME/lib/Gast -ms -nw -b -nt %s -o %s", + pathchars, modulechars, modulechars); free(pathchars); free(modulechars); diff --git a/iclean.icl b/iclean.icl index 9c5fd23..92c9020 100644 --- a/iclean.icl +++ b/iclean.icl @@ -38,9 +38,7 @@ readline_history :== "/home/camil/.iclean_history" template :== [ "import StdEnv" , "import StdMaybe" , "import StdDynamic" - , "import GenPrint" - , "derive gPrint (,),(,,),(,,,),(,,,,),(,,,,,),(,,,,,,),(,,,,,,,)," +++ - "(,,,,,,,,),(,,,,,,,,,),(,,,,,,,,,,),(,,,,,,,,,,,),(,,,,,,,,,,,,)" + , "import genLibTest" ] // END SETTINGS @@ -97,8 +95,9 @@ writemodule mem s w # f = f <<< "module " <<< temp_module <<< "\n" # f = f <<< join "\n" mem # f = f <<< "start = " <<< s <<< "\n" + <<< "rslt = genShow{|*|} \"\" True start []\n" <<< "Start = toString (typeCodeOfDynamic (dynamic start)) " - <<< "+++ \" :: \" +++ printToString start +++ \"\\n\"\n" + <<< "+++ \" :: \" +++ foldl (+++) \"\" rslt +++ \"\\n\"\n" # (ok,w) = fclose f w | not ok = abort ("Couldn't close " +++ temp_file +++ "\n") | otherwise = w -- cgit v1.2.3