From 006b289416ce53bdead86be0f86c120bda689c8b Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Tue, 2 Sep 2008 09:53:15 -0400 Subject: Cjrize query --- src/cjr.sml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/cjr.sml') diff --git a/src/cjr.sml b/src/cjr.sml index cda7245a..e9b89bfc 100644 --- a/src/cjr.sml +++ b/src/cjr.sml @@ -32,8 +32,7 @@ type 'a located = 'a ErrorMsg.located 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 @@ datatype exp' = | 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 -- cgit v1.2.3