strictness, ci

[minfp.git] / minfp.icl

diff --git a/minfp.icl b/minfp.icl
index 5e2a377..8673436 100644 (file)
--- a/minfp.icl
+++ b/minfp.icl
@@ -44,12 +44,10 @@ Start w
        # mstr = case mode of
                MHelp = Left [usageInfo ("Usage: " +++ argv0 +++ " [opts]\n") opts]
                MLex = map (nl o toString) <$> lex cs
-               MParse = map (nl o toString) <$> (lex cs >>= parse)
+               MParse = map (nl o either toString toString) <$> (lex cs >>= parse)
                MType = map (\(t, s)->nl (toString t +++ " :: " +++ toString s)) o snd <$> (lex cs >>= parse >>= check)
-               MInterpret = pure o toString <$> (lex cs >>= parse >>= check >>= int o fst)
+               MInterpret = pure o nl o toString <$> (lex cs >>= parse >>= check >>= int o fst)
                MGen = lex cs >>= parse >>= check >>= gen o fst
        = exit (either (\_->1) (\_->0) mstr) (either id id mstr) io w
 
 nl x = x +++ "\n"
-
-