Fix menhirLib namespaces, following changes in Menhir version 20180530

13 files changed, 3 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index e983db8d..2001656f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ endif
 
 DIRS=lib common $(ARCHDIRS) backend cfrontend driver \
   flocq/Core flocq/Prop flocq/Calc flocq/Appli exportclight \
-  cparser cparser/validator
+  cparser cparser/MenhirLib
 
 RECDIRS=lib common $(ARCHDIRS) backend cfrontend driver flocq exportclight cparser
 
@@ -227,7 +227,7 @@ driver/Version.ml: VERSION
 	>driver/Version.ml
 
 cparser/Parser.v: cparser/Parser.vy
-	$(MENHIR) --coq cparser/Parser.vy
+	$(MENHIR) --coq-lib-path compcert.cparser.MenhirLib --coq cparser/Parser.vy
 
 depend: $(GENERATED) depend1
 
diff --git a/configure b/configure
index 4459e9d5..5b51ce9e 100755
--- a/configure
+++ b/configure
@@ -539,7 +539,7 @@ else
   ocaml_opt_comp=false
 fi
 
-MENHIR_REQUIRED=20161201
+MENHIR_REQUIRED=20180530
 echo "Testing Menhir... " | tr -d '\n'
 menhir_ver=`menhir --version 2>/dev/null | sed -n -e 's/^.*version \([0-9]*\).*$/\1/p'`
 case "$menhir_ver" in
diff --git a/cparser/validator/Alphabet.v b/cparser/MenhirLib/Alphabet.v
index a13f69b0..a13f69b0 100644
--- a/cparser/validator/Alphabet.v
+++ b/cparser/MenhirLib/Alphabet.v
diff --git a/cparser/validator/Automaton.v b/cparser/MenhirLib/Automaton.v
index fc995298..fc995298 100644
--- a/cparser/validator/Automaton.v
+++ b/cparser/MenhirLib/Automaton.v
diff --git a/cparser/validator/Grammar.v b/cparser/MenhirLib/Grammar.v
index 8e427cd9..8e427cd9 100644
--- a/cparser/validator/Grammar.v
+++ b/cparser/MenhirLib/Grammar.v
diff --git a/cparser/validator/Interpreter.v b/cparser/MenhirLib/Interpreter.v
index 4ac02693..4ac02693 100644
--- a/cparser/validator/Interpreter.v
+++ b/cparser/MenhirLib/Interpreter.v
diff --git a/cparser/validator/Interpreter_complete.v b/cparser/MenhirLib/Interpreter_complete.v
index 2e64b8da..2e64b8da 100644
--- a/cparser/validator/Interpreter_complete.v
+++ b/cparser/MenhirLib/Interpreter_complete.v
diff --git a/cparser/validator/Interpreter_correct.v b/cparser/MenhirLib/Interpreter_correct.v
index 1263d4e3..1263d4e3 100644
--- a/cparser/validator/Interpreter_correct.v
+++ b/cparser/MenhirLib/Interpreter_correct.v
diff --git a/cparser/validator/Interpreter_safe.v b/cparser/MenhirLib/Interpreter_safe.v
index a1aa35b8..a1aa35b8 100644
--- a/cparser/validator/Interpreter_safe.v
+++ b/cparser/MenhirLib/Interpreter_safe.v
diff --git a/cparser/validator/Main.v b/cparser/MenhirLib/Main.v
index 1a17e988..1a17e988 100644
--- a/cparser/validator/Main.v
+++ b/cparser/MenhirLib/Main.v
diff --git a/cparser/validator/Tuples.v b/cparser/MenhirLib/Tuples.v
index 3fd2ec03..3fd2ec03 100644
--- a/cparser/validator/Tuples.v
+++ b/cparser/MenhirLib/Tuples.v
diff --git a/cparser/validator/Validator_complete.v b/cparser/MenhirLib/Validator_complete.v
index a9823278..a9823278 100644
--- a/cparser/validator/Validator_complete.v
+++ b/cparser/MenhirLib/Validator_complete.v
diff --git a/cparser/validator/Validator_safe.v b/cparser/MenhirLib/Validator_safe.v
index 183d661b..183d661b 100644
--- a/cparser/validator/Validator_safe.v
+++ b/cparser/MenhirLib/Validator_safe.v