diff options
author | Akim Demaille <akim.demaille@gmail.com> | 2020-09-06 13:30:23 +0200 |
---|---|---|
committer | Akim Demaille <akim.demaille@gmail.com> | 2020-09-19 08:31:49 +0200 |
commit | 75c3746ce287f9ba3ee5d8c60e2961be72b544f0 (patch) | |
tree | 04dbba24bfc5f9b436f7d4ab19c9d55a3ac50681 /tests/output.at | |
parent | b329f0b5dfb97b974b2b38d571f631deac5f7aba (diff) | |
download | bison-75c3746ce287f9ba3ee5d8c60e2961be72b544f0.tar.gz |
options: rename --defines as --header
The name "defines" is incorrect, the generated file contains far more
than just #defines.
* src/getargs.h, src/getargs.c (-H, --header): New option.
With optional argument, just like --defines, --xml, etc.
(defines_flag): Rename as...
(header_flag): this.
Adjust dependencies.
* data/skeletons/bison.m4, data/skeletons/c.m4, data/skeletons/glr.c,
* data/skeletons/glr.cc, data/skeletons/glr2.cc, data/skeletons/lalr1.cc,
* data/skeletons/yacc.c:
Adjust.
* examples, doc/bison.texi: Adjust.
* tests/headers.at, tests/local.at, tests/output.at: Convert most
tests from using --defines to using --header.
Diffstat (limited to 'tests/output.at')
-rw-r--r-- | tests/output.at | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/output.at b/tests/output.at index 5af1e914..2ef33354 100644 --- a/tests/output.at +++ b/tests/output.at @@ -133,6 +133,10 @@ AT_CHECK_OUTPUT([foo.yy], [%defines %verbose ], [-o foo.c], [foo.c foo.h foo.output]) AT_CHECK_OUTPUT([foo.yy], [], + [--header=foo.hpp -o foo.c++], + [foo.c++ foo.hpp]) + +AT_CHECK_OUTPUT([foo.yy], [], [--defines=foo.hpp -o foo.c++], [foo.c++ foo.hpp]) @@ -147,14 +151,14 @@ AT_CHECK_OUTPUT([foo.yy], [], # Do not generate code when there are early errors (even warnings as # errors). AT_CHECK_OUTPUT([foo.y], [%type <foo> useless], - [--defines --graph --xml --report=all -Wall -Werror], + [--header --graph --xml --report=all -Wall -Werror], [foo.dot foo.output foo.xml], [1]) # Do not generate code when there are late errors (even warnings as # errors). AT_CHECK_OUTPUT([foo.y], [%define useless], - [--defines --graph --xml --report=all -Wall -Werror], + [--header --graph --xml --report=all -Wall -Werror], [foo.dot foo.output foo.xml], [1]) @@ -284,7 +288,7 @@ AT_DATA_GRAMMAR([glr.y], %% start: {}; ]]) -AT_BISON_CHECK([-o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" glr.y]) +AT_BISON_CHECK([-o "AS_ESCAPE([$1.c])" --header="AS_ESCAPE([$1.h])" glr.y]) AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore]) AT_COMPILE([glr.o], [-c "AS_ESCAPE([$1.c])"]) $2 @@ -295,7 +299,7 @@ AT_DATA_GRAMMAR([cxx.y], %% start: {}; ]]) -AT_BISON_CHECK([-o "AS_ESCAPE([$1.cc])" --defines="AS_ESCAPE([$1.hh])" cxx.y]) +AT_BISON_CHECK([-o "AS_ESCAPE([$1.cc])" --header="AS_ESCAPE([$1.hh])" cxx.y]) AT_CHECK([ls "AS_ESCAPE([$1.cc])" "AS_ESCAPE([$1.hh])"], [], [ignore]) AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.cc])"]) $2 |