comparison src/mono.sml @ 2211:ef766ef6e242

Merge.
author Ziv Scully <ziv@mit.edu>
date Sat, 13 Sep 2014 19:16:07 -0400
parents a9159911c3ba
children 278e10629ba1
comparison
equal deleted inserted replaced
2210:69c0f36255cb 2211:ef766ef6e242
1 (* Copyright (c) 2008-2010, 2013, Adam Chlipala 1 (* Copyright (c) 2008-2010, 2013-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 *
160 datatype sidedness = 160 datatype sidedness =
161 ServerOnly 161 ServerOnly
162 | ServerAndPull 162 | ServerAndPull
163 | ServerAndPullAndPush 163 | ServerAndPullAndPush
164 164
165 type file = decl list * (int * sidedness) list 165 datatype dbmode =
166 NoDb
167 | OneQuery
168 | AnyDb
169
170 type file = decl list * (int * sidedness * dbmode) list
166 171
167 end 172 end