comparison src/mono.sml @ 1254:935a981f4380

Merge
author Adam Chlipala <adamc@hcoop.net>
date Thu, 06 May 2010 13:57:01 -0400
parents a2cd6664f57f
children 3d06e0f7a6f3
comparison
equal deleted inserted replaced
1198:b52929351402 1254:935a981f4380
1 (* Copyright (c) 2008, Adam Chlipala 1 (* Copyright (c) 2008-2010, 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 *
121 | ESleep of exp 121 | ESleep of exp
122 | ESpawn of exp 122 | ESpawn of exp
123 123
124 withtype exp = exp' located 124 withtype exp = exp' located
125 125
126 datatype policy =
127 PolClient of exp
128 | PolInsert of exp
129 | PolDelete of exp
130 | PolUpdate of exp
131 | PolSequence of exp
132
126 datatype decl' = 133 datatype decl' =
127 DDatatype of (string * int * (string * int * typ option) list) list 134 DDatatype of (string * int * (string * int * typ option) list) list
128 | DVal of string * int * typ * exp * string 135 | DVal of string * int * typ * exp * string
129 | DValRec of (string * int * typ * exp * string) list 136 | DValRec of (string * int * typ * exp * string) list
130 | DExport of export_kind * string * int * typ list * typ * bool 137 | DExport of export_kind * string * int * typ list * typ * bool
139 | DCookie of string 146 | DCookie of string
140 | DStyle of string 147 | DStyle of string
141 148
142 | DTask of exp * exp 149 | DTask of exp * exp
143 150
151 | DPolicy of policy
152
144 withtype decl = decl' located 153 withtype decl = decl' located
145 154
146 type file = decl list 155 type file = decl list
147 156
148 end 157 end