89a672bb76
- update to 2.5.37
** Import flex into git. See
git://flex.git.sourceforge.net/gitroot/flex/flex.
** Fix make install target to not fail when the flex++ program is
already installed
** New translations from the translation project: de, fi, pl, vi
** various portability fixes that quiet compiler warnings on 64-bit
hosts
** various manual fixes, including correcting the name of a %option and
updating some simple examples to use ANSI C syntax
** various bug fixes that prevent certain error conditions from
persisting when they should not persist
** improvements to the test suite so it behaves better when linking
compiled files
** new translations from the translation project: ca, da, es, fi, fr,
ga, ko, pt_br, ro, ru, sv, tr, zh_cn
** the flex distribution is now built with automake 1.10.1 and automake
2.61
- add patch flex-2.5.37-notex.patch to compile without texlive
- remove patches no longer required:
flex-2.5.33-yylineno.patch
flex-2.5.34-doc-fix.diff
flex-2.5.34-g++44.diff
OBS-URL: https://build.opensuse.org/request/show/138308
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/flex?expand=0&rev=12
96 lines
2.7 KiB
Diff
96 lines
2.7 KiB
Diff
Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
|
|
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;
|
|
}
|