From 05a27df3423dfddd9e48abfba019cf26da5ce4a5 Mon Sep 17 00:00:00 2001
From: François Pottier <francois.pottier@inria.fr>
Date: Tue, 10 Nov 2015 15:37:00 +0100
Subject: Change one line in [Lexer.mll] to obey API change in Menhir 20151110.
 Update configure to require Menhir 20151110.

---
 configure         | 2 +-
 cparser/Lexer.mll | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 02242eef..21aa5c75 100755
--- a/configure
+++ b/configure
@@ -281,7 +281,7 @@ else
   ocaml_opt_comp=false
 fi
 
-MENHIR_REQUIRED=20151023
+MENHIR_REQUIRED=20151110
 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/Lexer.mll b/cparser/Lexer.mll
index 23d8ab8d..17c4528c 100644
--- a/cparser/Lexer.mll
+++ b/cparser/Lexer.mll
@@ -470,7 +470,7 @@ and singleline_comment = parse
     let lexbuf = Lexing.from_string text in
     lexbuf.lex_curr_p <- {lexbuf.lex_curr_p with pos_fname = filename; pos_lnum = 1};
     let module I = Pre_parser.MenhirInterpreter in
-    let checkpoint = Pre_parser.Incremental.translation_unit_file()
+    let checkpoint = Pre_parser.Incremental.translation_unit_file lexbuf.lex_curr_p
     and supplier = I.lexer_lexbuf_to_supplier lexer lexbuf
     and succeed () = ()
     and fail checkpoint =
-- 
cgit