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

normalize record types in overload resolution

Browse Source
This commit is contained in:
aarne
2006-11-18 20:54:10 +00:00
parent 8e07d61ccf
commit 9d1cc07284
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,9 +339,13 @@ computeLType gr t = do
r' <- comp r
s' <- comp s
case (r',s') of
(RecType rs, RecType ss) -> checkErr $ plusRecType r' s'
(RecType rs, RecType ss) -> checkErr (plusRecType r' s') >>= comp
_ -> return $ ExtR r' s'
RecType fs -> do
let fs' = sortBy (\x y -> compare (fst x) (fst y)) fs
liftM RecType $ mapPairsM comp fs'
_ | isPredefConstant ty -> return ty
_ -> composOp comp ty
@@ -585,8 +589,8 @@ inferLType gr trm = case trm of
_ -> raise $ "no overload instance of" +++ prt f +++
"for" +++ unwords (map prtType tys) +++ "among" ++++
unlines [unwords (map prtType ty) | (ty,_) <- typs]
++++ "DEBUG" +++ unwords (map show tys) +++ ";" ++++
unlines (map (show . fst) typs) ----
++++ "DEBUG" +++ unwords (map show tys) +++ ";"
++++ unlines (map (show . fst) typs) ----
lookupOverloadInstance tys typs = lookup tys typs ---- use Map
@@ -822,8 +826,10 @@ checkEqLType env t u trm = do
checkWarn $ "WARNING: missing lock field" +++ unwords (map prt lo)
return t'
Bad s -> raise (s +++ "type of" +++ prt trm +++
": expected" ++++ prtType t' ++++
"inferred" ++++ prtType u' ++++ show u')
": expected:" +++ prtType t' ++++
"inferred:" +++ prtType u'
---- +++++ "DEBUG:" ++++ show t' ++++ show u'
)
where
-- t is a subtype of u