From: Akim Demaille <akim@lrde.epita.fr>
Date: Wed, 13 Jun 2012 19:03:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/maint'
X-Git-Tag: v2.7.90~441
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/9ce27ab013185d1c17c78e0d57ff637319cb1e29

Merge remote-tracking branch 'origin/maint'

* origin/maint:
  skeletons: factor yacc.c and glr.c.
  glr.c: minor refactoring.
  tests: remove all the -On flags.
  maint: fix spello.
  maint: improve release procedure instructions.
  gnulib: update readme-release.
  maint: cfg.mk: manual title.
  maint: cfg.mk: simplify
  maint: post-release administrivia

Conflicts:
	NEWS
	bootstrap.conf
---

9ce27ab013185d1c17c78e0d57ff637319cb1e29
diff --cc bootstrap.conf
index 6cdb017c,aa05e340..cff387f9
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@@ -17,14 -17,13 +17,13 @@@
  
  # gnulib modules used by this package.
  gnulib_modules='
-   announce-gen argmatch assert calloc-posix close closeout config-h c-strcase
+   argmatch assert calloc-posix close closeout config-h c-strcase
    configmake
    dirname
-   do-release-commit-and-tag
-   error extensions fdl fopen-safer gendocs getopt-gnu
+   error extensions fdl fopen-safer getopt-gnu
    gettext git-version-gen gitlog-to-changelog
    gpl-3.0 hash inttypes isnan javacomp-script
-   javaexec-script ldexpl maintainer-makefile malloc-gnu
 -  javaexec-script ldexpl malloc-gnu mbschr mbsrchr
++  javaexec-script ldexpl malloc-gnu
    mbswidth obstack perror progname
    quote quotearg
    readme-release
diff --cc data/glr.c
index 8f77aa61,7ebc65c0..1463a9a7
--- a/data/glr.c
+++ b/data/glr.c
@@@ -159,9 -151,24 +159,24 @@@ m4_define([b4_lhs_location]
  # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
  # on RHS.
  m4_define([b4_rhs_location],
 -[(((yyGLRStackItem const *)yyvsp)@{YYFILL (($2) - ($1))@}.yystate.yyloc)])
 +[(b4_rhs_data([$1], [$2]).yyloc)])
  
  
+ ## -------------- ##
+ ## Declarations.  ##
+ ## -------------- ##
+ 
+ # b4_shared_declarations
+ # ----------------------
+ # Declaration that might either go into the header (if --defines)
+ # or open coded in the parser body.
+ m4_define([b4_shared_declarations],
+ [b4_percent_code_get([[requires]])[
+ ]b4_token_enums(b4_tokens)[
+ ]b4_declare_yylstype[
+ ]b4_percent_code_get([[provides]])[]dnl
+ ])
+ 
  
  ## -------------- ##
  ## Output files.  ##
diff --cc data/yacc.c
index 0cc17f33,5ba271cb..922a4ebe
--- a/data/yacc.c
+++ b/data/yacc.c
@@@ -157,12 -155,12 +157,12 @@@ m4_define([b4_lhs_location]
  # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
  # on RHS.
  m4_define([b4_rhs_location],
 -[(yylsp@{($2) - ($1)@})])
 +          [(yylsp@{b4_subtract([$2], [$1])@})])
  
  
- ## ------------------ ##
- ## Parser variables.  ##
- ## ------------------ ##
+ ## -------------- ##
+ ## Declarations.  ##
+ ## -------------- ##
  
  # b4_declare_scanner_communication_variables
  # ------------------------------------------