comparison src/cjr.sml @ 2211:ef766ef6e242

Merge.
author Ziv Scully <ziv@mit.edu>
date Sat, 13 Sep 2014 19:16:07 -0400
parents a9159911c3ba
children
comparison
equal deleted inserted replaced
2210:69c0f36255cb 2211:ef766ef6e242
127 | DOnError of int 127 | DOnError of int
128 128
129 withtype decl = decl' located 129 withtype decl = decl' located
130 130
131 datatype sidedness = datatype Mono.sidedness 131 datatype sidedness = datatype Mono.sidedness
132 datatype dbmode = datatype Mono.dbmode
132 133
133 datatype effect = datatype Export.effect 134 datatype effect = datatype Export.effect
134 datatype export_kind = datatype Export.export_kind 135 datatype export_kind = datatype Export.export_kind
135 136
136 type file = decl list * (export_kind * string * int * typ list * typ * sidedness * bool) list 137 type file = decl list * (export_kind * string * int * typ list * typ * sidedness * dbmode * bool) list
137 138
138 end 139 end