GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-06 09:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

GF.Grammar.Grammar.allExtends now returns a list of source modules instead of just the module names. This saves extra lookups later

Browse Source
This commit is contained in:
kr.angelov
2013-09-23 09:18:27 +00:00
parent a7469a694b
commit e6dbd74dc9
4 changed files with 30 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/GF/Compile/GrammarToPGF.hs
View File

@@ -65,8 +65,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,
Just r <- [lookup i (allExtendSpecs gr cm)]]
let cflags = concatOptions [mflags mo | (i,mo) <- modules gr, isModCnc mo]
(seqs,cdefs) <- addMissingPMCFGs
Map.empty

8
src/compiler/GF/Compile/Rename.hs
View File

@@ -125,10 +125,10 @@ tree2status o = case o of
buildStatus :: SourceGrammar -> SourceModule -> Check Status
buildStatus gr mo@(m,mi) = checkIn (ppLocation (msrc mi) NoLoc <> colon) $ do
let gr1 = prependModule gr mo
ops = [OSimple e | e <- allExtends gr1 m] ++ mopens mi
mods <- checkErr $ mapM (lookupModule gr1 . openedModule) ops
let sts = map modInfo2status $ zip ops mods
let gr1 = prependModule gr mo
exts = [(OSimple m,mi) | (m,mi) <- allExtends gr1 m]
ops <- checkErr $ mapM (\o -> lookupModule gr1 (openedModule o) >>= \mi -> return (o,mi)) (mopens mi)
let sts = map modInfo2status (exts++ops)
return (if isModCnc mi
then (emptyBinTree, reverse sts) -- the module itself does not define any names
else (self2status m mi,reverse sts)) -- so the empty ident is not needed