streamlined the binary operators

[proglang.git] / Abssyntax.hs

diff --git a/Abssyntax.hs b/Abssyntax.hs
index 7c95d5324e1a58ef1a8f32b099d16fb0babcac42..4cc8d19eb8e0dea898b8239177d6c32e73e7fee9 100644 (file)
--- a/Abssyntax.hs
+++ b/Abssyntax.hs
@@ -15,9 +15,8 @@ data Stm =
   deriving (Eq,Ord,Show)
 
 data Exp =
-   BExp Exp BOp Exp
+   EAss Ident Exp
  | EVar Ident
- | EAss Ident Exp
  | EInt Integer
  | ENeg Exp
  | EBool Bool
@@ -25,7 +24,7 @@ data Exp =
  | EReadB
  | ExpT Type Exp
  | EDefault
- | OpExp Exp Op Exp
+ | BiOpExp Exp Op Exp
  | EPost Ident Op
   deriving (Eq,Ord,Show)
 
@@ -33,17 +32,14 @@ data Stms =
    Program [Stm]
   deriving (Eq,Ord,Show)
 
-data BOp =
+data Op =
    Lt
  | ELt
  | Gt
  | EGt
  | Eq
  | NEq
-  deriving (Eq,Ord,Show)
-
-data Op =
-   Plus
+ | Plus
  | Minus
  | Times
  | Div