Author: bdubbs Date: 2012-08-20 11:34:27 -0600 (Mon, 20 Aug 2012) New Revision: 2513
Added: trunk/flex/flex-2.5.37-bison-2.6.1.patch Log: Add fixes to flex regression tests Added: trunk/flex/flex-2.5.37-bison-2.6.1.patch =================================================================== --- trunk/flex/flex-2.5.37-bison-2.6.1.patch (rev 0) +++ trunk/flex/flex-2.5.37-bison-2.6.1.patch 2012-08-20 17:34:27 UTC (rev 2513) @@ -0,0 +1,95 @@ +Submitted By: Bruce Dubbs <[email protected]> +Date: 2012-08-20 +Initial Package Version: 2.5.36 +Origin: Redhat +Description: This fixes two errors in the regression tests due to changes +in bison. + +diff -up flex-2.5.36/tests/test-bison-yylloc/main.c~ flex-2.5.36/tests/test-bison-yylloc/main.c +--- flex-2.5.36/tests/test-bison-yylloc/main.c~ 2002-06-25 21:37:06.000000000 +0200 ++++ flex-2.5.36/tests/test-bison-yylloc/main.c 2012-07-31 18:53:22.007394045 +0200 +@@ -21,8 +21,6 @@ + #include "parser.h" + #include "scanner.h" + +-extern int testparse(yyscan_t); +- + int main ( int argc, char** argv ) + { + yyscan_t scanner; +diff -up flex-2.5.36/tests/test-bison-yylloc/parser.y~ flex-2.5.36/tests/test-bison-yylloc/parser.y +--- flex-2.5.36/tests/test-bison-yylloc/parser.y~ 2002-07-25 02:43:47.000000000 +0200 ++++ flex-2.5.36/tests/test-bison-yylloc/parser.y 2012-08-01 01:06:53.093155586 +0200 +@@ -21,6 +21,8 @@ + * PURPOSE. + */ + ++%parse-param { void* scanner } ++ + /* + How to compile: + bison --defines --output-file="parser.c" --name-prefix="test" parser.y +@@ -32,10 +34,8 @@ + #include "config.h" + + #define YYERROR_VERBOSE 1 +-#define YYPARSE_PARAM scanner + #define YYLEX_PARAM scanner + +-int yyerror(char* msg); + extern int testget_lineno(void*); + + +@@ -89,7 +89,7 @@ line: + + %% + +-int yyerror(char* msg) { ++int yyerror(void* scanner, char* msg) { + fprintf(stderr,"%s\n",msg); + return 0; + } +diff -up flex-2.5.36/tests/test-bison-yylval/main.c~ flex-2.5.36/tests/test-bison-yylval/main.c +--- flex-2.5.36/tests/test-bison-yylval/main.c~ 2002-06-25 21:37:06.000000000 +0200 ++++ flex-2.5.36/tests/test-bison-yylval/main.c 2012-08-01 01:10:02.015510280 +0200 +@@ -24,8 +24,6 @@ + #include "parser.h" + #include "scanner.h" + +-extern int testparse(yyscan_t); +- + int main ( int argc, char** argv ) + { + yyscan_t scanner; +diff -up flex-2.5.36/tests/test-bison-yylval/parser.y~ flex-2.5.36/tests/test-bison-yylval/parser.y +--- flex-2.5.36/tests/test-bison-yylval/parser.y~ 2002-06-25 21:37:06.000000000 +0200 ++++ flex-2.5.36/tests/test-bison-yylval/parser.y 2012-08-01 01:13:11.239867147 +0200 +@@ -25,6 +25,7 @@ + How to compile: + bison --defines --output-file="parser.c" --name-prefix="test" parser.y + */ ++%parse-param { void* scanner } + %{ + #include <stdio.h> + #include <stdlib.h> +@@ -32,11 +33,8 @@ + #include "config.h" + + #define YYERROR_VERBOSE 1 +-#define YYPARSE_PARAM scanner + #define YYLEX_PARAM scanner + +-int yyerror(char* msg); +- + + /* A dummy function. A check against seg-faults in yylval->str. */ + int process_text(char* s) { +@@ -76,7 +74,7 @@ starttag: LT TAGNAME GT { process_ + endtag: LTSLASH TAGNAME GT { process_text($2);free($2);} ; + %% + +-int yyerror(char* msg) { ++int yyerror(void* scanner, char* msg) { + fprintf(stderr,"%s\n",msg); + return 0; + } -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
