comparison src/elab.sml @ 2206:c1a62ce47083

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 27 May 2014 21:38:01 -0400
parents 403f0cc65b9c
children 22117edf8fd3
comparison
equal deleted inserted replaced
2205:cdea39473c78 2206:c1a62ce47083
1 (* Copyright (c) 2008-2011, Adam Chlipala 1 (* Copyright (c) 2008-2011, 2014, Adam Chlipala
2 * All rights reserved. 2 * All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met: 5 * modification, are permitted provided that the following conditions are met:
6 * 6 *
179 | DCookie of int * string * int * con 179 | DCookie of int * string * int * con
180 | DStyle of int * string * int 180 | DStyle of int * string * int
181 | DTask of exp * exp 181 | DTask of exp * exp
182 | DPolicy of exp 182 | DPolicy of exp
183 | DOnError of int * string list * string 183 | DOnError of int * string list * string
184 | DFfi of string * int * Source.ffi_mode list * con
184 185
185 and str' = 186 and str' =
186 StrConst of decl list 187 StrConst of decl list
187 | StrVar of int 188 | StrVar of int
188 | StrProj of str * string 189 | StrProj of str * string