Integration modifs de l'arbre de Daniel et de l'arbre standard de Camlp4.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5682 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

2 files changed, 21 insertions, 7 deletions

diff --git a/camlp4/ICHANGES b/camlp4/ICHANGES
new file mode 100644
index 0000000000..bbb9eb146b
--- /dev/null
+++ b/camlp4/ICHANGES
@@ -0,0 +1,17 @@
+Internal, very small, undocumented, or invisible changes
+********************************************************
+
+Camlp4s Version 3.06+19
+-----------------------
+
+- [28 Oct 02] Changed and simplified local entry of pa_o.ml from "cvalue"
+  to "cvalue_binding".
+- [18 Oct 02] The standard syntax for antiquotations in object class_types
+  and object class_expr are now: <:class_type< $opt:x$ $list:y$ >> and
+  <:class_expr< $opt:x$ $list:y$ >>: the syntax without the "opt" is
+  accepted but deprecated (a warning is displayed).
+- [15 Oct 02] Changed Plexer which now manages better the line directives
+  (applied only on begin of lines, no error if parsing error in the
+  directive).
+- [14 Sep 02] Grammar.print_entry does not end any more with
+  Format.print_flush. The "flush" is done by Grammar.Entry.print.
diff --git a/camlp4/Makefile b/camlp4/Makefile
index b93642a619..0af8f37c46 100644
--- a/camlp4/Makefile
+++ b/camlp4/Makefile
@@ -6,7 +6,7 @@ DIRS=odyl camlp4 meta etc top ocpp lib man
 FDIRS=odyl camlp4 meta lib
 OPTDIRS= lib odyl camlp4 meta compile
 SHELL=/bin/sh
-COLD_FILES=ocaml_src/camlp4/argl.ml ocaml_src/camlp4/ast2pt.ml ocaml_src/camlp4/ast2pt.mli ocaml_src/camlp4/mLast.mli ocaml_src/camlp4/pcaml.ml ocaml_src/camlp4/pcaml.mli ocaml_src/camlp4/quotation.ml ocaml_src/camlp4/quotation.mli ocaml_src/camlp4/reloc.ml ocaml_src/camlp4/reloc.mli ocaml_src/camlp4/spretty.ml ocaml_src/camlp4/spretty.mli ocaml_src/lib/extfun.ml ocaml_src/lib/extfun.mli ocaml_src/lib/fstream.ml ocaml_src/lib/fstream.mli ocaml_src/lib/gramext.ml ocaml_src/lib/gramext.mli ocaml_src/lib/grammar.ml ocaml_src/lib/grammar.mli ocaml_src/lib/plexer.ml ocaml_src/lib/plexer.mli ocaml_src/lib/stdpp.ml ocaml_src/lib/stdpp.mli ocaml_src/lib/token.ml ocaml_src/lib/token.mli ocaml_src/meta/pa_extend.ml ocaml_src/meta/pa_extend_m.ml ocaml_src/meta/pa_ifdef.ml ocaml_src/meta/pa_r.ml ocaml_src/meta/pa_rp.ml ocaml_src/meta/pr_dump.ml ocaml_src/meta/q_MLast.ml ocaml_src/odyl/odyl_main.ml ocaml_src/odyl/odyl_main.mli ocaml_src/odyl/odyl.ml
+COLD_FILES=ocaml_src/camlp4/argl.ml ocaml_src/camlp4/ast2pt.ml ocaml_src/camlp4/ast2pt.mli ocaml_src/camlp4/mLast.mli ocaml_src/camlp4/pcaml.ml ocaml_src/camlp4/pcaml.mli ocaml_src/camlp4/quotation.ml ocaml_src/camlp4/quotation.mli ocaml_src/camlp4/reloc.ml ocaml_src/camlp4/reloc.mli ocaml_src/camlp4/spretty.ml ocaml_src/camlp4/spretty.mli ocaml_src/lib/extfun.ml ocaml_src/lib/extfun.mli ocaml_src/lib/fstream.ml ocaml_src/lib/fstream.mli ocaml_src/lib/gramext.ml ocaml_src/lib/gramext.mli ocaml_src/lib/grammar.ml ocaml_src/lib/grammar.mli ocaml_src/lib/plexer.ml ocaml_src/lib/plexer.mli ocaml_src/lib/stdpp.ml ocaml_src/lib/stdpp.mli ocaml_src/lib/token.ml ocaml_src/lib/token.mli ocaml_src/meta/pa_extend.ml ocaml_src/meta/pa_extend_m.ml ocaml_src/meta/pa_macro.ml ocaml_src/meta/pa_r.ml ocaml_src/meta/pa_rp.ml ocaml_src/meta/pr_dump.ml ocaml_src/meta/q_MLast.ml ocaml_src/odyl/odyl_main.ml ocaml_src/odyl/odyl_main.mli ocaml_src/odyl/odyl.ml
 
 all: boot/camlp4$(EXE)
 	set -e; for i in $(DIRS); do cd $$i; $(MAKE) all; cd ..; done
@@ -29,11 +29,11 @@ depend:
 	for i in $(DIRS) compile; do (cd $$i; $(MAKE) depend); done
 
 install:
-	for i in $(DIRS) compile; do (cd $$i; $(MAKE) install BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR)); done
+	for i in $(DIRS) compile; do (cd $$i; $(MAKE) install BINDIR="$(BINDIR)" LIBDIR="$(LIBDIR)" MANDIR="$(MANDIR)"); done
 
 uninstall:
-	rm -rf $(LIBDIR)/camlp4
-	cd $(BINDIR); rm -f *camlp4* odyl ocpp
+	rm -rf "$(LIBDIR)/camlp4"
+	cd "$(BINDIR)"; rm -f *camlp4* odyl ocpp
 
 clean::
 	$(MAKE) clean_hot clean_cold
@@ -86,9 +86,6 @@ core: boot/camlp4$(EXE)
 clean_core:
 	for i in $(FDIRS); do (cd $$i; $(MAKE) clean); done
 
-fast: core
-bootstrap_fast: bootstrap_core
-
 
 # The very beginning