From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH v2] flex: Fix broken testsuite with bison 3.0 Date: Fri, 23 Oct 2015 21:05:40 +0100 Message-ID: <1445630740.2626.128.camel@ipfire.org> In-Reply-To: <1445621159-1847-1-git-send-email-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7345735102842234557==" List-Id: --===============7345735102842234557== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Please keep down the noise if you can. Merged. -Michael On Fri, 2015-10-23 at 19:25 +0200, Stefan Schantl wrote: > In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been > removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or > %param. > > This commit adds a patch to fix the tests so they still work. > > Fixes #10951. > > Signed-off-by: Stefan Schantl > --- > flex/flex.nm | 2 +- > ...fixes-Do-not-use-obsolete-bison-construct.patch | 79 > ++++++++++++++++++++++ > 2 files changed, 80 insertions(+), 1 deletion(-) > create mode 100644 flex/patches/0001-bison-test-fixes-Do-not-use > -obsolete-bison-construct.patch > > diff --git a/flex/flex.nm b/flex/flex.nm > index 7bff151..4c5b555 100644 > --- a/flex/flex.nm > +++ b/flex/flex.nm > @@ -5,7 +5,7 @@ > > name = flex > version = 2.5.39 > -release = 2 > +release = 2.1 > > groups = Development/Tools > url = http://flex.sourceforge.net/ > diff --git a/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete > -bison-construct.patch b/flex/patches/0001-bison-test-fixes-Do-not > -use-obsolete-bison-construct.patch > new file mode 100644 > index 0000000..eb46be3 > --- /dev/null > +++ b/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison > -construct.patch > @@ -0,0 +1,79 @@ > +From 35aba3d6e3c99fcd527c677bef8efeb59963fe8a Mon Sep 17 00:00:00 > 2001 > +Message-Id: <35aba3d6e3c99fcd527c677bef8efeb59963fe8a.1397340102.git > .srivasta(a)golden-gryphon.com> > +From: Manoj Srivastava > +Date: Wed, 9 Apr 2014 00:23:07 -0700 > +Subject: [PATCH 1/1] [bison-test-fixes] Do not use obsolete bison > constructs in tests. > + > +In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been > +removed (deprecated in Bison 1.875): use %lex-param, %parse-param, > or > +%param. This commit fixes the tests so they still work. > + > +Signed-off-by: Manoj Srivastava > +--- > + tests/test-bison-yylloc/parser.y | 4 ++-- > + tests/test-bison-yylval/parser.y | 4 ++-- > + 2 files changed, 4 insertions(+), 4 deletions(-) > + 50.0% tests/test-bison-yylloc/ > + 50.0% tests/test-bison-yylval/ > + > +diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison > -yylloc/parser.y > +index e8f4e56..224d252 100644 > +--- a/tests/test-bison-yylloc/parser.y > ++++ b/tests/test-bison-yylloc/parser.y > +@@ -22,6 +22,7 @@ > + */ > + > + %parse-param { void* scanner } > ++%lex-param { void* scanner } > + > + /* > + How to compile: > +@@ -34,7 +35,6 @@ > + #include "config.h" > + > + #define YYERROR_VERBOSE 1 > +-#define YYLEX_PARAM scanner > + > + extern int testget_lineno(void*); > + > +@@ -52,7 +52,7 @@ int process_text(char* s) { > + > + %} > + > +-%pure_parser > ++%pure-parser > + > + %union { > + int lineno; > +diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison > -yylval/parser.y > +index 0ffdb89..626c5e7 100644 > +--- a/tests/test-bison-yylval/parser.y > ++++ b/tests/test-bison-yylval/parser.y > +@@ -26,6 +26,7 @@ > + bison --defines --output-file="parser.c" --name-prefix="test" > parser.y > + */ > + %parse-param { void* scanner } > ++%lex-param { void* scanner } > + %{ > + #include > + #include > +@@ -33,7 +34,6 @@ > + #include "config.h" > + > + #define YYERROR_VERBOSE 1 > +-#define YYLEX_PARAM scanner > + > + > + /* A dummy function. A check against seg-faults in yylval->str. */ > +@@ -49,7 +49,7 @@ int process_text(char* s) { > + > + %} > + > +-%pure_parser > ++%pure-parser > + > + %union { > + long unused; > +-- > +1.9.2 > + --===============7345735102842234557== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC Q2dBR0JRSldLcE1VQUFvSkVJQjU4UDl2a0FrSDA3QVFBSXJqVGRkVHFUMjNVcnZLMmxVc1FoQWEK eEN0aWJWMSt6bHM5aTYwc1c1RWoyNlREcEFsWkZqWFJOa3pndnhRSXJQYkRKSXQzU3huTkJvZU5n WGhWWTB6WQoxdEFhNmtSUHJxc0txbGgxamZwVkp2UGg2a1FTa3k3d05DVTUwb2N0VGNOeUVqZWU2 Zm5sVHgzZm9FZkJ4R08xCmpXbHVQMmZjM2pjaURjUjRVRlJOQzNHUUxJNnRwU0kwQUdhL0pmQXRW aGNGUzJ3am1QUGxsb0Y1YytWYVNpaGwKQUdQQ2hXT1UwdUtCNFI2cEhreWphU3BzaU1lL29pYmxk OHU1YTljaDlrNS9mL2VVaGVySTdjTSsyKy9URUlPNApPZFo2QjlFSmYwbmszYTU3clJlYTFTSG93 VDNXVWxOWG1lL3R3ZFUwaHQ2cXhmeVZvNXZ4ZXNONEtJSWlUOU9mCnFmL0lWbGpidjdKRnhCcjZ2 eUxpazRBR0lWYUhWcVNjT0w2eDZPYW16UFh5STB1Z0pORmVMWEhURytWZnNrR00KUGVtOUM4akZI ejRXZ2NGTjNSR3R2THo3TVp2NTJyMktjbVFuUnBiMDRPcmZOVHJQSS9PUndxT1I5WG5OcVhSTgpn VGpabkRKMzBQbWZQakpjWEZQNDJpb1R4T3RBSVlsZENEZzRCTGFaVUF4c0tFcW1OVjYySDE2T1Nm SWJMMlk5ClJHc05RVmNTVlF4UmxVWTk1dFhHd1cwZGlib00wOHY3Tk5nTW5jNTk1SHV0ZUZhZk5m L2pueFE2Qy9jaHFKd3gKb2djOW9lcEwvd2YxUnhGWnQrbDMrVU1IbU94bUNQemk1Z0tnV3VVakdC TVIyRFl3dVEranRLRVZIekk2S3ZVSApnb2t1UmlCRDdSZ0ZlTHBtUmJiWQo9TUEvTQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============7345735102842234557==--