X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=spl.icl;h=5dad10ea107e724307abd66ad97d038792f544d9;hb=2473a12c050ab50a6fded6d4ea6df9b81ab8abf1;hp=1690d71850c97d1d312ee9c9808fa992dd623fac;hpb=a363f872ee96379d8b0b9b14cb6faec9d74e7e92;p=cc1516.git diff --git a/spl.icl b/spl.icl index 1690d71..5dad10e 100644 --- a/spl.icl +++ b/spl.icl @@ -12,6 +12,7 @@ import Data.Maybe import Data.Func import System.CommandLine import GenPrint +import Data.Map from Text import class Text(concat,join), instance Text String import parse @@ -50,7 +51,8 @@ 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 @@ -67,9 +69,9 @@ Start w stdin <<< "//PARSER\n" <<< toString parseOut <<< "//PARSER\n") = case sem parseOut of (Left e) = snd $ fclose (stdin <<< join "\n" (map toString e)) w - (Right semOut) + (Right (semOut, gamma)) # stdin = if (not args.sem) stdin ( - stdin <<< "//SEM\n" <<< toString semOut <<< "//SEM\n") + stdin <<< "//SEM\n" <<< toString gamma <<< "//SEM\n") = snd $ fclose stdin w where printTokens :: [Token] -> String