summaryrefslogtreecommitdiff
path: root/recipes/iproute2/iproute2-2.6.20/new-flex-fix.patch
blob: af7272163ee5d3306bd512d4b8f388b48a5b6efe (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
The tc command was failing to build due to flex errors. These errors are
caused by an incompatible change to flex in recent versions, including the
version shipped with OE. 

This fix is as per the one used by opensure:

  http://lists.opensuse.org/opensuse-commit/2006-04/msg00090.html

and simple renames str to prevent it conflicting.

--- iproute-2.6.20-070313/tc/emp_ematch.l	2007/03/17 02:52:20	1.1
+++ iproute-2.6.20-070313/tc/emp_ematch.l	2007/03/17 02:54:01
@@ -63,7 +63,7 @@
 
 %}
 
-%x str
+%x STR
 
 %option 8bit stack warn noyywrap prefix="ematch_"
 %%
@@ -78,17 +78,17 @@
 						}
 						strbuf_index = 0;
 
-						BEGIN(str);
+						BEGIN(STR);
 					}
 
-<str>\"					{
+<STR>\"					{
 						BEGIN(INITIAL);
 						yylval.b = bstr_new(strbuf, strbuf_index);
 						yylval.b->quoted = 1;
 						return ATTRIBUTE;
 					}
 
-<str>\\[0-7]{1,3}			{ /* octal escape sequence */
+<STR>\\[0-7]{1,3}			{ /* octal escape sequence */
 						int res;
 
 						sscanf(yytext + 1, "%o", &res);
@@ -100,12 +100,12 @@
 						strbuf_append_char((unsigned char) res);
 					}
 
-<str>\\[0-9]+				{ /* catch wrong octal escape seq. */
+<STR>\\[0-9]+				{ /* catch wrong octal escape seq. */
 						fprintf(stderr, "error: invalid octale escape sequence\n");
 						return ERROR;
 					}
 
-<str>\\x[0-9a-fA-F]{1,2}		{
+<STR>\\x[0-9a-fA-F]{1,2}		{
 						int res;
 
 						sscanf(yytext + 2, "%x", &res);
@@ -118,16 +118,16 @@
 						strbuf_append_char((unsigned char) res);
 					}
 
-<str>\\n				strbuf_append_char('\n');
-<str>\\r				strbuf_append_char('\r');
-<str>\\t				strbuf_append_char('\t');
-<str>\\v				strbuf_append_char('\v');
-<str>\\b				strbuf_append_char('\b');
-<str>\\f				strbuf_append_char('\f');
-<str>\\a				strbuf_append_char('\a');
+<STR>\\n				strbuf_append_char('\n');
+<STR>\\r				strbuf_append_char('\r');
+<STR>\\t				strbuf_append_char('\t');
+<STR>\\v				strbuf_append_char('\v');
+<STR>\\b				strbuf_append_char('\b');
+<STR>\\f				strbuf_append_char('\f');
+<STR>\\a				strbuf_append_char('\a');
 
-<str>\\(.|\n)				strbuf_append_char(yytext[1]);
-<str>[^\\\n\"]+				strbuf_append_charp(yytext);
+<STR>\\(.|\n)				strbuf_append_char(yytext[1]);
+<STR>[^\\\n\"]+				strbuf_append_charp(yytext);
 
 [aA][nN][dD]				return AND;
 [oO][rR]				return OR;