removed NoType and EDefault and added assert

[proglang.git] / Skelsyntax.hs

diff --git a/Skelsyntax.hs b/Skelsyntax.hs
index c1af30729a27da27cf5d3a1f820bc0ffaf8ebbf1..bc9bc0cd636ac74859db584ea12a06693837fbec 100644 (file)
--- a/Skelsyntax.hs
+++ b/Skelsyntax.hs
@@ -20,61 +20,54 @@ transBool x = case x of
   False  -> failure x
 
 
+transType :: Type -> Result
+transType x = case x of
+  TInt  -> failure x
+  TBool  -> failure x
+
+
+transStms :: Stms -> Result
+transStms x = case x of
+  Program stms  -> failure x
+
+
 transStm :: Stm -> Result
 transStm x = case x of
-  SDecl type' id exp  -> failure x
   SExp exp  -> failure x
   SBlock stms  -> failure x
-  SIf exp stm0 stm  -> failure x
   SWhile exp stm  -> failure x
+  SIf exp stm0 stm  -> failure x
   SPrint exp  -> failure x
   SNoop  -> failure x
+  SDecl type' id exp  -> failure x
 
 
 transExp :: Exp -> Result
 transExp x = case x of
-  BExp exp0 bop exp  -> failure x
-  EVar id  -> failure x
   EAss id exp  -> failure x
+  EVar id  -> failure x
   EInt n  -> failure x
-  ENeg exp  -> failure x
   EBool bool  -> failure x
+  ENeg exp  -> failure x
+  ENot exp  -> failure x
   EReadI  -> failure x
   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
 
 
-transStms :: Stms -> Result
-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
   Div  -> failure x
 
 
-transType :: Type -> Result
-transType x = case x of
-  TInt  -> failure x
-  TBool  -> failure x
-  NoType  -> failure x
-
-