X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=spl.icl;h=e88e9432f3534012e9e754ebe27349005fcb063e;hb=5b98614f91d22a47f6e089329336acd727d56fb5;hp=240de63540f0a0b9856babac414e58d8bf70bade;hpb=df7fbaaf21817473f51525a2c8f03b0a5a37b823;p=cc1516.git

diff --git a/spl.icl b/spl.icl
index 240de63..e88e943 100644
--- a/spl.icl
+++ b/spl.icl
@@ -12,12 +12,14 @@ 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
 import lex
 import sem
 import AST
+import gen
 from yard import :: Error, instance toString Error
 
 :: Opts = {
@@ -26,6 +28,7 @@ from yard import :: Error, instance toString Error
 	lex :: Bool,
 	parse :: Bool,
 	sem :: Bool,
+    gen :: Bool,
 	fp :: Maybe String,
 	help :: Bool}
 
@@ -50,29 +53,36 @@ 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
 	(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
-			(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
-				(Left e) = snd $ fclose (stdin <<< "SEMERRORS: " <<<
-					join "\n" (map toString e)) w
-				(Right semOut)
-				# stdin = if (not args.sem) stdin (
-					stdin <<<  "//SEM\n" <<< toString semOut <<< "//SEM\n")
-				= snd $ fclose stdin 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")
+                # stdin = if (not args.gen) stdin (stdin
+                    <<< "//CODE GEN\n" <<< gen ast <<< "\n//CODE GEN\n")
+				= snd $ fclose (stdin <<< "\n") w
 		where
+			printConstraints :: Constraints -> String
+			printConstraints [] = ""
+			printConstraints [(t1, t2):ts] = concat [
+				"(", toString t1, ",", toString t2, ")"] +++ printConstraints ts
+
 			printTokens :: [Token] -> String
 			printTokens ts = concat $ flatten $ map pt ts
 				where
@@ -88,6 +98,7 @@ parseArgs w
 	lex=False,
 	parse=False,
 	sem=True,
+    gen=True,
 	fp=Nothing,
 	help=False}, w)
 where
@@ -101,6 +112,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 ["--gen":r] o = pa r {o & gen=True}
+    pa ["--no-gen":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)