Changeset 3636 for src/Main.hs

Timestamp:

05/22/05 15:06:08 (4 years ago)

Author:

iblech

svk:copy_cache_prev:

5201

Message:

Added ".." as a shell command which outputs the AST unformatted.

Files:

• src/Main.hs (modified) (3 diffs)

src/Main.hs

@@ -104 +104 @@
 
 parse :: String -> IO ()
-parse = doParse "-"
+parse = doParse pretty "-"
 
 dump :: String -> IO ()
@@ -130 +130 @@
             CmdLoad fn        -> doLoad env fn >> loop
             CmdRun opts prog  -> doRunSingle env opts prog >> loop
-            CmdParse prog     -> doParse "<interactive>" prog >> loop
+            CmdParse prog     -> doParse pretty "<interactive>" prog >> loop
+            CmdParseRaw prog  -> doParse show   "<interactive>" prog >> loop
             CmdHelp           -> printInteractiveHelp >> loop
             CmdReset          -> tabulaRasa >>= (liftSTM . writeTVar env) >> loop
@@ -185 +186 @@
     f' env = f env name
 
-
-doParse :: FilePath -> String -> IO ()
-doParse name prog = do
+doParse :: (Exp -> String) -> FilePath -> String -> IO ()
+doParse prettyFunc name prog = do
     env <- emptyEnv name []
     case runRule env envBody ruleProgram name (decodeUTF8 prog) of
         (Val err@(VError _ _)) -> putStrLn $ pretty err
-        exp -> putStrLn $ pretty exp
+        exp -> putStrLn $ prettyFunc exp
 
 doLoad :: TVar Env -> String -> IO ()