summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Mauny <Michel.Mauny@ensta.fr>2006-01-03 18:12:30 +0000
committerMichel Mauny <Michel.Mauny@ensta.fr>2006-01-03 18:12:30 +0000
commit20ae41f7b0a52bb368675a6a7985e16f5eff5d93 (patch)
treef1f3bdd7e71f50342f3325c627889e64a52f23ad
parentf27a79b5a703ce5ee0f39fa3e09ef55f11d8e1a2 (diff)
Fixed a bug about pretty-printing of lazy/assert/new
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7297 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--camlp4/etc/pr_o.ml4
-rw-r--r--camlp4/etc/pr_r.ml3
2 files changed, 5 insertions, 2 deletions
diff --git a/camlp4/etc/pr_o.ml b/camlp4/etc/pr_o.ml
index 21d74d3bf..ca585ac7f 100644
--- a/camlp4/etc/pr_o.ml
+++ b/camlp4/etc/pr_o.ml
@@ -1407,7 +1407,9 @@ pr_expr.pr_levels :=
<:expr< for $_$ = $_$ $to:_$ $_$ do { $list:_$ } >> |
<:expr< while $_$ do { $list:_$ } >> | <:expr< ($list: _$) >> |
<:expr< let $opt:_$ $list:_$ in $_$ >> |
- <:expr< let module $_$ = $_$ in $_$ >> as e ->
+ <:expr< let module $_$ = $_$ in $_$ >> |
+ <:expr< new $list:_$ >> |
+ <:expr< assert $_$ >> | <:expr< lazy $_$ >> as e ->
fun curr next dg k ->
[: `S LO "("; `expr e "" [: `HVbox [: `S RO ")"; k :] :] :]
| e -> fun curr next _ k -> [: `not_impl "expr" e :] ]}];
diff --git a/camlp4/etc/pr_r.ml b/camlp4/etc/pr_r.ml
index 810943e30..74b1322c9 100644
--- a/camlp4/etc/pr_r.ml
+++ b/camlp4/etc/pr_r.ml
@@ -1315,7 +1315,8 @@ pr_expr.pr_levels :=
<:expr< while $_$ do { $list:_$ } >> |
<:expr< let $opt:_$ $list:_$ in $_$ >> |
<:expr< let module $_$ = $_$ in $_$ >> |
- <:expr< new $list:_$ >> as e ->
+ <:expr< new $list:_$ >> |
+ <:expr< assert $_$ >> | <:expr< lazy $_$ >> as e ->
fun curr next _ k ->
[: `S LO "("; `expr e [: `HVbox [: `S RO ")"; k :] :] :]
| e -> fun curr next _ k -> [: `not_impl "expr" e :] ]}];