streamlined the binary operators

[proglang.git] / Skelsyntax.hs

diff --git a/Skelsyntax.hs b/Skelsyntax.hs
index 8a3605383704b6bf4c3a36e6e4936be53876cfec..5f49a5b5a4d392571d9009e04c94d63961e34ff8 100644 (file)
--- a/Skelsyntax.hs
+++ b/Skelsyntax.hs
@@ -34,7 +34,6 @@ transStm x = case x of
 transExp :: Exp -> Result
 transExp x = case x of
   EAss id exp  -> failure x
-  BExp exp0 bop exp  -> failure x
   EVar id  -> failure x
   EInt n  -> failure x
   ENeg exp  -> failure x
@@ -43,7 +42,7 @@ transExp x = case x of
   EReadB  -> failure x
   ExpT type' exp  -> failure x
   EDefault  -> failure x
-  OpExp exp0 op exp  -> failure x
+  BiOpExp exp0 op exp  -> failure x
   EPost id op  -> failure x
 
 
@@ -52,18 +51,14 @@ transStms x = case x of
   Program stms  -> failure x
 
 
-transBOp :: BOp -> Result
-transBOp x = case x of
+transOp :: Op -> Result
+transOp x = case x of
   Lt  -> failure x
   ELt  -> failure x
   Gt  -> failure x
   EGt  -> failure x
   Eq  -> failure x
   NEq  -> failure x
-
-
-transOp :: Op -> Result
-transOp x = case x of
   Plus  -> failure x
   Minus  -> failure x
   Times  -> failure x