summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraarne <unknown>2005-03-17 08:58:18 +0000
committeraarne <unknown>2005-03-17 08:58:18 +0000
commit5b9d27ee9feee7e197b57cc59822fb144ec6fa6a (patch)
treeb3dc5f6d33f481db71fb661e915bfef57088c89c
parent1f16988540865e0a552b910f10e57fdd0f15c04f (diff)
fix in TC handling with qualified names
-rw-r--r--src/GF/Grammar/TC.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/GF/Grammar/TC.hs b/src/GF/Grammar/TC.hs
index e44a28e97..2287b8afb 100644
--- a/src/GF/Grammar/TC.hs
+++ b/src/GF/Grammar/TC.hs
@@ -5,9 +5,9 @@
-- Stability : (stable)
-- Portability : (portable)
--
--- > CVS $Date: 2005/02/18 19:21:13 $
--- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/03/17 09:58:18 $
+-- > CVS $Author: aarne $
+-- > CVS $Revision: 1.8 $
--
-- Thierry Coquand's type checking algorithm that creates a trace
-----------------------------------------------------------------------------
@@ -94,6 +94,9 @@ eqVal k u1 u2 = ---- errIn (prt u1 +++ "<>" +++ prBracket (show k) +++ prt u2) $
(eqVal k (VClos env1 a1) (VClos env2 a2))
(eqVal (k+1) (VClos ((x1,v x1):env1) e1) (VClos ((x2,v x1):env2) e2))
(VGen i _, VGen j _) -> return [(w1,w2) | i /= j]
+ (VCn (_, i), VCn (_,j)) -> return [(w1,w2) | i /= j]
+ --- thus ignore qualifications; valid because inheritance cannot
+ --- be qualified. Simplifies annotation. AR 17/3/2005
_ -> return [(w1,w2) | w1 /= w2]
-- invariant: constraints are in whnf