repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added default functions, isEmpty does not typecheck...
[cc1516.git]
/
spl.icl
diff --git
a/spl.icl
b/spl.icl
index
cf3d5f3
..
b5738ee
100644
(file)
--- a/
spl.icl
+++ b/
spl.icl
@@
-19,6
+19,7
@@
import parse
import lex
import sem
import AST
import lex
import sem
import AST
+import gen
from yard import :: Error, instance toString Error
:: Opts = {
from yard import :: Error, instance toString Error
:: Opts = {
@@
-27,6
+28,7
@@
from yard import :: Error, instance toString Error
lex :: Bool,
parse :: Bool,
sem :: Bool,
lex :: Bool,
parse :: Bool,
sem :: Bool,
+ gen :: Bool,
fp :: Maybe String,
help :: Bool}
fp :: Maybe String,
help :: Bool}
@@
-52,27
+54,33
@@
Start w
<<< " --version Show the version\n"
<<< " --[no-]lex Lexer output(default: disabled)\n"
<<< " --[no-]parse Parser output(default: disabled)\n"
<<< " --version Show the version\n"
<<< " --[no-]lex Lexer output(default: disabled)\n"
<<< " --[no-]parse Parser output(default: disabled)\n"
- <<< " --[no-]sem Semantic analysis output(default: enabled)\n"
+ <<< " --[no-]sem Semantic analysis output(default: disabled)\n"
+ <<< " --[no-]code Code generation 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) = case lexer cs of
= snd $ fclose stdin w
# (contents, stdin, w) = readFileOrStdin stdin args.fp w
= case contents of
(Left cs) = snd $ fclose (stdin <<< cs) w
(Right cs) = case lexer cs of
- (Left e) = snd $ fclose (stdin <<< toString e) w
+ (Left e) = snd $ fclose (stdin <<< toString e
<<< "\n"
) w
(Right lexOut)
# stdin = if (not args.lex) stdin (
stdin <<< "//LEXER\n" <<< printTokens lexOut <<< "//LEXER\n")
= case parser lexOut of
(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
+ (Left e) = snd $ fclose (stdin <<< toString e
<<< "\n"
) w
(Right parseOut)
# stdin = if (not args.parse) stdin (
stdin <<< "//PARSER\n" <<< toString parseOut <<< "//PARSER\n")
= case sem parseOut of
(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
+ (Left e) = snd $ fclose (stdin <<< join "\n" (map toString e)
<<< "\n"
) w
(Right ast)
# stdin = if (not args.sem) stdin (stdin
<<< "//SEM G\n" <<< toString ast <<< "//SEMA\n")
(Right ast)
# stdin = if (not args.sem) stdin (stdin
<<< "//SEM G\n" <<< toString ast <<< "//SEMA\n")
- = snd $ fclose (stdin <<< "\n") w
+ = case gen ast of
+ (Left e) = snd $ fclose (stdin <<< e) w
+ (Right asm)
+ # stdin = if (not args.gen) stdin (stdin
+ <<< ";CODE GEN\n" <<< asm <<< "\n;CODE GEN\n")
+ = snd $ fclose (stdin <<< "\n") w
where
printConstraints :: Constraints -> String
printConstraints [] = ""
where
printConstraints :: Constraints -> String
printConstraints [] = ""
@@
-93,7
+101,8
@@
parseArgs w
version=False,
lex=False,
parse=False,
version=False,
lex=False,
parse=False,
- sem=True,
+ sem=False,
+ gen=True,
fp=Nothing,
help=False}, w)
where
fp=Nothing,
help=False}, w)
where
@@
-107,6
+116,8
@@
where
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 ["--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 ["--code":r] o = pa r {o & gen=True}
+ pa ["--no-code":r] o = pa r {o & gen=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)