From 772f296f18daca19ed3c1f8bb85a2661ace15614 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 20 Mar 2018 10:29:39 +0100 Subject: Update to platform generics --- Makefile | 1 - compile.c | 2 +- iclean.icl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 093eeb0..a17dcf6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ CFLAGS=-std=c99 -Wall -O0 -c CLM=clm CLMFLAGS=\ -I $$CLEAN_HOME/lib/Platform\ - -I $$CLEAN_HOME/lib/Generics\ -I CleanReadLine\ -l -lreadline\ -l compile.o\ diff --git a/compile.c b/compile.c index a991dbf..91482a1 100644 --- a/compile.c +++ b/compile.c @@ -72,12 +72,12 @@ int64_t compile(CleanString path, CleanString module) { "-I $CLEAN_HOME/lib/Directory " "-I $CLEAN_HOME/lib/Dynamics -dynamics " "-I $CLEAN_HOME/lib/Gast " - "-I $CLEAN_HOME/lib/Generics " "-I $CLEAN_HOME/lib/GraphCopy " "-I $CLEAN_HOME/lib/Platform " "-I $CLEAN_HOME/lib/Platform/Deprecated/ArgEnv " "-I $CLEAN_HOME/lib/Platform/Deprecated/MersenneTwister " "-I $CLEAN_HOME/lib/Platform/Deprecated/StdLib " + "-I $CLEAN_HOME/lib/Platform/Deprecated/Generics " "-I $CLEAN_HOME/lib/Local " "-b -nt -h 20M %s -o %s", pathchars, modulechars, modulechars); diff --git a/iclean.icl b/iclean.icl index 31cd2e1..526bacb 100644 --- a/iclean.icl +++ b/iclean.icl @@ -38,7 +38,7 @@ import ExtraString temp_path :== "/tmp/" temp_module :== "iclean" readline_history :== "/home/.iclean_history" -template :== map ((+++) "import ") ["StdEnv", "StdDynamic", "GenPrint"] +template :== map ((+++) "import ") ["StdEnv", "StdDynamic", "Data.Generics.GenPrint"] template_file :== "/home/.iclean_template" // END SETTINGS -- cgit v1.2.3