diff options
| -rw-r--r-- | camlp4/meta/pa_r.ml | 2 | ||||
| -rw-r--r-- | camlp4/ocaml_src/meta/Makefile | 2 | ||||
| -rw-r--r-- | camlp4/ocaml_src/meta/pa_r.ml | 7 | ||||
| -rw-r--r-- | camlp4/ocaml_src/meta/pr_dump.ml | 2 | ||||
| -rwxr-xr-x | camlp4/tools/camlp4_comm.sh | 3 |
5 files changed, 7 insertions, 9 deletions
diff --git a/camlp4/meta/pa_r.ml b/camlp4/meta/pa_r.ml index 6cc837e6f..541947ee0 100644 --- a/camlp4/meta/pa_r.ml +++ b/camlp4/meta/pa_r.ml @@ -815,7 +815,7 @@ value warning_seq () = } else () ; -Pcaml.add_option "-no-warn_seq" (Arg.Clear not_yet_warned) +Pcaml.add_option "-no_warn_seq" (Arg.Clear not_yet_warned) " Warn when using old syntax for sequences."; EXTEND diff --git a/camlp4/ocaml_src/meta/Makefile b/camlp4/ocaml_src/meta/Makefile index a2aa5e05f..6248bd0e2 100644 --- a/camlp4/ocaml_src/meta/Makefile +++ b/camlp4/ocaml_src/meta/Makefile @@ -6,7 +6,7 @@ INCLUDES=-I ../camlp4 -I ../../boot -I $(OTOP)/utils OCAMLCFLAGS=$(INCLUDES) OBJS=q_MLast.cmo pa_r.cmo pa_rp.cmo pa_extend.cmo pa_extend_m.cmo pa_ifdef.cmo pr_dump.cmo CAMLP4RM=pa_r.cmo pa_rp.cmo pr_dump.cmo -CAMLP4RMX=pa_r.cmx pa_rp.cmx pr_dump.cmx pa_extend.cmx q_MLast.cmx pa_ifdef.cmx +CAMLP4RMX=pa_r.cmx pa_rp.cmx pr_dump.cmx SHELL=/bin/sh COUT=$(OBJS) camlp4r$(EXE) COPT=camlp4r.opt diff --git a/camlp4/ocaml_src/meta/pa_r.ml b/camlp4/ocaml_src/meta/pa_r.ml index 3d4190f0e..88f2e9a8f 100644 --- a/camlp4/ocaml_src/meta/pa_r.ml +++ b/camlp4/ocaml_src/meta/pa_r.ml @@ -2387,18 +2387,19 @@ Grammar.extend (* Old syntax for sequences *) -let not_yet_warned = ref false;; +let not_yet_warned = ref true;; let warning_seq () = if !not_yet_warned then begin not_yet_warned := false; Printf.eprintf "\ -*** warning: use of old syntax; do \"camlp4r -help_seq\" for explanations +*** warning: use of old syntax +*** type \"camlp4r -help_seq\" in a shell for explanations "; flush stderr end ;; -Pcaml.add_option "-warn_seq" (Arg.Set not_yet_warned) +Pcaml.add_option "-no_warn_seq" (Arg.Clear not_yet_warned) " Warn when using old syntax for sequences.";; Grammar.extend diff --git a/camlp4/ocaml_src/meta/pr_dump.ml b/camlp4/ocaml_src/meta/pr_dump.ml index 508e3cfba..1352c5e60 100644 --- a/camlp4/ocaml_src/meta/pr_dump.ml +++ b/camlp4/ocaml_src/meta/pr_dump.ml @@ -5,7 +5,7 @@ (* *) (* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt *) (* *) -(* Copyright 1998 Institut National de Recherche en Informatique et *) +(* Copyright 2001 Institut National de Recherche en Informatique et *) (* Automatique. Distributed only by permission. *) (* *) (***********************************************************************) diff --git a/camlp4/tools/camlp4_comm.sh b/camlp4/tools/camlp4_comm.sh index 455ddde7c..0b82f1f3c 100755 --- a/camlp4/tools/camlp4_comm.sh +++ b/camlp4/tools/camlp4_comm.sh @@ -15,9 +15,6 @@ head -1 $FILE >/dev/null || exit 1 set - `head -1 $FILE` if test "$2" = "camlp4r" -o "$2" = "camlp4"; then - if test "$2" = "camlp4r"; then - ARGS1="$ARGS1 -warn_seq" - fi COMM="ocamlrun$EXE ../boot/$2$EXE -nolib -I ../boot" if test "`basename $OTOP`" != "ocaml_stuff"; then COMM="$OTOP/boot/$COMM" |