comparison src/source_print.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
275 p_exp e]) 275 p_exp e])
276 | EDisjointApp e => parenIf par (box [p_exp e, 276 | EDisjointApp e => parenIf par (box [p_exp e,
277 space, 277 space,
278 string "!"]) 278 string "!"])
279 279
280 | ERecord xes => box [string "{", 280 | ERecord (xes, flex) => box [string "{",
281 p_list (fn (x, e) => 281 p_list (fn (x, e) =>
282 box [p_name x, 282 box [p_name x,
283 space, 283 space,
284 string "=", 284 string "=",
285 space, 285 space,
286 p_exp e]) xes, 286 p_exp e]) xes,
287 string "}"] 287 if flex then
288 box [string ",",
289 space,
290 string "..."]
291 else
292 box [],
293 string "}"]
288 | EField (e, c) => box [p_exp' true e, 294 | EField (e, c) => box [p_exp' true e,
289 string ".", 295 string ".",
290 p_con' true c] 296 p_con' true c]
291 | EConcat (e1, e2) => parenIf par (box [p_exp' true e1, 297 | EConcat (e1, e2) => parenIf par (box [p_exp' true e1,
292 space, 298 space,
666 p_exp e2] 672 p_exp e2]
667 | DPolicy e1 => box [string "policy", 673 | DPolicy e1 => box [string "policy",
668 space, 674 space,
669 p_exp e1] 675 p_exp e1]
670 | DOnError _ => string "ONERROR" 676 | DOnError _ => string "ONERROR"
677 | DFfi _ => string "FFI"
671 678
672 and p_str (str, _) = 679 and p_str (str, _) =
673 case str of 680 case str of
674 StrConst ds => box [string "struct", 681 StrConst ds => box [string "struct",
675 newline, 682 newline,