From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 4 Feb 2022 11:36:47 +0000 (+0000)
Subject: Use old code-generator for menhir
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=3fc9a3298c032eb544923776d16e069c630c94ab;p=goals.git

Use old code-generator for menhir

The new code generator breaks include statements.
---

diff --git a/Goalfile.in b/Goalfile.in
index 711016e..7dca26f 100644
--- a/Goalfile.in
+++ b/Goalfile.in
@@ -92,7 +92,7 @@ goal tool = : ocaml_link ("src/goals", objects) ;
 
 # Parser.
 "src/parser.mli", "src/parser.ml" : "src/parser.mly" {
-    %MENHIR --explain %<
+    %MENHIR --explain --code-ancient %<
     # Hack required to break circular dependencies.
     echo 'val lexer_read : (Lexing.lexbuf -> token) option ref' >> src/parser.mli
     echo 'val eval_substitute : (Ast.env -> Ast.loc -> Ast.substs -> string) option ref' >> src/parser.mli
diff --git a/Makefile.am b/Makefile.am
index e7b5171..d57d376 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ maintainer-srpm maintainer-fedora-copr: src/goals
 # goals itself (see Goalfile.in).
 
 src/goals:
-	$(MENHIR) --explain src/parser.mly
+	$(MENHIR) --explain --code-ancient src/parser.mly
 # Hack required to break circular dependencies.
 	echo 'val lexer_read : (Lexing.lexbuf -> token) option ref' >> src/parser.mli
 	echo 'val eval_substitute : (Ast.env -> Ast.loc -> Ast.substs -> string) option ref' >> src/parser.mli