1
0
forked from GitHub/gf-core

forgiving names in concrete that are not in abstract, with a warning (no warning guaranteed if this is because restricted inheritance)

This commit is contained in:
aarne
2008-08-14 20:25:52 +00:00
parent 5939be16b8
commit 1302960992
2 changed files with 23 additions and 4 deletions

View File

@@ -103,7 +103,9 @@ canon2gfcc opts pars cgr@(M.MGrammar ((a,M.ModMod abm):cms)) =
---- then (trace "decode" D.convertStringsInTerm decodeUTF8) else id
umkTerm = utf . mkTerm
lins = Map.fromAscList
[(i2i f, umkTerm tr) | (f,CncFun _ (Yes tr) _) <- js]
[(f', umkTerm tr) | (f,CncFun _ (Yes tr) _) <- js,
let f' = i2i f, exists f'] -- eliminating lins without fun
-- needed even here because of restricted inheritance
lincats = Map.fromAscList
[(i2i c, mkCType ty) | (c,CncCat (Yes ty) _ _) <- js]
lindefs = Map.fromAscList
@@ -115,6 +117,8 @@ canon2gfcc opts pars cgr@(M.MGrammar ((a,M.ModMod abm):cms)) =
[(i2i c, pars lang0 c) | (c,CncCat (Yes ty) _ _) <- js]
fcfg = Nothing
exists f = Map.member f funs
i2i :: Ident -> CId
i2i = CId . ident2bs