From 00713e4af086eccab5a590e823a22d7de4ee8a20 Mon Sep 17 00:00:00 2001 From: lego Date: Sat, 11 Aug 2007 22:05:44 +0000 Subject: Use '~' as a synonim for "matches" replace rogue "s with \042 to avoid some text editors going wild git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22486 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dfilter/scanner.l | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'epan/dfilter') diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l index 2c0d036e29..6af7921798 100644 --- a/epan/dfilter/scanner.l +++ b/epan/dfilter/scanner.l @@ -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; } -\" { +\042 { /* end quote */ int token; BEGIN(INITIAL); @@ -244,7 +244,7 @@ GString* quoted_string = NULL; g_string_append_c(quoted_string, yytext[1]); } -[^\\\"]+ { +[^\\\042]+ { /* non-escaped string */ g_string_append(quoted_string, yytext); } -- cgit v1.2.3