diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2014-04-28 11:49:52 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2014-04-28 11:49:52 +0000 |
commit | cc25e53ad310eb32d4854a1505ac3a9a917c8368 (patch) | |
tree | 101a8f24490f8ef63c75820cfd945cc4d7f669fc /parsing/pprintast.ml | |
parent | e94190206fe983154d5606a448e434aec03783d0 (diff) | |
parent | f1f362698f931494a305d48667936ffee2012b64 (diff) | |
download | ocaml-safe-string.tar.gz |
merge trunk up to commit 14699safe-string
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/safe-string@14700 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'parsing/pprintast.ml')
-rw-r--r-- | parsing/pprintast.ml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/parsing/pprintast.ml b/parsing/pprintast.ml index 28965bce3d..8b156bafd1 100644 --- a/parsing/pprintast.ml +++ b/parsing/pprintast.ml @@ -1224,12 +1224,12 @@ class printer ()= object(self:'self) pp f "~%s:%a" lbl self#simple_expr e method directive_argument f x = - match x with + (match x with + | Pdir_none -> () | Pdir_string (s) -> pp f "@ %S" s | Pdir_int (i) -> pp f "@ %d" i | Pdir_ident (li) -> pp f "@ %a" self#longident li - | Pdir_bool (b) -> pp f "@ %s" (string_of_bool b) - | Pdir_keyword s -> pp f "@ %s" s + | Pdir_bool (b) -> pp f "@ %s" (string_of_bool b)) method toplevel_phrase f x = match x with @@ -1238,8 +1238,7 @@ class printer ()= object(self:'self) self#list self#structure_item f s ; pp_close_box f (); | Ptop_dir (s, da) -> - pp f "@[<hov2>#%s@ %a@]" s - (self#list ~sep:" " self#directive_argument) da + pp f "@[<hov2>#%s@ %a@]" s self#directive_argument da end;; @@ -1253,8 +1252,7 @@ let toplevel_phrase f x = (* pp_print_list structure_item f s ; *) (* pp_close_box f (); *) | Ptop_dir (s, da) -> - pp f "@[<hov2>#%s@ %a@]" s - (default#list ~sep:" " default#directive_argument) da + pp f "@[<hov2>#%s@ %a@]" s default#directive_argument da (* pp f "@[<hov2>#%s@ %a@]" s directive_argument da *) let expression f x = |