GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 03:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

resource.txt updates ; lock field and lookup book fixes

Browse Source
This commit is contained in:
aarne
2006-06-20 15:05:22 +00:00
parent 0333ba894b
commit a6cc18c8bd
9 changed files with 238 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GF/Compile/MkConcrete.hs
View File

@@ -82,7 +82,7 @@ mkCncGroups opts0 ((res,path),files) = do
return
(\cat s ->
errVal ([],"No parse") $
optParseArgErrMsg (options [newMParser, firstCat cat, beVerbose]) gr s >>=
optParseArgErrMsg (options [newFParser, firstCat cat, beVerbose]) gr s >>=
(\ (ts,e) -> return (map tree2exp ts, e)) ,
isKnownWord gr)
putStrLn "Building parser"

4
src/GF/Compile/Rename.hs
View File

@@ -204,7 +204,9 @@ renameTerm env vars = ren vars where
| elem r vs -> return trm -- var proj first
| otherwise -> case renid (Q r (label2ident l)) of -- qualif second
Ok t -> return t
_ -> liftM (flip P l) $ renid t -- const proj last
_ -> case liftM (flip P l) $ renid t of
Ok t -> return t -- const proj last
_ -> prtBad "unknown qualified constant" trm
_ -> composOp (ren vs) trm