Changeset 2396 for src/Main.hs

Timestamp:

04/27/05 15:02:41 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

3914

Message:

* compiler repaired.

Files:

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

src/Main.hs

@@ -89 +89 @@
 
 dump :: String -> IO ()
-dump = (doParseWith $ \exp _ -> print exp) "-"
-
-comp :: String -> IO ()
-comp = (doParseWith $ \exp _ -> putStrLn =<< compile "Haskell" exp) "-"
+dump = (doParseWith $ \env _ -> print $ envBody env) "-"
+
+dumpGlob :: String -> IO ()
+dumpGlob = (doParseWith $ \env _ -> do
+    glob <- readIORef $ envGlobal env
+    print $ userDefined glob) "-"
+
+userDefined :: Pad -> Pad
+userDefined (MkPad pad) = MkPad $ Map.filterWithKey doFilter pad
+    where
+    doFilter (_:'*':_) _ = False
+    doFilter _ _         = True
 
 repLoop :: IO ()
@@ -117 +125 @@
 
 doExternal :: String -> FilePath -> String -> IO ()
-doExternal mod = doParseWith $ \exp _ -> do
-    str <- externalize mod exp
+doExternal mod = doParseWith $ \env _ -> do
+    str <- externalize mod $ envBody env
     putStrLn str
 
 doCompile :: [Char] -> FilePath -> String -> IO ()
-doCompile backend = doParseWith $ \exp _ -> do
-    str <- compile backend exp
+doCompile backend = doParseWith $ \env _ -> do
+    glob    <- readIORef $ envGlobal env
+    globRef <- newIORef $ userDefined glob
+    str  <- compile backend env{ envGlobal = globRef }
     writeFile "dump.ast" str
 
-doParseWith :: (Pugs.AST.Exp -> FilePath -> IO a) -> FilePath -> String -> IO a
+doParseWith :: (Env -> FilePath -> IO a) -> FilePath -> String -> IO a
 doParseWith f name prog = do
     env <- emptyEnv []
-    runRule env (f' . envBody) ruleProgram name $ decodeUTF8 prog
-    where
-    f' (Val err@(VError _ _)) = do
+    runRule env f' ruleProgram name $ decodeUTF8 prog
+    where
+    f' Env{ envBody = Val err@(VError _ _) } = do
         hPutStrLn stderr $ pretty err
         exitFailure
-    f' exp = f exp name
+    f' env = f env name