diff src/cjr.sml @ 2211:ef766ef6e242

Merge.
author Ziv Scully <ziv@mit.edu>
date Sat, 13 Sep 2014 19:16:07 -0400
parents a9159911c3ba
children
line wrap: on
line diff
--- a/src/cjr.sml	Sat May 31 22:23:25 2014 -0400
+++ b/src/cjr.sml	Sat Sep 13 19:16:07 2014 -0400
@@ -129,10 +129,11 @@
 withtype decl = decl' located
 
 datatype sidedness = datatype Mono.sidedness
+datatype dbmode = datatype Mono.dbmode
 
 datatype effect = datatype Export.effect
 datatype export_kind = datatype Export.export_kind
 
-type file = decl list * (export_kind * string * int * typ list * typ * sidedness * bool) list
+type file = decl list * (export_kind * string * int * typ list * typ * sidedness * dbmode * bool) list
 
 end