mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-08-13 20:55:15 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d9839c4a8 | ||
|
|
ad32ec64c8 | ||
|
|
44cdc0f001 | ||
|
|
ca796220ec | ||
|
|
8a910107b3 | ||
|
|
28d1ca8f48 | ||
|
|
1817b475a6 | ||
|
|
22ca07defa | ||
|
|
dbd6975b5c | ||
|
|
cd726fdc4d | ||
|
|
60ebd8e210 | ||
|
|
3765e3e790 | ||
|
|
c313360deb | ||
|
|
25698b58c0 | ||
|
|
17d34c231b | ||
|
|
af000bab11 | ||
|
|
b2347a3c3e | ||
|
|
008d927f71 | ||
|
|
1650c729d9 | ||
|
|
7bdf7246fb | ||
|
|
583c193ffa | ||
|
|
47b9ada6fa | ||
|
|
dcd5bb26e3 | ||
|
|
cce6c998b6 | ||
|
|
3398b0fa90 | ||
|
|
2bd1d9e20f | ||
|
|
1f2546396e | ||
|
|
809268c1a4 |
+1
-1
@@ -1 +1 @@
|
|||||||
3.4.2
|
3.4.90
|
||||||
|
|||||||
@@ -1,5 +1,70 @@
|
|||||||
GNU Bison NEWS
|
GNU Bison NEWS
|
||||||
|
|
||||||
|
* Noteworthy changes in release 3.4.91 (2019-11-20) [beta]
|
||||||
|
|
||||||
|
** New Features
|
||||||
|
|
||||||
|
*** New diagnostic: -Wdangling-alias
|
||||||
|
|
||||||
|
String literals, which allow for better error messages, are (too)
|
||||||
|
liberally accepted by Bison, which might result in silent errors. For
|
||||||
|
instance
|
||||||
|
|
||||||
|
%type <exVal> cond "condition"
|
||||||
|
|
||||||
|
does not define "condition" as a string alias to 'cond' (nonterminal
|
||||||
|
symbols do not have string aliases). It is rather equivalent to
|
||||||
|
|
||||||
|
%nterm <exVal> cond
|
||||||
|
%token <exVal> "condition"
|
||||||
|
|
||||||
|
i.e., it gives the type 'exVal' to the "condition" token, which was
|
||||||
|
clearly not the intention.
|
||||||
|
|
||||||
|
Also, because string aliases need not be defined, typos such as "baz"
|
||||||
|
instead of "bar" will be not reported.
|
||||||
|
|
||||||
|
The option -Wdangling-alias catches these situations. On
|
||||||
|
|
||||||
|
%token BAR "bar"
|
||||||
|
%type <ival> foo "foo"
|
||||||
|
%%
|
||||||
|
foo: "baz" {}
|
||||||
|
|
||||||
|
bison -Wdangling-alias reports
|
||||||
|
|
||||||
|
warning: string literal not attached to a symbol
|
||||||
|
| %type <ival> foo "foo"
|
||||||
|
| ^~~~~
|
||||||
|
warning: string literal not attached to a symbol
|
||||||
|
| foo: "baz" {}
|
||||||
|
| ^~~~~
|
||||||
|
|
||||||
|
The -Wall option does not (yet?) include -Wdangling-alias.
|
||||||
|
|
||||||
|
*** Better POSIX Yacc compatibility diagnostics
|
||||||
|
|
||||||
|
POSIX Yacc restricts %type to nonterminals. This is now diagnosed by
|
||||||
|
-Wyacc.
|
||||||
|
|
||||||
|
%token TOKEN1
|
||||||
|
%type <ival> TOKEN1 TOKEN2 't'
|
||||||
|
%token TOKEN2
|
||||||
|
%%
|
||||||
|
expr:
|
||||||
|
|
||||||
|
gives, with -Wyacc
|
||||||
|
|
||||||
|
input.y:2.15-20: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
|
||||||
|
2 | %type <ival> TOKEN1 TOKEN2 't'
|
||||||
|
| ^~~~~~
|
||||||
|
input.y:2.29-31: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
|
||||||
|
2 | %type <ival> TOKEN1 TOKEN2 't'
|
||||||
|
| ^~~
|
||||||
|
input.y:2.22-27: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
|
||||||
|
2 | %type <ival> TOKEN1 TOKEN2 't'
|
||||||
|
| ^~~~~~
|
||||||
|
|
||||||
* Noteworthy changes in release 3.4.90 (2019-10-29) [beta]
|
* Noteworthy changes in release 3.4.90 (2019-10-29) [beta]
|
||||||
|
|
||||||
** Backward incompatible changes
|
** Backward incompatible changes
|
||||||
@@ -11,7 +76,8 @@ GNU Bison NEWS
|
|||||||
In C++, line numbers and columns are now represented as 'int' not
|
In C++, line numbers and columns are now represented as 'int' not
|
||||||
'unsigned', so that integer overflow on positions is easily checkable via
|
'unsigned', so that integer overflow on positions is easily checkable via
|
||||||
'gcc -fsanitize=undefined' and the like. This affects the API for
|
'gcc -fsanitize=undefined' and the like. This affects the API for
|
||||||
positions.
|
positions. The default position and location classes now expose
|
||||||
|
'counter_type' (int), used to define line and column numbers.
|
||||||
|
|
||||||
** Bug fixes
|
** Bug fixes
|
||||||
|
|
||||||
|
|||||||
@@ -7,20 +7,42 @@ Here are basic installation instructions for a repository checkout:
|
|||||||
$ git submodule update --init
|
$ git submodule update --init
|
||||||
$ ./bootstrap
|
$ ./bootstrap
|
||||||
|
|
||||||
then proceed with the usual 'configure && make' steps.
|
then proceed with the usual `configure && make` steps.
|
||||||
|
|
||||||
Be sure to read README-hacking, which contains all the needed information
|
The file README-hacking.md contains all the needed information about
|
||||||
about building, modifying and checking Bison.
|
building, modifying and checking Bison.
|
||||||
|
|
||||||
## Build from tarball
|
## Build from tarball
|
||||||
See the file INSTALL for generic compilation and installation instructions.
|
See the file INSTALL for generic compilation and installation instructions.
|
||||||
|
|
||||||
Bison requires GNU m4 1.4.6 or later. See:
|
Bison requires GNU m4 1.4.6 or later. See
|
||||||
|
https://ftp.gnu.org/gnu/m4/m4-1.4.6.tar.gz.
|
||||||
|
|
||||||
https://ftp.gnu.org/gnu/m4/m4-1.4.6.tar.gz
|
## Colored diagnostics
|
||||||
|
As an experimental feature, diagnostics are now colored, controlled by the
|
||||||
|
`--color` and `--style` options.
|
||||||
|
|
||||||
|
To use them, install the libtextstyle library before configuring Bison. It
|
||||||
|
is available from https://alpha.gnu.org/gnu/gettext/, for instance
|
||||||
|
https://alpha.gnu.org/gnu/gettext/libtextstyle-0.8.tar.gz.
|
||||||
|
|
||||||
|
The option --color supports the following arguments:
|
||||||
|
- always, yes: Enable colors.
|
||||||
|
- never, no: Disable colors.
|
||||||
|
- auto, tty (default): Enable colors if the output device is a tty.
|
||||||
|
|
||||||
|
To customize the styles, create a CSS file, say `bison-bw.css`, similar to
|
||||||
|
|
||||||
|
/* bison-bw.css */
|
||||||
|
.warning { }
|
||||||
|
.error { font-weight: 800; text-decoration: underline; }
|
||||||
|
.note { }
|
||||||
|
|
||||||
|
then invoke bison with `--style=bison-bw.css`, or set the `BISON_STYLE`
|
||||||
|
environment variable to `bison-bw.css`.
|
||||||
|
|
||||||
## Relocatability
|
## Relocatability
|
||||||
If you pass '--enable-relocatable' to 'configure', Bison is relocatable.
|
If you pass `--enable-relocatable` to `configure`, Bison is relocatable.
|
||||||
|
|
||||||
A relocatable program can be moved or copied to a different location on the
|
A relocatable program can be moved or copied to a different location on the
|
||||||
file system. It can also be used through mount points for network sharing.
|
file system. It can also be used through mount points for network sharing.
|
||||||
@@ -42,15 +64,15 @@ details.
|
|||||||
# Questions
|
# Questions
|
||||||
See the section FAQ in the documentation (doc/bison.info) for frequently
|
See the section FAQ in the documentation (doc/bison.info) for frequently
|
||||||
asked questions. The documentation is also available in PDF and HTML,
|
asked questions. The documentation is also available in PDF and HTML,
|
||||||
provided you have a recent version of Texinfo installed: run "make pdf" or
|
provided you have a recent version of Texinfo installed: run `make pdf` or
|
||||||
"make html".
|
`make html`.
|
||||||
|
|
||||||
If you have questions about using Bison and the documentation does not
|
If you have questions about using Bison and the documentation does not
|
||||||
answer them, please send mail to <[email protected]>.
|
answer them, please send mail to <[email protected]>.
|
||||||
|
|
||||||
# Bug reports
|
# Bug reports
|
||||||
Please send bug reports to <[email protected]>. Be sure to include the
|
Please send bug reports to <[email protected]>. Be sure to include the
|
||||||
version number from 'bison --version', and a complete, self-contained test
|
version number from `bison --version`, and a complete, self-contained test
|
||||||
case in each bug report.
|
case in each bug report.
|
||||||
|
|
||||||
# Copyright statements
|
# Copyright statements
|
||||||
@@ -59,12 +81,6 @@ that the range specifies every single year in that closed interval.
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
|
||||||
Local Variables:
|
|
||||||
mode: markdown
|
|
||||||
fill-column: 76
|
|
||||||
ispell-dictionary: "american"
|
|
||||||
End:
|
|
||||||
|
|
||||||
Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2015, 2018-2019 Free
|
Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2015, 2018-2019 Free
|
||||||
Software Foundation, Inc.
|
Software Foundation, Inc.
|
||||||
|
|
||||||
@@ -83,6 +99,12 @@ GNU General Public License for more details.
|
|||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Local Variables:
|
||||||
|
mode: markdown
|
||||||
|
fill-column: 76
|
||||||
|
ispell-dictionary: "american"
|
||||||
|
End:
|
||||||
|
|
||||||
LocalWords: parsers ngettext Texinfo pdf html YYYY ZZZZ ispell american
|
LocalWords: parsers ngettext Texinfo pdf html YYYY ZZZZ ispell american
|
||||||
LocalWords: MERCHANTABILITY
|
LocalWords: MERCHANTABILITY
|
||||||
|
|
||||||
|
|||||||
+171
-155
@@ -2,20 +2,19 @@ This file attempts to describe the rules to use when hacking Bison.
|
|||||||
Don't put this file into the distribution.
|
Don't put this file into the distribution.
|
||||||
|
|
||||||
Everything related to the development of Bison is on Savannah:
|
Everything related to the development of Bison is on Savannah:
|
||||||
|
http://savannah.gnu.org/projects/bison/.
|
||||||
http://savannah.gnu.org/projects/bison/
|
|
||||||
|
|
||||||
|
|
||||||
* Administrivia
|
# Administrivia
|
||||||
|
|
||||||
** If you incorporate a change from somebody on the net:
|
## If you incorporate a change from somebody on the net:
|
||||||
First, if it is a large change, you must make sure they have signed the
|
First, if it is a large change, you must make sure they have signed the
|
||||||
appropriate paperwork. Second, be sure to add their name and email address
|
appropriate paperwork. Second, be sure to add their name and email address
|
||||||
to THANKS.
|
to THANKS.
|
||||||
|
|
||||||
** If a change fixes a test, mention the test in the commit message.
|
## If a change fixes a test, mention the test in the commit message.
|
||||||
|
|
||||||
** Bug reports
|
## Bug reports
|
||||||
If somebody reports a new bug, mention his name in the commit message and in
|
If somebody reports a new bug, mention his name in the commit message and in
|
||||||
the test case you write. Put him into THANKS.
|
the test case you write. Put him into THANKS.
|
||||||
|
|
||||||
@@ -24,18 +23,18 @@ demonstrates the bug. Then fix the bug, re-run the test suite, and check
|
|||||||
everything in.
|
everything in.
|
||||||
|
|
||||||
|
|
||||||
* Hacking
|
# Hacking
|
||||||
|
|
||||||
** Visible changes
|
## Visible changes
|
||||||
Which include serious bug fixes, must be mentioned in NEWS.
|
Which include serious bug fixes, must be mentioned in NEWS.
|
||||||
|
|
||||||
** Translations
|
## Translations
|
||||||
Only user visible strings are to be translated: error messages, bits of the
|
Only user visible strings are to be translated: error messages, bits of the
|
||||||
.output file etc. This excludes impossible error messages (comparable to
|
.output file etc. This excludes impossible error messages (comparable to
|
||||||
assert/abort), and all the --trace output which is meant for the maintainers
|
assert/abort), and all the --trace output which is meant for the maintainers
|
||||||
only.
|
only.
|
||||||
|
|
||||||
** Horizontal tabs
|
## Horizontal tabs
|
||||||
Do not add horizontal tab characters to any file in Bison's repository
|
Do not add horizontal tab characters to any file in Bison's repository
|
||||||
except where required. For example, do not use tabs to format C code.
|
except where required. For example, do not use tabs to format C code.
|
||||||
However, make files, ChangeLog, and some regular expressions require tabs.
|
However, make files, ChangeLog, and some regular expressions require tabs.
|
||||||
@@ -43,12 +42,12 @@ Also, test cases might need to contain tabs to check that Bison properly
|
|||||||
processes tabs in its input.
|
processes tabs in its input.
|
||||||
|
|
||||||
|
|
||||||
* Working from the repository
|
# Working from the repository
|
||||||
|
|
||||||
These notes intend to help people working on the checked-out sources. These
|
These notes intend to help people working on the checked-out sources. These
|
||||||
requirements do not apply when building from a distribution tarball.
|
requirements do not apply when building from a distribution tarball.
|
||||||
|
|
||||||
** Requirements
|
## Requirements
|
||||||
|
|
||||||
We've opted to keep only the highest-level sources in the repository. This
|
We've opted to keep only the highest-level sources in the repository. This
|
||||||
eases our maintenance burden, (fewer merges etc.), but imposes more
|
eases our maintenance burden, (fewer merges etc.), but imposes more
|
||||||
@@ -75,8 +74,8 @@ If you're using a GNU/Linux distribution, the easiest way to install the
|
|||||||
above packages depends on your system. The following shell command should
|
above packages depends on your system. The following shell command should
|
||||||
work for Debian-based systems such as Ubuntu:
|
work for Debian-based systems such as Ubuntu:
|
||||||
|
|
||||||
sudo apt-get install \
|
sudo apt-get install \
|
||||||
autoconf automake autopoint flex graphviz help2man texinfo valgrind
|
autoconf automake autopoint flex graphviz help2man texinfo valgrind
|
||||||
|
|
||||||
Bison is written using Bison grammars, so there are bootstrapping issues.
|
Bison is written using Bison grammars, so there are bootstrapping issues.
|
||||||
The bootstrap script attempts to discover when the C code generated from the
|
The bootstrap script attempts to discover when the C code generated from the
|
||||||
@@ -89,53 +88,51 @@ after synchronizing from the repository a plain 'make' should be sufficient.
|
|||||||
Note, however, that when gnulib is updated, running './bootstrap' again
|
Note, however, that when gnulib is updated, running './bootstrap' again
|
||||||
might be needed.
|
might be needed.
|
||||||
|
|
||||||
** First checkout
|
## First checkout
|
||||||
|
|
||||||
Obviously, if you are reading these notes, you did manage to check out this
|
Obviously, if you are reading these notes, you did manage to check out this
|
||||||
package from the repository. For the record, you will find all the relevant
|
package from the repository. For the record, you will find all the relevant
|
||||||
information on:
|
information on http://savannah.gnu.org/git/?group=bison.
|
||||||
|
|
||||||
http://savannah.gnu.org/git/?group=bison
|
|
||||||
|
|
||||||
Bison uses Git submodules: subscriptions to other Git repositories. In
|
Bison uses Git submodules: subscriptions to other Git repositories. In
|
||||||
particular it uses gnulib, the GNU portability library. To ask Git to
|
particular it uses gnulib, the GNU portability library. To ask Git to
|
||||||
perform the first checkout of the submodules, run
|
perform the first checkout of the submodules, run
|
||||||
|
|
||||||
$ git submodule update --init
|
$ git submodule update --init
|
||||||
|
|
||||||
The next step is to get other files needed to build, which are extracted
|
The next step is to get other files needed to build, which are extracted
|
||||||
from other source packages:
|
from other source packages:
|
||||||
|
|
||||||
$ ./bootstrap
|
$ ./bootstrap
|
||||||
|
|
||||||
Bootstrapping updates the submodules to the versions registered in the
|
Bootstrapping updates the submodules to the versions registered in the
|
||||||
top-level directory. To change gnulib, first check out the version you want
|
top-level directory. To change gnulib, first check out the version you want
|
||||||
in `gnulib`, then commit this change in Bison's repository, and finally run
|
in `gnulib`, then commit this change in Bison's repository, and finally run
|
||||||
bootstrap.
|
bootstrap.
|
||||||
|
|
||||||
If it fails with missing symbols (e.g., "error: possibly undefined macro:
|
If it fails with missing symbols (e.g., `error: possibly undefined macro:
|
||||||
AC_PROG_GNU_M4"), you are likely to have forgotten the submodule
|
AC_PROG_GNU_M4`), you are likely to have forgotten the submodule
|
||||||
initialization part. To recover from it, run `git reset --hard HEAD`, and
|
initialization part. To recover from it, run `git reset --hard HEAD`, and
|
||||||
restart with the submodule initialization. Otherwise, there you are! Just
|
restart with the submodule initialization. Otherwise, there you are! Just
|
||||||
|
|
||||||
$ ./configure
|
$ ./configure
|
||||||
$ make
|
$ make
|
||||||
$ make check
|
$ make check
|
||||||
|
|
||||||
At this point, there should be no difference between your local copy, and
|
At this point, there should be no difference between your local copy, and
|
||||||
the master copy:
|
the master copy:
|
||||||
|
|
||||||
$ git diff
|
$ git diff
|
||||||
|
|
||||||
should output no difference.
|
should output no difference.
|
||||||
|
|
||||||
Enjoy!
|
Enjoy!
|
||||||
|
|
||||||
** Updating
|
## Updating
|
||||||
|
|
||||||
If you have git at version 1.8.2 or later, the command
|
If you have git at version 1.8.2 or later, the command
|
||||||
|
|
||||||
$ git submodule update --recursive --remote
|
$ git submodule update --recursive --remote
|
||||||
|
|
||||||
will be useful for updating to the latest version of all submodules.
|
will be useful for updating to the latest version of all submodules.
|
||||||
|
|
||||||
@@ -143,65 +140,73 @@ Under earlier versions, use of submodules make things somewhat different
|
|||||||
because git does not yet support recursive operations: submodules must be
|
because git does not yet support recursive operations: submodules must be
|
||||||
taken care of explicitly.
|
taken care of explicitly.
|
||||||
|
|
||||||
*** Updating Bison
|
### Updating Bison
|
||||||
|
|
||||||
If you pull a newer version of a branch, say via "git pull", you might
|
If you pull a newer version of a branch, say via `git pull`, you might
|
||||||
import requests for updated submodules. A simple "git diff" will reveal if
|
import requests for updated submodules. A simple `git diff` will reveal if
|
||||||
the current version of the submodule (i.e., the actual contents of the
|
the current version of the submodule (i.e., the actual contents of the
|
||||||
gnulib directory) and the current request from the subscriber (i.e., the
|
gnulib directory) and the current request from the subscriber (i.e., the
|
||||||
reference of the version of gnulib that the Bison repository requests)
|
reference of the version of gnulib that the Bison repository requests)
|
||||||
differ. To upgrade the submodules (i.e., to check out the version that is
|
differ. To upgrade the submodules (i.e., to check out the version that is
|
||||||
actually requested by the subscriber, run "git submodule update".
|
actually requested by the subscriber, run `git submodule update`.
|
||||||
|
|
||||||
$ git pull
|
$ git pull
|
||||||
$ git submodule update
|
$ git submodule update
|
||||||
|
|
||||||
*** Updating a submodule
|
### Updating a submodule
|
||||||
To update a submodule, say gnulib, do as follows:
|
To update a submodule, say gnulib, do as follows:
|
||||||
|
|
||||||
Get the most recent version of the master branch from git.
|
Get the most recent version of the master branch from git.
|
||||||
|
|
||||||
$ cd gnulib
|
$ cd gnulib
|
||||||
$ git fetch
|
$ git fetch
|
||||||
$ git checkout -b master --track origin/master
|
$ git checkout -b master --track origin/master
|
||||||
|
|
||||||
Make sure Bison can live with that version of gnulib.
|
Make sure Bison can live with that version of gnulib.
|
||||||
|
|
||||||
$ cd ..
|
$ cd ..
|
||||||
$ ./bootstrap
|
$ ./bootstrap
|
||||||
$ make distcheck
|
$ make distcheck
|
||||||
|
|
||||||
Register your changes.
|
Register your changes.
|
||||||
|
|
||||||
$ git checkin ...
|
$ git commit ...
|
||||||
|
|
||||||
For a suggestion of what gnulib commit might be stable enough for a formal
|
For a suggestion of what gnulib commit might be stable enough for a formal
|
||||||
release, see the ChangeLog in the latest gnulib snapshot at:
|
release, see the ChangeLog in the latest gnulib snapshot at
|
||||||
|
http://erislabs.net/ianb/projects/gnulib/.
|
||||||
http://erislabs.net/ianb/projects/gnulib/
|
|
||||||
|
|
||||||
The Autoconf files we use are currently:
|
The Autoconf files we use are currently:
|
||||||
|
- m4/m4.m4
|
||||||
m4/m4.m4
|
- lib/m4sugar/m4sugar.m4
|
||||||
lib/m4sugar/m4sugar.m4
|
- lib/m4sugar/foreach.m4
|
||||||
lib/m4sugar/foreach.m4
|
|
||||||
|
|
||||||
These files don't change very often in Autoconf, so it should be relatively
|
These files don't change very often in Autoconf, so it should be relatively
|
||||||
straight-forward to examine the differences in order to decide whether to
|
straight-forward to examine the differences in order to decide whether to
|
||||||
update.
|
update.
|
||||||
|
|
||||||
* Test suite
|
# Test suite
|
||||||
|
|
||||||
** make check
|
## make check
|
||||||
Use liberally.
|
Use liberally.
|
||||||
|
|
||||||
** Updating the expectations
|
## Updating the expectations
|
||||||
Sometimes some changes have a large impact on the test suite (e.g., when we
|
Sometimes some changes have a large impact on the test suite (e.g., when we
|
||||||
added the "[-Wother]" part to all the warnings). Part of the update can be
|
added the `[-Wother]` part to all the warnings). Part of the update can be
|
||||||
done with a crude tool: tests/update-test. Read it for more information.
|
done with a crude tool: `build-aux/update-test`.
|
||||||
|
|
||||||
** TESTSUITEFLAGS
|
Once you ran the test suite, and therefore have many testsuite.log files,
|
||||||
To run just the testsuite (not the tests related to the examples), run `make
|
run, from the source tree:
|
||||||
|
|
||||||
|
$ ./build-aux/update-test _build/tests/testsuite.dir/*/testsuite.log
|
||||||
|
|
||||||
|
where `_build` would be your build tree. This will hopefully update most
|
||||||
|
tests. Re-run the test suite. It might be interesting to run `update-test`
|
||||||
|
again, since some early failures may stop latter tests from being run. Yet
|
||||||
|
at some point, you'll have to fix remaining issues by hand...
|
||||||
|
|
||||||
|
## TESTSUITEFLAGS
|
||||||
|
To run just the test suite (not the tests related to the examples), run `make
|
||||||
check-local`.
|
check-local`.
|
||||||
|
|
||||||
The default is for make check-local to run all tests sequentially. This can
|
The default is for make check-local to run all tests sequentially. This can
|
||||||
@@ -209,43 +214,48 @@ be very time consuming when checking repeatedly or on slower setups. This
|
|||||||
can be sped up in two ways:
|
can be sped up in two ways:
|
||||||
|
|
||||||
Using -j, in a make-like fashion, for example:
|
Using -j, in a make-like fashion, for example:
|
||||||
$ make check-local TESTSUITEFLAGS='-j8'
|
|
||||||
|
$ make check-local TESTSUITEFLAGS='-j8'
|
||||||
|
|
||||||
Actually, when using GNU Make, TESTSUITEFLAGS defaults to the -jN passed to
|
Actually, when using GNU Make, TESTSUITEFLAGS defaults to the -jN passed to
|
||||||
it, so you may simply run
|
it, so you may simply run
|
||||||
$ make check-local -j8
|
|
||||||
|
$ make check-local -j8
|
||||||
|
|
||||||
Running only the tests of a certain category, as specified in the AT files
|
Running only the tests of a certain category, as specified in the AT files
|
||||||
with AT_KEYWORDS([[category]]). Categories include:
|
with AT_KEYWORDS([[category]]). Categories include:
|
||||||
- c++, for c++ parsers
|
- c++, for c++ parsers
|
||||||
- deprec, for tests concerning deprecated constructs.
|
- deprec, for tests concerning deprecated constructs.
|
||||||
- glr, for glr parsers
|
- glr, for glr parsers
|
||||||
- java, for java parsers
|
- java, for java parsers
|
||||||
- report, for automaton dumps
|
- report, for automaton dumps
|
||||||
|
|
||||||
To run a specific set of tests, use -k (for "keyword"). For example:
|
To run a specific set of tests, use -k (for "keyword"). For example:
|
||||||
$ make check-local TESTSUITEFLAGS='-k c++'
|
|
||||||
|
$ make check-local TESTSUITEFLAGS='-k c++'
|
||||||
|
|
||||||
Both can be combined.
|
Both can be combined.
|
||||||
$ make check-local TESTSUITEFLAGS='-j8 -k c++'
|
|
||||||
|
$ make check-local TESTSUITEFLAGS='-j8 -k c++'
|
||||||
|
|
||||||
To rerun the tests that failed:
|
To rerun the tests that failed:
|
||||||
$ make recheck -j5
|
|
||||||
|
|
||||||
** Typical errors
|
$ make recheck -j5
|
||||||
|
|
||||||
|
## Typical errors
|
||||||
If the test suite shows failures such as the following one
|
If the test suite shows failures such as the following one
|
||||||
|
|
||||||
.../bison/lib/getopt.h:196:8: error: redefinition of 'struct option'
|
.../bison/lib/getopt.h:196:8: error: redefinition of 'struct option'
|
||||||
/usr/include/getopt.h:54:8: error: previous definition of 'struct option'
|
/usr/include/getopt.h:54:8: error: previous definition of 'struct option'
|
||||||
|
|
||||||
it probably means that some file was compiled without
|
it probably means that some file was compiled without
|
||||||
AT_DATA_SOURCE_PROLOGUE. This error is due to the fact that our -I options
|
`AT_DATA_SOURCE_PROLOGUE`. This error is due to the fact that our -I
|
||||||
pick up gnulib's replacement headers, such as getopt.h, and this will go
|
options pick up gnulib's replacement headers, such as getopt.h, and this
|
||||||
wrong if config.h was not included first.
|
will go wrong if config.h was not included first.
|
||||||
|
|
||||||
See tests/local.at for details.
|
See tests/local.at for details.
|
||||||
|
|
||||||
** make maintainer-check-valgrind
|
## make maintainer-check-valgrind
|
||||||
This target uses valgrind both to check bison, and the generated parsers.
|
This target uses valgrind both to check bison, and the generated parsers.
|
||||||
|
|
||||||
This is not mature on Mac OS X. First, Valgrind does support the way bison
|
This is not mature on Mac OS X. First, Valgrind does support the way bison
|
||||||
@@ -256,13 +266,13 @@ bison. build-aux/darwin11.4.0.valgrind addresses some of them.
|
|||||||
|
|
||||||
Third, valgrind issues warnings such as:
|
Third, valgrind issues warnings such as:
|
||||||
|
|
||||||
--99312:0:syswrap- WARNING: Ignoring sigreturn( ..., UC_RESET_ALT_STACK );
|
--99312:0:syswrap- WARNING: Ignoring sigreturn( ..., UC_RESET_ALT_STACK );
|
||||||
|
|
||||||
which cause the test to fail uselessly. It is hard to ignore these errors
|
which cause the test to fail uselessly. It is hard to ignore these errors
|
||||||
with a major overhaul of the way instrumentation is performed in the test
|
with a major overhaul of the way instrumentation is performed in the test
|
||||||
suite. So currently, do not try to run valgrind on Mac OS X.
|
suite. So currently, do not try to run valgrind on Mac OS X.
|
||||||
|
|
||||||
** Release checks
|
## Release checks
|
||||||
Try to run the test suite with more severe conditions before a
|
Try to run the test suite with more severe conditions before a
|
||||||
release:
|
release:
|
||||||
|
|
||||||
@@ -274,25 +284,25 @@ release:
|
|||||||
its warnings; there's no need to obey blindly to it
|
its warnings; there's no need to obey blindly to it
|
||||||
(<http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00057.html>).
|
(<http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00057.html>).
|
||||||
|
|
||||||
- Check with "make syntax-check" if there are issues diagnosed by gnulib.
|
- Check with `make syntax-check` if there are issues diagnosed by gnulib.
|
||||||
|
|
||||||
- run "make maintainer-check" which:
|
- run `make maintainer-check` which:
|
||||||
- runs "valgrind -q bison" to run Bison under Valgrind.
|
- runs `valgrind -q bison` to run Bison under Valgrind.
|
||||||
- runs the parsers under Valgrind.
|
- runs the parsers under Valgrind.
|
||||||
- runs the test suite with G++ as C compiler...
|
- runs the test suite with G++ as C compiler...
|
||||||
|
|
||||||
- run "make maintainer-check-push", which runs "make maintainer-check" while
|
- run `make maintainer-check-push`, which runs `make maintainer-check` while
|
||||||
activating the push implementation and its pull interface wrappers in many
|
activating the push implementation and its pull interface wrappers in many
|
||||||
test cases that were originally written to exercise only the pull
|
test cases that were originally written to exercise only the pull
|
||||||
implementation. This makes certain the push implementation can perform
|
implementation. This makes certain the push implementation can perform
|
||||||
every task the pull implementation can.
|
every task the pull implementation can.
|
||||||
|
|
||||||
- run "make maintainer-check-xml", which runs "make maintainer-check" while
|
- run `make maintainer-check-xml`, which runs `make maintainer-check` while
|
||||||
checking Bison's XML automaton report for every working grammar passed to
|
checking Bison's XML automaton report for every working grammar passed to
|
||||||
Bison in the test suite. The check just diffs the output of Bison's
|
Bison in the test suite. The check just diffs the output of Bison's
|
||||||
included XSLT style sheets with the output of --report=all and --graph.
|
included XSLT style sheets with the output of --report=all and --graph.
|
||||||
|
|
||||||
- running "make maintainer-check-release" takes care of running
|
- running `make maintainer-check-release` takes care of running
|
||||||
maintainer-check, maintainer-check-push and maintainer-check-xml.
|
maintainer-check, maintainer-check-push and maintainer-check-xml.
|
||||||
|
|
||||||
- Change tests/atlocal/CFLAGS to add your preferred options.
|
- Change tests/atlocal/CFLAGS to add your preferred options.
|
||||||
@@ -300,7 +310,7 @@ release:
|
|||||||
- Test with a very recent version of GCC for both C and C++. Testing with
|
- Test with a very recent version of GCC for both C and C++. Testing with
|
||||||
older versions that are still in use is nice too.
|
older versions that are still in use is nice too.
|
||||||
|
|
||||||
** gnulib
|
## gnulib
|
||||||
To run tests on gnulib components (e.g., on bitset):
|
To run tests on gnulib components (e.g., on bitset):
|
||||||
|
|
||||||
cd gnulib
|
cd gnulib
|
||||||
@@ -319,58 +329,58 @@ re-run the tests, run:
|
|||||||
./configure -C CC='gcc-mp-8 -fsanitize=undefined' CFLAGS='-ggdb'
|
./configure -C CC='gcc-mp-8 -fsanitize=undefined' CFLAGS='-ggdb'
|
||||||
make check
|
make check
|
||||||
|
|
||||||
* Release Procedure
|
# Release Procedure
|
||||||
This section needs to be updated to take into account features from gnulib.
|
This section needs to be updated to take into account features from gnulib.
|
||||||
In particular, be sure to read README-release.
|
In particular, be sure to read README-release.
|
||||||
|
|
||||||
** Update the submodules. See above.
|
## Update the submodules. See above.
|
||||||
|
|
||||||
** Update maintainer tools, such as Autoconf. See above.
|
## Update maintainer tools, such as Autoconf. See above.
|
||||||
|
|
||||||
** Try to get the *.pot files to the Translation Project at least one
|
## Try to get the *.pot files to the Translation Project at least one
|
||||||
week before a stable release, to give them time to translate them. Before
|
week before a stable release, to give them time to translate them. Before
|
||||||
generating the *.pot files, make sure that po/POTFILES.in and
|
generating the *.pot files, make sure that po/POTFILES.in and
|
||||||
runtime-po/POTFILES.in list all files with translatable strings. This
|
runtime-po/POTFILES.in list all files with translatable strings. This
|
||||||
helps: grep -l '\<_(' *.
|
helps: `grep -l '\<_(' *`.
|
||||||
|
|
||||||
** Tests
|
## Tests
|
||||||
See above.
|
See above.
|
||||||
|
|
||||||
** Update the foreign files
|
## Update the foreign files
|
||||||
Running "./bootstrap" in the top level should update them all for you. This
|
Running `./bootstrap` in the top level should update them all for you. This
|
||||||
covers PO files too. Sometimes a PO file contains problems that causes it
|
covers PO files too. Sometimes a PO file contains problems that causes it
|
||||||
to be rejected by recent Gettext releases; please report these to the
|
to be rejected by recent Gettext releases; please report these to the
|
||||||
Translation Project.
|
Translation Project.
|
||||||
|
|
||||||
** Update README
|
## Update README
|
||||||
Make sure the information in README is current. Most notably, make sure it
|
Make sure the information in README is current. Most notably, make sure it
|
||||||
recommends a version of GNU M4 that is compatible with the latest Bison
|
recommends a version of GNU M4 that is compatible with the latest Bison
|
||||||
sources.
|
sources.
|
||||||
|
|
||||||
** Check copyright years.
|
## Check copyright years.
|
||||||
We update years in copyright statements throughout Bison once at the start
|
We update years in copyright statements throughout Bison once at the start
|
||||||
of every year by running "make update-copyright". However, before a
|
of every year by running `make update-copyright`. However, before a
|
||||||
release, it's good to verify that it's actually been run. Besides the
|
release, it's good to verify that it's actually been run. Besides the
|
||||||
copyright statement for each Bison file, check the copyright statements that
|
copyright statement for each Bison file, check the copyright statements that
|
||||||
the skeletons insert into generated parsers, and check all occurrences of
|
the skeletons insert into generated parsers, and check all occurrences of
|
||||||
PACKAGE_COPYRIGHT_YEAR in configure.ac.
|
PACKAGE_COPYRIGHT_YEAR in configure.ac.
|
||||||
|
|
||||||
** Update NEWS, commit and tag.
|
## Update NEWS, commit and tag.
|
||||||
See do-release-commit-and-tag in README-release. For a while, we used beta
|
See do-release-commit-and-tag in README-release. For a while, we used beta
|
||||||
names such as "2.6_rc1". Now that we use gnulib in the release procedure,
|
names such as `2.6_rc1`. Now that we use gnulib in the release procedure,
|
||||||
we must use "2.5.90", which has the additional benefit of being properly
|
we must use `2.5.90`, which has the additional benefit of being properly
|
||||||
sorted in "git tag -l".
|
sorted in `git tag -l`.
|
||||||
|
|
||||||
** make alpha, beta, or stable
|
## make alpha, beta, or stable
|
||||||
See README-release.
|
See README-release.
|
||||||
|
|
||||||
** Upload
|
## Upload
|
||||||
There are two ways to upload the tarballs to the GNU servers: using gnupload
|
There are two ways to upload the tarballs to the GNU servers: using gnupload
|
||||||
(from gnulib), or by hand. Obviously prefer the former. But in either
|
(from gnulib), or by hand. Obviously prefer the former. But in either
|
||||||
case, be sure to read the following paragraph.
|
case, be sure to read the following paragraph.
|
||||||
|
|
||||||
*** Setup
|
### Setup
|
||||||
You need "gnupg".
|
You need `gnupg`.
|
||||||
|
|
||||||
Make sure your public key has been uploaded at least to keys.gnupg.net. You
|
Make sure your public key has been uploaded at least to keys.gnupg.net. You
|
||||||
can upload it with:
|
can upload it with:
|
||||||
@@ -379,106 +389,105 @@ can upload it with:
|
|||||||
|
|
||||||
where F125BDF3 should be replaced with your key ID.
|
where F125BDF3 should be replaced with your key ID.
|
||||||
|
|
||||||
*** Using gnupload
|
### Using gnupload
|
||||||
You need "ncftp".
|
You need `ncftp`.
|
||||||
|
|
||||||
At the end "make stable" (or alpha/beta) will display the procedure to run.
|
At the end `make stable` (or alpha/beta) will display the procedure to run.
|
||||||
Just copy and paste it in your shell.
|
Just copy and paste it in your shell.
|
||||||
|
|
||||||
*** By hand
|
### By hand
|
||||||
|
|
||||||
The generic GNU upload procedure is at:
|
The generic GNU upload procedure is at
|
||||||
|
http://www.gnu.org/prep/maintain/maintain.html#Automated-FTP-Uploads.
|
||||||
http://www.gnu.org/prep/maintain/maintain.html#Automated-FTP-Uploads
|
|
||||||
|
|
||||||
Follow the instructions there to register your information so you're permitted
|
Follow the instructions there to register your information so you're permitted
|
||||||
to upload.
|
to upload.
|
||||||
|
|
||||||
Here's a brief reminder of how to roll the tarballs and upload them:
|
Here's a brief reminder of how to roll the tarballs and upload them:
|
||||||
|
|
||||||
*** make distcheck
|
### make distcheck
|
||||||
*** gpg -b bison-2.3b.tar.gz
|
### gpg -b bison-2.3b.tar.gz
|
||||||
*** In a file named "bison-2.3b.tar.gz.directive", type:
|
### In a file named `bison-2.3b.tar.gz.directive`, type:
|
||||||
|
|
||||||
version: 1.1
|
version: 1.1
|
||||||
directory: bison
|
directory: bison
|
||||||
filename: bison-2.3b.tar.gz
|
filename: bison-2.3b.tar.gz
|
||||||
|
|
||||||
*** gpg --clearsign bison-2.3b.tar.gz.directive
|
### gpg --clearsign bison-2.3b.tar.gz.directive
|
||||||
*** ftp ftp-upload.gnu.org # Log in as anonymous.
|
### ftp ftp-upload.gnu.org # Log in as anonymous.
|
||||||
*** cd /incoming/alpha # cd /incoming/ftp for full release.
|
### cd /incoming/alpha # cd /incoming/ftp for full release.
|
||||||
*** put bison-2.3b.tar.gz # This can take a while.
|
### put bison-2.3b.tar.gz # This can take a while.
|
||||||
*** put bison-2.3b.tar.gz.sig
|
### put bison-2.3b.tar.gz.sig
|
||||||
*** put bison-2.3b.tar.gz.directive.asc
|
### put bison-2.3b.tar.gz.directive.asc
|
||||||
*** Repeat all these steps for bison-2.3b.tar.xz.
|
### Repeat all these steps for bison-2.3b.tar.xz.
|
||||||
|
|
||||||
** Update Bison manual on www.gnu.org.
|
## Update Bison manual on www.gnu.org.
|
||||||
|
|
||||||
The instructions below are obsolete, and left in case one would like to run
|
The instructions below are obsolete, and left in case one would like to run
|
||||||
the commands by hand. Today, one just needs to run
|
the commands by hand. Today, one just needs to run
|
||||||
|
|
||||||
$ make web-manual-update
|
$ make web-manual-update
|
||||||
|
|
||||||
See README-release.
|
See README-release.
|
||||||
|
|
||||||
*** You need a non-anonymous checkout of the web pages directory.
|
### You need a non-anonymous checkout of the web pages directory.
|
||||||
|
|
||||||
$ cvs -d YOUR_USERID@cvs.savannah.gnu.org:/web/bison checkout bison
|
$ cvs -d YOUR_USERID@cvs.savannah.gnu.org:/web/bison checkout bison
|
||||||
|
|
||||||
*** Get familiar with the instructions for web page maintainers.
|
### Get familiar with the instructions for web page maintainers.
|
||||||
http://www.gnu.org/server/standards/readme_index.html
|
http://www.gnu.org/server/standards/readme_index.html
|
||||||
http://www.gnu.org/server/standards/README.software.html
|
http://www.gnu.org/server/standards/README.software.html
|
||||||
especially the note about symlinks.
|
especially the note about symlinks.
|
||||||
|
|
||||||
*** Build the web pages.
|
### Build the web pages.
|
||||||
Assuming BISON_CHECKOUT refers to a checkout of the Bison dir, and
|
Assuming BISON_CHECKOUT refers to a checkout of the Bison dir, and
|
||||||
BISON_WWW_CHECKOUT refers to the web directory created above, do:
|
BISON_WWW_CHECKOUT refers to the web directory created above, do:
|
||||||
|
|
||||||
$ cd $BISON_CHECKOUT/doc
|
$ cd $BISON_CHECKOUT/doc
|
||||||
$ make stamp-vti
|
$ make stamp-vti
|
||||||
$ ../build-aux/gendocs.sh -o "$BISON_WWW_CHECKOUT/manual" \
|
$ ../build-aux/gendocs.sh -o "$BISON_WWW_CHECKOUT/manual" \
|
||||||
bison "Bison - GNU parser generator"
|
bison "Bison - GNU parser generator"
|
||||||
$ cd $BISON_WWW_CHECKOUT
|
$ cd $BISON_WWW_CHECKOUT
|
||||||
|
|
||||||
Verify that the result looks sane.
|
Verify that the result looks sane.
|
||||||
|
|
||||||
*** Commit the modified and the new files.
|
### Commit the modified and the new files.
|
||||||
|
|
||||||
*** Remove old files.
|
### Remove old files.
|
||||||
Find the files which have not been overwritten (because they belonged to
|
Find the files which have not been overwritten (because they belonged to
|
||||||
sections that have been removed or renamed):
|
sections that have been removed or renamed):
|
||||||
|
|
||||||
$ cd manual/html_node
|
$ cd manual/html_node
|
||||||
$ ls -lt
|
$ ls -lt
|
||||||
|
|
||||||
Remove these files and commit their removal to CVS. For each of these
|
Remove these files and commit their removal to CVS. For each of these
|
||||||
files, add a line to the file .symlinks. This will ensure that hyperlinks
|
files, add a line to the file .symlinks. This will ensure that hyperlinks
|
||||||
to the removed files will redirect to the entire manual; this is better than
|
to the removed files will redirect to the entire manual; this is better than
|
||||||
a 404 error.
|
a 404 error.
|
||||||
|
|
||||||
** Announce
|
## Announce
|
||||||
The "make release" command just created a template,
|
The "make release" command just created a template,
|
||||||
$HOME/announce-bison-X.Y. Otherwise, to generate it, run:
|
`$HOME/announce-bison-X.Y`. Otherwise, to generate it, run:
|
||||||
|
|
||||||
make RELEASE_TYPE=alpha gpg_key_ID=F125BDF3 announcement
|
make RELEASE_TYPE=alpha gpg_key_ID=F125BDF3 announcement
|
||||||
|
|
||||||
where alpha can be replaced by beta or stable and F125BDF3 should be
|
where alpha can be replaced by `beta` or `table` and F125BDF3 should be
|
||||||
replaced with your key ID.
|
replaced with your key ID.
|
||||||
|
|
||||||
Complete/fix the announcement file. The generated list of recipients
|
Complete/fix the announcement file. The generated list of recipients
|
||||||
(info-gnu@gnu.org, bug-bison@gnu.org, help-bison@gnu.org,
|
(info-gnu@gnu.org, bison-announce@gnu.org, bug-bison@gnu.org,
|
||||||
bison-patches@gnu.org, and coordinator@translationproject.org) is
|
help-bison@gnu.org, bison-patches@gnu.org, and
|
||||||
appropriate for a stable release or a "serious beta". For any other
|
coordinator@translationproject.org) is appropriate for a stable release or a
|
||||||
release, drop at least info-gnu@gnu.org. For an example of how to fill out
|
"serious beta". For any other release, drop at least info-gnu@gnu.org. For
|
||||||
the rest of the template, search the mailing list archives for the most
|
an example of how to fill out the rest of the template, search the mailing
|
||||||
recent release announcement.
|
list archives for the most recent release announcement.
|
||||||
|
|
||||||
For a stable release, send the same announcement on the comp.compilers
|
For a stable release, send the same announcement on the comp.compilers
|
||||||
newsgroup by sending email to compilers@iecc.com. Do not make any Cc as the
|
newsgroup by sending email to compilers@iecc.com. Do not make any Cc as the
|
||||||
moderator will throw away anything cross-posted or Cc'ed. It really needs
|
moderator will throw away anything cross-posted or Cc'ed. It really needs
|
||||||
to be a separate message.
|
to be a separate message.
|
||||||
|
|
||||||
** Prepare NEWS
|
## Prepare NEWS
|
||||||
So that developers don't accidentally add new items to the old NEWS entry,
|
So that developers don't accidentally add new items to the old NEWS entry,
|
||||||
create a new empty entry in line 3 (without the two leading spaces):
|
create a new empty entry in line 3 (without the two leading spaces):
|
||||||
|
|
||||||
@@ -486,7 +495,7 @@ create a new empty entry in line 3 (without the two leading spaces):
|
|||||||
|
|
||||||
Push these changes.
|
Push these changes.
|
||||||
|
|
||||||
-----
|
<!--
|
||||||
|
|
||||||
Copyright (C) 2002-2005, 2007-2015, 2018-2019 Free Software Foundation,
|
Copyright (C) 2002-2005, 2007-2015, 2018-2019 Free Software Foundation,
|
||||||
Inc.
|
Inc.
|
||||||
@@ -506,13 +515,20 @@ GNU General Public License for more details.
|
|||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
LocalWords: Automake Autoconf Gettext Gzip Rsync Valgrind gnulib submodules
|
|
||||||
LocalWords: submodule init cd distcheck checkin ChangeLog valgrind sigreturn
|
|
||||||
LocalWords: UC gcc DGNULIB POSIXCHECK xml XSLT glr lalr README po runtime rc
|
|
||||||
LocalWords: gnupload gnupg gpg keyserver BDF ncftp filename clearsign cvs dir
|
|
||||||
LocalWords: symlinks vti html lt POSIX Cc'ed
|
|
||||||
|
|
||||||
Local Variables:
|
Local Variables:
|
||||||
mode: outline
|
mode: markdown
|
||||||
fill-column: 76
|
fill-column: 76
|
||||||
|
ispell-dictionary: "american"
|
||||||
End:
|
End:
|
||||||
|
|
||||||
|
LocalWords: Automake Autoconf Gettext Gzip Rsync Valgrind gnulib submodules
|
||||||
|
LocalWords: submodule init cd distcheck ChangeLog valgrind sigreturn sudo
|
||||||
|
LocalWords: UC gcc DGNULIB POSIXCHECK xml XSLT glr lalr README po runtime rc
|
||||||
|
LocalWords: gnupload gnupg gpg keyserver BDF ncftp filename clearsign cvs dir
|
||||||
|
LocalWords: symlinks vti html lt POSIX Cc'ed Graphviz Texinfo autoconf jN
|
||||||
|
LocalWords: automake autopoint graphviz texinfo PROG Wother parsers
|
||||||
|
LocalWords: TESTSUITEFLAGS deprec struct gnulib's getopt config ggdb
|
||||||
|
LocalWords: bitset fsanitize symlink CFLAGS MERCHANTABILITY ispell
|
||||||
|
LocalWords: american
|
||||||
|
|
||||||
|
-->
|
||||||
@@ -60,6 +60,8 @@ gnulib_modules='
|
|||||||
vsnprintf-posix vsprintf-posix
|
vsnprintf-posix vsprintf-posix
|
||||||
'
|
'
|
||||||
|
|
||||||
|
checkout_only_file=README-hacking.md
|
||||||
|
|
||||||
# Additional xgettext options to use. Use "\\\newline" to break lines.
|
# Additional xgettext options to use. Use "\\\newline" to break lines.
|
||||||
XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
|
XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
|
||||||
--from-code=UTF-8\\\
|
--from-code=UTF-8\\\
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
#! /usr/bin/env python
|
#! /usr/bin/env python
|
||||||
|
|
||||||
# usage:
|
# usage:
|
||||||
# update-test _build/8d/tests/testsuite.dir/*/testsuite.log
|
#
|
||||||
|
# update-test _build/8d/tests/testsuite.dir/*/testsuite.log
|
||||||
|
#
|
||||||
|
# from your source tree.
|
||||||
import argparse
|
import argparse
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ exclude = \
|
|||||||
$(call exclude, \
|
$(call exclude, \
|
||||||
bindtextdomain=^lib/main.c$$ \
|
bindtextdomain=^lib/main.c$$ \
|
||||||
cast_of_argument_to_free=^src/muscle-tab.c$$ \
|
cast_of_argument_to_free=^src/muscle-tab.c$$ \
|
||||||
po_check=^po/POTFILES.in$$ \
|
po_check=(^po/POTFILES.in|.md)$$ \
|
||||||
preprocessor_indentation=^data/|^lib/|^src/parse-gram.[ch]$$ \
|
preprocessor_indentation=^data/|^lib/|^src/parse-gram.[ch]$$ \
|
||||||
program_name=^lib/main.c$$ \
|
program_name=^lib/main.c$$ \
|
||||||
prohibit_always-defined_macros=^data/skeletons/yacc.c$$ \
|
prohibit_always-defined_macros=^data/skeletons/yacc.c$$ \
|
||||||
|
|||||||
+3
-2
@@ -107,7 +107,8 @@ if test "$enable_gcc_warnings" = yes; then
|
|||||||
-Wpointer-arith -Wshadow
|
-Wpointer-arith -Wshadow
|
||||||
-Wwrite-strings'
|
-Wwrite-strings'
|
||||||
warn_c='-Wbad-function-cast -Wstrict-prototypes'
|
warn_c='-Wbad-function-cast -Wstrict-prototypes'
|
||||||
warn_cxx='-Wextra-semi -Wnoexcept -Wundefined-func-template -Wweak-vtables'
|
warn_cxx='-Wextra-semi -Wnoexcept -Wold-style-cast -Wundefined-func-template
|
||||||
|
-Wweak-vtables'
|
||||||
# Warnings for the test suite only.
|
# Warnings for the test suite only.
|
||||||
#
|
#
|
||||||
# -fno-color-diagnostics: Clang's use of colors in the error
|
# -fno-color-diagnostics: Clang's use of colors in the error
|
||||||
@@ -278,7 +279,7 @@ uname=`uname`
|
|||||||
case $VALGRIND:$uname in
|
case $VALGRIND:$uname in
|
||||||
'':*) ;;
|
'':*) ;;
|
||||||
*:Darwin)
|
*:Darwin)
|
||||||
# See README-hacking.
|
# See README-hacking.md.
|
||||||
VALGRIND=;;
|
VALGRIND=;;
|
||||||
*:*)
|
*:*)
|
||||||
suppfile=build-aux/$uname.valgrind
|
suppfile=build-aux/$uname.valgrind
|
||||||
|
|||||||
@@ -346,6 +346,21 @@ m4_define([b4_attribute_define],
|
|||||||
]])
|
]])
|
||||||
|
|
||||||
|
|
||||||
|
# b4_cast_define
|
||||||
|
# --------------
|
||||||
|
m4_define([b4_cast_define],
|
||||||
|
[# ifndef YY_CAST
|
||||||
|
# ifdef __cplusplus
|
||||||
|
# define YY_CAST(Type, Val) static_cast<Type> (Val)
|
||||||
|
# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
|
||||||
|
# else
|
||||||
|
# define YY_CAST(Type, Val) ((Type) (Val))
|
||||||
|
# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
|
||||||
|
# endif
|
||||||
|
# endif[]dnl
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
# b4_null_define
|
# b4_null_define
|
||||||
# --------------
|
# --------------
|
||||||
# Portability issues: define a YY_NULLPTR appropriate for the current
|
# Portability issues: define a YY_NULLPTR appropriate for the current
|
||||||
|
|||||||
+87
-69
@@ -125,7 +125,7 @@ m4_define([b4_lhs_value],
|
|||||||
# -----------------------------
|
# -----------------------------
|
||||||
# See README.
|
# See README.
|
||||||
m4_define([b4_rhs_data],
|
m4_define([b4_rhs_data],
|
||||||
[((yyGLRStackItem const *)yyvsp)@{YYFILL (b4_subtract([$2], [$1]))@}.yystate])
|
[YY_CAST (yyGLRStackItem const *, yyvsp)@{YYFILL (b4_subtract([$2], [$1]))@}.yystate])
|
||||||
|
|
||||||
|
|
||||||
# b4_rhs_value(RULE-LENGTH, POS, SYMBOL-NUM, [TYPE])
|
# b4_rhs_value(RULE-LENGTH, POS, SYMBOL-NUM, [TYPE])
|
||||||
@@ -235,7 +235,7 @@ b4_copyright([Skeleton implementation for Bison GLR parsers in C],
|
|||||||
#define yylloc ]b4_prefix[lloc]])]))[
|
#define yylloc ]b4_prefix[lloc]])]))[
|
||||||
|
|
||||||
]b4_user_pre_prologue[
|
]b4_user_pre_prologue[
|
||||||
|
]b4_cast_define[
|
||||||
]b4_null_define[
|
]b4_null_define[
|
||||||
|
|
||||||
]b4_defines_if([[#include "@basename(]b4_spec_header_file[@)"]],
|
]b4_defines_if([[#include "@basename(]b4_spec_header_file[@)"]],
|
||||||
@@ -289,7 +289,8 @@ static YYLTYPE yyloc_default][]b4_yyloc_default;])[
|
|||||||
# define YYREALLOC realloc
|
# define YYREALLOC realloc
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define YYSIZEMAX (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : (ptrdiff_t) SIZE_MAX)
|
#define YYSIZEMAX \
|
||||||
|
(PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : YY_CAST (ptrdiff_t, SIZE_MAX))
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
typedef bool yybool;
|
typedef bool yybool;
|
||||||
@@ -617,7 +618,7 @@ yytnamerr (char *yyres, const char *yystr)
|
|||||||
if (yyres)
|
if (yyres)
|
||||||
return yystpcpy (yyres, yystr) - yyres;
|
return yystpcpy (yyres, yystr) - yyres;
|
||||||
else
|
else
|
||||||
return (ptrdiff_t) strlen (yystr);
|
return YY_CAST (ptrdiff_t, strlen (yystr));
|
||||||
}
|
}
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
@@ -845,7 +846,8 @@ yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp,
|
|||||||
yyGLRStack* yystackp,
|
yyGLRStack* yystackp,
|
||||||
YYSTYPE* yyvalp]b4_locuser_formals[)
|
YYSTYPE* yyvalp]b4_locuser_formals[)
|
||||||
{
|
{
|
||||||
yybool yynormal YY_ATTRIBUTE_UNUSED = (yybool) (yystackp->yysplitPoint == YY_NULLPTR);
|
yybool yynormal YY_ATTRIBUTE_UNUSED
|
||||||
|
= YY_CAST (yybool, yystackp->yysplitPoint == YY_NULLPTR);
|
||||||
int yylow;
|
int yylow;
|
||||||
]b4_parse_param_use([yyvalp], [yylocp])dnl
|
]b4_parse_param_use([yyvalp], [yylocp])dnl
|
||||||
[ YYUSE (yyrhslen);
|
[ YYUSE (yyrhslen);
|
||||||
@@ -980,7 +982,7 @@ yylhsNonterm (yyRuleNum yyrule)
|
|||||||
static inline yybool
|
static inline yybool
|
||||||
yyisDefaultedState (yyStateNum yystate)
|
yyisDefaultedState (yyStateNum yystate)
|
||||||
{
|
{
|
||||||
return (yybool) yypact_value_is_default (yypact[yystate]);
|
return YY_CAST (yybool, yypact_value_is_default (yypact[yystate]));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The default reduction for YYSTATE, assuming it has one. */
|
/** The default reduction for YYSTATE, assuming it has one. */
|
||||||
@@ -1040,13 +1042,13 @@ yyLRgotoState (yyStateNum yystate, yySymbol yysym)
|
|||||||
static inline yybool
|
static inline yybool
|
||||||
yyisShiftAction (int yyaction)
|
yyisShiftAction (int yyaction)
|
||||||
{
|
{
|
||||||
return (yybool) (0 < yyaction);
|
return YY_CAST (yybool, 0 < yyaction);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline yybool
|
static inline yybool
|
||||||
yyisErrorAction (int yyaction)
|
yyisErrorAction (int yyaction)
|
||||||
{
|
{
|
||||||
return (yybool) (yyaction == 0);
|
return YY_CAST (yybool, yyaction == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* GLRStates */
|
/* GLRStates */
|
||||||
@@ -1102,21 +1104,24 @@ yyinitStateSet (yyGLRStateSet* yyset)
|
|||||||
yyset->yysize = 1;
|
yyset->yysize = 1;
|
||||||
yyset->yycapacity = 16;
|
yyset->yycapacity = 16;
|
||||||
yyset->yystates
|
yyset->yystates
|
||||||
= (yyGLRState**) YYMALLOC ((size_t) yyset->yycapacity
|
= YY_CAST (yyGLRState**,
|
||||||
* sizeof yyset->yystates[0]);
|
YYMALLOC (YY_CAST (size_t, yyset->yycapacity)
|
||||||
|
* sizeof yyset->yystates[0]));
|
||||||
if (! yyset->yystates)
|
if (! yyset->yystates)
|
||||||
return yyfalse;
|
return yyfalse;
|
||||||
yyset->yystates[0] = YY_NULLPTR;
|
yyset->yystates[0] = YY_NULLPTR;
|
||||||
yyset->yylookaheadNeeds
|
yyset->yylookaheadNeeds
|
||||||
= (yybool*) YYMALLOC ((size_t) yyset->yycapacity
|
= YY_CAST (yybool*,
|
||||||
* sizeof yyset->yylookaheadNeeds[0]);
|
YYMALLOC (YY_CAST (size_t, yyset->yycapacity)
|
||||||
|
* sizeof yyset->yylookaheadNeeds[0]));
|
||||||
if (! yyset->yylookaheadNeeds)
|
if (! yyset->yylookaheadNeeds)
|
||||||
{
|
{
|
||||||
YYFREE (yyset->yystates);
|
YYFREE (yyset->yystates);
|
||||||
return yyfalse;
|
return yyfalse;
|
||||||
}
|
}
|
||||||
memset (yyset->yylookaheadNeeds,
|
memset (yyset->yylookaheadNeeds,
|
||||||
0, (size_t) yyset->yycapacity * sizeof yyset->yylookaheadNeeds[0]);
|
0,
|
||||||
|
YY_CAST (size_t, yyset->yycapacity) * sizeof yyset->yylookaheadNeeds[0]);
|
||||||
return yytrue;
|
return yytrue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1134,9 +1139,10 @@ yyinitGLRStack (yyGLRStack* yystackp, ptrdiff_t yysize)
|
|||||||
yystackp->yyerrState = 0;
|
yystackp->yyerrState = 0;
|
||||||
yynerrs = 0;
|
yynerrs = 0;
|
||||||
yystackp->yyspaceLeft = yysize;
|
yystackp->yyspaceLeft = yysize;
|
||||||
yystackp->yyitems =
|
yystackp->yyitems
|
||||||
(yyGLRStackItem*) YYMALLOC ((size_t) yysize
|
= YY_CAST (yyGLRStackItem*,
|
||||||
* sizeof yystackp->yynextFree[0]);
|
YYMALLOC (YY_CAST (size_t, yysize)
|
||||||
|
* sizeof yystackp->yynextFree[0]));
|
||||||
if (!yystackp->yyitems)
|
if (!yystackp->yyitems)
|
||||||
return yyfalse;
|
return yyfalse;
|
||||||
yystackp->yynextFree = yystackp->yyitems;
|
yystackp->yynextFree = yystackp->yyitems;
|
||||||
@@ -1147,8 +1153,9 @@ yyinitGLRStack (yyGLRStack* yystackp, ptrdiff_t yysize)
|
|||||||
|
|
||||||
|
|
||||||
#if YYSTACKEXPANDABLE
|
#if YYSTACKEXPANDABLE
|
||||||
# define YYRELOC(YYFROMITEMS,YYTOITEMS,YYX,YYTYPE) \
|
# define YYRELOC(YYFROMITEMS, YYTOITEMS, YYX, YYTYPE) \
|
||||||
&((YYTOITEMS) - ((YYFROMITEMS) - (yyGLRStackItem*) (YYX)))->YYTYPE
|
&((YYTOITEMS) \
|
||||||
|
- ((YYFROMITEMS) - YY_REINTERPRET_CAST (yyGLRStackItem*, (YYX))))->YYTYPE
|
||||||
|
|
||||||
/** If *YYSTACKP is expandable, extend it. WARNING: Pointers into the
|
/** If *YYSTACKP is expandable, extend it. WARNING: Pointers into the
|
||||||
stack from outside should be considered invalid after this call.
|
stack from outside should be considered invalid after this call.
|
||||||
@@ -1168,8 +1175,10 @@ yyexpandGLRStack (yyGLRStack* yystackp)
|
|||||||
yynewSize = 2*yysize;
|
yynewSize = 2*yysize;
|
||||||
if (YYMAXDEPTH < yynewSize)
|
if (YYMAXDEPTH < yynewSize)
|
||||||
yynewSize = YYMAXDEPTH;
|
yynewSize = YYMAXDEPTH;
|
||||||
yynewItems = (yyGLRStackItem*) YYMALLOC ((size_t) yynewSize
|
yynewItems
|
||||||
* sizeof yynewItems[0]);
|
= YY_CAST (yyGLRStackItem*,
|
||||||
|
YYMALLOC (YY_CAST (size_t, yynewSize)
|
||||||
|
* sizeof yynewItems[0]));
|
||||||
if (! yynewItems)
|
if (! yynewItems)
|
||||||
yyMemoryExhausted (yystackp);
|
yyMemoryExhausted (yystackp);
|
||||||
for (yyp0 = yystackp->yyitems, yyp1 = yynewItems, yyn = yysize;
|
for (yyp0 = yystackp->yyitems, yyp1 = yynewItems, yyn = yysize;
|
||||||
@@ -1177,7 +1186,7 @@ yyexpandGLRStack (yyGLRStack* yystackp)
|
|||||||
yyn -= 1, yyp0 += 1, yyp1 += 1)
|
yyn -= 1, yyp0 += 1, yyp1 += 1)
|
||||||
{
|
{
|
||||||
*yyp1 = *yyp0;
|
*yyp1 = *yyp0;
|
||||||
if (*(yybool *) yyp0)
|
if (*YY_REINTERPRET_CAST (yybool *, yyp0))
|
||||||
{
|
{
|
||||||
yyGLRState* yys0 = &yyp0->yystate;
|
yyGLRState* yys0 = &yyp0->yystate;
|
||||||
yyGLRState* yys1 = &yyp1->yystate;
|
yyGLRState* yys1 = &yyp1->yystate;
|
||||||
@@ -1282,7 +1291,7 @@ yyremoveDeletes (yyGLRStack* yystackp)
|
|||||||
if (yyj != yyi)
|
if (yyj != yyi)
|
||||||
{
|
{
|
||||||
YYDPRINTF ((stderr, "Rename stack %ld -> %ld.\n",
|
YYDPRINTF ((stderr, "Rename stack %ld -> %ld.\n",
|
||||||
(long) yyi, (long) yyj));
|
YY_CAST (long, yyi), YY_CAST (long, yyj)));
|
||||||
}
|
}
|
||||||
yyj += 1;
|
yyj += 1;
|
||||||
}
|
}
|
||||||
@@ -1353,7 +1362,7 @@ yy_reduce_print (yybool yynormal, yyGLRStackItem* yyvsp, ptrdiff_t yyk,
|
|||||||
int yylow = 1;])[
|
int yylow = 1;])[
|
||||||
int yyi;
|
int yyi;
|
||||||
YYFPRINTF (stderr, "Reducing stack %ld by rule %d (line %d):\n",
|
YYFPRINTF (stderr, "Reducing stack %ld by rule %d (line %d):\n",
|
||||||
(long) yyk, yyrule - 1, yyrline[yyrule]);
|
YY_CAST (long, yyk), yyrule - 1, yyrline[yyrule]);
|
||||||
if (! yynormal)
|
if (! yynormal)
|
||||||
yyfillin (yyvsp, 1, -yynrhs);
|
yyfillin (yyvsp, 1, -yynrhs);
|
||||||
/* The symbols being reduced. */
|
/* The symbols being reduced. */
|
||||||
@@ -1387,7 +1396,8 @@ yydoAction (yyGLRStack* yystackp, ptrdiff_t yyk, yyRuleNum yyrule,
|
|||||||
if (yystackp->yysplitPoint == YY_NULLPTR)
|
if (yystackp->yysplitPoint == YY_NULLPTR)
|
||||||
{
|
{
|
||||||
/* Standard special case: single stack. */
|
/* Standard special case: single stack. */
|
||||||
yyGLRStackItem* yyrhs = (yyGLRStackItem*) yystackp->yytops.yystates[yyk];
|
yyGLRStackItem* yyrhs
|
||||||
|
= YY_REINTERPRET_CAST (yyGLRStackItem*, yystackp->yytops.yystates[yyk]);
|
||||||
YYASSERT (yyk == 0);
|
YYASSERT (yyk == 0);
|
||||||
yystackp->yynextFree -= yynrhs;
|
yystackp->yynextFree -= yynrhs;
|
||||||
yystackp->yyspaceLeft += yynrhs;
|
yystackp->yyspaceLeft += yynrhs;
|
||||||
@@ -1445,7 +1455,7 @@ yyglrReduce (yyGLRStack* yystackp, ptrdiff_t yyk, yyRuleNum yyrule,
|
|||||||
{
|
{
|
||||||
YYDPRINTF ((stderr,
|
YYDPRINTF ((stderr,
|
||||||
"Parse on stack %ld rejected by rule %d (line %d).\n",
|
"Parse on stack %ld rejected by rule %d (line %d).\n",
|
||||||
(long) yyk, yyrule - 1, yyrline[yyrule - 1]));
|
YY_CAST (long, yyk), yyrule - 1, yyrline[yyrule - 1]));
|
||||||
}
|
}
|
||||||
if (yyflag != yyok)
|
if (yyflag != yyok)
|
||||||
return yyflag;
|
return yyflag;
|
||||||
@@ -1473,7 +1483,8 @@ yyglrReduce (yyGLRStack* yystackp, ptrdiff_t yyk, yyRuleNum yyrule,
|
|||||||
YYDPRINTF ((stderr,
|
YYDPRINTF ((stderr,
|
||||||
"Reduced stack %ld by rule %d (line %d); action deferred. "
|
"Reduced stack %ld by rule %d (line %d); action deferred. "
|
||||||
"Now in state %d.\n",
|
"Now in state %d.\n",
|
||||||
(long) yyk, yyrule - 1, yyrline[yyrule - 1], yynewLRState));
|
YY_CAST (long, yyk), yyrule - 1, yyrline[yyrule - 1],
|
||||||
|
yynewLRState));
|
||||||
for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1)
|
for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1)
|
||||||
if (yyi != yyk && yystackp->yytops.yystates[yyi] != YY_NULLPTR)
|
if (yyi != yyk && yystackp->yytops.yystates[yyi] != YY_NULLPTR)
|
||||||
{
|
{
|
||||||
@@ -1486,7 +1497,7 @@ yyglrReduce (yyGLRStack* yystackp, ptrdiff_t yyk, yyRuleNum yyrule,
|
|||||||
yyaddDeferredAction (yystackp, yyk, yyp, yys0, yyrule);
|
yyaddDeferredAction (yystackp, yyk, yyp, yys0, yyrule);
|
||||||
yymarkStackDeleted (yystackp, yyk);
|
yymarkStackDeleted (yystackp, yyk);
|
||||||
YYDPRINTF ((stderr, "Merging stack %ld into stack %ld.\n",
|
YYDPRINTF ((stderr, "Merging stack %ld into stack %ld.\n",
|
||||||
(long) yyk, (long) yyi));
|
YY_CAST (long, yyk), YY_CAST (long, yyi)));
|
||||||
return yyok;
|
return yyok;
|
||||||
}
|
}
|
||||||
yyp = yyp->yypred;
|
yyp = yyp->yypred;
|
||||||
@@ -1517,18 +1528,20 @@ yysplitStack (yyGLRStack* yystackp, ptrdiff_t yyk)
|
|||||||
yyMemoryExhausted (yystackp);
|
yyMemoryExhausted (yystackp);
|
||||||
yystackp->yytops.yycapacity *= 2;
|
yystackp->yytops.yycapacity *= 2;
|
||||||
|
|
||||||
yynewStates =
|
yynewStates
|
||||||
(yyGLRState**) YYREALLOC (yystackp->yytops.yystates,
|
= YY_CAST (yyGLRState**,
|
||||||
((size_t) yystackp->yytops.yycapacity
|
YYREALLOC (yystackp->yytops.yystates,
|
||||||
* sizeof yynewStates[0]));
|
(YY_CAST (size_t, yystackp->yytops.yycapacity)
|
||||||
|
* sizeof yynewStates[0])));
|
||||||
if (yynewStates == YY_NULLPTR)
|
if (yynewStates == YY_NULLPTR)
|
||||||
yyMemoryExhausted (yystackp);
|
yyMemoryExhausted (yystackp);
|
||||||
yystackp->yytops.yystates = yynewStates;
|
yystackp->yytops.yystates = yynewStates;
|
||||||
|
|
||||||
yynewLookaheadNeeds =
|
yynewLookaheadNeeds
|
||||||
(yybool*) YYREALLOC (yystackp->yytops.yylookaheadNeeds,
|
= YY_CAST (yybool*,
|
||||||
((size_t) yystackp->yytops.yycapacity
|
YYREALLOC (yystackp->yytops.yylookaheadNeeds,
|
||||||
* sizeof yynewLookaheadNeeds[0]));
|
(YY_CAST (size_t, yystackp->yytops.yycapacity)
|
||||||
|
* sizeof yynewLookaheadNeeds[0])));
|
||||||
if (yynewLookaheadNeeds == YY_NULLPTR)
|
if (yynewLookaheadNeeds == YY_NULLPTR)
|
||||||
yyMemoryExhausted (yystackp);
|
yyMemoryExhausted (yystackp);
|
||||||
yystackp->yytops.yylookaheadNeeds = yynewLookaheadNeeds;
|
yystackp->yytops.yylookaheadNeeds = yynewLookaheadNeeds;
|
||||||
@@ -1731,8 +1744,8 @@ yyreportTree (yySemanticOption* yyx, int yyindent)
|
|||||||
else
|
else
|
||||||
YYFPRINTF (stderr, "%*s%s -> <Rule %d, tokens %ld .. %ld>\n",
|
YYFPRINTF (stderr, "%*s%s -> <Rule %d, tokens %ld .. %ld>\n",
|
||||||
yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
|
yyindent, "", yytokenName (yylhsNonterm (yyx->yyrule)),
|
||||||
yyx->yyrule - 1, (long) (yys->yyposn + 1),
|
yyx->yyrule - 1, YY_CAST (long, yys->yyposn + 1),
|
||||||
(long) yyx->yystate->yyposn);
|
YY_CAST (long, yyx->yystate->yyposn));
|
||||||
for (yyi = 1; yyi <= yynrhs; yyi += 1)
|
for (yyi = 1; yyi <= yynrhs; yyi += 1)
|
||||||
{
|
{
|
||||||
if (yystates[yyi]->yyresolved)
|
if (yystates[yyi]->yyresolved)
|
||||||
@@ -1743,8 +1756,8 @@ yyreportTree (yySemanticOption* yyx, int yyindent)
|
|||||||
else
|
else
|
||||||
YYFPRINTF (stderr, "%*s%s <tokens %ld .. %ld>\n", yyindent+2, "",
|
YYFPRINTF (stderr, "%*s%s <tokens %ld .. %ld>\n", yyindent+2, "",
|
||||||
yytokenName (yystos[yystates[yyi]->yylrState]),
|
yytokenName (yystos[yystates[yyi]->yylrState]),
|
||||||
(long) (yystates[yyi-1]->yyposn + 1),
|
YY_CAST (long, yystates[yyi-1]->yyposn + 1),
|
||||||
(long) yystates[yyi]->yyposn);
|
YY_CAST (long, yystates[yyi]->yyposn));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
yyreportTree (yystates[yyi]->yysemantics.yyfirstVal, yyindent+2);
|
yyreportTree (yystates[yyi]->yysemantics.yyfirstVal, yyindent+2);
|
||||||
@@ -1940,7 +1953,7 @@ yycompressStack (yyGLRStack* yystackp)
|
|||||||
yyp->yypred = yyr;
|
yyp->yypred = yyr;
|
||||||
|
|
||||||
yystackp->yyspaceLeft += yystackp->yynextFree - yystackp->yyitems;
|
yystackp->yyspaceLeft += yystackp->yynextFree - yystackp->yyitems;
|
||||||
yystackp->yynextFree = ((yyGLRStackItem*) yystackp->yysplitPoint) + 1;
|
yystackp->yynextFree = YY_REINTERPRET_CAST (yyGLRStackItem*, yystackp->yysplitPoint) + 1;
|
||||||
yystackp->yyspaceLeft -= yystackp->yynextFree - yystackp->yyitems;
|
yystackp->yyspaceLeft -= yystackp->yynextFree - yystackp->yyitems;
|
||||||
yystackp->yysplitPoint = YY_NULLPTR;
|
yystackp->yysplitPoint = YY_NULLPTR;
|
||||||
yystackp->yylastDeleted = YY_NULLPTR;
|
yystackp->yylastDeleted = YY_NULLPTR;
|
||||||
@@ -1973,7 +1986,7 @@ yyprocessOneStack (yyGLRStack* yystackp, ptrdiff_t yyk,
|
|||||||
yyRuleNum yyrule = yydefaultAction (yystate);
|
yyRuleNum yyrule = yydefaultAction (yystate);
|
||||||
if (yyrule == 0)
|
if (yyrule == 0)
|
||||||
{
|
{
|
||||||
YYDPRINTF ((stderr, "Stack %ld dies.\n", (long) yyk));
|
YYDPRINTF ((stderr, "Stack %ld dies.\n", YY_CAST (long, yyk)));
|
||||||
yymarkStackDeleted (yystackp, yyk);
|
yymarkStackDeleted (yystackp, yyk);
|
||||||
return yyok;
|
return yyok;
|
||||||
}
|
}
|
||||||
@@ -1983,7 +1996,7 @@ yyprocessOneStack (yyGLRStack* yystackp, ptrdiff_t yyk,
|
|||||||
YYDPRINTF ((stderr,
|
YYDPRINTF ((stderr,
|
||||||
"Stack %ld dies "
|
"Stack %ld dies "
|
||||||
"(predicate failure or explicit user error).\n",
|
"(predicate failure or explicit user error).\n",
|
||||||
(long) yyk));
|
YY_CAST (long, yyk)));
|
||||||
yymarkStackDeleted (yystackp, yyk);
|
yymarkStackDeleted (yystackp, yyk);
|
||||||
return yyok;
|
return yyok;
|
||||||
}
|
}
|
||||||
@@ -2002,7 +2015,7 @@ yyprocessOneStack (yyGLRStack* yystackp, ptrdiff_t yyk,
|
|||||||
YYRESULTTAG yyflag;
|
YYRESULTTAG yyflag;
|
||||||
ptrdiff_t yynewStack = yysplitStack (yystackp, yyk);
|
ptrdiff_t yynewStack = yysplitStack (yystackp, yyk);
|
||||||
YYDPRINTF ((stderr, "Splitting off stack %ld from %ld.\n",
|
YYDPRINTF ((stderr, "Splitting off stack %ld from %ld.\n",
|
||||||
(long) yynewStack, (long) yyk));
|
YY_CAST (long, yynewStack), YY_CAST (long, yyk)));
|
||||||
yyflag = yyglrReduce (yystackp, yynewStack,
|
yyflag = yyglrReduce (yystackp, yynewStack,
|
||||||
*yyconflicts,
|
*yyconflicts,
|
||||||
yyimmediate[*yyconflicts]]b4_user_args[);
|
yyimmediate[*yyconflicts]]b4_user_args[);
|
||||||
@@ -2011,7 +2024,7 @@ yyprocessOneStack (yyGLRStack* yystackp, ptrdiff_t yyk,
|
|||||||
yyposn]b4_pure_args[));
|
yyposn]b4_pure_args[));
|
||||||
else if (yyflag == yyerr)
|
else if (yyflag == yyerr)
|
||||||
{
|
{
|
||||||
YYDPRINTF ((stderr, "Stack %ld dies.\n", (long) yynewStack));
|
YYDPRINTF ((stderr, "Stack %ld dies.\n", YY_CAST (long, yynewStack)));
|
||||||
yymarkStackDeleted (yystackp, yynewStack);
|
yymarkStackDeleted (yystackp, yynewStack);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2023,7 +2036,7 @@ yyprocessOneStack (yyGLRStack* yystackp, ptrdiff_t yyk,
|
|||||||
break;
|
break;
|
||||||
else if (yyisErrorAction (yyaction))
|
else if (yyisErrorAction (yyaction))
|
||||||
{
|
{
|
||||||
YYDPRINTF ((stderr, "Stack %ld dies.\n", (long) yyk));
|
YYDPRINTF ((stderr, "Stack %ld dies.\n", YY_CAST (long, yyk)));
|
||||||
yymarkStackDeleted (yystackp, yyk);
|
yymarkStackDeleted (yystackp, yyk);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -2036,7 +2049,7 @@ yyprocessOneStack (yyGLRStack* yystackp, ptrdiff_t yyk,
|
|||||||
YYDPRINTF ((stderr,
|
YYDPRINTF ((stderr,
|
||||||
"Stack %ld dies "
|
"Stack %ld dies "
|
||||||
"(predicate failure or explicit user error).\n",
|
"(predicate failure or explicit user error).\n",
|
||||||
(long) yyk));
|
YY_CAST (long, yyk)));
|
||||||
yymarkStackDeleted (yystackp, yyk);
|
yymarkStackDeleted (yystackp, yyk);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -2147,7 +2160,7 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
ptrdiff_t yysz = (ptrdiff_t) strlen (yyformat);
|
ptrdiff_t yysz = YY_CAST (ptrdiff_t, strlen (yyformat));
|
||||||
if (YYSIZEMAX - yysize < yysz)
|
if (YYSIZEMAX - yysize < yysz)
|
||||||
yysize_overflow = yytrue;
|
yysize_overflow = yytrue;
|
||||||
else
|
else
|
||||||
@@ -2155,7 +2168,7 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!yysize_overflow)
|
if (!yysize_overflow)
|
||||||
yymsg = (char *) YYMALLOC ((size_t) yysize);
|
yymsg = YY_CAST (char *, YYMALLOC (YY_CAST (size_t, yysize)));
|
||||||
|
|
||||||
if (yymsg)
|
if (yymsg)
|
||||||
{
|
{
|
||||||
@@ -2389,7 +2402,7 @@ b4_dollar_popdef])[]dnl
|
|||||||
ptrdiff_t yys;
|
ptrdiff_t yys;
|
||||||
|
|
||||||
for (yys = 0; yys < yystack.yytops.yysize; yys += 1)
|
for (yys = 0; yys < yystack.yytops.yysize; yys += 1)
|
||||||
yystackp->yytops.yylookaheadNeeds[yys] = (yybool) (yychar != YYEMPTY);
|
yystackp->yytops.yylookaheadNeeds[yys] = YY_CAST (yybool, yychar != YYEMPTY);
|
||||||
|
|
||||||
/* yyprocessOneStack returns one of three things:
|
/* yyprocessOneStack returns one of three things:
|
||||||
|
|
||||||
@@ -2440,12 +2453,12 @@ b4_dollar_popdef])[]dnl
|
|||||||
int yyaction = yygetLRActions (yystate, yytoken_to_shift,
|
int yyaction = yygetLRActions (yystate, yytoken_to_shift,
|
||||||
&yyconflicts);
|
&yyconflicts);
|
||||||
/* Note that yyconflicts were handled by yyprocessOneStack. */
|
/* Note that yyconflicts were handled by yyprocessOneStack. */
|
||||||
YYDPRINTF ((stderr, "On stack %ld, ", (long) yys));
|
YYDPRINTF ((stderr, "On stack %ld, ", YY_CAST (long, yys)));
|
||||||
YY_SYMBOL_PRINT ("shifting", yytoken_to_shift, &yylval, &yylloc);
|
YY_SYMBOL_PRINT ("shifting", yytoken_to_shift, &yylval, &yylloc);
|
||||||
yyglrShift (&yystack, yys, yyaction, yyposn,
|
yyglrShift (&yystack, yys, yyaction, yyposn,
|
||||||
&yylval]b4_locations_if([, &yylloc])[);
|
&yylval]b4_locations_if([, &yylloc])[);
|
||||||
YYDPRINTF ((stderr, "Stack %ld now in state #%d\n",
|
YYDPRINTF ((stderr, "Stack %ld now in state #%d\n",
|
||||||
(long) yys,
|
YY_CAST (long, yys),
|
||||||
yystack.yytops.yystates[yys]->yylrState));
|
yystack.yytops.yystates[yys]->yylrState));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2527,7 +2540,7 @@ yy_yypstack (yyGLRState* yys)
|
|||||||
yy_yypstack (yys->yypred);
|
yy_yypstack (yys->yypred);
|
||||||
YYFPRINTF (stderr, " -> ");
|
YYFPRINTF (stderr, " -> ");
|
||||||
}
|
}
|
||||||
YYFPRINTF (stderr, "%d@@%ld", yys->yylrState, (long) yys->yyposn);
|
YYFPRINTF (stderr, "%d@@%ld", yys->yylrState, YY_CAST (long, yys->yyposn));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -2546,31 +2559,31 @@ yypstack (yyGLRStack* yystackp, ptrdiff_t yyk)
|
|||||||
yypstates (yystackp->yytops.yystates[yyk]);
|
yypstates (yystackp->yytops.yystates[yyk]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define YYINDEX(YYX) \
|
|
||||||
((YYX) == YY_NULLPTR ? -1 : (yyGLRStackItem*) (YYX) - yystackp->yyitems)
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
yypdumpstack (yyGLRStack* yystackp)
|
yypdumpstack (yyGLRStack* yystackp)
|
||||||
{
|
{
|
||||||
|
#define YYINDEX(YYX) \
|
||||||
|
YY_CAST (long, \
|
||||||
|
((YYX) \
|
||||||
|
? YY_REINTERPRET_CAST (yyGLRStackItem*, (YYX)) - yystackp->yyitems \
|
||||||
|
: -1))
|
||||||
|
|
||||||
yyGLRStackItem* yyp;
|
yyGLRStackItem* yyp;
|
||||||
ptrdiff_t yyi;
|
|
||||||
for (yyp = yystackp->yyitems; yyp < yystackp->yynextFree; yyp += 1)
|
for (yyp = yystackp->yyitems; yyp < yystackp->yynextFree; yyp += 1)
|
||||||
{
|
{
|
||||||
YYFPRINTF (stderr, "%3ld. ",
|
YYFPRINTF (stderr, "%3ld. ",
|
||||||
(long) (yyp - yystackp->yyitems));
|
YY_CAST (long, yyp - yystackp->yyitems));
|
||||||
if (*(yybool *) yyp)
|
if (*YY_REINTERPRET_CAST (yybool *, yyp))
|
||||||
{
|
{
|
||||||
YYASSERT (yyp->yystate.yyisState);
|
YYASSERT (yyp->yystate.yyisState);
|
||||||
YYASSERT (yyp->yyoption.yyisState);
|
YYASSERT (yyp->yyoption.yyisState);
|
||||||
YYFPRINTF (stderr, "Res: %d, LR State: %d, posn: %ld, pred: %ld",
|
YYFPRINTF (stderr, "Res: %d, LR State: %d, posn: %ld, pred: %ld",
|
||||||
yyp->yystate.yyresolved, yyp->yystate.yylrState,
|
yyp->yystate.yyresolved, yyp->yystate.yylrState,
|
||||||
(long) yyp->yystate.yyposn,
|
YY_CAST (long, yyp->yystate.yyposn),
|
||||||
(long) YYINDEX (yyp->yystate.yypred));
|
YYINDEX (yyp->yystate.yypred));
|
||||||
if (! yyp->yystate.yyresolved)
|
if (! yyp->yystate.yyresolved)
|
||||||
YYFPRINTF (stderr, ", firstVal: %ld",
|
YYFPRINTF (stderr, ", firstVal: %ld",
|
||||||
(long) YYINDEX (yyp->yystate
|
YYINDEX (yyp->yystate.yysemantics.yyfirstVal));
|
||||||
.yysemantics.yyfirstVal));
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2578,16 +2591,21 @@ yypdumpstack (yyGLRStack* yystackp)
|
|||||||
YYASSERT (!yyp->yyoption.yyisState);
|
YYASSERT (!yyp->yyoption.yyisState);
|
||||||
YYFPRINTF (stderr, "Option. rule: %d, state: %ld, next: %ld",
|
YYFPRINTF (stderr, "Option. rule: %d, state: %ld, next: %ld",
|
||||||
yyp->yyoption.yyrule - 1,
|
yyp->yyoption.yyrule - 1,
|
||||||
(long) YYINDEX (yyp->yyoption.yystate),
|
YYINDEX (yyp->yyoption.yystate),
|
||||||
(long) YYINDEX (yyp->yyoption.yynext));
|
YYINDEX (yyp->yyoption.yynext));
|
||||||
}
|
}
|
||||||
YYFPRINTF (stderr, "\n");
|
YYFPRINTF (stderr, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
YYFPRINTF (stderr, "Tops:");
|
YYFPRINTF (stderr, "Tops:");
|
||||||
for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1)
|
{
|
||||||
YYFPRINTF (stderr, "%ld: %ld; ", (long) yyi,
|
ptrdiff_t yyi;
|
||||||
(long) YYINDEX (yystackp->yytops.yystates[yyi]));
|
for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1)
|
||||||
YYFPRINTF (stderr, "\n");
|
YYFPRINTF (stderr, "%ld: %ld; ", YY_CAST (long, yyi),
|
||||||
|
YYINDEX (yystackp->yytops.yystates[yyi]));
|
||||||
|
YYFPRINTF (stderr, "\n");
|
||||||
|
}
|
||||||
|
#undef YYINDEX
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -257,6 +257,14 @@ b4_percent_code_get([[requires]])[
|
|||||||
]b4_attribute_define[
|
]b4_attribute_define[
|
||||||
]b4_null_define[
|
]b4_null_define[
|
||||||
|
|
||||||
|
// This skeleton is based on C, yet compiles it as C++.
|
||||||
|
// So expect warnings about C style casts.
|
||||||
|
#if defined __clang__ && 306 <= __clang_major__ * 100 + __clang_minor__
|
||||||
|
# pragma clang diagnostic ignored "-Wold-style-cast"
|
||||||
|
#elif defined __GNUC__ && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
|
||||||
|
# pragma GCC diagnostic ignored "-Wold-style-cast"
|
||||||
|
#endif
|
||||||
|
|
||||||
// Whether we are compiled with exception support.
|
// Whether we are compiled with exception support.
|
||||||
#ifndef YY_EXCEPTIONS
|
#ifndef YY_EXCEPTIONS
|
||||||
# if defined __GNUC__ && !defined __EXCEPTIONS
|
# if defined __GNUC__ && !defined __EXCEPTIONS
|
||||||
|
|||||||
@@ -174,6 +174,7 @@ m4_define([b4_shared_declarations],
|
|||||||
]b4_variant_if([b4_variant_includes])[
|
]b4_variant_if([b4_variant_includes])[
|
||||||
|
|
||||||
]b4_attribute_define[
|
]b4_attribute_define[
|
||||||
|
]b4_cast_define[
|
||||||
]b4_null_define[
|
]b4_null_define[
|
||||||
|
|
||||||
]b4_YYDEBUG_define[
|
]b4_YYDEBUG_define[
|
||||||
@@ -1195,10 +1196,10 @@ b4_dollar_popdef])[]dnl
|
|||||||
{
|
{
|
||||||
std::ptrdiff_t yylen = yyr2_[yyrule];
|
std::ptrdiff_t yylen = yyr2_[yyrule];
|
||||||
// First pop from the LAC stack as many tokens as possible.
|
// First pop from the LAC stack as many tokens as possible.
|
||||||
std::ptrdiff_t lac_size = (std::ptrdiff_t) yylac_stack_.size ();
|
std::ptrdiff_t lac_size = std::ptrdiff_t (yylac_stack_.size ());
|
||||||
if (yylen < lac_size)
|
if (yylen < lac_size)
|
||||||
{
|
{
|
||||||
yylac_stack_.resize ((std::size_t) (lac_size - yylen));
|
yylac_stack_.resize (std::size_t (lac_size - yylen));
|
||||||
yylen = 0;
|
yylen = 0;
|
||||||
}
|
}
|
||||||
else if (lac_size)
|
else if (lac_size)
|
||||||
|
|||||||
+39
-27
@@ -62,11 +62,14 @@ m4_define([b4_location_define],
|
|||||||
[[ /// A point in a source file.
|
[[ /// A point in a source file.
|
||||||
class position
|
class position
|
||||||
{
|
{
|
||||||
public:]m4_ifdef([b4_location_constructors], [[
|
public:
|
||||||
|
/// Type for line and column numbers.
|
||||||
|
typedef int counter_type;
|
||||||
|
]m4_ifdef([b4_location_constructors], [[
|
||||||
/// Construct a position.
|
/// Construct a position.
|
||||||
explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
|
explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
|
||||||
int l = ]b4_location_initial_line[,
|
counter_type l = ]b4_location_initial_line[,
|
||||||
int c = ]b4_location_initial_column[)
|
counter_type c = ]b4_location_initial_column[)
|
||||||
: filename (f)
|
: filename (f)
|
||||||
, line (l)
|
, line (l)
|
||||||
, column (c)
|
, column (c)
|
||||||
@@ -75,8 +78,8 @@ m4_define([b4_location_define],
|
|||||||
]])[
|
]])[
|
||||||
/// Initialization.
|
/// Initialization.
|
||||||
void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULLPTR,
|
void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULLPTR,
|
||||||
int l = ]b4_location_initial_line[,
|
counter_type l = ]b4_location_initial_line[,
|
||||||
int c = ]b4_location_initial_column[)
|
counter_type c = ]b4_location_initial_column[)
|
||||||
{
|
{
|
||||||
filename = fn;
|
filename = fn;
|
||||||
line = l;
|
line = l;
|
||||||
@@ -86,7 +89,7 @@ m4_define([b4_location_define],
|
|||||||
/** \name Line and Column related manipulators
|
/** \name Line and Column related manipulators
|
||||||
** \{ */
|
** \{ */
|
||||||
/// (line related) Advance to the COUNT next lines.
|
/// (line related) Advance to the COUNT next lines.
|
||||||
void lines (int count = 1)
|
void lines (counter_type count = 1)
|
||||||
{
|
{
|
||||||
if (count)
|
if (count)
|
||||||
{
|
{
|
||||||
@@ -96,7 +99,7 @@ m4_define([b4_location_define],
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// (column related) Advance to the COUNT next columns.
|
/// (column related) Advance to the COUNT next columns.
|
||||||
void columns (int count = 1)
|
void columns (counter_type count = 1)
|
||||||
{
|
{
|
||||||
column = add_ (column, count, ]b4_location_initial_column[);
|
column = add_ (column, count, ]b4_location_initial_column[);
|
||||||
}
|
}
|
||||||
@@ -105,13 +108,13 @@ m4_define([b4_location_define],
|
|||||||
/// File name to which this position refers.
|
/// File name to which this position refers.
|
||||||
]b4_percent_define_get([[filename_type]])[* filename;
|
]b4_percent_define_get([[filename_type]])[* filename;
|
||||||
/// Current line number.
|
/// Current line number.
|
||||||
int line;
|
counter_type line;
|
||||||
/// Current column number.
|
/// Current column number.
|
||||||
int column;
|
counter_type column;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/// Compute max (min, lhs+rhs).
|
/// Compute max (min, lhs+rhs).
|
||||||
static int add_ (int lhs, int rhs, int min)
|
static counter_type add_ (counter_type lhs, counter_type rhs, counter_type min)
|
||||||
{
|
{
|
||||||
return lhs + rhs < min ? min : lhs + rhs;
|
return lhs + rhs < min ? min : lhs + rhs;
|
||||||
}
|
}
|
||||||
@@ -119,7 +122,7 @@ m4_define([b4_location_define],
|
|||||||
|
|
||||||
/// Add \a width columns, in place.
|
/// Add \a width columns, in place.
|
||||||
inline position&
|
inline position&
|
||||||
operator+= (position& res, int width)
|
operator+= (position& res, position::counter_type width)
|
||||||
{
|
{
|
||||||
res.columns (width);
|
res.columns (width);
|
||||||
return res;
|
return res;
|
||||||
@@ -127,21 +130,21 @@ m4_define([b4_location_define],
|
|||||||
|
|
||||||
/// Add \a width columns.
|
/// Add \a width columns.
|
||||||
inline position
|
inline position
|
||||||
operator+ (position res, int width)
|
operator+ (position res, position::counter_type width)
|
||||||
{
|
{
|
||||||
return res += width;
|
return res += width;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Subtract \a width columns, in place.
|
/// Subtract \a width columns, in place.
|
||||||
inline position&
|
inline position&
|
||||||
operator-= (position& res, int width)
|
operator-= (position& res, position::counter_type width)
|
||||||
{
|
{
|
||||||
return res += -width;
|
return res += -width;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Subtract \a width columns.
|
/// Subtract \a width columns.
|
||||||
inline position
|
inline position
|
||||||
operator- (position res, int width)
|
operator- (position res, position::counter_type width)
|
||||||
{
|
{
|
||||||
return res -= width;
|
return res -= width;
|
||||||
}
|
}
|
||||||
@@ -181,6 +184,8 @@ m4_define([b4_location_define],
|
|||||||
class location
|
class location
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/// Type for line and column numbers.
|
||||||
|
typedef position::counter_type counter_type;
|
||||||
]m4_ifdef([b4_location_constructors], [
|
]m4_ifdef([b4_location_constructors], [
|
||||||
/// Construct a location from \a b to \a e.
|
/// Construct a location from \a b to \a e.
|
||||||
location (const position& b, const position& e)
|
location (const position& b, const position& e)
|
||||||
@@ -196,8 +201,8 @@ m4_define([b4_location_define],
|
|||||||
|
|
||||||
/// Construct a 0-width location in \a f, \a l, \a c.
|
/// Construct a 0-width location in \a f, \a l, \a c.
|
||||||
explicit location (]b4_percent_define_get([[filename_type]])[* f,
|
explicit location (]b4_percent_define_get([[filename_type]])[* f,
|
||||||
int l = ]b4_location_initial_line[,
|
counter_type l = ]b4_location_initial_line[,
|
||||||
int c = ]b4_location_initial_column[)
|
counter_type c = ]b4_location_initial_column[)
|
||||||
: begin (f, l, c)
|
: begin (f, l, c)
|
||||||
, end (f, l, c)
|
, end (f, l, c)
|
||||||
{}
|
{}
|
||||||
@@ -205,8 +210,8 @@ m4_define([b4_location_define],
|
|||||||
])[
|
])[
|
||||||
/// Initialization.
|
/// Initialization.
|
||||||
void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
|
void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
|
||||||
int l = ]b4_location_initial_line[,
|
counter_type l = ]b4_location_initial_line[,
|
||||||
int c = ]b4_location_initial_column[)
|
counter_type c = ]b4_location_initial_column[)
|
||||||
{
|
{
|
||||||
begin.initialize (f, l, c);
|
begin.initialize (f, l, c);
|
||||||
end = begin;
|
end = begin;
|
||||||
@@ -222,13 +227,13 @@ m4_define([b4_location_define],
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Extend the current location to the COUNT next columns.
|
/// Extend the current location to the COUNT next columns.
|
||||||
void columns (int count = 1)
|
void columns (counter_type count = 1)
|
||||||
{
|
{
|
||||||
end += count;
|
end += count;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Extend the current location to the COUNT next lines.
|
/// Extend the current location to the COUNT next lines.
|
||||||
void lines (int count = 1)
|
void lines (counter_type count = 1)
|
||||||
{
|
{
|
||||||
end.lines (count);
|
end.lines (count);
|
||||||
}
|
}
|
||||||
@@ -243,39 +248,45 @@ m4_define([b4_location_define],
|
|||||||
};
|
};
|
||||||
|
|
||||||
/// Join two locations, in place.
|
/// Join two locations, in place.
|
||||||
inline location& operator+= (location& res, const location& end)
|
inline location&
|
||||||
|
operator+= (location& res, const location& end)
|
||||||
{
|
{
|
||||||
res.end = end.end;
|
res.end = end.end;
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Join two locations.
|
/// Join two locations.
|
||||||
inline location operator+ (location res, const location& end)
|
inline location
|
||||||
|
operator+ (location res, const location& end)
|
||||||
{
|
{
|
||||||
return res += end;
|
return res += end;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add \a width columns to the end position, in place.
|
/// Add \a width columns to the end position, in place.
|
||||||
inline location& operator+= (location& res, int width)
|
inline location&
|
||||||
|
operator+= (location& res, location::counter_type width)
|
||||||
{
|
{
|
||||||
res.columns (width);
|
res.columns (width);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add \a width columns to the end position.
|
/// Add \a width columns to the end position.
|
||||||
inline location operator+ (location res, int width)
|
inline location
|
||||||
|
operator+ (location res, location::counter_type width)
|
||||||
{
|
{
|
||||||
return res += width;
|
return res += width;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Subtract \a width columns to the end position, in place.
|
/// Subtract \a width columns to the end position, in place.
|
||||||
inline location& operator-= (location& res, int width)
|
inline location&
|
||||||
|
operator-= (location& res, location::counter_type width)
|
||||||
{
|
{
|
||||||
return res += -width;
|
return res += -width;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Subtract \a width columns to the end position.
|
/// Subtract \a width columns to the end position.
|
||||||
inline location operator- (location res, int width)
|
inline location
|
||||||
|
operator- (location res, location::counter_type width)
|
||||||
{
|
{
|
||||||
return res -= width;
|
return res -= width;
|
||||||
}
|
}
|
||||||
@@ -304,7 +315,8 @@ m4_define([b4_location_define],
|
|||||||
std::basic_ostream<YYChar>&
|
std::basic_ostream<YYChar>&
|
||||||
operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
|
operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
|
||||||
{
|
{
|
||||||
int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
|
location::counter_type end_col
|
||||||
|
= 0 < loc.end.column ? loc.end.column - 1 : 0;
|
||||||
ostr << loc.begin;
|
ostr << loc.begin;
|
||||||
if (loc.end.filename
|
if (loc.end.filename
|
||||||
&& (!loc.begin.filename
|
&& (!loc.begin.filename
|
||||||
|
|||||||
@@ -90,10 +90,11 @@ m4_define([b4_stack_define],
|
|||||||
{
|
{
|
||||||
return index_type (seq_.size ());
|
return index_type (seq_.size ());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::ptrdiff_t
|
std::ptrdiff_t
|
||||||
ssize () const YY_NOEXCEPT
|
ssize () const YY_NOEXCEPT
|
||||||
{
|
{
|
||||||
return (std::ptrdiff_t) size ();
|
return std::ptrdiff_t (size ());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Iterator on top of the stack (going downwards).
|
/// Iterator on top of the stack (going downwards).
|
||||||
|
|||||||
+22
-18
@@ -339,13 +339,13 @@ m4_if(b4_api_prefix, [yy], [],
|
|||||||
#define yylex ]b4_prefix[lex
|
#define yylex ]b4_prefix[lex
|
||||||
#define yyerror ]b4_prefix[error
|
#define yyerror ]b4_prefix[error
|
||||||
#define yydebug ]b4_prefix[debug
|
#define yydebug ]b4_prefix[debug
|
||||||
#define yynerrs ]b4_prefix[nerrs
|
#define yynerrs ]b4_prefix[nerrs]]b4_pure_if([], [[
|
||||||
]]b4_pure_if([], [[
|
|
||||||
#define yylval ]b4_prefix[lval
|
#define yylval ]b4_prefix[lval
|
||||||
#define yychar ]b4_prefix[char]b4_locations_if([[
|
#define yychar ]b4_prefix[char]b4_locations_if([[
|
||||||
#define yylloc ]b4_prefix[lloc]])]))[
|
#define yylloc ]b4_prefix[lloc]])]))[
|
||||||
|
|
||||||
]b4_user_pre_prologue[
|
]b4_user_pre_prologue[
|
||||||
|
]b4_cast_define[
|
||||||
]b4_null_define[
|
]b4_null_define[
|
||||||
|
|
||||||
/* Enabling verbose error messages. */
|
/* Enabling verbose error messages. */
|
||||||
@@ -400,10 +400,13 @@ m4_if(b4_api_prefix, [yy], [],
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define YYSIZE_MAXIMUM ((YYPTRDIFF_T) (YYPTRDIFF_MAXIMUM < (YYSIZE_T) -1 \
|
#define YYSIZE_MAXIMUM \
|
||||||
? YYPTRDIFF_MAXIMUM : (YYSIZE_T) -1))
|
YY_CAST (YYPTRDIFF_T, \
|
||||||
|
(YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \
|
||||||
|
? YYPTRDIFF_MAXIMUM \
|
||||||
|
: YY_CAST (YYSIZE_T, -1)))
|
||||||
|
|
||||||
#define YYSIZEOF(X) ((YYPTRDIFF_T) sizeof (X))
|
#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
|
||||||
|
|
||||||
/* Stored state numbers (used for stacks). */
|
/* Stored state numbers (used for stacks). */
|
||||||
typedef ]b4_int_type(0, m4_eval(b4_states_number - 1))[ yy_state_t;
|
typedef ]b4_int_type(0, m4_eval(b4_states_number - 1))[ yy_state_t;
|
||||||
@@ -557,7 +560,7 @@ union yyalloc
|
|||||||
# ifndef YYCOPY
|
# ifndef YYCOPY
|
||||||
# if defined __GNUC__ && 1 < __GNUC__
|
# if defined __GNUC__ && 1 < __GNUC__
|
||||||
# define YYCOPY(Dst, Src, Count) \
|
# define YYCOPY(Dst, Src, Count) \
|
||||||
__builtin_memcpy (Dst, Src, (YYSIZE_T) (Count) * sizeof (*(Src)))
|
__builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
|
||||||
# else
|
# else
|
||||||
# define YYCOPY(Dst, Src, Count) \
|
# define YYCOPY(Dst, Src, Count) \
|
||||||
do \
|
do \
|
||||||
@@ -832,8 +835,9 @@ yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd,
|
|||||||
if (YYMAXDEPTH < yyalloc)
|
if (YYMAXDEPTH < yyalloc)
|
||||||
yyalloc = YYMAXDEPTH;
|
yyalloc = YYMAXDEPTH;
|
||||||
yybottom_new =
|
yybottom_new =
|
||||||
(yy_state_t *) YYSTACK_ALLOC ((YYSIZE_T)
|
YY_CAST (yy_state_t *,
|
||||||
(yyalloc * YYSIZEOF (*yybottom_new)));
|
YYSTACK_ALLOC (YY_CAST (YYSIZE_T,
|
||||||
|
yyalloc * YYSIZEOF (*yybottom_new))));
|
||||||
if (!yybottom_new)
|
if (!yybottom_new)
|
||||||
{
|
{
|
||||||
YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix,
|
YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix,
|
||||||
@@ -851,7 +855,7 @@ yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd,
|
|||||||
*yycapacity = yyalloc;]m4_if(b4_percent_define_get([[parse.lac.memory-trace]]),
|
*yycapacity = yyalloc;]m4_if(b4_percent_define_get([[parse.lac.memory-trace]]),
|
||||||
[full], [[
|
[full], [[
|
||||||
YYDPRINTF ((stderr, "%srealloc to %ld%s", yydebug_prefix,
|
YYDPRINTF ((stderr, "%srealloc to %ld%s", yydebug_prefix,
|
||||||
(long) yyalloc, yydebug_suffix));]])[
|
YY_CAST (long, yyalloc), yydebug_suffix));]])[
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -1008,7 +1012,7 @@ yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
|
|||||||
if (yyesp == yyes_prev)
|
if (yyesp == yyes_prev)
|
||||||
{
|
{
|
||||||
yyesp = *yyes;
|
yyesp = *yyes;
|
||||||
*yyesp = (yy_state_t) yystate;
|
*yyesp = YY_CAST (yy_state_t, yystate);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1021,7 +1025,7 @@ yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
|
|||||||
YYDPRINTF ((stderr, "\n"));
|
YYDPRINTF ((stderr, "\n"));
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
*++yyesp = (yy_state_t) yystate;
|
*++yyesp = YY_CAST (yy_state_t, yystate);
|
||||||
}
|
}
|
||||||
YYDPRINTF ((stderr, " G%d", yystate));
|
YYDPRINTF ((stderr, " G%d", yystate));
|
||||||
}
|
}
|
||||||
@@ -1033,7 +1037,7 @@ yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
|
|||||||
|
|
||||||
# ifndef yystrlen
|
# ifndef yystrlen
|
||||||
# if defined __GLIBC__ && defined _STRING_H
|
# if defined __GLIBC__ && defined _STRING_H
|
||||||
# define yystrlen(S) ((YYPTRDIFF_T) strlen (S))
|
# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
|
||||||
# else
|
# else
|
||||||
/* Return the length of YYSTR. */
|
/* Return the length of YYSTR. */
|
||||||
]b4_function_define([yystrlen], [static YYPTRDIFF_T],
|
]b4_function_define([yystrlen], [static YYPTRDIFF_T],
|
||||||
@@ -1342,7 +1346,7 @@ b4_function_define([[yyparse]], [[int]], b4_parse_param)[
|
|||||||
yypstate *yyps;]b4_pure_if([], [[
|
yypstate *yyps;]b4_pure_if([], [[
|
||||||
if (yypstate_allocated)
|
if (yypstate_allocated)
|
||||||
return YY_NULLPTR;]])[
|
return YY_NULLPTR;]])[
|
||||||
yyps = (yypstate *) malloc (sizeof *yyps);
|
yyps = YY_CAST (yypstate *, malloc (sizeof *yyps));
|
||||||
if (!yyps)
|
if (!yyps)
|
||||||
return YY_NULLPTR;
|
return YY_NULLPTR;
|
||||||
yyps->yynew = 1;]b4_pure_if([], [[
|
yyps->yynew = 1;]b4_pure_if([], [[
|
||||||
@@ -1484,7 +1488,7 @@ yynewstate:
|
|||||||
yysetstate:
|
yysetstate:
|
||||||
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
|
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
|
||||||
YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
|
YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
|
||||||
*yyssp = (yy_state_t) yystate;
|
*yyssp = YY_CAST (yy_state_t, yystate);
|
||||||
|
|
||||||
if (yyss + yystacksize - 1 <= yyssp)
|
if (yyss + yystacksize - 1 <= yyssp)
|
||||||
#if !defined yyoverflow && !defined YYSTACK_RELOCATE
|
#if !defined yyoverflow && !defined YYSTACK_RELOCATE
|
||||||
@@ -1527,8 +1531,8 @@ yysetstate:
|
|||||||
{
|
{
|
||||||
yy_state_t *yyss1 = yyss;
|
yy_state_t *yyss1 = yyss;
|
||||||
union yyalloc *yyptr =
|
union yyalloc *yyptr =
|
||||||
(union yyalloc *) YYSTACK_ALLOC ((YYSIZE_T)
|
YY_CAST (union yyalloc *,
|
||||||
YYSTACK_BYTES (yystacksize));
|
YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
|
||||||
if (! yyptr)
|
if (! yyptr)
|
||||||
goto yyexhaustedlab;
|
goto yyexhaustedlab;
|
||||||
YYSTACK_RELOCATE (yyss_alloc, yyss);
|
YYSTACK_RELOCATE (yyss_alloc, yyss);
|
||||||
@@ -1545,7 +1549,7 @@ yysetstate:
|
|||||||
yylsp = yyls + yysize - 1;])[
|
yylsp = yyls + yysize - 1;])[
|
||||||
|
|
||||||
YYDPRINTF ((stderr, "Stack size increased to %ld\n",
|
YYDPRINTF ((stderr, "Stack size increased to %ld\n",
|
||||||
(long) yystacksize));
|
YY_CAST (long, yystacksize)));
|
||||||
|
|
||||||
if (yyss + yystacksize - 1 <= yyssp)
|
if (yyss + yystacksize - 1 <= yyssp)
|
||||||
YYABORT;
|
YYABORT;
|
||||||
@@ -1758,7 +1762,7 @@ yyerrlab:
|
|||||||
{
|
{
|
||||||
if (yymsg != yymsgbuf)
|
if (yymsg != yymsgbuf)
|
||||||
YYSTACK_FREE (yymsg);
|
YYSTACK_FREE (yymsg);
|
||||||
yymsg = (char *) YYSTACK_ALLOC ((YYSIZE_T) yymsg_alloc);
|
yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
|
||||||
if (!yymsg)
|
if (!yymsg)
|
||||||
{
|
{
|
||||||
yymsg = yymsgbuf;
|
yymsg = yymsgbuf;
|
||||||
|
|||||||
+312
-249
File diff suppressed because it is too large
Load Diff
@@ -54,6 +54,23 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL)
|
|||||||
$(AM_V_at)mv $@.tmp $@
|
$(AM_V_at)mv $@.tmp $@
|
||||||
MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
|
MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
|
||||||
|
|
||||||
|
|
||||||
|
# Fix Info's @code in @deftype
|
||||||
|
# https://lists.gnu.org/archive/html/help-texinfo/2019-11/msg00004.html
|
||||||
|
all: $(srcdir)/$(doc_bison).info.bak
|
||||||
|
$(srcdir)/$(doc_bison).info.bak: $(srcdir)/$(doc_bison).info
|
||||||
|
$(AM_V_GEN) $(PERL) -pi.bak -0777 \
|
||||||
|
-e 's{(^ --.*\n(?: {10}.*\n)*)}' \
|
||||||
|
-e '{' \
|
||||||
|
-e ' $$def = $$1;' \
|
||||||
|
-e ' $$def =~ s/‘|’//g;' \
|
||||||
|
-e ' $$def;' \
|
||||||
|
-e '}gem;' $(srcdir)/$(doc_bison).info
|
||||||
|
@ touch $@
|
||||||
|
EXTRA_DIST += $(srcdir)/$(doc_bison).info.bak
|
||||||
|
MAINTAINERCLEANFILES += $(srcdir)/$(doc_bison).info.bak
|
||||||
|
|
||||||
|
|
||||||
## ---------- ##
|
## ---------- ##
|
||||||
## Ref card. ##
|
## Ref card. ##
|
||||||
## ---------- ##
|
## ---------- ##
|
||||||
|
|||||||
+1
-1
Submodule gnulib updated: 56ca994d47...a4740cc6fa
@@ -16,6 +16,7 @@
|
|||||||
/argmatch.c
|
/argmatch.c
|
||||||
/argmatch.h
|
/argmatch.h
|
||||||
/asnprintf.c
|
/asnprintf.c
|
||||||
|
/asprintf.c
|
||||||
/assure.h
|
/assure.h
|
||||||
/basename-lgpl.c
|
/basename-lgpl.c
|
||||||
/basename.c
|
/basename.c
|
||||||
@@ -303,6 +304,7 @@
|
|||||||
/unsetenv.c
|
/unsetenv.c
|
||||||
/vasnprintf.c
|
/vasnprintf.c
|
||||||
/vasnprintf.h
|
/vasnprintf.h
|
||||||
|
/vasprintf.c
|
||||||
/verify.h
|
/verify.h
|
||||||
/vfprintf.c
|
/vfprintf.c
|
||||||
/vsnprintf.c
|
/vsnprintf.c
|
||||||
|
|||||||
@@ -43,14 +43,23 @@
|
|||||||
/getopt.m4
|
/getopt.m4
|
||||||
/getprogname.m4
|
/getprogname.m4
|
||||||
/getrusage.m4
|
/getrusage.m4
|
||||||
|
/gettext.m4
|
||||||
/gettime.m4
|
/gettime.m4
|
||||||
/gettimeofday.m4
|
/gettimeofday.m4
|
||||||
|
/glibc2.m4
|
||||||
|
/glibc21.m4
|
||||||
/gnulib-cache.m4
|
/gnulib-cache.m4
|
||||||
/gnulib-common.m4
|
/gnulib-common.m4
|
||||||
/gnulib-comp.m4
|
/gnulib-comp.m4
|
||||||
/gnulib-tool.m4
|
/gnulib-tool.m4
|
||||||
/host-cpu-c-abi.m4
|
/host-cpu-c-abi.m4
|
||||||
|
/iconv.m4
|
||||||
/include_next.m4
|
/include_next.m4
|
||||||
|
/intdiv0.m4
|
||||||
|
/intl.m4
|
||||||
|
/intldir.m4
|
||||||
|
/intlmacosx.m4
|
||||||
|
/intmax.m4
|
||||||
/intmax_t.m4
|
/intmax_t.m4
|
||||||
/inttypes-pri.m4
|
/inttypes-pri.m4
|
||||||
/inttypes.m4
|
/inttypes.m4
|
||||||
@@ -65,6 +74,7 @@
|
|||||||
/jm-winsz1.m4
|
/jm-winsz1.m4
|
||||||
/jm-winsz2.m4
|
/jm-winsz2.m4
|
||||||
/largefile.m4
|
/largefile.m4
|
||||||
|
/lcmessage.m4
|
||||||
/ldexp.m4
|
/ldexp.m4
|
||||||
/ldexpl.m4
|
/ldexpl.m4
|
||||||
/lib-ld.m4
|
/lib-ld.m4
|
||||||
@@ -98,6 +108,7 @@
|
|||||||
/msvc-inval.m4
|
/msvc-inval.m4
|
||||||
/msvc-nothrow.m4
|
/msvc-nothrow.m4
|
||||||
/multiarch.m4
|
/multiarch.m4
|
||||||
|
/nls.m4
|
||||||
/nocrash.m4
|
/nocrash.m4
|
||||||
/non-recursive-gnulib-prefix-hack.m4
|
/non-recursive-gnulib-prefix-hack.m4
|
||||||
/obstack-printf.m4
|
/obstack-printf.m4
|
||||||
@@ -109,11 +120,14 @@
|
|||||||
/pathmax.m4
|
/pathmax.m4
|
||||||
/perror.m4
|
/perror.m4
|
||||||
/pipe2.m4
|
/pipe2.m4
|
||||||
|
/po.m4
|
||||||
/posix_spawn.m4
|
/posix_spawn.m4
|
||||||
/printf-frexp.m4
|
/printf-frexp.m4
|
||||||
/printf-frexpl.m4
|
/printf-frexpl.m4
|
||||||
/printf-posix-rpl.m4
|
/printf-posix-rpl.m4
|
||||||
|
/printf-posix.m4
|
||||||
/printf.m4
|
/printf.m4
|
||||||
|
/progtest.m4
|
||||||
/pthread_rwlock_rdlock.m4
|
/pthread_rwlock_rdlock.m4
|
||||||
/quote.m4
|
/quote.m4
|
||||||
/quotearg.m4
|
/quotearg.m4
|
||||||
@@ -169,12 +183,16 @@
|
|||||||
/time_h.m4
|
/time_h.m4
|
||||||
/timespec.m4
|
/timespec.m4
|
||||||
/tls.m4
|
/tls.m4
|
||||||
|
/uintmax_t.m4
|
||||||
/unistd-safer.m4
|
/unistd-safer.m4
|
||||||
/unistd_h.m4
|
/unistd_h.m4
|
||||||
/unlink.m4
|
/unlink.m4
|
||||||
/unlocked-io.m4
|
/unlocked-io.m4
|
||||||
/vasnprintf.m4
|
/vasnprintf.m4
|
||||||
|
/vasprintf-posix.m4
|
||||||
|
/vasprintf.m4
|
||||||
/vfprintf-posix.m4
|
/vfprintf-posix.m4
|
||||||
|
/visibility.m4
|
||||||
/vsnprintf-posix.m4
|
/vsnprintf-posix.m4
|
||||||
/vsnprintf.m4
|
/vsnprintf.m4
|
||||||
/vsprintf-posix.m4
|
/vsprintf-posix.m4
|
||||||
|
|||||||
+10
-8
@@ -113,13 +113,14 @@ static const argmatch_warning_doc argmatch_warning_docs[] =
|
|||||||
{
|
{
|
||||||
{ "conflicts-sr", N_("S/R conflicts (enabled by default)") },
|
{ "conflicts-sr", N_("S/R conflicts (enabled by default)") },
|
||||||
{ "conflicts-rr", N_("R/R conflicts (enabled by default)") },
|
{ "conflicts-rr", N_("R/R conflicts (enabled by default)") },
|
||||||
|
{ "dangling-alias", N_("string aliases not attached to a symbol") },
|
||||||
{ "deprecated", N_("obsolete constructs") },
|
{ "deprecated", N_("obsolete constructs") },
|
||||||
{ "empty-rule", N_("empty rules without %empty") },
|
{ "empty-rule", N_("empty rules without %empty") },
|
||||||
{ "midrule-values", N_("unset or unused midrule values") },
|
{ "midrule-values", N_("unset or unused midrule values") },
|
||||||
{ "precedence", N_("useless precedence and associativity") },
|
{ "precedence", N_("useless precedence and associativity") },
|
||||||
{ "yacc", N_("incompatibilities with POSIX Yacc") },
|
{ "yacc", N_("incompatibilities with POSIX Yacc") },
|
||||||
{ "other", N_("all other warnings (enabled by default)") },
|
{ "other", N_("all other warnings (enabled by default)") },
|
||||||
{ "all", N_("all the warnings except 'yacc'") },
|
{ "all", N_("all the warnings except 'dangling-alias' and 'yacc'") },
|
||||||
{ "no-CATEGORY", N_("turn off warnings in CATEGORY") },
|
{ "no-CATEGORY", N_("turn off warnings in CATEGORY") },
|
||||||
{ "none", N_("turn off all the warnings") },
|
{ "none", N_("turn off all the warnings") },
|
||||||
{ "error[=CATEGORY]", N_("treat warnings as errors") },
|
{ "error[=CATEGORY]", N_("treat warnings as errors") },
|
||||||
@@ -128,17 +129,18 @@ static const argmatch_warning_doc argmatch_warning_docs[] =
|
|||||||
|
|
||||||
static const argmatch_warning_arg argmatch_warning_args[] =
|
static const argmatch_warning_arg argmatch_warning_args[] =
|
||||||
{
|
{
|
||||||
{ "none", Wnone },
|
{ "all", Wall },
|
||||||
{ "midrule-values", Wmidrule_values },
|
|
||||||
{ "yacc", Wyacc },
|
|
||||||
{ "conflicts-sr", Wconflicts_sr },
|
|
||||||
{ "conflicts-rr", Wconflicts_rr },
|
{ "conflicts-rr", Wconflicts_rr },
|
||||||
|
{ "conflicts-sr", Wconflicts_sr },
|
||||||
|
{ "dangling-alias", Wdangling_alias },
|
||||||
{ "deprecated", Wdeprecated },
|
{ "deprecated", Wdeprecated },
|
||||||
{ "empty-rule", Wempty_rule },
|
{ "empty-rule", Wempty_rule },
|
||||||
{ "precedence", Wprecedence },
|
|
||||||
{ "other", Wother },
|
|
||||||
{ "all", Wall },
|
|
||||||
{ "everything", Weverything },
|
{ "everything", Weverything },
|
||||||
|
{ "midrule-values", Wmidrule_values },
|
||||||
|
{ "none", Wnone },
|
||||||
|
{ "other", Wother },
|
||||||
|
{ "precedence", Wprecedence },
|
||||||
|
{ "yacc", Wyacc },
|
||||||
{ NULL, Wnone }
|
{ NULL, Wnone }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -47,6 +47,7 @@ typedef enum
|
|||||||
{
|
{
|
||||||
warning_conflicts_rr,
|
warning_conflicts_rr,
|
||||||
warning_conflicts_sr,
|
warning_conflicts_sr,
|
||||||
|
warning_dangling_alias,
|
||||||
warning_deprecated,
|
warning_deprecated,
|
||||||
warning_empty_rule,
|
warning_empty_rule,
|
||||||
warning_midrule_values,
|
warning_midrule_values,
|
||||||
@@ -104,6 +105,7 @@ typedef enum
|
|||||||
|
|
||||||
Wconflicts_rr = 1 << warning_conflicts_rr,
|
Wconflicts_rr = 1 << warning_conflicts_rr,
|
||||||
Wconflicts_sr = 1 << warning_conflicts_sr,
|
Wconflicts_sr = 1 << warning_conflicts_sr,
|
||||||
|
Wdangling_alias = 1 << warning_dangling_alias,
|
||||||
Wdeprecated = 1 << warning_deprecated,
|
Wdeprecated = 1 << warning_deprecated,
|
||||||
Wempty_rule = 1 << warning_empty_rule,
|
Wempty_rule = 1 << warning_empty_rule,
|
||||||
Wmidrule_values = 1 << warning_midrule_values,
|
Wmidrule_values = 1 << warning_midrule_values,
|
||||||
@@ -118,7 +120,7 @@ typedef enum
|
|||||||
|
|
||||||
/**< All above warnings. */
|
/**< All above warnings. */
|
||||||
Weverything = ~complaint & ~fatal & ~silent,
|
Weverything = ~complaint & ~fatal & ~silent,
|
||||||
Wall = Weverything & ~Wyacc
|
Wall = Weverything & ~Wdangling_alias & ~Wyacc
|
||||||
} warnings;
|
} warnings;
|
||||||
|
|
||||||
/** Whether the warnings of \a flags are all unset.
|
/** Whether the warnings of \a flags are all unset.
|
||||||
|
|||||||
+13
-4
@@ -259,12 +259,11 @@ grammar_dump (FILE *out, const char *title)
|
|||||||
"ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nritems = %d\n\n",
|
"ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nritems = %d\n\n",
|
||||||
ntokens, nvars, nsyms, nrules, nritems);
|
ntokens, nvars, nsyms, nrules, nritems);
|
||||||
|
|
||||||
|
fprintf (out, "Tokens\n------\n\n");
|
||||||
fprintf (out, "Variables\n---------\n\n");
|
|
||||||
{
|
{
|
||||||
fprintf (out, "Value Sprec Sassoc Tag\n");
|
fprintf (out, "Value Sprec Sassoc Tag\n");
|
||||||
|
|
||||||
for (symbol_number i = ntokens; i < nsyms; i++)
|
for (symbol_number i = 0; i < ntokens; i++)
|
||||||
fprintf (out, "%5d %5d %5d %s\n",
|
fprintf (out, "%5d %5d %5d %s\n",
|
||||||
i,
|
i,
|
||||||
symbols[i]->content->prec, symbols[i]->content->assoc,
|
symbols[i]->content->prec, symbols[i]->content->assoc,
|
||||||
@@ -272,6 +271,16 @@ grammar_dump (FILE *out, const char *title)
|
|||||||
fprintf (out, "\n\n");
|
fprintf (out, "\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fprintf (out, "Non terminals\n-------------\n\n");
|
||||||
|
{
|
||||||
|
fprintf (out, "Value Tag\n");
|
||||||
|
|
||||||
|
for (symbol_number i = ntokens; i < nsyms; i++)
|
||||||
|
fprintf (out, "%5d %s\n",
|
||||||
|
i, symbols[i]->tag);
|
||||||
|
fprintf (out, "\n\n");
|
||||||
|
}
|
||||||
|
|
||||||
fprintf (out, "Rules\n-----\n\n");
|
fprintf (out, "Rules\n-----\n\n");
|
||||||
{
|
{
|
||||||
fprintf (out,
|
fprintf (out,
|
||||||
@@ -282,7 +291,7 @@ grammar_dump (FILE *out, const char *title)
|
|||||||
rule const *rule_i = &rules[i];
|
rule const *rule_i = &rules[i];
|
||||||
int const rhs_itemno = rule_i->rhs - ritem;
|
int const rhs_itemno = rule_i->rhs - ritem;
|
||||||
int length = rule_rhs_length (rule_i);
|
int length = rule_rhs_length (rule_i);
|
||||||
aver (item_number_as_rule_number (rule_i->rhs[length] == i));
|
aver (item_number_as_rule_number (rule_i->rhs[length]) == i);
|
||||||
fprintf (out, "%3d (%2d, %2d, %2s, %2s) %2d -> (%2u-%2u)",
|
fprintf (out, "%3d (%2d, %2d, %2s, %2s) %2d -> (%2u-%2u)",
|
||||||
i,
|
i,
|
||||||
rule_i->prec ? rule_i->prec->prec : 0,
|
rule_i->prec ? rule_i->prec->prec : 0,
|
||||||
|
|||||||
+4
-4
@@ -21,13 +21,13 @@
|
|||||||
#include "system.h"
|
#include "system.h"
|
||||||
|
|
||||||
#include <hash.h>
|
#include <hash.h>
|
||||||
|
#include <quote.h>
|
||||||
|
|
||||||
#include "complain.h"
|
#include "complain.h"
|
||||||
#include "files.h"
|
#include "files.h"
|
||||||
#include "fixits.h"
|
#include "fixits.h"
|
||||||
#include "getargs.h"
|
#include "getargs.h"
|
||||||
#include "muscle-tab.h"
|
#include "muscle-tab.h"
|
||||||
#include "quote.h"
|
|
||||||
|
|
||||||
muscle_kind
|
muscle_kind
|
||||||
muscle_kind_new (char const *k)
|
muscle_kind_new (char const *k)
|
||||||
@@ -626,17 +626,17 @@ muscle_percent_define_check_kind (char const *variable, muscle_kind kind)
|
|||||||
{
|
{
|
||||||
case muscle_code:
|
case muscle_code:
|
||||||
complain (&loc, Wdeprecated,
|
complain (&loc, Wdeprecated,
|
||||||
"%%define variable '%s' requires '{...}' values",
|
_("%%define variable '%s' requires '{...}' values"),
|
||||||
variable);
|
variable);
|
||||||
break;
|
break;
|
||||||
case muscle_keyword:
|
case muscle_keyword:
|
||||||
complain (&loc, Wdeprecated,
|
complain (&loc, Wdeprecated,
|
||||||
"%%define variable '%s' requires keyword values",
|
_("%%define variable '%s' requires keyword values"),
|
||||||
variable);
|
variable);
|
||||||
break;
|
break;
|
||||||
case muscle_string:
|
case muscle_string:
|
||||||
complain (&loc, Wdeprecated,
|
complain (&loc, Wdeprecated,
|
||||||
"%%define variable '%s' requires '\"...\"' values",
|
_("%%define variable '%s' requires '\"...\"' values"),
|
||||||
variable);
|
variable);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
+42
-24
@@ -1,4 +1,4 @@
|
|||||||
/* A Bison parser, made by GNU Bison 3.4.2.213-aa24. */
|
/* A Bison parser, made by GNU Bison 3.4.90.26-44cd. */
|
||||||
|
|
||||||
/* Bison implementation for Yacc-like parsers in C
|
/* Bison implementation for Yacc-like parsers in C
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
#define YYBISON 1
|
#define YYBISON 1
|
||||||
|
|
||||||
/* Bison version. */
|
/* Bison version. */
|
||||||
#define YYBISON_VERSION "3.4.2.213-aa24"
|
#define YYBISON_VERSION "3.4.90.26-44cd"
|
||||||
|
|
||||||
/* Skeleton name. */
|
/* Skeleton name. */
|
||||||
#define YYSKELETON_NAME "yacc.c"
|
#define YYSKELETON_NAME "yacc.c"
|
||||||
@@ -78,7 +78,15 @@
|
|||||||
#define yynerrs gram_nerrs
|
#define yynerrs gram_nerrs
|
||||||
|
|
||||||
|
|
||||||
|
# ifndef YY_CAST
|
||||||
|
# ifdef __cplusplus
|
||||||
|
# define YY_CAST(Type, Val) static_cast<Type> (Val)
|
||||||
|
# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
|
||||||
|
# else
|
||||||
|
# define YY_CAST(Type, Val) ((Type) (Val))
|
||||||
|
# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
# ifndef YY_NULLPTR
|
# ifndef YY_NULLPTR
|
||||||
# if defined __cplusplus
|
# if defined __cplusplus
|
||||||
# if 201103L <= __cplusplus
|
# if 201103L <= __cplusplus
|
||||||
@@ -289,10 +297,13 @@ typedef int yytype_uint16;
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define YYSIZE_MAXIMUM ((YYPTRDIFF_T) (YYPTRDIFF_MAXIMUM < (YYSIZE_T) -1 \
|
#define YYSIZE_MAXIMUM \
|
||||||
? YYPTRDIFF_MAXIMUM : (YYSIZE_T) -1))
|
YY_CAST (YYPTRDIFF_T, \
|
||||||
|
(YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \
|
||||||
|
? YYPTRDIFF_MAXIMUM \
|
||||||
|
: YY_CAST (YYSIZE_T, -1)))
|
||||||
|
|
||||||
#define YYSIZEOF(X) ((YYPTRDIFF_T) sizeof (X))
|
#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
|
||||||
|
|
||||||
/* Stored state numbers (used for stacks). */
|
/* Stored state numbers (used for stacks). */
|
||||||
typedef yytype_uint8 yy_state_t;
|
typedef yytype_uint8 yy_state_t;
|
||||||
@@ -451,7 +462,7 @@ union yyalloc
|
|||||||
# ifndef YYCOPY
|
# ifndef YYCOPY
|
||||||
# if defined __GNUC__ && 1 < __GNUC__
|
# if defined __GNUC__ && 1 < __GNUC__
|
||||||
# define YYCOPY(Dst, Src, Count) \
|
# define YYCOPY(Dst, Src, Count) \
|
||||||
__builtin_memcpy (Dst, Src, (YYSIZE_T) (Count) * sizeof (*(Src)))
|
__builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
|
||||||
# else
|
# else
|
||||||
# define YYCOPY(Dst, Src, Count) \
|
# define YYCOPY(Dst, Src, Count) \
|
||||||
do \
|
do \
|
||||||
@@ -499,11 +510,11 @@ static const yytype_int16 yyrline[] =
|
|||||||
453, 457, 467, 468, 469, 470, 474, 475, 480, 481,
|
453, 457, 467, 468, 469, 470, 474, 475, 480, 481,
|
||||||
485, 486, 490, 491, 492, 505, 514, 518, 522, 530,
|
485, 486, 490, 491, 492, 505, 514, 518, 522, 530,
|
||||||
531, 535, 548, 549, 561, 565, 569, 577, 579, 584,
|
531, 535, 548, 549, 561, 565, 569, 577, 579, 584,
|
||||||
591, 601, 605, 609, 617, 618, 626, 627, 633, 634,
|
591, 601, 605, 609, 617, 622, 634, 635, 641, 642,
|
||||||
635, 642, 642, 650, 651, 652, 657, 660, 662, 664,
|
643, 650, 650, 658, 659, 660, 665, 668, 670, 672,
|
||||||
666, 668, 670, 672, 674, 676, 681, 682, 691, 715,
|
674, 676, 678, 680, 682, 684, 689, 690, 699, 723,
|
||||||
716, 717, 718, 730, 732, 759, 764, 765, 770, 779,
|
724, 725, 726, 738, 740, 767, 772, 773, 778, 787,
|
||||||
780, 784, 785
|
788, 792, 793
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1225,8 +1236,9 @@ yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd,
|
|||||||
if (YYMAXDEPTH < yyalloc)
|
if (YYMAXDEPTH < yyalloc)
|
||||||
yyalloc = YYMAXDEPTH;
|
yyalloc = YYMAXDEPTH;
|
||||||
yybottom_new =
|
yybottom_new =
|
||||||
(yy_state_t *) YYSTACK_ALLOC ((YYSIZE_T)
|
YY_CAST (yy_state_t *,
|
||||||
(yyalloc * YYSIZEOF (*yybottom_new)));
|
YYSTACK_ALLOC (YY_CAST (YYSIZE_T,
|
||||||
|
yyalloc * YYSIZEOF (*yybottom_new))));
|
||||||
if (!yybottom_new)
|
if (!yybottom_new)
|
||||||
{
|
{
|
||||||
YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix,
|
YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix,
|
||||||
@@ -1398,7 +1410,7 @@ yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
|
|||||||
if (yyesp == yyes_prev)
|
if (yyesp == yyes_prev)
|
||||||
{
|
{
|
||||||
yyesp = *yyes;
|
yyesp = *yyes;
|
||||||
*yyesp = (yy_state_t) yystate;
|
*yyesp = YY_CAST (yy_state_t, yystate);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1411,7 +1423,7 @@ yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
|
|||||||
YYDPRINTF ((stderr, "\n"));
|
YYDPRINTF ((stderr, "\n"));
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
*++yyesp = (yy_state_t) yystate;
|
*++yyesp = YY_CAST (yy_state_t, yystate);
|
||||||
}
|
}
|
||||||
YYDPRINTF ((stderr, " G%d", yystate));
|
YYDPRINTF ((stderr, " G%d", yystate));
|
||||||
}
|
}
|
||||||
@@ -1423,7 +1435,7 @@ yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
|
|||||||
|
|
||||||
# ifndef yystrlen
|
# ifndef yystrlen
|
||||||
# if defined __GLIBC__ && defined _STRING_H
|
# if defined __GLIBC__ && defined _STRING_H
|
||||||
# define yystrlen(S) ((YYPTRDIFF_T) strlen (S))
|
# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
|
||||||
# else
|
# else
|
||||||
/* Return the length of YYSTR. */
|
/* Return the length of YYSTR. */
|
||||||
static YYPTRDIFF_T
|
static YYPTRDIFF_T
|
||||||
@@ -1845,7 +1857,7 @@ yynewstate:
|
|||||||
yysetstate:
|
yysetstate:
|
||||||
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
|
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
|
||||||
YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
|
YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
|
||||||
*yyssp = (yy_state_t) yystate;
|
*yyssp = YY_CAST (yy_state_t, yystate);
|
||||||
|
|
||||||
if (yyss + yystacksize - 1 <= yyssp)
|
if (yyss + yystacksize - 1 <= yyssp)
|
||||||
#if !defined yyoverflow && !defined YYSTACK_RELOCATE
|
#if !defined yyoverflow && !defined YYSTACK_RELOCATE
|
||||||
@@ -1888,8 +1900,8 @@ yysetstate:
|
|||||||
{
|
{
|
||||||
yy_state_t *yyss1 = yyss;
|
yy_state_t *yyss1 = yyss;
|
||||||
union yyalloc *yyptr =
|
union yyalloc *yyptr =
|
||||||
(union yyalloc *) YYSTACK_ALLOC ((YYSIZE_T)
|
YY_CAST (union yyalloc *,
|
||||||
YYSTACK_BYTES (yystacksize));
|
YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
|
||||||
if (! yyptr)
|
if (! yyptr)
|
||||||
goto yyexhaustedlab;
|
goto yyexhaustedlab;
|
||||||
YYSTACK_RELOCATE (yyss_alloc, yyss);
|
YYSTACK_RELOCATE (yyss_alloc, yyss);
|
||||||
@@ -1906,7 +1918,7 @@ yysetstate:
|
|||||||
yylsp = yyls + yysize - 1;
|
yylsp = yyls + yysize - 1;
|
||||||
|
|
||||||
YYDPRINTF ((stderr, "Stack size increased to %ld\n",
|
YYDPRINTF ((stderr, "Stack size increased to %ld\n",
|
||||||
(long) yystacksize));
|
YY_CAST (long, yystacksize)));
|
||||||
|
|
||||||
if (yyss + yystacksize - 1 <= yyssp)
|
if (yyss + yystacksize - 1 <= yyssp)
|
||||||
YYABORT;
|
YYABORT;
|
||||||
@@ -2399,11 +2411,17 @@ yyreduce:
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 84:
|
case 84:
|
||||||
{ (yyval.yytype_86) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
|
{
|
||||||
|
symbol_class_set ((yyvsp[0].symbol), pct_type_sym, (yylsp[0]), false);
|
||||||
|
(yyval.yytype_86) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 85:
|
case 85:
|
||||||
{ (yyval.yytype_86) = symbol_list_append ((yyvsp[-1].yytype_86), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
|
{
|
||||||
|
symbol_class_set ((yyvsp[0].symbol), pct_type_sym, (yylsp[0]), false);
|
||||||
|
(yyval.yytype_86) = symbol_list_append ((yyvsp[-1].yytype_86), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 90:
|
case 90:
|
||||||
@@ -2619,7 +2637,7 @@ yyerrlab:
|
|||||||
{
|
{
|
||||||
if (yymsg != yymsgbuf)
|
if (yymsg != yymsgbuf)
|
||||||
YYSTACK_FREE (yymsg);
|
YYSTACK_FREE (yymsg);
|
||||||
yymsg = (char *) YYSTACK_ALLOC ((YYSIZE_T) yymsg_alloc);
|
yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
|
||||||
if (!yymsg)
|
if (!yymsg)
|
||||||
{
|
{
|
||||||
yymsg = yymsgbuf;
|
yymsg = yymsgbuf;
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
/* A Bison parser, made by GNU Bison 3.4.2.213-aa24. */
|
/* A Bison parser, made by GNU Bison 3.4.90.26-44cd. */
|
||||||
|
|
||||||
/* Bison interface for Yacc-like parsers in C
|
/* Bison interface for Yacc-like parsers in C
|
||||||
|
|
||||||
|
|||||||
+15
-7
@@ -592,11 +592,11 @@ token_decl_for_prec:
|
|||||||
;
|
;
|
||||||
|
|
||||||
|
|
||||||
/*-----------------------.
|
/*-----------------------------------.
|
||||||
| symbol_decls (%type). |
|
| symbol_decls (argument of %type). |
|
||||||
`-----------------------*/
|
`-----------------------------------*/
|
||||||
|
|
||||||
// A non empty list of typed symbols.
|
// A non empty list of typed symbols (for %type).
|
||||||
symbol_decls:
|
symbol_decls:
|
||||||
symbol_decl.1[syms]
|
symbol_decl.1[syms]
|
||||||
{
|
{
|
||||||
@@ -612,10 +612,18 @@ symbol_decls:
|
|||||||
}
|
}
|
||||||
;
|
;
|
||||||
|
|
||||||
// One or more token declarations.
|
// One or more token declarations (for %type).
|
||||||
symbol_decl.1:
|
symbol_decl.1:
|
||||||
symbol { $$ = symbol_list_sym_new ($1, @1); }
|
symbol
|
||||||
| symbol_decl.1 symbol { $$ = symbol_list_append ($1, symbol_list_sym_new ($2, @2)); }
|
{
|
||||||
|
symbol_class_set ($symbol, pct_type_sym, @symbol, false);
|
||||||
|
$$ = symbol_list_sym_new ($symbol, @symbol);
|
||||||
|
}
|
||||||
|
| symbol_decl.1 symbol
|
||||||
|
{
|
||||||
|
symbol_class_set ($symbol, pct_type_sym, @symbol, false);
|
||||||
|
$$ = symbol_list_append ($1, symbol_list_sym_new ($symbol, @symbol));
|
||||||
|
}
|
||||||
;
|
;
|
||||||
|
|
||||||
/*------------------------------------------.
|
/*------------------------------------------.
|
||||||
|
|||||||
+2
-6
@@ -232,12 +232,8 @@ grammar_current_rule_begin (symbol *lhs, location loc,
|
|||||||
assign_named_ref (current_rule, named_ref_copy (lhs_name));
|
assign_named_ref (current_rule, named_ref_copy (lhs_name));
|
||||||
|
|
||||||
/* Mark the rule's lhs as a nonterminal if not already so. */
|
/* Mark the rule's lhs as a nonterminal if not already so. */
|
||||||
if (lhs->content->class == unknown_sym)
|
if (lhs->content->class == unknown_sym || lhs->content->class == pct_type_sym)
|
||||||
{
|
symbol_class_set (lhs, nterm_sym, empty_loc, false);
|
||||||
lhs->content->class = nterm_sym;
|
|
||||||
lhs->content->number = nvars;
|
|
||||||
++nvars;
|
|
||||||
}
|
|
||||||
else if (lhs->content->class == token_sym)
|
else if (lhs->content->class == token_sym)
|
||||||
complain (&loc, complaint, _("rule given for %s, which is a token"),
|
complain (&loc, complaint, _("rule given for %s, which is a token"),
|
||||||
lhs->tag);
|
lhs->tag);
|
||||||
|
|||||||
+36
-5
@@ -26,13 +26,12 @@
|
|||||||
#include <assure.h>
|
#include <assure.h>
|
||||||
#include <fstrcmp.h>
|
#include <fstrcmp.h>
|
||||||
#include <hash.h>
|
#include <hash.h>
|
||||||
|
#include <quote.h>
|
||||||
|
|
||||||
#include "complain.h"
|
#include "complain.h"
|
||||||
#include "getargs.h"
|
#include "getargs.h"
|
||||||
#include "gram.h"
|
#include "gram.h"
|
||||||
#include "intprops.h"
|
#include "intprops.h"
|
||||||
#include "quote.h"
|
|
||||||
|
|
||||||
|
|
||||||
static struct hash_table *symbol_table = NULL;
|
static struct hash_table *symbol_table = NULL;
|
||||||
static struct hash_table *semantic_type_table = NULL;
|
static struct hash_table *semantic_type_table = NULL;
|
||||||
@@ -233,7 +232,14 @@ symbol_print (symbol const *s, FILE *f)
|
|||||||
{
|
{
|
||||||
if (s)
|
if (s)
|
||||||
{
|
{
|
||||||
fputs (s->tag, f);
|
symbol_class c = s->content->class;
|
||||||
|
fprintf (f, "%s: %s",
|
||||||
|
c == unknown_sym ? "unknown"
|
||||||
|
: c == pct_type_sym ? "%type"
|
||||||
|
: c == token_sym ? "token"
|
||||||
|
: c == nterm_sym ? "nterm"
|
||||||
|
: NULL, /* abort. */
|
||||||
|
s->tag);
|
||||||
SYMBOL_ATTR_PRINT (type_name);
|
SYMBOL_ATTR_PRINT (type_name);
|
||||||
SYMBOL_CODE_PRINT (destructor);
|
SYMBOL_CODE_PRINT (destructor);
|
||||||
SYMBOL_CODE_PRINT (printer);
|
SYMBOL_CODE_PRINT (printer);
|
||||||
@@ -502,15 +508,33 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
|
|||||||
| Set the CLASS associated with SYM. |
|
| Set the CLASS associated with SYM. |
|
||||||
`------------------------------------*/
|
`------------------------------------*/
|
||||||
|
|
||||||
|
static void
|
||||||
|
complain_pct_type_on_token (location *loc)
|
||||||
|
{
|
||||||
|
complain (loc, Wyacc,
|
||||||
|
_("POSIX yacc reserves %%type to nonterminals"));
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
|
symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
|
||||||
{
|
{
|
||||||
aver (class != unknown_sym);
|
aver (class != unknown_sym);
|
||||||
sym_content *s = sym->content;
|
sym_content *s = sym->content;
|
||||||
if (s->class != unknown_sym && s->class != class)
|
if (class == pct_type_sym)
|
||||||
|
{
|
||||||
|
if (s->class == token_sym)
|
||||||
|
complain_pct_type_on_token (&loc);
|
||||||
|
else if (s->class == unknown_sym)
|
||||||
|
s->class = class;
|
||||||
|
}
|
||||||
|
else if (s->class != unknown_sym && s->class != pct_type_sym
|
||||||
|
&& s->class != class)
|
||||||
complain_class_redeclared (sym, class, loc);
|
complain_class_redeclared (sym, class, loc);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
if (class == token_sym && s->class == pct_type_sym)
|
||||||
|
complain_pct_type_on_token (&sym->location);
|
||||||
|
|
||||||
if (class == nterm_sym && s->class != nterm_sym)
|
if (class == nterm_sym && s->class != nterm_sym)
|
||||||
s->number = nvars++;
|
s->number = nvars++;
|
||||||
else if (class == token_sym && s->number == NUMBER_UNDEFINED)
|
else if (class == token_sym && s->number == NUMBER_UNDEFINED)
|
||||||
@@ -579,13 +603,20 @@ static void
|
|||||||
symbol_check_defined (symbol *sym)
|
symbol_check_defined (symbol *sym)
|
||||||
{
|
{
|
||||||
sym_content *s = sym->content;
|
sym_content *s = sym->content;
|
||||||
if (s->class == unknown_sym)
|
if (s->class == unknown_sym || s->class == pct_type_sym)
|
||||||
{
|
{
|
||||||
complain_symbol_undeclared (sym);
|
complain_symbol_undeclared (sym);
|
||||||
s->class = nterm_sym;
|
s->class = nterm_sym;
|
||||||
s->number = nvars++;
|
s->number = nvars++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (s->class == token_sym
|
||||||
|
&& sym->tag[0] == '"'
|
||||||
|
&& !sym->is_alias)
|
||||||
|
complain (&sym->location, Wdangling_alias,
|
||||||
|
_("string literal %s not attached to a symbol"),
|
||||||
|
sym->tag);
|
||||||
|
|
||||||
for (int i = 0; i < 2; ++i)
|
for (int i = 0; i < 2; ++i)
|
||||||
symbol_code_props_get (sym, i)->is_used = true;
|
symbol_code_props_get (sym, i)->is_used = true;
|
||||||
|
|
||||||
|
|||||||
+10
-4
@@ -38,9 +38,15 @@
|
|||||||
/** Symbol classes. */
|
/** Symbol classes. */
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
unknown_sym, /**< Undefined. */
|
/** Undefined. */
|
||||||
token_sym, /**< Terminal. */
|
unknown_sym,
|
||||||
nterm_sym /**< Nonterminal. */
|
/** Declared with %type: same as Undefined, but triggered a Wyacc if
|
||||||
|
applied to a terminal. */
|
||||||
|
pct_type_sym,
|
||||||
|
/** Terminal. */
|
||||||
|
token_sym,
|
||||||
|
/** Nonterminal. */
|
||||||
|
nterm_sym
|
||||||
} symbol_class;
|
} symbol_class;
|
||||||
|
|
||||||
|
|
||||||
@@ -219,7 +225,7 @@ void symbol_precedence_set (symbol *sym, int prec, assoc a, location loc);
|
|||||||
/** Set the \c class associated with \c sym.
|
/** Set the \c class associated with \c sym.
|
||||||
|
|
||||||
Whether \c declaring means whether this class definition comes
|
Whether \c declaring means whether this class definition comes
|
||||||
from %nterm or %token. */
|
from %nterm or %token (but not %type, prec/assoc, etc.). */
|
||||||
void symbol_class_set (symbol *sym, symbol_class class, location loc,
|
void symbol_class_set (symbol *sym, symbol_class class, location loc,
|
||||||
bool declaring);
|
bool declaring);
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -772,10 +772,10 @@ static
|
|||||||
static int counter = 0;
|
static int counter = 0;
|
||||||
|
|
||||||
int c = ]AT_VAL[]m4_ifval([$6], [.ival])[ = counter++;
|
int c = ]AT_VAL[]m4_ifval([$6], [.ival])[ = counter++;
|
||||||
|
assert (c <= YY_CAST (int, strlen (source)));
|
||||||
/* As in BASIC, line numbers go from 10 to 10. */
|
/* As in BASIC, line numbers go from 10 to 10. */
|
||||||
]AT_LOC_FIRST_LINE[ = ]AT_LOC_FIRST_COLUMN[ = (10 * c);
|
]AT_LOC_FIRST_LINE[ = ]AT_LOC_FIRST_COLUMN[ = (10 * c);
|
||||||
]AT_LOC_LAST_LINE[ = ]AT_LOC_LAST_COLUMN[ = ]AT_LOC_FIRST_LINE[ + 9;
|
]AT_LOC_LAST_LINE[ = ]AT_LOC_LAST_COLUMN[ = ]AT_LOC_FIRST_LINE[ + 9;
|
||||||
assert (c <= (int) strlen (source));
|
|
||||||
if (source[c])
|
if (source[c])
|
||||||
fprintf (stderr, "sending: '%c'", source[c]);
|
fprintf (stderr, "sending: '%c'", source[c]);
|
||||||
else
|
else
|
||||||
@@ -1780,7 +1780,8 @@ float: UNTYPED INT
|
|||||||
yy::parser::token::INT,
|
yy::parser::token::INT,
|
||||||
EOF}]],
|
EOF}]],
|
||||||
[[{UNTYPED, INT, EOF}]]),
|
[[{UNTYPED, INT, EOF}]]),
|
||||||
[AT_VAL.ival = (int) toknum * 10; AT_VAL.fval = (float) toknum / 10.0f;])[
|
[AT_VAL.ival = YY_CAST (int, toknum) * 10;
|
||||||
|
AT_VAL.fval = YY_CAST (float, toknum) / 10.0f;])[
|
||||||
]AT_MAIN_DEFINE[
|
]AT_MAIN_DEFINE[
|
||||||
]])
|
]])
|
||||||
|
|
||||||
@@ -1805,7 +1806,6 @@ AT_CLEANUP
|
|||||||
])
|
])
|
||||||
|
|
||||||
m4_map_args([AT_TEST], [yacc.c], [glr.c], [lalr1.cc], [glr.cc])
|
m4_map_args([AT_TEST], [yacc.c], [glr.c], [lalr1.cc], [glr.cc])
|
||||||
|
|
||||||
m4_popdef([AT_TEST])
|
m4_popdef([AT_TEST])
|
||||||
|
|
||||||
## -------------------------------------------------- ##
|
## -------------------------------------------------- ##
|
||||||
@@ -1897,7 +1897,7 @@ exp:
|
|||||||
|
|
||||||
%%
|
%%
|
||||||
]AT_YYERROR_DEFINE[
|
]AT_YYERROR_DEFINE[
|
||||||
]AT_YYLEX_DEFINE(["bcd"], [*lvalp = (int) ((toknum + 1) * 10)])[
|
]AT_YYLEX_DEFINE(["bcd"], [*lvalp = YY_CAST (int, (toknum + 1) * 10)])[
|
||||||
]AT_MAIN_DEFINE[
|
]AT_MAIN_DEFINE[
|
||||||
]])
|
]])
|
||||||
AT_BISON_OPTION_POPDEFS
|
AT_BISON_OPTION_POPDEFS
|
||||||
|
|||||||
+1
-1
@@ -37,7 +37,7 @@ fi
|
|||||||
# We redirect stderr, which breaks the computation of the terminal
|
# We redirect stderr, which breaks the computation of the terminal
|
||||||
# screen width. So export COLUMNS to Bison, hoping for the shell to
|
# screen width. So export COLUMNS to Bison, hoping for the shell to
|
||||||
# have defined it.
|
# have defined it.
|
||||||
: ${COLUMNS=`tput cols || echo 132`}
|
: ${COLUMNS=`(tput cols) 2>/dev/null || echo 132`}
|
||||||
export COLUMNS
|
export COLUMNS
|
||||||
$PREBISON "$abs_top_builddir/src/bison" ${1+"$@"} 2>"$stderr"
|
$PREBISON "$abs_top_builddir/src/bison" ${1+"$@"} 2>"$stderr"
|
||||||
status=$?
|
status=$?
|
||||||
|
|||||||
+18
-21
@@ -178,7 +178,7 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
buffer[i++] = (char) c;
|
buffer[i++] = YY_CAST (char, c);
|
||||||
colNum += 1;
|
colNum += 1;
|
||||||
assert (i != sizeof buffer - 1);
|
assert (i != sizeof buffer - 1);
|
||||||
c = getchar ();
|
c = getchar ();
|
||||||
@@ -187,8 +187,8 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
ungetc (c, stdin);
|
ungetc (c, stdin);
|
||||||
buffer[i++] = 0;
|
buffer[i++] = 0;
|
||||||
tok = isupper ((unsigned char) buffer[0]) ? TYPENAME : ID;
|
tok = isupper (YY_CAST (unsigned char, buffer[0])) ? TYPENAME : ID;
|
||||||
yylval = new_term (strcpy ((char *) malloc (i), buffer));
|
yylval = new_term (strcpy (YY_CAST (char *, malloc (i)), buffer));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -206,7 +206,7 @@ main (int argc, char **argv)
|
|||||||
static Node *
|
static Node *
|
||||||
new_nterm (char const *form, Node *child0, Node *child1, Node *child2)
|
new_nterm (char const *form, Node *child0, Node *child1, Node *child2)
|
||||||
{
|
{
|
||||||
Node *node = (Node *) malloc (sizeof (Node));
|
Node *node = YY_CAST (Node *, malloc (sizeof (Node)));
|
||||||
node->nterm.isNterm = 1;
|
node->nterm.isNterm = 1;
|
||||||
node->nterm.parents = 0;
|
node->nterm.parents = 0;
|
||||||
node->nterm.form = form;
|
node->nterm.form = form;
|
||||||
@@ -225,7 +225,7 @@ new_nterm (char const *form, Node *child0, Node *child1, Node *child2)
|
|||||||
static Node *
|
static Node *
|
||||||
new_term (char *text)
|
new_term (char *text)
|
||||||
{
|
{
|
||||||
Node *node = (Node *) malloc (sizeof (Node));
|
Node *node = YY_CAST (Node *, malloc (sizeof (Node)));
|
||||||
node->term.isNterm = 0;
|
node->term.isNterm = 0;
|
||||||
node->term.parents = 0;
|
node->term.parents = 0;
|
||||||
node->term.text = text;
|
node->term.text = text;
|
||||||
@@ -255,30 +255,27 @@ free_node (Node *node)
|
|||||||
static char *
|
static char *
|
||||||
node_to_string (Node *node)
|
node_to_string (Node *node)
|
||||||
{
|
{
|
||||||
char *child0;
|
char *res;
|
||||||
char *child1;
|
|
||||||
char *child2;
|
|
||||||
char *buffer;
|
|
||||||
if (!node)
|
if (!node)
|
||||||
{
|
{
|
||||||
buffer = (char *) malloc (1);
|
res = YY_CAST (char *, malloc (1));
|
||||||
buffer[0] = 0;
|
res[0] = 0;
|
||||||
}
|
}
|
||||||
else if (node->nodeInfo.isNterm == 1)
|
else if (node->nodeInfo.isNterm == 1)
|
||||||
{
|
{
|
||||||
child0 = node_to_string (node->nterm.children[0]);
|
char *child0 = node_to_string (node->nterm.children[0]);
|
||||||
child1 = node_to_string (node->nterm.children[1]);
|
char *child1 = node_to_string (node->nterm.children[1]);
|
||||||
child2 = node_to_string (node->nterm.children[2]);
|
char *child2 = node_to_string (node->nterm.children[2]);
|
||||||
buffer = (char *) malloc (strlen (node->nterm.form) + strlen (child0)
|
res = YY_CAST (char *, malloc (strlen (node->nterm.form) + strlen (child0)
|
||||||
+ strlen (child1) + strlen (child2) + 1);
|
+ strlen (child1) + strlen (child2) + 1));
|
||||||
sprintf (buffer, node->nterm.form, child0, child1, child2);
|
sprintf (res, node->nterm.form, child0, child1, child2);
|
||||||
free (child0);
|
|
||||||
free (child1);
|
|
||||||
free (child2);
|
free (child2);
|
||||||
|
free (child1);
|
||||||
|
free (child0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
buffer = strdup (node->term.text);
|
res = strdup (node->term.text);
|
||||||
return buffer;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
]]
|
]]
|
||||||
|
|||||||
+20
-42
@@ -1,4 +1,4 @@
|
|||||||
# Checking diagnotics. -*- Autotest -*-
|
# Checking diagnostics. -*- Autotest -*-
|
||||||
|
|
||||||
# Copyright (C) 2019 Free Software Foundation, Inc.
|
# Copyright (C) 2019 Free Software Foundation, Inc.
|
||||||
|
|
||||||
@@ -30,7 +30,8 @@ AT_KEYWORDS([diagnostics])
|
|||||||
|
|
||||||
# We need UTF-8 support for correct screen-width computation of UTF-8
|
# We need UTF-8 support for correct screen-width computation of UTF-8
|
||||||
# characters. Skip the test if not available.
|
# characters. Skip the test if not available.
|
||||||
AT_SKIP_IF([! locale -a | grep '^en_US.UTF-8$'])
|
locale=`locale -a | $EGREP '^en_US\.(UTF-8|utf8)$' | sed 1q`
|
||||||
|
AT_SKIP_IF([test x == x"$locale"])
|
||||||
|
|
||||||
AT_BISON_OPTION_PUSHDEFS
|
AT_BISON_OPTION_PUSHDEFS
|
||||||
|
|
||||||
@@ -45,7 +46,7 @@ fi
|
|||||||
|
|
||||||
AT_DATA([experr], [$4])
|
AT_DATA([experr], [$4])
|
||||||
|
|
||||||
AT_CHECK([LC_ALL=en_US.UTF-8 $5 bison -fcaret --color=debug -Wall input.y], [$3], [], [experr])
|
AT_CHECK([LC_ALL="$locale" $5 bison -fcaret --color=debug -Wall input.y], [$3], [], [experr])
|
||||||
|
|
||||||
# When no style, same messages, but without style.
|
# When no style, same messages, but without style.
|
||||||
AT_PERL_REQUIRE([-pi -e 's{(</?(-|\w)+>)}{ $[]1 eq "<tag>" ? $[]1 : "" }ge' experr])
|
AT_PERL_REQUIRE([-pi -e 's{(</?(-|\w)+>)}{ $[]1 eq "<tag>" ? $[]1 : "" }ge' experr])
|
||||||
@@ -53,7 +54,7 @@ AT_PERL_REQUIRE([-pi -e 's{(</?(-|\w)+>)}{ $[]1 eq "<tag>" ? $[]1 : "" }ge' expe
|
|||||||
# Cannot use AT_BISON_CHECK easily as we need to change the
|
# Cannot use AT_BISON_CHECK easily as we need to change the
|
||||||
# environment.
|
# environment.
|
||||||
# FIXME: Enhance AT_BISON_CHECK.
|
# FIXME: Enhance AT_BISON_CHECK.
|
||||||
AT_CHECK([LC_ALL=en_US.UTF-8 $5 bison -fcaret -Wall input.y], [$3], [], [experr])
|
AT_CHECK([LC_ALL="$locale" $5 bison -fcaret -Wall input.y], [$3], [], [experr])
|
||||||
|
|
||||||
|
|
||||||
AT_BISON_OPTION_POPDEFS
|
AT_BISON_OPTION_POPDEFS
|
||||||
@@ -233,49 +234,26 @@ input.y: <warning>warning:</warning> fix-its can be applied. Rerun with option
|
|||||||
]])
|
]])
|
||||||
|
|
||||||
|
|
||||||
## ------------------- ##
|
## -------------------- ##
|
||||||
## Locations from M4. ##
|
## Complaints from M4. ##
|
||||||
## ------------------- ##
|
## -------------------- ##
|
||||||
|
|
||||||
# Locations coming from m4 need the byte-column for diagnostics.
|
# Complaints issued m4 need complete locations (byte and column) for
|
||||||
|
# diagnostics.
|
||||||
|
|
||||||
AT_TEST([[Locations from M4]],
|
AT_TEST([[Complaints from M4]],
|
||||||
[[%define api.prefix {foo}
|
[[%define error1 {e}
|
||||||
%define api.prefix {bar}
|
%define error2 {é}
|
||||||
%%
|
%%
|
||||||
exp:;
|
exp: %empty;
|
||||||
]],
|
]],
|
||||||
[1],
|
[1],
|
||||||
[[input.y:10.1-24: <error>error:</error> %define variable 'api.prefix' redefined
|
[[input.y:9.1-27: <error>error:</error> %define variable 'error1' is not used
|
||||||
10 | <error>%define api.prefix {bar}</error>
|
9 | <error>%define error1 {e}</error>
|
||||||
| <error>^~~~~~~~~~~~~~~~~~~~~~~~</error>
|
| <error>^~~~~~~~~~~~~~~~~~~~~~~~~~~</error>
|
||||||
input.y:9.1-24: previous definition
|
input.y:10.1-27: <error>error:</error> %define variable 'error2' is not used
|
||||||
9 | <note>%define api.prefix {foo}</note>
|
10 | <error>%define error2 {é}</error>
|
||||||
| <note>^~~~~~~~~~~~~~~~~~~~~~~~</note>
|
| <error>^~~~~~~~~~~~~~~~~~~~~~~~~~~</error>
|
||||||
input.y: <warning>warning:</warning> fix-its can be applied. Rerun with option '--update'. [<warning>-Wother</warning>]
|
|
||||||
]])
|
|
||||||
|
|
||||||
|
|
||||||
## ---------------------------------------------- ##
|
|
||||||
## Tabulations and multibyte characters from M4. ##
|
|
||||||
## ---------------------------------------------- ##
|
|
||||||
|
|
||||||
# Locations coming from m4 need the byte-column for diagnostics.
|
|
||||||
|
|
||||||
AT_TEST([[Tabulations and multibyte characters from M4]],
|
|
||||||
[[%define api.prefix {sun}
|
|
||||||
%define api.prefix {🌞}
|
|
||||||
%%
|
|
||||||
exp:;
|
|
||||||
]],
|
|
||||||
[1],
|
|
||||||
[[input.y:10.1-35: <error>error:</error> %define variable 'api.prefix' redefined
|
|
||||||
10 | <error>%define api.prefix {🌞}</error>
|
|
||||||
| <error>^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</error>
|
|
||||||
input.y:9.1-37: previous definition
|
|
||||||
9 | <note>%define api.prefix {sun}</note>
|
|
||||||
| <note>^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~</note>
|
|
||||||
input.y: <warning>warning:</warning> fix-its can be applied. Rerun with option '--update'. [<warning>-Wother</warning>]
|
|
||||||
]])
|
]])
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+20
-17
@@ -153,7 +153,7 @@ var_list:
|
|||||||
{ $$ = $1; }
|
{ $$ = $1; }
|
||||||
| var ',' var_list
|
| var ',' var_list
|
||||||
{
|
{
|
||||||
char *s = (char *) realloc ($1, strlen ($1) + 1 + strlen ($3) + 1);
|
char *s = YY_CAST (char *, realloc ($1, strlen ($1) + 1 + strlen ($3) + 1));
|
||||||
strcat (s, ",");
|
strcat (s, ",");
|
||||||
strcat (s, $3);
|
strcat (s, $3);
|
||||||
free ($3);
|
free ($3);
|
||||||
@@ -172,7 +172,6 @@ int
|
|||||||
yylex (void)
|
yylex (void)
|
||||||
{
|
{
|
||||||
char buf[50];
|
char buf[50];
|
||||||
char *s;
|
|
||||||
assert (!feof (stdin));
|
assert (!feof (stdin));
|
||||||
switch (fscanf (input, " %1[a-z,]", buf))
|
switch (fscanf (input, " %1[a-z,]", buf))
|
||||||
{
|
{
|
||||||
@@ -181,15 +180,19 @@ yylex (void)
|
|||||||
case EOF:
|
case EOF:
|
||||||
return 0;
|
return 0;
|
||||||
default:
|
default:
|
||||||
|
if (fscanf (input, "%49s", buf) != 1)
|
||||||
|
return 0;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
char *s;
|
||||||
|
assert (strlen (buf) < sizeof buf - 1);
|
||||||
|
s = YY_CAST (char *, malloc (strlen (buf) + 1));
|
||||||
|
strcpy (s, buf);
|
||||||
|
yylval = s;
|
||||||
|
return 'V';
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (fscanf (input, "%49s", buf) != 1)
|
|
||||||
return 0;
|
|
||||||
assert (strlen (buf) < sizeof buf - 1);
|
|
||||||
s = (char *) malloc (strlen (buf) + 1);
|
|
||||||
strcpy (s, buf);
|
|
||||||
yylval = s;
|
|
||||||
return 'V';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@@ -419,7 +422,7 @@ make_value (char const *parent, char const *child)
|
|||||||
{
|
{
|
||||||
char const format[] = "%s <- %s";
|
char const format[] = "%s <- %s";
|
||||||
char *value = *ptrs_next++ =
|
char *value = *ptrs_next++ =
|
||||||
(char *) malloc (strlen (parent) + strlen (child) + sizeof format);
|
YY_CAST (char *, malloc (strlen (parent) + strlen (child) + sizeof format));
|
||||||
sprintf (value, format, parent, child);
|
sprintf (value, format, parent, child);
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
@@ -429,7 +432,7 @@ merge (YYSTYPE s1, YYSTYPE s2)
|
|||||||
{
|
{
|
||||||
char const format[] = "merge{ %s and %s }";
|
char const format[] = "merge{ %s and %s }";
|
||||||
char *value = *ptrs_next++ =
|
char *value = *ptrs_next++ =
|
||||||
(char *) malloc (strlen (s1.ptr) + strlen (s2.ptr) + sizeof format);
|
YY_CAST (char *, malloc (strlen (s1.ptr) + strlen (s2.ptr) + sizeof format));
|
||||||
sprintf (value, format, s1.ptr, s2.ptr);
|
sprintf (value, format, s1.ptr, s2.ptr);
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
@@ -601,7 +604,7 @@ stack2: 'a' ;
|
|||||||
static int
|
static int
|
||||||
yylex (void)
|
yylex (void)
|
||||||
{
|
{
|
||||||
yylval.node = (count_node*) malloc (sizeof *yylval.node);
|
yylval.node = YY_CAST (count_node*, malloc (sizeof *yylval.node));
|
||||||
if (!yylval.node)
|
if (!yylval.node)
|
||||||
{
|
{
|
||||||
fprintf (stderr, "Test inconclusive.\n");
|
fprintf (stderr, "Test inconclusive.\n");
|
||||||
@@ -1118,7 +1121,7 @@ change_lookahead:
|
|||||||
|
|
||||||
]AT_YYERROR_DEFINE[
|
]AT_YYERROR_DEFINE[
|
||||||
]AT_YYLEX_DEFINE(["ab"],
|
]AT_YYLEX_DEFINE(["ab"],
|
||||||
[yylval.value = (char) (res + 'A' - 'a')])[
|
[yylval.value = YY_CAST (char, res + 'A' - 'a')])[
|
||||||
|
|
||||||
static void
|
static void
|
||||||
print_lookahead (char const *reduction)
|
print_lookahead (char const *reduction)
|
||||||
@@ -1319,10 +1322,10 @@ yylex (void)
|
|||||||
{
|
{
|
||||||
static char const input[] = "abcdddd";
|
static char const input[] = "abcdddd";
|
||||||
static int toknum = 0;
|
static int toknum = 0;
|
||||||
assert (toknum < (int) sizeof input);
|
assert (toknum < YY_CAST (int, sizeof input));
|
||||||
yylloc.first_line = yylloc.last_line = 1;
|
yylloc.first_line = yylloc.last_line = 1;
|
||||||
yylloc.first_column = yylloc.last_column = toknum + 1;
|
yylloc.first_column = yylloc.last_column = toknum + 1;
|
||||||
yylval.value = (char) (input[toknum] + 'A' - 'a');
|
yylval.value = YY_CAST (char, input[toknum] + 'A' - 'a');
|
||||||
return input[toknum++];
|
return input[toknum++];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1349,7 +1352,7 @@ print_lookahead (char const *reduction)
|
|||||||
static char
|
static char
|
||||||
merge (union YYSTYPE s1, union YYSTYPE s2)
|
merge (union YYSTYPE s1, union YYSTYPE s2)
|
||||||
{
|
{
|
||||||
return (char) (s1.value + s2.value);
|
return YY_CAST (char, s1.value + s2.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@@ -1577,7 +1580,7 @@ yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
|
|||||||
{
|
{
|
||||||
static char const input[] = "ab";
|
static char const input[] = "ab";
|
||||||
static int toknum = 0;
|
static int toknum = 0;
|
||||||
assert (toknum < (int) sizeof input);
|
assert (toknum < YY_CAST (int, sizeof input));
|
||||||
lvalp->dummy = 0;
|
lvalp->dummy = 0;
|
||||||
llocp->first_line = llocp->last_line = 2;
|
llocp->first_line = llocp->last_line = 2;
|
||||||
llocp->first_column = toknum + 1;
|
llocp->first_column = toknum + 1;
|
||||||
|
|||||||
@@ -322,6 +322,7 @@ AT_PERL_CHECK([[-n -0777 -e '
|
|||||||
|YYPUSH_MORE(?:_DEFINED)?
|
|YYPUSH_MORE(?:_DEFINED)?
|
||||||
|YYUSE
|
|YYUSE
|
||||||
|YY_ATTRIBUTE(?:_PURE|_UNUSED)
|
|YY_ATTRIBUTE(?:_PURE|_UNUSED)
|
||||||
|
|YY(?:_REINTERPRET)?_CAST
|
||||||
|YY_CONSTEXPR
|
|YY_CONSTEXPR
|
||||||
|YY_COPY
|
|YY_COPY
|
||||||
|YY_CPLUSPLUS
|
|YY_CPLUSPLUS
|
||||||
|
|||||||
@@ -195,6 +195,55 @@ input.y:7.4-9: warning: POSIX Yacc does not support %empty [-Wyacc]
|
|||||||
AT_CLEANUP
|
AT_CLEANUP
|
||||||
|
|
||||||
|
|
||||||
|
## -------------- ##
|
||||||
|
## Yacc's %type. ##
|
||||||
|
## -------------- ##
|
||||||
|
|
||||||
|
AT_SETUP([Yacc's %type])
|
||||||
|
|
||||||
|
AT_DATA([input.y],
|
||||||
|
[[%token TOKEN1
|
||||||
|
%nterm nterm1
|
||||||
|
%type <ival> TOKEN1 TOKEN2 "TOKEN3" nterm1 nterm2 nterm3 '+'
|
||||||
|
%token TOKEN2
|
||||||
|
%nterm nterm2
|
||||||
|
%%
|
||||||
|
expr: nterm1 nterm2 nterm3
|
||||||
|
nterm1: TOKEN1
|
||||||
|
nterm2: TOKEN2
|
||||||
|
nterm3: "TOKEN3"
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_BISON_CHECK([-fcaret -Wyacc input.y], [0], [],
|
||||||
|
[[input.y:2.1-6: warning: POSIX Yacc does not support %nterm [-Wyacc]
|
||||||
|
2 | %nterm nterm1
|
||||||
|
| ^~~~~~
|
||||||
|
input.y:3.14-19: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
|
||||||
|
3 | %type <ival> TOKEN1 TOKEN2 "TOKEN3" nterm1 nterm2 nterm3 '+'
|
||||||
|
| ^~~~~~
|
||||||
|
input.y:3.28-35: warning: POSIX Yacc does not support string literals [-Wyacc]
|
||||||
|
3 | %type <ival> TOKEN1 TOKEN2 "TOKEN3" nterm1 nterm2 nterm3 '+'
|
||||||
|
| ^~~~~~~~
|
||||||
|
input.y:3.28-35: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
|
||||||
|
3 | %type <ival> TOKEN1 TOKEN2 "TOKEN3" nterm1 nterm2 nterm3 '+'
|
||||||
|
| ^~~~~~~~
|
||||||
|
input.y:3.58-60: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
|
||||||
|
3 | %type <ival> TOKEN1 TOKEN2 "TOKEN3" nterm1 nterm2 nterm3 '+'
|
||||||
|
| ^~~
|
||||||
|
input.y:5.1-6: warning: POSIX Yacc does not support %nterm [-Wyacc]
|
||||||
|
5 | %nterm nterm2
|
||||||
|
| ^~~~~~
|
||||||
|
input.y:3.21-26: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
|
||||||
|
3 | %type <ival> TOKEN1 TOKEN2 "TOKEN3" nterm1 nterm2 nterm3 '+'
|
||||||
|
| ^~~~~~
|
||||||
|
input.y:10.9-16: warning: POSIX Yacc does not support string literals [-Wyacc]
|
||||||
|
10 | nterm3: "TOKEN3"
|
||||||
|
| ^~~~~~~~
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_CLEANUP
|
||||||
|
|
||||||
|
|
||||||
## ----------------------------- ##
|
## ----------------------------- ##
|
||||||
## Invalid symbol declarations. ##
|
## Invalid symbol declarations. ##
|
||||||
## ----------------------------- ##
|
## ----------------------------- ##
|
||||||
@@ -249,6 +298,31 @@ input.y:8.14: error: syntax error, unexpected integer
|
|||||||
AT_CLEANUP
|
AT_CLEANUP
|
||||||
|
|
||||||
|
|
||||||
|
## ------------------ ##
|
||||||
|
## Dangling aliases. ##
|
||||||
|
## ------------------ ##
|
||||||
|
|
||||||
|
AT_SETUP([Dangling aliases])
|
||||||
|
|
||||||
|
AT_DATA([input.y],
|
||||||
|
[[%token FOO "foo"
|
||||||
|
%type <val> "bar"
|
||||||
|
%%
|
||||||
|
expr: "foo" "bar" "baz"
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_BISON_CHECK([-fcaret -Wdangling input.y], [0], [],
|
||||||
|
[[input.y:2.13-17: warning: string literal "bar" not attached to a symbol [-Wdangling-alias]
|
||||||
|
2 | %type <val> "bar"
|
||||||
|
| ^~~~~
|
||||||
|
input.y:4.19-23: warning: string literal "baz" not attached to a symbol [-Wdangling-alias]
|
||||||
|
4 | expr: "foo" "bar" "baz"
|
||||||
|
| ^~~~~
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_CLEANUP
|
||||||
|
|
||||||
|
|
||||||
## --------------------- ##
|
## --------------------- ##
|
||||||
## Symbol declarations. ##
|
## Symbol declarations. ##
|
||||||
## --------------------- ##
|
## --------------------- ##
|
||||||
|
|||||||
+6
-2
@@ -47,8 +47,12 @@ done
|
|||||||
foo: '0' {};
|
foo: '0' {};
|
||||||
]])
|
]])
|
||||||
|
|
||||||
# There is not AT_DATA_UNQUOTED.
|
# There is no AT_DATA_UNQUOTED.
|
||||||
AT_PERL_REQUIRE([-pi -e 's{\$at_dir}'"{$at_group_dir}g" $1])
|
if $EGREP 'at_dir' $1 >/dev/null; then
|
||||||
|
AT_PERL_REQUIRE([-pi -e 's{\$at_dir}'"{$at_group_dir}g" $1])
|
||||||
|
# On Cygwin, up to Perl 5.28, 'perl -pi' left a foo.bak file.
|
||||||
|
AT_CHECK([rm -f $1.bak])
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
AT_BISON_CHECK([$3 $1], [$5], [], [ignore])[
|
AT_BISON_CHECK([$3 $1], [$5], [], [ignore])[
|
||||||
|
|||||||
+105
-6
@@ -329,14 +329,27 @@ Reduced Grammar
|
|||||||
|
|
||||||
ntokens = 7, nvars = 4, nsyms = 11, nrules = 6, nritems = 17
|
ntokens = 7, nvars = 4, nsyms = 11, nrules = 6, nritems = 17
|
||||||
|
|
||||||
Variables
|
Tokens
|
||||||
---------
|
------
|
||||||
|
|
||||||
Value Sprec Sassoc Tag
|
Value Sprec Sassoc Tag
|
||||||
7 0 0 $accept
|
0 0 0 $end
|
||||||
8 0 0 expr
|
1 0 0 error
|
||||||
9 0 0 term
|
2 0 0 $undefined
|
||||||
10 0 0 fact
|
3 0 0 "+"
|
||||||
|
4 0 0 "*"
|
||||||
|
5 0 0 "useless"
|
||||||
|
6 0 0 "num"
|
||||||
|
|
||||||
|
|
||||||
|
Non terminals
|
||||||
|
-------------
|
||||||
|
|
||||||
|
Value Tag
|
||||||
|
7 $accept
|
||||||
|
8 expr
|
||||||
|
9 term
|
||||||
|
10 fact
|
||||||
|
|
||||||
|
|
||||||
Rules
|
Rules
|
||||||
@@ -368,3 +381,89 @@ reduced input.y defines 7 terminals, 4 nonterminals, and 6 productions.
|
|||||||
]])
|
]])
|
||||||
|
|
||||||
AT_CLEANUP
|
AT_CLEANUP
|
||||||
|
|
||||||
|
|
||||||
|
## ------------------------------------- ##
|
||||||
|
## Reduced Grammar with prec and assoc. ##
|
||||||
|
## ------------------------------------- ##
|
||||||
|
|
||||||
|
# Check information about the grammar, once reduced.
|
||||||
|
|
||||||
|
AT_SETUP([Reduced Grammar with prec and assoc])
|
||||||
|
|
||||||
|
AT_DATA([input.y],
|
||||||
|
[[%nonassoc '<' '>'
|
||||||
|
%left '+' '-'
|
||||||
|
%right '^' '='
|
||||||
|
%%
|
||||||
|
exp:
|
||||||
|
exp '<' exp
|
||||||
|
| exp '>' exp
|
||||||
|
| exp '+' exp
|
||||||
|
| exp '-' exp
|
||||||
|
| exp '^' exp
|
||||||
|
| exp '=' exp
|
||||||
|
| "exp"
|
||||||
|
;
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_BISON_CHECK([[--trace=grammar -o input.c input.y]], [], [],
|
||||||
|
[[Reduced Grammar
|
||||||
|
|
||||||
|
ntokens = 10, nvars = 2, nsyms = 12, nrules = 8, nritems = 29
|
||||||
|
|
||||||
|
Tokens
|
||||||
|
------
|
||||||
|
|
||||||
|
Value Sprec Sassoc Tag
|
||||||
|
0 0 0 $end
|
||||||
|
1 0 0 error
|
||||||
|
2 0 0 $undefined
|
||||||
|
3 1 3 '<'
|
||||||
|
4 1 3 '>'
|
||||||
|
5 2 2 '+'
|
||||||
|
6 2 2 '-'
|
||||||
|
7 3 1 '^'
|
||||||
|
8 3 1 '='
|
||||||
|
9 0 0 "exp"
|
||||||
|
|
||||||
|
|
||||||
|
Non terminals
|
||||||
|
-------------
|
||||||
|
|
||||||
|
Value Tag
|
||||||
|
10 $accept
|
||||||
|
11 exp
|
||||||
|
|
||||||
|
|
||||||
|
Rules
|
||||||
|
-----
|
||||||
|
|
||||||
|
Num (Prec, Assoc, Useful, UselessChain) Lhs -> (Ritem Range) Rhs
|
||||||
|
0 ( 0, 0, t, f) 10 -> ( 0- 1) 11 0
|
||||||
|
1 ( 1, 3, t, f) 11 -> ( 3- 5) 11 3 11
|
||||||
|
2 ( 1, 3, t, f) 11 -> ( 7- 9) 11 4 11
|
||||||
|
3 ( 2, 2, t, f) 11 -> (11-13) 11 5 11
|
||||||
|
4 ( 2, 2, t, f) 11 -> (15-17) 11 6 11
|
||||||
|
5 ( 3, 1, t, f) 11 -> (19-21) 11 7 11
|
||||||
|
6 ( 3, 1, t, f) 11 -> (23-25) 11 8 11
|
||||||
|
7 ( 0, 0, t, t) 11 -> (27-27) 9
|
||||||
|
|
||||||
|
|
||||||
|
Rules interpreted
|
||||||
|
-----------------
|
||||||
|
|
||||||
|
0 $accept: exp $end
|
||||||
|
1 exp: exp '<' exp
|
||||||
|
2 exp: exp '>' exp
|
||||||
|
3 exp: exp '+' exp
|
||||||
|
4 exp: exp '-' exp
|
||||||
|
5 exp: exp '^' exp
|
||||||
|
6 exp: exp '=' exp
|
||||||
|
7 exp: "exp"
|
||||||
|
|
||||||
|
|
||||||
|
reduced input.y defines 10 terminals, 2 nonterminals, and 8 productions.
|
||||||
|
]])
|
||||||
|
|
||||||
|
AT_CLEANUP
|
||||||
|
|||||||
+4
-5
@@ -1,11 +1,10 @@
|
|||||||
/* We don't need perfect functions for these tests. */
|
/* Common definitions to include in the generated parsers. See
|
||||||
#undef malloc
|
AT_DATA_SOURCE_PROLOGUE. */
|
||||||
#undef memcmp
|
|
||||||
#undef realloc
|
|
||||||
|
|
||||||
/* In C++ pre C++11 it is standard practice to use 0 for the null
|
/* In C++ pre C++11 it is standard practice to use 0 for the null
|
||||||
pointer. But GCC -std=c++98 with -Wzero-as-null-pointer-constant
|
pointer. But GCC -std=c++98 with -Wzero-as-null-pointer-constant
|
||||||
warns about this. Warning introduced in GCC 4.7. */
|
warns about this, although this is just no alternative! Warning
|
||||||
|
introduced in GCC 4.7. */
|
||||||
#if defined __cplusplus && __cplusplus < 201103L
|
#if defined __cplusplus && __cplusplus < 201103L
|
||||||
# if defined __GNUC__ && ! defined __clang__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
|
# if defined __GNUC__ && ! defined __clang__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
|
||||||
# pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
|
# pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
|
||||||
|
|||||||
+1
-1
@@ -446,7 +446,7 @@ get_args (int argc, const char **argv)
|
|||||||
assert (0 <= res);
|
assert (0 <= res);
|
||||||
assert (res <= INT_MAX);
|
assert (res <= INT_MAX);
|
||||||
assert (errno != ERANGE);
|
assert (errno != ERANGE);
|
||||||
return (int) res;
|
return YY_CAST (int, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|||||||
+2
-2
@@ -166,7 +166,7 @@ m4_foreach([b4_skel], [[yacc.c], [glr.c], [lalr1.cc], [glr.cc]],
|
|||||||
[if (res)
|
[if (res)
|
||||||
{
|
{
|
||||||
AT_VAL.ival = (res - '0') * 10;
|
AT_VAL.ival = (res - '0') * 10;
|
||||||
AT_VAL.fval = (float) (res - '0') / 10.f;
|
AT_VAL.fval = YY_CAST (float, res - '0') / 10.f;
|
||||||
}],
|
}],
|
||||||
[30 0.3])
|
[30 0.3])
|
||||||
|
|
||||||
@@ -197,7 +197,7 @@ m4_foreach([b4_skel], [[yacc.c], [glr.c], [lalr1.cc], [glr.cc]],
|
|||||||
["12"],
|
["12"],
|
||||||
[if (res)
|
[if (res)
|
||||||
{
|
{
|
||||||
AT_VAL.up = (struct u *) malloc (sizeof *AT_VAL.up);
|
AT_VAL.up = YY_CAST (struct u *, malloc (sizeof *AT_VAL.up));
|
||||||
assert (AT_VAL.up);
|
assert (AT_VAL.up);
|
||||||
AT_VAL.up->ival = res - '0';
|
AT_VAL.up->ival = res - '0';
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user