Update cl-loop-parser grammar file for bison 3.x

This allows the cl emodule to build with bison version 3.x, and sets
the minimum required version to 2.7

	* m4/sxe-bldchain-progs.m4 (SXE_PROG_BISON): Set minimum bison
	version needed to v2.7.x,

	* modules/cl/cl-loop-parser.y: Use api.prefix, api.pure instead of
	name-prefix, pure_parser which are deprecated.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/m4/sxe-bldchain-progs.m4 b/m4/sxe-bldchain-progs.m4
index 6d71535..ebd9adf 100644 (file)
--- a/m4/sxe-bldchain-progs.m4
+++ b/m4/sxe-bldchain-progs.m4
@@ -57,7 +57,7 @@ AC_DEFUN([SXE_PROG_BISON], [
                SXE_MSG_CHECKING([if bison is recent enough])
                sxe_cv_feat_bison_version="$(${BISON} --version | head -n1)"
                case "$sxe_cv_feat_bison_version" in
-               *\ 1.875 | *\ 2.*)
+               *\ 2.7* | *\ 3.*)
                        ;;
                *)
                        have_bison="no"

diff --git a/modules/cl/cl-loop-parser.y b/modules/cl/cl-loop-parser.y
index b7a72eb..0b7eba0 100644 (file)
--- a/modules/cl/cl-loop-parser.y
+++ b/modules/cl/cl-loop-parser.y
@@ -55,8 +55,8 @@ cl_loop_step_scanner(Lisp_Object *scanner)
 
 %}
 
-%name-prefix="cl_loop_yy"
-%pure_parser
+%define api.prefix {cl_loop_yy}
+%define api.pure full
 %defines
 
 %parse-param {Lisp_Object *yyscanner}