Merge branch 'master' of https://github.com/dopefishh/cc1516

[cc1516.git] / spl.icl

diff --git a/spl.icl b/spl.icl
index e88e943..383b84e 100644 (file)
--- a/spl.icl
+++ b/spl.icl
@@ -34,6 +34,16 @@ from yard import :: Error, instance toString Error
 
 derive gPrint TokenValue
 
+preamble :: AST -> AST
+preamble (AST fd) = AST (pre ++ fd)
+       where
+               pre = [
+                       FunDecl zero "1printstr" ["x"] Nothing [] [
+                               IfStmt (FunExpr zero "isEmpty" [VarExpr zero (VarDef "x" [])] [])
+                                       []
+                                       [FunStmt "1printchar" [VarExpr zero (VarDef "x" [FieldHd])] []
+                                       ,FunStmt "1printstr" [VarExpr zero (VarDef "x" [FieldTl])] []]]]
+
 Start :: *World -> *World
 Start w
 # (args, w) = parseArgs w
@@ -54,7 +64,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
@@ -69,14 +80,17 @@ Start w
                        (Right parseOut)
                        # stdin = if (not args.parse) stdin (
                                stdin <<<  "//PARSER\n" <<< toString parseOut <<< "//PARSER\n")
-                       = case sem parseOut of
+                       = case sem (preamble parseOut) of
                                (Left e) = snd $ fclose (stdin <<< join "\n" (map toString e) <<< "\n") 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 +111,7 @@ parseArgs w
        version=False,
        lex=False,
        parse=False,
-       sem=True,
+       sem=False,
     gen=True,
        fp=Nothing,
        help=False}, w)
@@ -112,8 +126,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)