comparison src/source.sml @ 2206:c1a62ce47083

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 27 May 2014 21:38:01 -0400
parents 403f0cc65b9c
children
comparison
equal deleted inserted replaced
2205:cdea39473c78 2206:c1a62ce47083
123 | EDisjoint of con * con * exp 123 | EDisjoint of con * con * exp
124 | EDisjointApp of exp 124 | EDisjointApp of exp
125 125
126 | EKAbs of string * exp 126 | EKAbs of string * exp
127 127
128 | ERecord of (con * exp) list 128 | ERecord of (con * exp) list * bool
129 | EField of exp * con 129 | EField of exp * con
130 | EConcat of exp * exp 130 | EConcat of exp * exp
131 | ECut of exp * con 131 | ECut of exp * con
132 | ECutMulti of exp * con 132 | ECutMulti of exp * con
133 133
144 withtype sgn_item = sgn_item' located 144 withtype sgn_item = sgn_item' located
145 and sgn = sgn' located 145 and sgn = sgn' located
146 and pat = pat' located 146 and pat = pat' located
147 and exp = exp' located 147 and exp = exp' located
148 and edecl = edecl' located 148 and edecl = edecl' located
149
150 datatype ffi_mode =
151 Effectful
152 | BenignEffectful
153 | ClientOnly
154 | ServerOnly
155 | JsFunc of string
149 156
150 datatype decl' = 157 datatype decl' =
151 DCon of string * kind option * con 158 DCon of string * kind option * con
152 | DDatatype of (string * string list * (string * con option) list) list 159 | DDatatype of (string * string list * (string * con option) list) list
153 | DDatatypeImp of string * string list * string 160 | DDatatypeImp of string * string list * string
167 | DCookie of string * con 174 | DCookie of string * con
168 | DStyle of string 175 | DStyle of string
169 | DTask of exp * exp 176 | DTask of exp * exp
170 | DPolicy of exp 177 | DPolicy of exp
171 | DOnError of string * string list * string 178 | DOnError of string * string list * string
179 | DFfi of string * ffi_mode list * con
172 180
173 and str' = 181 and str' =
174 StrConst of decl list 182 StrConst of decl list
175 | StrVar of string 183 | StrVar of string
176 | StrProj of str * string 184 | StrProj of str * string