Add strings to type system and parser/lexer

[snipe.git] / trans / tree.sml

diff --git a/trans/tree.sml b/trans/tree.sml
index f5a92b5a3275451a8c47c123d9e3f1e3d4a5f060..2111fc19f666758fa1680f3c211e509438935564 100644 (file)
--- a/trans/tree.sml
+++ b/trans/tree.sml
@@ -9,8 +9,7 @@
 
 signature TREE =
 sig
 
 signature TREE =
 sig

-
-  datatype binop = ADD | SUB | MUL | DIV | MOD | LSH | RSH | LOGOR | LOGAND | BITOR | BITAND | BITXOR | NEQ | EQ | LT | GT | LE | GE
+  datatype binop = ADD | SUB | MUL | DIV | MOD | LSH | RSH | LOGOR | LOGAND | BITOR | BITAND | BITXOR | NEQ | EQ | LT | GT | LE | GE | BE

   datatype unop = NEG | BITNOT | BANG
 
   type Blarg = int
   datatype unop = NEG | BITNOT | BANG
 
   type Blarg = int


@@ -22,9 +21,15 @@ sig
     | BINOP of binop * exp * exp
     | UNOP of unop * exp
     | CALL of Ast.ident * exp list
     | BINOP of binop * exp * exp
     | UNOP of unop * exp
     | CALL of Ast.ident * exp list

+    | MEMORY of exp
+    | ALLOC of exp
+    | COND of exp * exp * exp
+    | STMVAR of stm list * exp
+    | NULLPTR

   and stm =
       MOVE of exp * exp
     | RETURN of exp
   and stm =
       MOVE of exp * exp
     | RETURN of exp

+    | EFFECT of exp

     | LABEL of Label.label
     | JUMPIFN of exp * Label.label
     | JUMP of Label.label
     | LABEL of Label.label
     | JUMPIFN of exp * Label.label
     | JUMP of Label.label


@@ -32,19 +37,11 @@ sig
       FUNCTION of Ast.ident * stm list
 
   type program = func list
       FUNCTION of Ast.ident * stm list
 
   type program = func list

-
-  structure Print :
-  sig
-    val pp_exp : exp -> string
-    val pp_stm : stm -> string
-    val pp_program : program -> string
-  end

 end
 
 structure Tree :> TREE =
 struct
 end
 
 structure Tree :> TREE =
 struct

-
-  datatype binop = ADD | SUB | MUL | DIV | MOD | LSH | RSH | LOGOR | LOGAND | BITOR | BITAND | BITXOR | NEQ | EQ | LT | GT | LE | GE
+  datatype binop = ADD | SUB | MUL | DIV | MOD | LSH | RSH | LOGOR | LOGAND | BITOR | BITAND | BITXOR | NEQ | EQ | LT | GT | LE | GE | BE

   datatype unop = NEG | BITNOT | BANG
 
   type Blarg = int
   datatype unop = NEG | BITNOT | BANG
 
   type Blarg = int


@@ -52,13 +49,19 @@ struct
   datatype exp = 
       CONST of Word32.word
     | TEMP of Temp.temp
   datatype exp = 
       CONST of Word32.word
     | TEMP of Temp.temp

-    | ARG of Blarg
+    | ARG of Blarg (* I am j4cbo *)

     | BINOP of binop * exp * exp
     | UNOP of unop * exp
     | CALL of Ast.ident * exp list
     | BINOP of binop * exp * exp
     | UNOP of unop * exp
     | CALL of Ast.ident * exp list

+    | MEMORY of exp
+    | ALLOC of exp
+    | COND of exp * exp * exp
+    | STMVAR of stm list * exp
+    | NULLPTR

   and stm =
       MOVE of exp * exp
     | RETURN of exp
   and stm =
       MOVE of exp * exp
     | RETURN of exp

+    | EFFECT of exp

     | LABEL of Label.label
     | JUMPIFN of exp * Label.label
     | JUMP of Label.label
     | LABEL of Label.label
     | JUMPIFN of exp * Label.label
     | JUMP of Label.label


@@ -66,62 +69,4 @@ struct
       FUNCTION of Ast.ident * stm list
 
   type program = func list
       FUNCTION of Ast.ident * stm list
 
   type program = func list

-
-  structure Print = 
-  struct
-
-    exception Aaaasssssss
-
-    fun pp_binop ADD = "+"
-      | pp_binop SUB = "-"
-      | pp_binop MUL = "*"
-      | pp_binop DIV = "/"
-      | pp_binop MOD = "%"
-      | pp_binop LSH = "<<"
-      | pp_binop RSH = ">>"
-      | pp_binop LOGOR = "||"
-      | pp_binop LOGAND = "&&"
-      | pp_binop BITOR = "|"
-      | pp_binop BITAND = "&"
-      | pp_binop BITXOR = "^"
-      | pp_binop NEQ = "!="
-      | pp_binop EQ = "=="
-      | pp_binop LE = "<="
-      | pp_binop LT = "<"
-      | pp_binop GE = ">="
-      | pp_binop GT = ">"
-    
-    fun pp_unop NEG = "-"
-      | pp_unop BITNOT = "~"
-      | pp_unop BANG = "!"
-
-    fun pp_exp (CONST(x)) = Word32Signed.toString x
-      | pp_exp (TEMP(t)) = Temp.name t
-      | pp_exp (ARG(n)) = "arg#"^Int.toString n
-      | pp_exp (BINOP (binop, e1, e2)) =
-         "(" ^ pp_exp e1 ^ " " ^ pp_binop binop ^ " " ^ pp_exp e2 ^ ")"
-      | pp_exp (UNOP (unop, e1)) =
-          pp_unop unop ^ "(" ^ pp_exp e1 ^ ")"
-      | pp_exp (CALL (f, l)) =
-          Symbol.name f ^ "(" ^ (String.concatWith ", " (List.map pp_exp l)) ^ ")"
-
-    fun pp_stm (MOVE (e1,e2)) =
-         pp_exp e1 ^ "  <--  " ^ pp_exp e2
-      | pp_stm (RETURN e) =
-         "return " ^ pp_exp e
-      | pp_stm (LABEL l) =
-          Label.name l ^ ":"
-      | pp_stm (JUMP l) = 
-          "jump "^Label.name l
-      | pp_stm (JUMPIFN (e, l)) =
-          "jump "^Label.name l^" if! "^pp_exp e
-
-    fun pp_program (nil) = ""
-      | pp_program (FUNCTION(id, stms)::funcs) =
-          (Symbol.name id) ^
-          "\n{\n" ^
-          (foldr (fn (a,b) => (pp_stm a) ^ "\n" ^ b) "" stms) ^
-          "}\n" ^
-          pp_program funcs
-  end

 end
 end