aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCamil Staps2018-05-16 21:47:56 +0200
committerCamil Staps2018-05-16 21:47:56 +0200
commitd8515fda7b0e06b349a4fe783f0261865f4a967c (patch)
tree9d47adb4b3431e3de04b2f70d1efbe95582146db
parentMerge branch 'master' of github:camilstaps/iClean (diff)
Minor updates and fix for new Platform generics
-rw-r--r--Makefile1
-rw-r--r--README.md2
-rw-r--r--iclean.icl23
3 files changed, 13 insertions, 13 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/README.md b/README.md
index 788076b..e8a2833 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Interactive Clean
This module allows you to evaluate [Clean][] expressions interactively, similar to GHCi or the Python shell.
-Copyright © 2016 Camil Staps. This project is licensed under the MIT license. For more details, see the LICENSE file.
+Copyright © 2015-2018 Camil Staps. This project is licensed under the MIT license. For more details, see the LICENSE file.
## Example session
diff --git a/iclean.icl b/iclean.icl
index 31cd2e1..ee43732 100644
--- a/iclean.icl
+++ b/iclean.icl
@@ -5,7 +5,7 @@ Clean program to easily compile and run one-line Clean expressions
The MIT License (MIT)
-Copyright (c) 2015 Camil Staps <info@camilstaps.nl>
+Copyright (c) 2015-2018 Camil Staps <info@camilstaps.nl>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -38,20 +38,21 @@ import ExtraString
temp_path :== "/tmp/"
temp_module :== "iclean"
readline_history :== "/home/.iclean_history"
-template :== map ((+++) "import ") ["StdEnv", "StdDynamic", "GenPrint"]
+template :== map ((+++) "import ") ["StdEnv", "StdDynamic", "Text.GenPrint"]
template_file :== "/home/.iclean_template"
// END SETTINGS
temp_file =: temp_path +++ temp_module +++ ".icl"
help =:
- "\tInteractive Clean - known commands:\n\n" +++
- "\t:quit\t\t\tExit iClean\n" +++
- "\t:mem\t\t\tDisplay current memory\n" +++
- "\t:help\t\t\tDisplay this message\n\n" +++
- "\t:set K V\t\tSet iClean's setting K to value V\n\n" +++
- "\t:def F X1 .. Xn = RHS\tAdd a rewrite rule to the memory\n" +++
- "\t:undef F\t\tRemove all rewrite rules starting with 'F ' from the memory\n"
+ " Interactive Clean - known commands:\n\n" +++
+ " :quit Exit iClean\n" +++
+ " :mem Display current memory\n" +++
+ " :help Display this message\n\n" +++
+ " :set K V Set iClean's setting K to value V\n" +++
+ " Possible keys are show_type and show_result with {true,false} as values\n\n" +++
+ " :def F X1 .. Xn = RHS Add a rewrite rule to the memory\n" +++
+ " :undef F Remove all rewrite rules starting with 'F ' from the memory\n"
:: Status
= { memory :: [String]
@@ -61,8 +62,8 @@ help =:
instance zero Status where zero = { memory = [], settings = zero }
:: Settings
- = { show_type :: Bool
- , show_result :: Bool
+ = { show_type :: !Bool
+ , show_result :: !Bool
}
instance zero Settings where zero = { show_type = False, show_result = True }