sig
type ident = Symbol.symbol
- datatype vtype = Int
- type variable = ident * vtype
-
datatype oper =
PLUS
| MINUS
| OpExp of oper * exp list
| Marked of (* Kane *) exp Mark.marked
| FuncCall of ident * (exp list)
+ | Member of exp * ident
+ | DerefMember of exp * ident
+ | Dereference of exp
+ | ArrIndex of exp * exp
+ | New of Type.vtype
+ | NewArr of Type.vtype * exp
+ | Null
+ | Conditional of exp * exp * exp
and stm =
- Assign of ident * exp
+ Assign of exp * exp
+ | AsnOp of oper * exp * exp
+ | Effect of exp (* Just side effect the expression *)
| Return of exp
| Nop
| Break
| MarkedStm of stm Mark.marked
datatype function =
- Extern of vtype * ident * (variable list)
- | Function of vtype * ident * (variable list) * (variable list) * stm list
+ Extern of Type.vtype * (Type.variable list)
+ | Function of Type.vtype * (Type.variable list) * (Type.variable list) * stm list
+ | MarkedFunction of function Mark.marked
- type program = function list
+ type program = Type.typedef Symbol.table * function Symbol.table
(* print as source, with redundant parentheses *)
structure Print :
val pp_stm : stm -> string
val pp_program : program -> string
end
-
end
structure Ast :> AST =
struct
type ident = Symbol.symbol
- datatype vtype = Int
- type variable = ident * vtype
-
datatype oper =
PLUS
| MINUS
| OpExp of oper * exp list
| Marked of exp Mark.marked
| FuncCall of ident * (exp list)
+ | Member of exp * ident
+ | DerefMember of exp * ident
+ | Dereference of exp
+ | ArrIndex of exp * exp
+ | New of Type.vtype
+ | NewArr of Type.vtype * exp
+ | Null
+ | Conditional of exp * exp * exp
and stm =
- Assign of ident * exp
+ Assign of exp * exp
+ | AsnOp of oper * exp * exp
+ | Effect of exp (* Just side effect the expression *)
| Return of exp
| Nop
| Break
| MarkedStm of stm Mark.marked
datatype function =
- Extern of vtype * ident * (variable list)
- | Function of vtype * ident * (variable list) * (variable list) * stm list
+ Extern of Type.vtype * (Type.variable list)
+ | Function of Type.vtype * (Type.variable list) * (Type.variable list) * stm list
+ | MarkedFunction of function Mark.marked
- type program = function list
+ type program = Type.typedef Symbol.table * function Symbol.table
(* print programs and expressions in source form
* using redundant parentheses to clarify precedence
| pp_exp (FuncCall(id, l)) = pp_ident id ^ "(" ^ pp_expl l ^ ")"
| pp_exp (Marked(marked_exp)) =
pp_exp (Mark.data marked_exp)
+ | pp_exp (Member(e, i)) = pp_exp e ^ "." ^ pp_ident i
+ | pp_exp (DerefMember(e, i)) = pp_exp e ^ "->" ^ pp_ident i
+ | pp_exp (Dereference(e)) = "*(" ^ pp_exp e ^ ")"
+ | pp_exp (ArrIndex(e1, e2)) = pp_exp e1 ^ "[" ^pp_exp e2 ^ "]"
+ | pp_exp (New t) = "new(" ^ Type.Print.pp_type t ^ ")"
+ | pp_exp (NewArr (t, s)) = "new(" ^ Type.Print.pp_type t ^ "[" ^ pp_exp s ^ "])"
+ | pp_exp Null = "NULL"
+ | pp_exp (Conditional (q, e1, e2)) = "("^(pp_exp q)^"?"^(pp_exp e1)^":"^(pp_exp e2)^")"
and pp_expl nil = ""
| pp_expl (e::a::l) = (pp_exp e) ^ ", " ^ (pp_expl (a::l))
| pp_expl (e::l) = (pp_exp e) ^ (pp_expl l)
- fun pp_stm (Assign (id,e)) =
- pp_ident id ^ " = " ^ pp_exp e ^ ";"
+ and pp_stm (Assign (e1,e2)) =
+ pp_exp e1 ^ " = " ^ pp_exp e2 ^ ";\n"
+ | pp_stm (AsnOp (oop, e1, e2)) =
+ pp_exp e1 ^ " " ^ pp_oper oop ^ "= " ^ pp_exp e2 ^ ";\n"
+ | pp_stm (Effect (e)) =
+ pp_exp e ^ ";\n"
| pp_stm (Return e) =
- "return " ^ pp_exp e ^ ";"
- | pp_stm Nop = ";"
- | pp_stm Break = "break;"
- | pp_stm Continue = "continue;"
- | pp_stm (If (e, s, NONE)) = "if ("^pp_exp e^")"^pp_block s
- | pp_stm (If (e, s, SOME s2)) = "if ("^pp_exp e^")"^pp_block s^" else "^pp_block s2
- | pp_stm (While (e, s)) = "while ("^pp_exp e^") "^pp_block s
- | pp_stm (For (so1, e, so2, s)) = "for ("^ (if (isSome so1) then pp_stm (valOf so1) else "") ^ pp_exp e ^ (if(isSome so2) then pp_stm (valOf so2) else "") ^ ")" ^ pp_block s
+ "return " ^ pp_exp e ^ ";\n"
+ | pp_stm Nop = ";\n"
+ | pp_stm Break = "break;\n"
+ | pp_stm Continue = "continue;\n"
+ | pp_stm (If (e, s, NONE)) = "if ("^pp_exp e^")\n"^pp_block s
+ | pp_stm (If (e, s, SOME s2)) = "if ("^pp_exp e^")\n"^pp_block s^"else\n"^pp_block s2
+ | pp_stm (While (e, s)) = "while ("^pp_exp e^")\n"^pp_block s
+ | pp_stm (For (so1, e, so2, s)) = "for ("^ (if (isSome so1) then pp_stm (valOf so1) else "") ^ pp_exp e ^ (if(isSome so2) then pp_stm (valOf so2) else "") ^ ")\n" ^ pp_block s
| pp_stm (MarkedStm m) = pp_stm (Mark.data m)
and pp_block (nil) = ";"
and pp_stms nil = ""
| pp_stms (s::ss) = pp_stm s ^ "\n" ^ pp_stms ss
-
- and pp_type Int = "int"
-
+
and pp_params nil = ""
- | pp_params ((i, t)::a::l) = (pp_ident i) ^ " : " ^ (pp_type t) ^ ", " ^ (pp_params (a::l))
- | pp_params ((i, t)::l) = (pp_ident i) ^ " : " ^ (pp_type t) ^ (pp_params l)
+ | pp_params ((i, t)::a::l) = (pp_ident i) ^ " : " ^ (Type.Print.pp_type t) ^ ", " ^ (pp_params (a::l))
+ | pp_params ((i, t)::l) = (pp_ident i) ^ " : " ^ (Type.Print.pp_type t) ^ (pp_params l)
and pp_vars nil = ""
- | pp_vars ((i, t)::l) = "var " ^ (pp_ident i) ^ " : " ^ (pp_type t) ^ ";\n" ^ (pp_vars l)
+ | pp_vars ((i, t)::l) = "var " ^ (pp_ident i) ^ " : " ^ (Type.Print.pp_type t) ^ ";\n" ^ (pp_vars l)
- and pp_function (Extern(t, n, pl)) = "extern " ^ (pp_type t) ^ " " ^ (pp_ident n) ^ "(" ^ (pp_params pl) ^ ");\n"
- | pp_function (Function(t, n, pl, vl, stms)) = (pp_type t) ^ " " ^ (pp_ident n) ^ "(" ^ (pp_params pl) ^ ")\n{\n" ^ (pp_vars vl) ^ (String.concat (map pp_stm stms)) ^ "\n}\n"
-
- and pp_program (p) = String.concat (map pp_function p)
+ and pp_function (n, Extern(t, pl)) = "extern " ^ (Type.Print.pp_type t) ^ " " ^ (pp_ident n) ^ "(" ^ (pp_params pl) ^ ");\n"
+ | pp_function (n, Function(t, pl, vl, stms)) = (Type.Print.pp_type t) ^ " " ^ (pp_ident n) ^ "(" ^ (pp_params pl) ^ ")\n{\n" ^ (pp_vars vl) ^ (String.concat (map pp_stm stms)) ^ "\n}\n"
+ | pp_function (n, MarkedFunction d) = pp_function (n, Mark.data d)
+
+ and pp_program (types, funs) = String.concat ((map Type.Print.pp_typedef (Symbol.elemsi types)) @ (map pp_function (Symbol.elemsi funs)))
end
end
git.joshuawise.com / snipe.git / blobdiff