summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel de Rauglaudre <daniel.de_rauglaudre@inria.fr>2002-02-05 15:08:01 +0000
committerDaniel de Rauglaudre <daniel.de_rauglaudre@inria.fr>2002-02-05 15:08:01 +0000
commit1c1502c43f77bd3a27067d693028a8d1078079d9 (patch)
tree647bd04cff0f4d54bb5878b799fcebb5612c7e53
parentdaba7e52d3bfc3e3ac0c72e9c390ea00a6af9ef0 (diff)
-
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4353 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--camlp4/CHANGES3
-rw-r--r--camlp4/etc/pr_r.ml8
2 files changed, 9 insertions, 2 deletions
diff --git a/camlp4/CHANGES b/camlp4/CHANGES
index c4eecc2ec..97521586d 100644
--- a/camlp4/CHANGES
+++ b/camlp4/CHANGES
@@ -1,6 +1,9 @@
Camlp4 Version 3.04+5
---------------------
+- [05 Feb 02] pr_r.cmo: now the option -ncip (no comments in phrases) is
+ by default, because its behaviour is not 100% sure. An option -cip has
+ been added to set it.
- [03 Feb 02] Added function Stdpp.line_of_loc returning the line and
columns positions from a character location and a file.
- [01 Feb 02] Fixed bug in token.ml: the location function provided by
diff --git a/camlp4/etc/pr_r.ml b/camlp4/etc/pr_r.ml
index 290ab1fb2..9290971dc 100644
--- a/camlp4/etc/pr_r.ml
+++ b/camlp4/etc/pr_r.ml
@@ -1547,7 +1547,7 @@ value output_string_eval oc s =
value maxl = ref 78;
value sep = Pcaml.inter_phrases;
-value ncip = ref False;
+value ncip = ref True;
value type_comm = ref False;
value input_source ic dont_skip_to_next_bol len =
@@ -1730,7 +1730,11 @@ Pcaml.add_option "-sep" (Arg.String (fun x -> sep.val := Some x))
Pcaml.add_option "-no_where" (Arg.Clear gen_where)
" Dont generate \"where\" statements";
-Pcaml.add_option "-ncip" (Arg.Set ncip) " No comments in phrases.";
+Pcaml.add_option "-cip" (Arg.Clear ncip)
+ " Add comments in phrases.";
+
+Pcaml.add_option "-ncip" (Arg.Set ncip)
+ " No comments in phrases (default).";
Pcaml.add_option "-old_seq" (Arg.Set old_sequences)
" Pretty print with old syntax for sequences.";