repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sem update'
[cc1516.git]
/
spl.icl
diff --git
a/spl.icl
b/spl.icl
index
0a3f197
..
93374a5
100644
(file)
--- a/
spl.icl
+++ b/
spl.icl
@@
-16,6
+16,7
@@
from Text import class Text(concat), instance Text String
import parse
import lex
import parse
import lex
+import sem
import AST
from yard import :: Error, instance toString Error
import AST
from yard import :: Error, instance toString Error
@@
-24,7
+25,6
@@
from yard import :: Error, instance toString Error
program :: String,
lex :: Bool,
parse :: Bool,
program :: String,
lex :: Bool,
parse :: Bool,
- selftest :: Bool,
fp :: Maybe String,
help :: Bool}
fp :: Maybe String,
help :: Bool}
@@
-50,7
+50,6
@@
Start w
<<< " --version Show the version\n"
<<< " --[no-]lex Lexer output(default: disabled)\n"
<<< " --[no-]parse Parser output(default: enabled)\n"
<<< " --version Show the version\n"
<<< " --[no-]lex Lexer output(default: disabled)\n"
<<< " --[no-]parse Parser output(default: enabled)\n"
- <<< " --[no-]selftest Feed pprint parse back(default: disabled)\n"
= snd $ fclose stdin w
# (contents, stdin, w) = readFileOrStdin stdin args.fp w
= case contents of
= snd $ fclose stdin w
# (contents, stdin, w) = readFileOrStdin stdin args.fp w
= case contents of
@@
-59,19
+58,24
@@
Start w
# lexOut = lexer cs
# stdin = if (not args.lex) stdin (case lexOut of
(Right toks) =
# lexOut = lexer cs
# stdin = if (not args.lex) stdin (case lexOut of
(Right toks) =
- stdin <<< "
---LEXER\n" <<< printTokens toks <<< "---
LEXER\n"
+ stdin <<< "
//LEXER\n" <<< printTokens toks <<< "//
LEXER\n"
_ = stdin)
# parseOut = parser lexOut
_ = stdin)
# parseOut = parser lexOut
- # stdin = if (not args.parse) stdin (case parse
r lex
Out of
+ # stdin = if (not args.parse) stdin (case parseOut of
(Right ast) =
(Right ast) =
- stdin <<< "
---PARSER\n" <<< toString ast <<< "---
PARSER\n"
+ stdin <<< "
//PARSER\n" <<< toString ast <<< "//
PARSER\n"
(Left parse) = stdin <<< toString parse)
(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
where
printTokens :: [Token] -> String
printTokens ts = concat $ flatten $ map pt ts
where
= snd $ fclose stdin w
where
printTokens :: [Token] -> String
printTokens ts = concat $ flatten $ map pt ts
where
-
pt ({line,col},token) = [toString line, ":",
+ pt ({line,col},token) = [toString line, ":",
toString col, ": ", printToString token, "\n"]
parseArgs :: *World -> (Opts, *World)
toString col, ": ", printToString token, "\n"]
parseArgs :: *World -> (Opts, *World)
@@
-93,8
+97,6
@@
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 ["--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 ["--selftest":r] o = pa r {o & selftest=True}
- pa ["--no-selftest":r] o = pa r {o & selftest=False}
pa [x:r] o = pa r {o & fp=Just x}
readFileOrStdin :: *File (Maybe String) *World -> *(Either String [Char], *File, *World)
pa [x:r] o = pa r {o & fp=Just x}
readFileOrStdin :: *File (Maybe String) *World -> *(Either String [Char], *File, *World)