osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use '~' as a synonim for "matches" replace rogue "s with \042 to avoid some text editors going wild 

svn path=/trunk/; revision=22486
This commit is contained in:
Luis Ontanon 2007-08-11 22:05:44 +00:00
parent c55f11cc73
commit 0b43610ea8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dfilter/scanner.l
View File

@ -112,9 +112,10 @@ GString* quoted_string = NULL;
"lt" return simple(TOKEN_TEST_LT);
"<=" return simple(TOKEN_TEST_LE);
"le" return simple(TOKEN_TEST_LE);
"bitwise_and" return simple(TOKEN_TEST_BITWISE_AND);
"&" return simple(TOKEN_TEST_BITWISE_AND);
"bitwise_and" return simple(TOKEN_TEST_BITWISE_AND);
"&" return simple(TOKEN_TEST_BITWISE_AND);
"contains" return simple(TOKEN_TEST_CONTAINS);
"~" return simple(TOKEN_TEST_MATCHES);
"matches" return simple(TOKEN_TEST_MATCHES);
"!" return simple(TOKEN_TEST_NOT);
"not" return simple(TOKEN_TEST_NOT);
@ -124,7 +125,6 @@ GString* quoted_string = NULL;
"or" return simple(TOKEN_TEST_OR);
"[" {
BEGIN(RANGE_INT);
return simple(TOKEN_LBRACKET);
@ -176,7 +176,7 @@ GString* quoted_string = NULL;
return SCAN_FAILED;
}
\" {
\042 {
/* start quote */
/* The example of how to scan for strings was taken from
the flex 2.5.4 manual, from the section "Start Conditions".
@ -208,7 +208,7 @@ GString* quoted_string = NULL;
return SCAN_FAILED;
}
<DQUOTE>\" {
<DQUOTE>\042 {
/* end quote */
int token;
BEGIN(INITIAL);
@ -244,7 +244,7 @@ GString* quoted_string = NULL;
g_string_append_c(quoted_string, yytext[1]);
}
<DQUOTE>[^\\\"]+ {
<DQUOTE>[^\\\042]+ {
/* non-escaped string */
g_string_append(quoted_string, yytext);
}