-

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

camlp4/CHANGES

@@ -1,8 +1,8 @@
 Camlp4 Version 3.04+1
 ---------------------
 
-- [28 Jan 02] Fixed bug in pa_o.cmo: some case of bad recognition in
-  a class_type.
+- [28 Jan 02] Fixed bug in OCaml toplevel when loading camlp4: the directives
+  were not applied in the good order.
 - [26 Jan 02] The printer pr_extend.cmo try now also to rebuild GEXTEND
   statements (before it tried only the EXTEND).
 - [23 Jan 02] The empty functional stream "fstream [: :]" is now of type

camlp4/etc/pa_o.ml

@@ -238,8 +238,8 @@ value test_not_class_signature =
              match stream_peek_nth lev strm with
              [ Some ("", "]") ->
                  match stream_peek_nth (lev + 1) strm with
-                 [ Some ("UIDENT" | "LIDENT", _) -> ()
-                 | _ -> raise Stream.Failure ]
+                 [ Some ("UIDENT" | "LIDENT", _) -> raise Stream.Failure
+                 | _ -> () ]
              | Some _ -> test (lev + 1)
              | None -> raise Stream.Failure ]
        | _ -> () ])

camlp4/top/camlp4_top.ml

@@ -156,15 +156,16 @@ value use_file cs =
             | _ -> (pl, False) ]
           else (pl, True)
       in
-      let r =
-        if eoi then pl0
+      let pl =
+        if eoi then []
         else
           loop () where rec loop () =
             let (pl, stopped_at_directive) =
               Grammar.Entry.parse Pcaml.use_file cs
             in
-            if stopped_at_directive then pl @ loop () else pl0 @ pl
+            if stopped_at_directive then pl @ loop () else pl
       in
+      let r = pl0 @ pl in
       let r = List.map ast2pt_phrase r in
       do { restore (); r }
     with e ->