Changeset 4198 for src/Main.hs

Timestamp:

05/31/05 10:38:43 (4 years ago)

Author:

bsmith

svk:copy_cache_prev:

5793

Message:

Moved some parser types to Pugs.Parser.Types.

Files:

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

src/Main.hs

@@ -184 +184 @@
 doParseWith f name prog = do
     env <- tabulaRasa
-    runRule env f' ruleProgram name $ decodeUTF8 prog
+    f' $ parseProgram env name $ decodeUTF8 prog
     where
     f' env | Val err@(VError _ _) <- envBody env = do
@@ -194 +194 @@
 doParse prettyFunc name prog = do
     env <- tabulaRasa
-    case runRule env envBody ruleProgram name (decodeUTF8 prog) of
+    case envBody $ parseProgram env name (decodeUTF8 prog) of
         (Val err@(VError _ _)) -> putStrLn $ pretty err
         exp -> putStrLn $ prettyFunc exp
@@ -221 +221 @@
     parse = do
         env <- liftSTM $ readTVar menv
-        runRule env (return . envBody) ruleProgram "<interactive>" (decodeUTF8 prog)
+        return $ envBody $ parseProgram env "<interactive>" $
+          (decodeUTF8 prog)
     theEnv = do
         ref <- if runOptSeparately opts
@@ -278 +279 @@
 runProgramWith fenv f name args prog = do
     env <- prepareEnv name args
-    val <- runEnv $ runRule (fenv env) id ruleProgram name $ decodeUTF8 prog
+    val <- runEnv $ parseProgram (fenv env) name $ decodeUTF8 prog
     f val