resource specialized to present tense ; preprocessor flag

src/GF/Compile/Compile.hs

@@ -84,7 +84,7 @@ compileModule opts st0 file |
   grammar1 <- case suff of
     "cf"   -> putp ("- parsing" +++ suff +++ file) $ getCFGrammar opts file
     "ebnf" -> putp ("- parsing" +++ suff +++ file) $ getEBNFGrammar opts file
-    "gfm"  -> putp ("- parsing" +++ suff +++ file) $ getSourceGrammar file
+    "gfm"  -> putp ("- parsing" +++ suff +++ file) $ getSourceGrammar opts file
     _      -> putp ("- parsing old gf" +++ file)   $ getOldGrammar opts file
   let mods = modules grammar1
   let env = compileEnvShSt st0 []
@@ -195,7 +195,7 @@ compileOne opts env@((_,srcgr,_),_) file = do
 
     -- for compiled resource, parse and organize, then update environment
     "gfr" -> do
-       sm0 <- putp ("| reading" +++ file) $ getSourceModule file
+       sm0 <- putp ("| reading" +++ file) $ getSourceModule opts file
        sm <- {- putp "creating indirections" $ -} ioeErr $ extendModule mos sm0
 ---- experiment with not optimizing gfr 
 ----      sm:_  <- putp "  optimizing " $ ioeErr $ evalModule mos sm1
@@ -206,7 +206,8 @@ compileOne opts env@((_,srcgr,_),_) file = do
 
     -- for gf source, do full compilation
     _ -> do
-       sm0 <- putpOpt ("- parsing" +++ file) ("- compiling" +++ file ++ "... ") $ getSourceModule file
+       sm0 <- putpOpt ("- parsing" +++ file) ("- compiling" +++ file ++ "... ") $ 
+                                           getSourceModule opts file
        (k',sm)  <- makeSourceModule opts (fst env) sm0
        cm  <- putpp "  generating code... " $ generateModuleCode opts path sm
        ft <- getReadTimes file

src/GF/Compile/GetGrammar.hs

@@ -44,16 +44,25 @@ import GF.Infra.ReadFiles ----
 import Data.Char (toUpper)
 import Data.List (nub)
 import Control.Monad (foldM)
+import System (system)
 
-getSourceModule :: FilePath -> IOE SourceModule
-getSourceModule file = do
+getSourceModule :: Options -> FilePath -> IOE SourceModule
+getSourceModule opts file0 = do
+  file <- case getOptVal opts usePreprocessor of
+    Just p -> do
+      let tmp = "_gf_preproc.tmp"
+          cmd = p +++ file0 ++ ">" ++ tmp
+      ioeIO $ system cmd
+      -- ioeIO $ putStrLn $ "preproc" +++ cmd
+      return tmp
+    _ -> return file0
   string    <- readFileIOE file
   let tokens = myLexer string
   mo1  <- ioeErr $ {- err2err $ -} pModDef tokens
   ioeErr $ transModDef mo1
 
-getSourceGrammar :: FilePath -> IOE SourceGrammar
-getSourceGrammar file = do
+getSourceGrammar :: Options -> FilePath -> IOE SourceGrammar
+getSourceGrammar opts file = do
   string    <- readFileIOE file
   let tokens = myLexer string
   gr1  <- ioeErr $ {- err2err $ -} pGrammar tokens