From d9ad8992f2a9e233569d9cdc8249a3a2d59cbda7 Mon Sep 17 00:00:00 2001
From: Damien Doligez <damien.doligez-inria.fr>
Date: Sat, 6 Nov 2004 20:16:10 +0000
Subject: [PATCH] parser_env -> __caml_parser_env

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6668 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 yacc/reader.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/yacc/reader.c b/yacc/reader.c
index 07d1287e0..400c4301e 100644
--- a/yacc/reader.c
+++ b/yacc/reader.c
@@ -1266,9 +1266,9 @@ void copy_action(void)
             nrules-2, input_file_name, lineno);
             */
     if (sflag)
-      fprintf(f, "yyact.(%d) <- (fun parser_env ->\n", nrules-2);
+      fprintf(f, "yyact.(%d) <- (fun __caml_parser_env ->\n", nrules-2);
     else
-      fprintf(f, "; (fun parser_env ->\n");
+      fprintf(f, "; (fun __caml_parser_env ->\n");
 
     n = 0;
     for (i = nitems - 1; pitem[i]; --i) ++n;
@@ -1278,11 +1278,13 @@ void copy_action(void)
       if (item->class == TERM && !item->tag) continue;
       fprintf(f, "    let _%d = ", i);
       if (item->tag)
-        fprintf(f, "(peek_val parser_env %d : %s) in\n", n - i, item->tag);
+        fprintf(f, "(peek_val __caml_parser_env %d : %s) in\n", n - i,
+                item->tag);
       else if (sflag)
-        fprintf(f, "peek_val parser_env %d in\n", n - i);
+        fprintf(f, "peek_val __caml_parser_env %d in\n", n - i);
       else
-        fprintf(f, "(peek_val parser_env %d : '%s) in\n", n - i, item->name);
+        fprintf(f, "(peek_val __caml_parser_env %d : '%s) in\n", n - i,
+                item->name);
     }
     fprintf(f, "    Obj.repr(\n");
     fprintf(f, line_format, lineno, input_file_name);
@@ -1768,11 +1770,11 @@ void make_goal(void)
               "(* Entry %s *)\n", bp->name);
       if (sflag)
         fprintf(action_file,
-                "yyact.(%d) <- (fun parser_env -> raise (YYexit (peek_val parser_env 0)))\n",
+                "yyact.(%d) <- (fun __caml_parser_env -> raise (YYexit (peek_val __caml_parser_env 0)))\n",
                 ntotalrules);
       else
         fprintf(action_file,
-              "; (fun parser_env -> raise (YYexit (peek_val parser_env 0)))\n");
+              "; (fun __caml_parser_env -> raise (YYexit (peek_val __caml_parser_env 0)))\n");
       ntotalrules++;
       last_was_action = 1;
       end_rule();