X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fmain.icl;h=31c98d760e0899bacbfb28ba60d09170f7f69614;hb=b3bedf1e825aaaee9134dddc6de82b373bf8b86b;hp=edd07f19c76a04cc8d181624333a9c083385209e;hpb=ecb884c3135dd60d57288b51359f458a6d127c77;p=cc1516.git

diff --git a/src/main.icl b/src/main.icl
index edd07f1..31c98d7 100644
--- a/src/main.icl
+++ b/src/main.icl
@@ -4,56 +4,92 @@ import StdFile
 import StdBool
 import StdMisc
 import StdFunc
+import StdTuple
 import StdList
 import StdString
 import Data.Either
 import Data.Maybe
+import Data.Func
 import System.CommandLine
+import GenPrint
+from Text import class Text(concat), instance Text String
 
 import parse
 import lex
+from yard import :: Error, instance toString Error
 
 :: Opts = {
+	version :: Bool,
 	program :: String,
 	lex :: Bool,
 	parse :: Bool,
 	fp :: Maybe String,
 	help :: Bool}
 
-:: *StartType :== (LexerOutput, ParserOutput, *World)
+derive gPrint TokenValue
 
-Start :: *World -> *StartType
+Start :: *World -> *World
 Start w
 # (args, w) = parseArgs w
-| args.help
-	# (out, w) = stdio w
-	# out = out <<< "\nUsage: " <<< args.program <<< " [opts] [FILENAME]\n"
-		<<< "\t--help  Show this help\n"
-		<<< "\t--lex   Lex only, is mutually exclusive with --parse\n"
-		<<< "\t--parse Lex & Parse only\n\n"
-		<<< "\tFILENAME   File to parse, when unspecified stdin is parsed\n"
-	# (_, w) = fclose out w
-	= (Left "", Left "", w)
 # (stdin, w) = stdio w
+| args.version
+	# stdin = stdin 
+		<<< "main 0.1 (17 march 2016)\n"
+		<<< "Copyright Pim Jager and Mart Lubbers\n"
+	= snd $ fclose stdin w
+| args.help
+	# stdin = stdin 
+		<<< "Usage: " <<< args.program <<< " [OPTION] [FILE]\n"
+		<<< "Lex parse and either FILE or stdin\n"
+		<<< "\n"
+		<<< "Options:\n"
+		<<< "  --help             Show this help\n"
+		<<< "  --version          Show the version\n"
+		<<< "  --[no-]lex         Lexer output(default: disabled)\n"
+		<<< "  --[no-]parse       Parser output(default: enabled)\n"
+	= snd $ fclose stdin w
 # (contents, stdin, w) = readFileOrStdin stdin args.fp w
-| args.lex = case contents of
-	(Right cs) = (lexer cs, Left "Parsing Disabled", w)
-	(Left e) = (Left e, Left "Parsing disabled", w)
 = case contents of
-	(Left e) = (Left e, Left "", w)
-	(Right cs) = let lexOut = lexer cs in (lexOut, parser lexOut, w)
+	(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
+		where
+			printTokens :: [Token] -> String
+			printTokens ts = concat $ flatten $ map pt ts
+				where
+					pt {line,column,token} = [toString line, ":", 
+						toString column, ": ", printToString token, "\n"]
 
 parseArgs :: *World -> (Opts, *World)
 parseArgs w
 # ([p:args], w) = getCommandLine w
-= (pa args {program=p, lex=False, parse=False, fp=Nothing, help=False}, w)
+= (pa args {
+	program=p,
+	version=False,
+	lex=False,
+	parse=True,
+	fp=Nothing,
+	help=False}, w)
 where
-	pa :: [String] -> (Opts -> Opts)
-	pa [] = id
-	pa ["--help":r] = \o.pa r {o & help=True}
-	pa ["--lex":r] = \o.pa r {o & lex=True, parse=False}
-	pa ["--parse":r] = \o.pa r {o & lex=False, parse=True}
-	pa [x:r] = \o.pa r {o & fp=Just x}
+	pa :: [String] Opts -> Opts
+	pa [] o = o
+	pa ["--help":r] o = pa r {o & help=True}
+	pa ["--version":r] o = pa r {o & version=True}
+	pa ["--lex":r] o = pa r {o & lex=True}
+	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 [x:r] o = pa r {o & fp=Just x}
 
 readFileOrStdin :: *File (Maybe String) *World -> *(Either String [Char], *File, *World)
 readFileOrStdin stdin Nothing w