comparison src/shake.sml @ 2211:ef766ef6e242

Merge.
author Ziv Scully <ziv@mit.edu>
date Sat, 13 Sep 2014 19:16:07 -0400
parents 4d64af730e35
children
comparison
equal deleted inserted replaced
2210:69c0f36255cb 2211:ef766ef6e242
42 con : IS.set, 42 con : IS.set,
43 exp : IS.set 43 exp : IS.set
44 } 44 }
45 45
46 val dummyt = (TRecord (CRecord ((KType, ErrorMsg.dummySpan), []), ErrorMsg.dummySpan), ErrorMsg.dummySpan) 46 val dummyt = (TRecord (CRecord ((KType, ErrorMsg.dummySpan), []), ErrorMsg.dummySpan), ErrorMsg.dummySpan)
47 val dummye = (EPrim (Prim.String ""), ErrorMsg.dummySpan) 47 val dummye = (EPrim (Prim.String (Prim.Normal, "")), ErrorMsg.dummySpan)
48 48
49 fun tupleC cs = (CTuple cs, ErrorMsg.dummySpan) 49 fun tupleC cs = (CTuple cs, ErrorMsg.dummySpan)
50 fun tupleE es = (ERecord (map (fn e => (dummyt, e, dummyt)) es), ErrorMsg.dummySpan) 50 fun tupleE es = (ERecord (map (fn e => (dummyt, e, dummyt)) es), ErrorMsg.dummySpan)
51 51
52 fun shake file = 52 fun shake file =