Changeset 12784

Timestamp:

05.11.2009 17:00:35 (2 weeks ago)

Author:

maeder

Message:

fail by returning Nothing for wrong types

Location:

trunk/HasCASL

Files:

• TypeAna.hs (modified) (2 diffs)
• test/PlainTypes.hascasl.output (modified) (3 diffs)

trunk/HasCASL/TypeAna.hs

@@ -29 +29 @@
 import Control.Monad
 
--- * infer kind
+ -- * infer kind
 
 -- | extract kinds of type identifier
@@ -64 +64 @@
         ("no kind found for '" ++ showDoc ty "'" ++
          if Set.null ks then "" else expected sk ks)
-        $ getRange ty] $ Just Set.empty
+        $ getRange ty] $ if dk == Error then Nothing else Just Set.empty
 
 -- | add an analysed type argument (warn on redeclared types)

trunk/HasCASL/test/PlainTypes.hascasl.output

@@ -8 +8 @@
 type  tuple3 : a -> b -> c -> d
 var   x : tuple3 r s t
-var   y : tuple3 r s
+var
 type  tuple1 : b -> a
 type  m : (a -> b) -> c
@@ -14 +14 @@
 type  List : a -> b
 var   w : m List
-var   o1 : m
-var   o2 : m tuple1
-var   o3 : m tuple3
+var
+var
+var
 var   nt : a -> (b -> c) -> c -> d
-var   o4 : nt r List s
+var
 types s1, r1, t1 < t
 types s2 = r2 = t2
@@ -56 +56 @@
 nt : a -> (b -> c) -> c -> d %(var_1)%
 vars
-o1 : m;
-o2 : m tuple1;
-o3 : m tuple3;
-o4 : nt r List s;
 u : [ r ];
 v : { s };
 w : m List;
 x : tuple3 r s t;
-y : tuple3 r s;
 z : m [__]
 forall x : t . (x in s3) <=> x = x