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

bug fix in with-modules and gr checker; factoring out cats to Common

Browse Source
This commit is contained in:
aarne
2006-05-23 22:20:00 +00:00
parent 14d3ffa2f5
commit 1595e31a28
9 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/GF/Compile/CheckGrammar.hs
View File

@@ -346,7 +346,7 @@ inferLType gr trm = case trm of
Q m ident | isPredef m -> termWith trm $ checkErr (typPredefined ident)
Q m ident -> checks [
termWith trm $ checkErr (lookupResType gr m ident)
termWith trm $ checkErr (lookupResType gr m ident) >>= comp
,
checkErr (lookupResDef gr m ident) >>= infer
,
@@ -356,7 +356,7 @@ inferLType gr trm = case trm of
QC m ident | isPredef m -> termWith trm $ checkErr (typPredefined ident)
QC m ident -> checks [
termWith trm $ checkErr (lookupResType gr m ident)
termWith trm $ checkErr (lookupResType gr m ident) >>= comp
,
checkErr (lookupResDef gr m ident) >>= infer
,
@@ -825,7 +825,7 @@ checkEqLType env t u trm = do
not (any (\ (k,b) -> alpha g a b && l == k) ts)]
(locks,others) = partition isLockLabel ls
in case others of
_:_ -> Bad $ "missing record fieds" +++ unwords (map prt others)
_:_ -> Bad $ "missing record fields" +++ unwords (map prt others)
_ -> return locks
_ -> Bad ""

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

@@ -72,8 +72,8 @@ rebuildModule ms mo@(i,mi) = do
++ [oQualif i i | i <- map snd insts] ----
++ [oSimple i | i <- map snd insts] ----
---- ++ [oSimple ext] ---- to encode dependence
--- check if me is incomplete; --- why inherit all forced by syntax
return $ ModMod $ Module mt0 stat' fs (map inheritAll me) ops1 js
--- check if me is incomplete
return $ ModMod $ Module mt0 stat' fs me ops1 js
---- (mapTree (qualifInstanceInfo insts) js) -- not needed
_ -> return mi