]>
Commit | Line | Data |
---|---|---|
968646d3 AM |
1 | diff -urNbB iproute2-2.6.14-051107.org/tc/emp_ematch.l iproute2-2.6.14-051107/tc/emp_ematch.l |
2 | --- iproute2-2.6.14-051107.org/tc/emp_ematch.l 2005-07-14 18:49:27.000000000 +0200 | |
3 | +++ iproute2-2.6.14-051107/tc/emp_ematch.l 2005-11-10 16:00:16.522017250 +0100 | |
4 | @@ -63,7 +63,7 @@ | |
5 | ||
6 | %} | |
7 | ||
8 | -%x str | |
9 | +%x stri | |
10 | ||
11 | %option 8bit stack warn noyywrap prefix="ematch_" | |
12 | %% | |
13 | @@ -78,17 +78,17 @@ | |
14 | } | |
15 | strbuf_index = 0; | |
16 | ||
17 | - BEGIN(str); | |
18 | + BEGIN(stri); | |
19 | } | |
20 | ||
21 | -<str>\" { | |
22 | +<stri>\" { | |
23 | BEGIN(INITIAL); | |
24 | yylval.b = bstr_new(strbuf, strbuf_index); | |
25 | yylval.b->quoted = 1; | |
26 | return ATTRIBUTE; | |
27 | } | |
28 | ||
29 | -<str>\\[0-7]{1,3} { /* octal escape sequence */ | |
30 | +<stri>\\[0-7]{1,3} { /* octal escape sequence */ | |
31 | int res; | |
32 | ||
33 | sscanf(yytext + 1, "%o", &res); | |
34 | @@ -100,12 +100,12 @@ | |
35 | strbuf_append_char((unsigned char) res); | |
36 | } | |
37 | ||
38 | -<str>\\[0-9]+ { /* catch wrong octal escape seq. */ | |
39 | +<stri>\\[0-9]+ { /* catch wrong octal escape seq. */ | |
40 | fprintf(stderr, "error: invalid octale escape sequence\n"); | |
41 | return ERROR; | |
42 | } | |
43 | ||
44 | -<str>\\x[0-9a-fA-F]{1,2} { | |
45 | +<stri>\\x[0-9a-fA-F]{1,2} { | |
46 | int res; | |
47 | ||
48 | sscanf(yytext + 2, "%x", &res); | |
49 | @@ -118,16 +118,16 @@ | |
50 | strbuf_append_char((unsigned char) res); | |
51 | } | |
52 | ||
53 | -<str>\\n strbuf_append_char('\n'); | |
54 | -<str>\\r strbuf_append_char('\r'); | |
55 | -<str>\\t strbuf_append_char('\t'); | |
56 | -<str>\\v strbuf_append_char('\v'); | |
57 | -<str>\\b strbuf_append_char('\b'); | |
58 | -<str>\\f strbuf_append_char('\f'); | |
59 | -<str>\\a strbuf_append_char('\a'); | |
60 | +<stri>\\n strbuf_append_char('\n'); | |
61 | +<stri>\\r strbuf_append_char('\r'); | |
62 | +<stri>\\t strbuf_append_char('\t'); | |
63 | +<stri>\\v strbuf_append_char('\v'); | |
64 | +<stri>\\b strbuf_append_char('\b'); | |
65 | +<stri>\\f strbuf_append_char('\f'); | |
66 | +<stri>\\a strbuf_append_char('\a'); | |
67 | ||
68 | -<str>\\(.|\n) strbuf_append_char(yytext[1]); | |
69 | -<str>[^\\\n\"]+ strbuf_append_charp(yytext); | |
70 | +<stri>\\(.|\n) strbuf_append_char(yytext[1]); | |
71 | +<stri>[^\\\n\"]+ strbuf_append_charp(yytext); | |
72 | ||
73 | [aA][nN][dD] return AND; | |
74 | [oO][rR] return OR; |