GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-08 10:42: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 ""