From 1195db1da3f8e0c1b7edf39cac604b2bf8482aab Mon Sep 17 00:00:00 2001 From: hallgren Date: Fri, 19 Oct 2012 19:56:00 +0000 Subject: Consistenly use SourceGrammar instead of [SourceModule] when calling compiler passes --- src/compiler/GF/Compile/GeneratePMCFG.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/compiler/GF/Compile/GeneratePMCFG.hs') diff --git a/src/compiler/GF/Compile/GeneratePMCFG.hs b/src/compiler/GF/Compile/GeneratePMCFG.hs index bb4c5b549..13ac8d26f 100644 --- a/src/compiler/GF/Compile/GeneratePMCFG.hs +++ b/src/compiler/GF/Compile/GeneratePMCFG.hs @@ -43,13 +43,13 @@ import Control.Exception ---------------------------------------------------------------------- -- main conversion function -generatePMCFG :: Options -> [SourceModule] -> SourceModule -> IO SourceModule -generatePMCFG opts mos cmo@(cm,cmi) = do +generatePMCFG :: Options -> SourceGrammar -> SourceModule -> IO SourceModule +generatePMCFG opts sgr cmo@(cm,cmi) = do (seqs,js) <- mapAccumWithKeyM (addPMCFG opts gr am cm) Map.empty (jments cmi) when (verbAtLeast opts Verbose) $ hPutStrLn stderr "" return (cm,cmi{mseqs = Just (mkSetArray seqs), jments = js}) where - gr = mGrammar (cmo:mos) + gr = prependModule sgr cmo MTConcrete am = mtype cmi mapAccumWithKeyM :: (Monad m, Ord k) => (a -> k -> b -> m (a,c)) -> a -- cgit v1.2.3