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

constraint bug fix

Browse Source
This commit is contained in:
aarne
2004-10-26 11:53:22 +00:00
parent b73e3b2b56
commit 25492ab0b9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
grammars/logic/Logic.gf
View File

@@ -81,7 +81,7 @@ def
ImplE _ _ (ImplI _ _ b) a = b a ; ImplE _ _ (ImplI _ _ b) a = b a ;
NegE _ (NegI _ b) a = b a ; NegE _ (NegI _ b) a = b a ;
UnivE _ _ (UnivI _ _ b) a = b a ; UnivE _ _ (UnivI _ _ b) a = b a ;
ExistE _ _ _ (ExistI A B a b) d = d a b ; ExistE _ _ _ (ExistI _ _ a b) d = d a b ;
-- Hypo and Pron are identities -- Hypo and Pron are identities
Hypo _ a = a ; Hypo _ a = a ;

6
src/GF/Grammar/TypeCheck.hs
View File

@@ -75,9 +75,9 @@ computeVal gr v = case v of
splitConstraints :: Constraints -> (Constraints,MetaSubst) splitConstraints :: Constraints -> (Constraints,MetaSubst)
splitConstraints cs = csmsu where splitConstraints cs = csmsu where
csmsu = (nub [(a,b) | (a,b) <- csf,a /= b],msf) csmsu = (nub [(a,b) | (a,b) <- csf1,a /= b],msf1)
csmsu0 = unif (csf,msf) -- alternative: filter first (csf1,msf1) = unif (csf,msf) -- alternative: filter first
(csf,msf) = foldr mkOne ([],[]) cs (csf,msf) = foldr mkOne ([],[]) cs
csmsf = foldr mkOne ([],msu) csu csmsf = foldr mkOne ([],msu) csu
(csu,msu) = unif (cs,[]) -- alternative: unify first (csu,msu) = unif (cs,[]) -- alternative: unify first