summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkr.angelov <kr.angelov@gmail.com>2013-09-23 09:30:45 +0000
committerkr.angelov <kr.angelov@gmail.com>2013-09-23 09:30:45 +0000
commit1402225a6ec280a0cbe46445ffca24f44d5619c2 (patch)
tree849721662bb046ac3812750aea7cab3573af4113
parent54c3924a11dce931215c94296275df6dfc17190c (diff)
GrammarToPGF now looks only at the top modules for the PGF flags
-rw-r--r--src/compiler/GF/Compile/GrammarToPGF.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/GF/Compile/GrammarToPGF.hs b/src/compiler/GF/Compile/GrammarToPGF.hs
index 41f6f8ff0..893dac237 100644
--- a/src/compiler/GF/Compile/GrammarToPGF.hs
+++ b/src/compiler/GF/Compile/GrammarToPGF.hs
@@ -45,8 +45,7 @@ mkCanon2pgf opts gr am = do
mkAbstr am = return (i2i am, D.Abstr flags funs cats bcode)
where
- aflags =
- concatOptions (reverse [mflags mo | (_,mo) <- modules gr, isModAbs mo])
+ aflags = err (const noOptions) mflags (lookupModule gr am)
(adefs,bcode) =
generateByteCode $
@@ -65,7 +64,7 @@ mkCanon2pgf opts gr am = do
[(0,i2i f) | ((m,f),AbsFun (Just (L _ ty)) _ _ (Just True),_) <- adefs, snd (GM.valCat ty) == cat]
mkConcr cm = do
- let cflags = concatOptions [mflags mo | (i,mo) <- modules gr, isModCnc mo]
+ let cflags = err (const noOptions) mflags (lookupModule gr cm)
(seqs,cdefs) <- addMissingPMCFGs
Map.empty