Changeset 4915

Timestamp:

06/22/05 21:02:52 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

6641

Message:

* make pirsmoke is now a reality...

Location:

src

Files:

• Main.hs (modified) (1 diff)
• Pugs/Compile.hs (modified) (1 diff)

src/Main.hs

@@ -324 +324 @@
     expandInc :: [FilePath] -> String -> IO String
     expandInc incs str = case breakOnGlue "\nuse " str of
-        Nothing -> return str
+        Nothing -> case breakOnGlue "\nrequire " str of
+            Nothing -> return str
+            Just (pre, post) -> do
+                let (mod, (_:rest)) = span (/= ';') (dropWhile isSpace post)
+                mod'    <- includeInc incs mod
+                rest'   <- expandInc incs rest
+                return $ pre ++ mod' ++ rest'
         Just (pre, post) -> do
             let (mod, (_:rest)) = span isAlphaNum (dropWhile isSpace post)

src/Pugs/Compile.hs

@@ -1 +1 @@
 {-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances -fno-warn-orphans -funbox-strict-fields -cpp #-}
+{-# OPTIONS_GHC -#include "UnicodeC.h" #-}
 
 {-|