gengeng

[clean-tests.git] / gengen / Data / GenType.dcl

diff --git a/gengen/Data/GenType.dcl b/gengen/Data/GenType.dcl
index 2230df7..de08c75 100644 (file)
--- a/gengen/Data/GenType.dcl
+++ b/gengen/Data/GenType.dcl
@@ -1,6 +1,7 @@
 definition module Data.GenType
 
 import StdGeneric
+from StdOverloaded import class ==, class toString
 
 :: Box b a =: Box b
 derive bimap Box
@@ -14,6 +15,7 @@ reBox x :== box (unBox x)
        | GTyArrow GType GType
        | GTyArray ArrayType GType
        | GTyUList UListType GType
+       | GTyUMaybe GType
        | GTyUnit
        | GTyEither GType GType
        | GTyPair GType GType
@@ -28,6 +30,7 @@ reBox x :== box (unBox x)
        | TyArrow Type Type
        | TyArray ArrayType Type
        | TyUList UListType Type
+       | TyUMaybe Type
        | TyNewType GenericTypeDefDescriptor GenericConsDescriptor Type
        | TyObject GenericTypeDefDescriptor [(GenericConsDescriptor, [Type])]
        | TyRecord GenericRecordDescriptor [(GenericFieldDescriptor, Type)]
@@ -86,8 +89,8 @@ instance replaceBuiltins Type, GType, GenType
  */
 generic gType a :: Box GType a
 derive gType UNIT, EITHER, PAIR, CONS of gcd, FIELD of gfd, OBJECT of gtd, RECORD of grd
-derive gType Int, Bool, Real, Char, World, Dynamic, File
+derive gType Int, Bool, Real, Char, World, File
 derive gType (->)
-derive gType /*?#,*/ ?, ?^
+derive gType ?#, ?, ?^
 derive gType [], [! ], [ !], [!!], [#], [#!], {}, {!}, {#}, {32#}
 derive gType (), (,), (,,), (,,,), (,,,,), (,,,,,), (,,,,,,), (,,,,,,,)