Simulator improvements; continue with countdown example

1 files changed, 5 insertions, 3 deletions

diff --git a/assignment-13/uFPL.dcl b/assignment-13/uFPL.dcl
index 55c9c66..f9b3ed6 100644
--- a/assignment-13/uFPL.dcl
+++ b/assignment-13/uFPL.dcl
@@ -58,7 +58,7 @@ instance Expr Char
 	| E.rwa rwb rwc: EIf            (Expr Bool rwa) (Expr t rwb) (Expr t rwc)
 
 lit :: (t -> Expr t RO)
-(?) infix 4 :: (Expr Bool rwa) (Expr t rwb, Expr t rwc) -> Expr t RO
+(?) infix 5 :: (Expr Bool rwa) (Expr t rwb, Expr t rwc) -> Expr t RO
 
 (==.) infix 4 :: (Expr t rwa) (Expr t rwb) -> Expr Bool RO | Expr, == t
 (<.) infix 4 :: (Expr t rwa) (Expr t rwb) -> Expr Bool RO | Expr, < t
@@ -73,8 +73,10 @@ lit :: (t -> Expr t RO)
 	| (?&) infixr 3 Trigger Trigger
 	| (?|) infixr 4 Trigger Trigger
 
+pressed :: (Expr Bool RO) -> Trigger
+
 :: Rule
-	= E.t rw:    (<#) infix 3   (Expr t RW) (Expr t rw) & Expr t
+	= E.t rw:    (<#) infix 4   (Expr t RW) (Expr t rw) & Expr t
 	| E.rw:      When           (Expr Bool rw) [Rule]
 	|            (>>>) infixr 2 Trigger [Rule]
 	| E.rwa rwb: SetCursor      (Expr Int rwa, Expr Int rwb)
@@ -84,7 +86,7 @@ lit :: (t -> Expr t RO)
 
 class gen f t :: f -> t
 
-class (:.) infixr 2 r :: Rule r -> [Rule]
+class (:.) infixr 3 r :: Rule r -> [Rule]
 instance :. Rule
 instance :. [Rule]