X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=spl.icl;h=2a4fb97e0b4cdaf0e6e712e31fad5e233506aaab;hb=b2e209f5c3b3d334dde4c93e8e86f4334428e802;hp=240de63540f0a0b9856babac414e58d8bf70bade;hpb=8c4ec1c3287d6c6ddefd22ef608a4d97693e7e85;p=cc1516.git diff --git a/spl.icl b/spl.icl index 240de63..2a4fb97 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 @@ -66,11 +67,10 @@ Start w # stdin = if (not args.parse) stdin ( stdin <<< "//PARSER\n" <<< toString parseOut <<< "//PARSER\n") = case sem parseOut of - (Left e) = snd $ fclose (stdin <<< "SEMERRORS: " <<< - join "\n" (map toString e)) w - (Right semOut) + (Left e) = snd $ fclose (stdin <<< join "\n" (map toString e)) w + (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