X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=spl.icl;h=e88e9432f3534012e9e754ebe27349005fcb063e;hb=483bcde4dbb75d1901cffad6cc2c45307b7e90a2;hp=291b0bdd369f4c2cdeebcae3ea94229c990b8f4e;hpb=f490bc3083cc290680499d4c12be9b732b94fd82;p=cc1516.git

diff --git a/spl.icl b/spl.icl
index 291b0bd..e88e943 100644
--- a/spl.icl
+++ b/spl.icl
@@ -19,6 +19,7 @@ import parse
 import lex
 import sem
 import AST
+import gen
 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,
+    gen :: Bool,
 	fp :: Maybe String,
 	help :: Bool}
 
@@ -58,22 +60,29 @@ Start 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 <<< join "\n" (map toString e)) w
-				(Right (semOut, gamma))
-				# stdin = if (not args.sem) stdin (
-					stdin <<<  "//SEM\n" <<< toString gamma <<< "//SEM\n")
+				(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
@@ -89,6 +98,7 @@ parseArgs w
 	lex=False,
 	parse=False,
 	sem=True,
+    gen=True,
 	fp=Nothing,
 	help=False}, w)
 where
@@ -102,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)