summaryrefslogtreecommitdiff
path: root/assignment-12/gastje.dcl
diff options
context:
space:
mode:
Diffstat (limited to 'assignment-12/gastje.dcl')
-rw-r--r--assignment-12/gastje.dcl15
1 files changed, 5 insertions, 10 deletions
diff --git a/assignment-12/gastje.dcl b/assignment-12/gastje.dcl
index a08d35b..a52618c 100644
--- a/assignment-12/gastje.dcl
+++ b/assignment-12/gastje.dcl
@@ -21,14 +21,9 @@ derive gen Int, Bool, Char, UNIT, PAIR, EITHER, CONS, OBJECT, RECORD, FIELD
generic string a :: a -> String
derive string Int, Bool, Char, UNIT, PAIR, EITHER, CONS of gcd, OBJECT, RECORD of grd, FIELD of gfd
-:: For t = E.p: (For) infix 0 (t -> p) [t] & prop p
+:: Property
+ = E.p t: (For) infix 0 (t -> p) [t] & prop p & string{|*|} t
+ | E.p: (==>) infix 0 Bool p & prop p
+ | E.t: (=.=) infix 4 t t & ==, string{|*|} t
-instance prop (For t) | string{|*|} t
-
-:: Implies = E.p: (==>) infix 0 Bool p & prop p
-
-instance prop Implies
-
-:: Equals a = (=.=) infix 4 a a
-
-instance prop (Equals a) | ==, string{|*|} a
+instance prop Property