X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=spl.icl;h=28b95fb9af33f1a3e8752d3141ba1c5c7d5d8a7b;hb=86f02767b3cd9625083c3dd8bd46525f163e9a5b;hp=2b458e47ca6642cdba3099f917fe6eee9874e108;hpb=d5abf2ad34be35640d0e1b04d4f3da24e4ea9967;p=cc1516.git diff --git a/spl.icl b/spl.icl index 2b458e4..28b95fb 100644 --- a/spl.icl +++ b/spl.icl @@ -24,7 +24,6 @@ from yard import :: Error, instance toString Error program :: String, lex :: Bool, parse :: Bool, - selftest :: Bool, fp :: Maybe String, help :: Bool} @@ -50,7 +49,6 @@ Start w <<< " --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" = snd $ fclose stdin w # (contents, stdin, w) = readFileOrStdin stdin args.fp w = case contents of @@ -71,7 +69,7 @@ Start w 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) @@ -82,7 +80,6 @@ parseArgs w version=False, lex=False, parse=True, - selftest=False, fp=Nothing, help=False}, w) where @@ -94,8 +91,6 @@ 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 [x:r] o = pa r {o & fp=Just x} readFileOrStdin :: *File (Maybe String) *World -> *(Either String [Char], *File, *World)