diff options
| author | aarne <aarne@cs.chalmers.se> | 2006-06-20 15:05:22 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2006-06-20 15:05:22 +0000 |
| commit | a75c3b1907a814e63cdff9cc045bdcaabe055b8f (patch) | |
| tree | 1b8d587c49fb67a41c68e3c4b8ff80e12c327df6 /src/GF/Compile | |
| parent | 402a113b567a96eef61946552b68df6ac6eb6712 (diff) | |
resource.txt updates ; lock field and lookup book fixes
Diffstat (limited to 'src/GF/Compile')
| -rw-r--r-- | src/GF/Compile/MkConcrete.hs | 2 | ||||
| -rw-r--r-- | src/GF/Compile/Rename.hs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/GF/Compile/MkConcrete.hs b/src/GF/Compile/MkConcrete.hs index 2bd45a4e5..5413d1b79 100644 --- a/src/GF/Compile/MkConcrete.hs +++ b/src/GF/Compile/MkConcrete.hs @@ -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" diff --git a/src/GF/Compile/Rename.hs b/src/GF/Compile/Rename.hs index ecabf03b1..05fdfa077 100644 --- a/src/GF/Compile/Rename.hs +++ b/src/GF/Compile/Rename.hs @@ -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 |