summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--samples/area.slam (renamed from samples/area.sample)0
-rw-r--r--samples/char.slam (renamed from samples/char.sample)0
-rw-r--r--samples/comparisons.slam (renamed from samples/comparisons.sample)0
-rw-r--r--samples/conditional.slam (renamed from samples/conditional.sample)0
-rw-r--r--samples/divbyzero.slam (renamed from samples/divbyzero.sample)0
-rw-r--r--samples/eval.slam (renamed from samples/eval.sample)0
-rw-r--r--samples/interpolation.slam (renamed from samples/interpolation.sample)0
-rw-r--r--samples/list.slam (renamed from samples/list.sample)0
-rw-r--r--samples/loop.slam (renamed from samples/loop.sample)0
-rw-r--r--samples/modulo.slam (renamed from samples/modulo.sample)0
-rw-r--r--samples/phrase.slam (renamed from samples/phrase.sample)0
-rw-r--r--samples/recursion.slam (renamed from samples/recursion.sample)0
-rw-r--r--samples/strliterals.slam (renamed from samples/strliterals.sample)0
-rw-r--r--samples/testing.slam (renamed from samples/testing.sample)0
-rw-r--r--samples/variables.slam (renamed from samples/variables.sample)0
-rw-r--r--src/Main.hs11
16 files changed, 9 insertions, 2 deletions
diff --git a/samples/area.sample b/samples/area.slam
index 57bbfbb..57bbfbb 100644
--- a/samples/area.sample
+++ b/samples/area.slam
diff --git a/samples/char.sample b/samples/char.slam
index 05e2b9a..05e2b9a 100644
--- a/samples/char.sample
+++ b/samples/char.slam
diff --git a/samples/comparisons.sample b/samples/comparisons.slam
index aea6387..aea6387 100644
--- a/samples/comparisons.sample
+++ b/samples/comparisons.slam
diff --git a/samples/conditional.sample b/samples/conditional.slam
index 2cb9326..2cb9326 100644
--- a/samples/conditional.sample
+++ b/samples/conditional.slam
diff --git a/samples/divbyzero.sample b/samples/divbyzero.slam
index 77d211f..77d211f 100644
--- a/samples/divbyzero.sample
+++ b/samples/divbyzero.slam
diff --git a/samples/eval.sample b/samples/eval.slam
index 927621b..927621b 100644
--- a/samples/eval.sample
+++ b/samples/eval.slam
diff --git a/samples/interpolation.sample b/samples/interpolation.slam
index 8baa6df..8baa6df 100644
--- a/samples/interpolation.sample
+++ b/samples/interpolation.slam
diff --git a/samples/list.sample b/samples/list.slam
index c0fa5da..c0fa5da 100644
--- a/samples/list.sample
+++ b/samples/list.slam
diff --git a/samples/loop.sample b/samples/loop.slam
index dce412e..dce412e 100644
--- a/samples/loop.sample
+++ b/samples/loop.slam
diff --git a/samples/modulo.sample b/samples/modulo.slam
index b093015..b093015 100644
--- a/samples/modulo.sample
+++ b/samples/modulo.slam
diff --git a/samples/phrase.sample b/samples/phrase.slam
index 1c84bac..1c84bac 100644
--- a/samples/phrase.sample
+++ b/samples/phrase.slam
diff --git a/samples/recursion.sample b/samples/recursion.slam
index 7dc833b..7dc833b 100644
--- a/samples/recursion.sample
+++ b/samples/recursion.slam
diff --git a/samples/strliterals.sample b/samples/strliterals.slam
index ee61fa2..ee61fa2 100644
--- a/samples/strliterals.sample
+++ b/samples/strliterals.slam
diff --git a/samples/testing.sample b/samples/testing.slam
index f9352cd..f9352cd 100644
--- a/samples/testing.sample
+++ b/samples/testing.slam
diff --git a/samples/variables.sample b/samples/variables.slam
index 8902b04..8902b04 100644
--- a/samples/variables.sample
+++ b/samples/variables.slam
diff --git a/src/Main.hs b/src/Main.hs
index b596a84..1673663 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,6 +2,7 @@ module Main where
import Control.Monad.Except
import Data.Char
+import Data.List (intercalate)
import Data.Map (Map, (!))
import qualified Data.Map as M
import Debug.Trace (trace, traceShow)
@@ -41,8 +42,14 @@ bootstrap args = do
debugPrint config $ fmt "executing file %%\n" [fileName]
source <- liftIO . readFile $ fileName
(parsedSource, strLitRefMap) <- parseSource source
- debugPrint config $ fmt "parsed words:\n%%\n" [show parsedSource]
- debugPrint config $ fmt "string literal refmap:\n%%\n" [show strLitRefMap]
+ debugPrint config $ fmt "parsed words:\n%%\n" [parsedSource $> map show .> intercalate ", "]
+ let reprKeyValPair (k, v) = fmt "%% = %%" [k, show v]
+ debugPrint config $
+ fmt
+ "string literal refmap:\n%%\n"
+ [ strLitRefMap
+ $> M.toList .> map reprKeyValPair .> intercalate "\n"
+ ]
debugPrint config "interpreter output:"
let initialState =
LState