diff src/cjr.sml @ 269:fac9fae654e2

Cjrize query
author Adam Chlipala <adamc@hcoop.net>
date Tue, 02 Sep 2008 09:53:15 -0400
parents 890a61991263
children 42dfb0d61cf0
line wrap: on
line diff
--- a/src/cjr.sml	Sun Aug 31 16:54:13 2008 -0400
+++ b/src/cjr.sml	Tue Sep 02 09:53:15 2008 -0400
@@ -32,8 +32,7 @@
 datatype datatype_kind = datatype Mono.datatype_kind
 
 datatype typ' =
-         TTop
-       | TFun of typ * typ
+         TFun of typ * typ
        | TRecord of int
        | TDatatype of datatype_kind * int * (string * int * typ option) list ref
        | TFfi of string * string
@@ -69,6 +68,15 @@
 
        | EWrite of exp
        | ESeq of exp * exp
+       | ELet of string * typ * exp * exp
+
+       | EQuery of { exps : (string * typ) list,
+                     tables : (string * (string * typ) list) list,
+                     rnum : int,
+                     state : typ,
+                     query : exp,
+                     body : exp,
+                     initial : exp }
 
 withtype exp = exp' located