From 62d5dfb71b1cd6e2eff6da14495daba86572e321 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Mon, 23 Sep 2013 09:30:45 +0000 Subject: [PATCH] GrammarToPGF now looks only at the top modules for the PGF flags --- src/compiler/GF/Compile/GrammarToPGF.hs | 5 ++--- 1 file 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