Added default functions, isEmpty does not typecheck...

[cc1516.git] / spl.icl

diff --git a/spl.icl b/spl.icl
index e88e943..b5738ee 100644 (file)
--- a/spl.icl
+++ b/spl.icl
@@ -54,7 +54,8 @@ Start w
                <<< "  --version          Show the version\n"
                <<< "  --[no-]lex         Lexer output(default: disabled)\n"
                <<< "  --[no-]parse       Parser output(default: disabled)\n"
-               <<< "  --[no-]sem         Semantic analysis output(default: enabled)\n"
+               <<< "  --[no-]sem         Semantic analysis output(default: disabled)\n"
+               <<< "  --[no-]code        Code generation output(default: enabled)\n"
        = snd $ fclose stdin w
 # (contents, stdin, w) = readFileOrStdin stdin args.fp w
 = case contents of
@@ -74,9 +75,12 @@ Start w
                                (Right ast)
                                # stdin = if (not args.sem) stdin (stdin
                                        <<< "//SEM G\n" <<< toString ast <<< "//SEMA\n")
-                # stdin = if (not args.gen) stdin (stdin
-                    <<< "//CODE GEN\n" <<< gen ast <<< "\n//CODE GEN\n")
-                               = snd $ fclose (stdin <<< "\n") w
+                               = case gen ast of
+                                       (Left e) = snd $ fclose (stdin <<< e) w
+                                       (Right asm)
+                                       # stdin = if (not args.gen) stdin (stdin
+                       <<< ";CODE GEN\n" <<< asm <<< "\n;CODE GEN\n")
+                                       = snd $ fclose (stdin <<< "\n") w
                where
                        printConstraints :: Constraints -> String
                        printConstraints [] = ""
@@ -97,7 +101,7 @@ parseArgs w
        version=False,
        lex=False,
        parse=False,
-       sem=True,
+       sem=False,
     gen=True,
        fp=Nothing,
        help=False}, w)
@@ -112,8 +116,8 @@ where
        pa ["--no-parse":r] o = pa r {o & parse=False}
        pa ["--sem":r] o = pa r {o & sem=True}
        pa ["--no-sem":r] o = pa r {o & sem=False}
-    pa ["--gen":r] o = pa r {o & gen=True}
-    pa ["--no-gen":r] o = pa r {o & gen=False}
+    pa ["--code":r] o = pa r {o & gen=True}
+    pa ["--no-code":r] o = pa r {o & gen=False}
        pa [x:r] o = pa r {o & fp=Just x}
 
 readFileOrStdin :: *File (Maybe String) *World -> *(Either String [Char], *File, *World)