repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lala working on lists
[cc1516.git]
/
spl.icl
diff --git
a/spl.icl
b/spl.icl
index
240de63
..
2a4fb97
100644
(file)
--- a/
spl.icl
+++ b/
spl.icl
@@
-12,6
+12,7
@@
import Data.Maybe
import Data.Func
import System.CommandLine
import GenPrint
import Data.Func
import System.CommandLine
import GenPrint
+import Data.Map
from Text import class Text(concat,join), instance Text String
import parse
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
# 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 = 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
= snd $ fclose stdin w
where
printTokens :: [Token] -> String