HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hcoop: move gibran and marsh to new ips
[hcoop/domtool2.git]
/
src
/
printFn.sml
diff --git
a/src/printFn.sml
b/src/printFn.sml
index
05172da
..
9b3c4ee
100644
(file)
--- a/
src/printFn.sml
+++ b/
src/printFn.sml
@@
-132,6
+132,9
@@
fun p_exp' pn (e, _) =
keyword "end"]
| EWith (e1, (ESkip, _)) => dBox [p_exp e1, space 1, keyword "with", space 1, keyword "end"]
| EWith (e1, e2) => dBox [p_exp e1, space 1, keyword "with", p_exp e2, space 1, keyword "end"]
keyword "end"]
| EWith (e1, (ESkip, _)) => dBox [p_exp e1, space 1, keyword "with", space 1, keyword "end"]
| EWith (e1, e2) => dBox [p_exp e1, space 1, keyword "with", p_exp e2, space 1, keyword "end"]
+ | EIf (e1, e2, e3) => dBox [keyword "if", space 1, p_exp e1,
+ space 1, keyword "then", space 1, p_exp e2,
+ space 1, keyword "else", space 1, p_exp e3]
and p_exp e = p_exp' false e
fun p_decl d =
and p_exp e = p_exp' false e
fun p_decl d =
@@
-152,6
+155,12
@@
fun p_decl d =
ident name, space 1,
punct ":", space 1,
p_typ t])
ident name, space 1,
punct ":", space 1,
p_typ t])
+ | DEnv (name, NONE, _) => string "Unannotated env declaration!"
+ | DEnv (name, SOME t, _) => anchor ("D_" ^ name,
+ dBox [keyword "var", space 1,
+ ident name, space 1,
+ punct ":", space 1,
+ p_typ t])
| DContext name => anchor ("C_" ^ name,
dBox [keyword "context", space 1,
ident name])
| DContext name => anchor ("C_" ^ name,
dBox [keyword "context", space 1,
ident name])
@@
-173,6
+182,12
@@
fun p_decl_fref d =
space 1,
punct ":", space 1,
p_typ t]
space 1,
punct ":", space 1,
p_typ t]
+ | DEnv (name, NONE, _) => string "Unannotated var declaration!"
+ | DEnv (name, SOME t, _) => dBox [keyword "var", space 1,
+ link ("#D_" ^ name, ident name),
+ space 1,
+ punct ":", space 1,
+ p_typ t]
| DContext name => dBox [keyword "context", space 1,
link ("#C_" ^ name, ident name)]
| DContext name => dBox [keyword "context", space 1,
link ("#C_" ^ name, ident name)]