X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=spl.icl;h=c42412c6fc9bca69e1da3914a037f85bc9379db6;hb=3d569407ede8e77c5809a1076735dc3c58ab1922;hp=da8fa316ce66730ea3e8103e02567a734d503735;hpb=e117090bd4eac114541e34d85463d271eded0865;p=cc1516.git

diff --git a/spl.icl b/spl.icl
index da8fa31..c42412c 100644
--- a/spl.icl
+++ b/spl.icl
@@ -12,10 +12,12 @@ import Data.Maybe
 import Data.Func
 import System.CommandLine
 import GenPrint
-from Text import class Text(concat), instance Text String
+import Data.Map
+from Text import class Text(concat,join), instance Text String
 
 import parse
 import lex
+import sem
 import AST
 from yard import :: Error, instance toString Error
 
@@ -24,7 +26,7 @@ from yard import :: Error, instance toString Error
 	program :: String,
 	lex :: Bool,
 	parse :: Bool,
-	selftest :: Bool,
+	sem :: Bool,
 	fp :: Maybe String,
 	help :: Bool}
 
@@ -49,29 +51,34 @@ 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-]selftest    Feed pprint parse back(default: disabled)\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)
-	# lexOut = lexer cs
-	# stdin = if (not args.lex) stdin (case lexOut of
-		(Right toks) = 
-			stdin <<< "---LEXER\n" <<< printTokens toks <<< "---LEXER\n"
-		_ = stdin)
-	# parseOut = parser lexOut
-	# stdin = if (not args.parse) stdin (case parser lexOut of
-		(Right ast) = 
-			stdin <<<  "---PARSER\n" <<< toString ast <<< "---PARSER\n" 
-		(Left parse) = stdin <<< toString parse)
-	= snd $ fclose stdin w
+	(Right cs) = case lexer cs of
+		(Left e) = snd $ fclose (stdin <<< toString e) 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
+			(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
 		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)
@@ -81,8 +88,8 @@ parseArgs w
 	program=p,
 	version=False,
 	lex=False,
-	parse=True,
-	selftest=False,
+	parse=False,
+	sem=True,
 	fp=Nothing,
 	help=False}, w)
 where
@@ -94,8 +101,8 @@ 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 ["--selftest":r] o = pa r {o & selftest=True}
-	pa ["--no-selftest":r] o = pa r {o & selftest=False}
+	pa ["--sem":r] o = pa r {o & sem=True}
+	pa ["--no-sem":r] o = pa r {o & sem=False}
 	pa [x:r] o = pa r {o & fp=Just x}
 
 readFileOrStdin :: *File (Maybe String) *World -> *(Either String [Char], *File, *World)