X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=spl.icl;h=b5738ee23d7ed3465334febe3cc1cc8b275ccb8e;hb=f081c2c5e248331eb6e2f090f4afe818fd8259eb;hp=c42412c6fc9bca69e1da3914a037f85bc9379db6;hpb=285d41abeaa5a7c9297009da26b83b0236390c02;p=cc1516.git

diff --git a/spl.icl b/spl.icl
index c42412c..b5738ee 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}
 
@@ -52,29 +54,39 @@ Start w
 		<<< "  --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
-		(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 G\n" <<< toString gamma <<< "//SEM A\n"
-					<<< "//SEM A\n" <<< toString semOut <<< "//SEM A\n")
-				= snd $ fclose (stdin <<< "\n") 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")
+				= 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 [] = ""
+			printConstraints [(t1, t2):ts] = concat [
+				"(", toString t1, ",", toString t2, ")"] +++ printConstraints ts
+
 			printTokens :: [Token] -> String
 			printTokens ts = concat $ flatten $ map pt ts
 				where
@@ -89,7 +101,8 @@ parseArgs w
 	version=False,
 	lex=False,
 	parse=False,
-	sem=True,
+	sem=False,
+    gen=True,
 	fp=Nothing,
 	help=False}, w)
 where
@@ -103,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 ["--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)