[prev in list] [next in list] [prev in thread] [next in thread]
List: openpkg-cvs
Subject: [CVS] OpenPKG: openpkg-src/flex/ flex.patch
From: "Ralf S. Engelschall" <rse () openpkg ! org>
Date: 2004-10-31 18:36:59
Message-ID: 20041031183659.0864B30463C () mail ! openpkg ! org
[Download RAW message or body]
OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: rse@openpkg.org
Module: openpkg-src Date: 31-Oct-2004 19:36:59
Branch: HEAD Handle: 2004103118365900
Modified files:
openpkg-src/flex flex.patch
Log:
apply two patches from the Debian package of GNU Flex 2.5.31
Summary:
Revision Changes Path
1.13 +116 -13 openpkg-src/flex/flex.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 flex.patch
--- openpkg-src/flex/flex.patch 31 Oct 2004 12:49:44 -0000 1.12
+++ openpkg-src/flex/flex.patch 31 Oct 2004 18:36:59 -0000 1.13
@@ -1,6 +1,73 @@
+Index: doc/flex.texi
+--- doc/flex.texi.orig 2003-03-27 19:02:59 +0100
++++ doc/flex.texi 2004-10-31 19:02:47 +0100
+@@ -3804,6 +3804,7 @@
+ @example
+ @verbatim
+ // An example of using the flex C++ scanner class.
++ %option noyywrap
+
+ %{
+ int mylineno = 0;
+@@ -3832,7 +3833,7 @@
+ if(c == '\n')
+ ++mylineno;
+
+- else if(c == @samp{*})
++ else if(c == '*')
+ {
+ if((c = yyinput()) == '/')
+ break;
+@@ -3842,19 +3843,19 @@
+ }
+ }
+
+- {number} cout "number " YYText() '\n';
++ {number} std::cout << "number " << YYText() << '\n';
+
+ \n mylineno++;
+
+- {name} cout "name " YYText() '\n';
++ {name} std::cout << "name " << YYText() << '\n';
+
+- {string} cout "string " YYText() '\n';
++ {string} std::cout << "string " << YYText() << '\n';
+
+ %%
+
+ int main( int /* argc */, char** /* argv */ )
+ {
+- @code{flex}Lexer* lexer = new yyFlexLexer;
++ FlexLexer* lexer = new yyFlexLexer;
+ while(lexer->yylex() != 0)
+ ;
+ return 0;
+@@ -3866,7 +3867,7 @@
+ If you want to create multiple (different) lexer classes, you use the
+ @samp{-P} flag (or the @code{prefix=} option) to rename each
+ @code{yyFlexLexer} to some other @samp{xxFlexLexer}. You then can
+-include @file{FlexLexer.h>} in your other sources once per lexer class,
++include @file{FlexLexer>} in your other sources once per lexer class,
+ first renaming @code{yyFlexLexer} as follows:
+
+ @cindex include files, with C++
+@@ -3876,11 +3877,11 @@
+ @verbatim
+ #undef yyFlexLexer
+ #define yyFlexLexer xxFlexLexer
+- #include <FflexLexer.h>
++ #include <FflexLexer>
+
+ #undef yyFlexLexer
+ #define yyFlexLexer zzFlexLexer
+- #include FlexLexer.h>
++ #include FlexLexer>
+ @end verbatim
+ @end example
+
Index: filter.c
--- filter.c.orig 2003-03-25 17:39:08 +0100
-+++ filter.c 2004-10-31 13:42:19 +0100
++++ filter.c 2004-10-31 19:00:16 +0100
@@ -158,10 +158,21 @@
int r;
@@ -38,7 +105,7 @@
}
Index: flex.skl
--- flex.skl.orig 2003-04-01 03:51:38 +0200
-+++ flex.skl 2004-10-31 13:42:19 +0100
++++ flex.skl 2004-10-31 19:08:21 +0100
@@ -345,19 +345,19 @@
%# yyscan_t yyscanner;
%#
@@ -128,9 +195,23 @@
[[YYFARGS2(YYSTYPE *,yylval_param, YYLTYPE *,yylloc_param)]])
]])
+@@ -2251,11 +2265,11 @@
+ * @note If you want to scan bytes that may contain NUL values, then use
+ * yy_scan_bytes() instead.
+ */
+-YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)
++YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)
+ {
+ m4_dnl M4_YY_DECL_GUTS_VAR();
+
+- return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);
++ return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);
+ }
+ %endif
+ ]])
Index: gen.c
--- gen.c.orig 2003-03-30 21:58:44 +0200
-+++ gen.c 2004-10-31 13:42:19 +0100
++++ gen.c 2004-10-31 19:00:16 +0100
@@ -1812,7 +1812,6 @@
if (yytext_is_array) {
if (!reentrant){
@@ -141,8 +222,16 @@
}
Index: main.c
--- main.c.orig 2003-04-01 03:51:38 +0200
-+++ main.c 2004-10-31 13:44:09 +0100
-@@ -1142,7 +1142,6 @@
++++ main.c 2004-10-31 19:09:34 +0100
+@@ -199,6 +199,7 @@
+ {
+ #if ENABLE_NLS
+ setlocale (LC_MESSAGES, "");
++ setlocale (LC_CTYPE, "");
+ textdomain (PACKAGE);
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ #endif
+@@ -1142,7 +1143,6 @@
break;
case OPT_NO_UNISTD_H:
@@ -150,7 +239,7 @@
buf_m4_define( &m4defs_buf, "M4_YY_NO_UNISTD_H",0);
break;
-@@ -1257,7 +1256,6 @@
+@@ -1257,7 +1257,6 @@
break;
case OPT_STACK:
@@ -158,7 +247,7 @@
buf_m4_define( &m4defs_buf, "M4_YY_STACK_USED",0);
break;
-@@ -1314,87 +1312,66 @@
+@@ -1314,87 +1313,66 @@
break;
case OPT_NO_YY_PUSH_STATE:
@@ -246,7 +335,7 @@
buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_LLOC",0);
break;
-@@ -1547,11 +1524,10 @@
+@@ -1547,11 +1525,10 @@
if (reject){
out_m4_define( "M4_YY_USES_REJECT", NULL);
@@ -259,7 +348,7 @@
outn ("#define YY_SKIP_YYWRAP");
}
-@@ -1595,7 +1571,6 @@
+@@ -1595,7 +1572,6 @@
outn ("#else");
outn (yy_stdinit);
outn ("#endif");
@@ -269,7 +358,7 @@
else {
Index: scan.c
--- scan.c.orig 2003-04-01 18:33:17 +0200
-+++ scan.c 2004-10-31 13:42:20 +0100
++++ scan.c 2004-10-31 19:00:17 +0100
@@ -1,5 +1,6 @@
+#line 2 "scan.c"
@@ -326,7 +415,7 @@
case YY_STATE_EOF(CODEBLOCK):
Index: scan.l
--- scan.l.orig 2003-04-01 03:51:38 +0200
-+++ scan.l 2004-10-31 13:42:19 +0100
++++ scan.l 2004-10-31 19:00:16 +0100
@@ -350,7 +350,7 @@
stack ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense );
stdinit do_stdinit = option_sense;
@@ -338,7 +427,7 @@
warn nowarn = ! option_sense;
Index: skel.c
--- skel.c.orig 2003-04-01 18:33:08 +0200
-+++ skel.c 2004-10-31 13:42:19 +0100
++++ skel.c 2004-10-31 19:34:35 +0100
@@ -404,19 +404,19 @@
"%# yyscan_t yyscanner;",
"%#",
@@ -428,9 +517,23 @@
" [[YYFARGS2(YYSTYPE *,yylval_param, YYLTYPE *,yylloc_param)]])",
"]])",
"",
+@@ -2454,11 +2468,11 @@
+ " * @note If you want to scan bytes that may contain NUL values, then use",
+ " * yy_scan_bytes() instead.",
+ " */",
+- "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)",
++ "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)",
+ "{",
+ " m4_dnl M4_YY_DECL_GUTS_VAR();",
+ "",
+- " return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);",
++ " return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);",
+ "}",
+ "%endif",
+ "]])",
Index: tables.c
--- tables.c.orig 2002-11-27 15:43:24 +0100
-+++ tables.c 2004-10-31 13:42:19 +0100
++++ tables.c 2004-10-31 19:00:16 +0100
@@ -86,7 +86,7 @@
th->th_magic = YYTBL_MAGIC;
th->th_hsize = 14 + strlen (version_str) + 1 + strlen (name) + 1;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic