update'

[cc1516.git] / spl.icl

diff --git a/spl.icl b/spl.icl
index 93374a5..c42412c 100644 (file)
--- a/spl.icl
+++ b/spl.icl
@@ -12,7 +12,8 @@ import Data.Maybe
 import Data.Func
 import System.CommandLine
 import GenPrint
-from Text import class Text(concat), instance Text String
+import Data.Map
+from Text import class Text(concat,join), instance Text String
 
 import parse
 import lex
@@ -25,6 +26,7 @@ from yard import :: Error, instance toString Error
        program :: String,
        lex :: Bool,
        parse :: Bool,
+       sem :: Bool,
        fp :: Maybe String,
        help :: Bool}
 
@@ -49,28 +51,29 @@ Start w
                <<< "  --help             Show this help\n"
                <<< "  --version          Show the version\n"
                <<< "  --[no-]lex         Lexer output(default: disabled)\n"
-               <<< "  --[no-]parse       Parser output(default: enabled)\n"
+               <<< "  --[no-]parse       Parser output(default: disabled)\n"
+               <<< "  --[no-]sem         Semantic analysis output(default: enabled)\n"
        = snd $ fclose stdin w
 # (contents, stdin, w) = readFileOrStdin stdin args.fp w
 = case contents of
        (Left cs) = snd $ fclose (stdin <<< cs) w
-       (Right cs)
-       # lexOut = lexer cs
-       # stdin = if (not args.lex) stdin (case lexOut of
-               (Right toks) = 
-                       stdin <<< "//LEXER\n" <<< printTokens toks <<< "//LEXER\n"
-               _ = stdin)
-       # parseOut = parser lexOut
-       # stdin = if (not args.parse) stdin (case parseOut of
-               (Right ast) = 
-                       stdin <<<  "//PARSER\n" <<< toString ast <<< "//PARSER\n" 
-               (Left parse) = stdin <<< toString parse)
-       # semOut = sem parseOut
-       # stdin = case semOut of
-               (Right ast) = 
-                       stdin <<<  "//TYPE\n" <<< toString ast <<< "//TYPE\n" 
-               (Left parse) = stdin <<< toString parse
-       = snd $ fclose stdin w
+       (Right cs) = case lexer cs of
+               (Left e) = snd $ fclose (stdin <<< toString e) w
+               (Right lexOut)
+               # stdin = if (not args.lex) stdin (
+                       stdin <<< "//LEXER\n" <<< printTokens lexOut <<< "//LEXER\n")
+               = case parser lexOut of
+                       (Left e) = snd $ fclose (stdin <<< toString e) w
+                       (Right parseOut)
+                       # stdin = if (not args.parse) stdin (
+                               stdin <<<  "//PARSER\n" <<< toString parseOut <<< "//PARSER\n")
+                       = case sem parseOut of
+                               (Left e) = snd $ fclose (stdin <<< join "\n" (map toString e)) w
+                               (Right (semOut, gamma))
+                               # stdin = if (not args.sem) stdin (stdin 
+                                       <<< "//SEM G\n" <<< toString gamma <<< "//SEM A\n"
+                                       <<< "//SEM A\n" <<< toString semOut <<< "//SEM A\n")
+                               = snd $ fclose (stdin <<< "\n") w
                where
                        printTokens :: [Token] -> String
                        printTokens ts = concat $ flatten $ map pt ts
@@ -85,7 +88,8 @@ parseArgs w
        program=p,
        version=False,
        lex=False,
-       parse=True,
+       parse=False,
+       sem=True,
        fp=Nothing,
        help=False}, w)
 where
@@ -97,6 +101,8 @@ where
        pa ["--no-lex":r] o = pa r {o & lex=False}
        pa ["--parse":r] o = pa r {o & parse=True}
        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 [x:r] o = pa r {o & fp=Just x}
 
 readFileOrStdin :: *File (Maybe String) *World -> *(Either String [Char], *File, *World)