diff options
| author | João Valverde <j@v6e.pt> | 2021-12-13 01:17:36 +0000 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-12-13 01:24:18 +0000 |
| commit | f5f8d9ebb61e8cd80dd3691062abe54d48a5e4d3 (patch) | |
| tree | 4b5211c1b65567715df4c73ea60e11611b383a41 /epan | |
| parent | 2df6ab090695af3f89f56ff7241addd571553481 (diff) | |
dfilter: Fix token associativity
TEST_EQ and TEST_NE are unused. Replace by the correct values
and add missing token to string representations.
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dfilter/dfilter.c | 6 | ||||
| -rw-r--r-- | epan/dfilter/grammar.lemon | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index 23fabf2ede..2502978a9a 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -262,8 +262,9 @@ const char *tokenstr(int token) switch (token) { case TOKEN_TEST_AND: return "TEST_AND"; case TOKEN_TEST_OR: return "TEST_OR"; - case TOKEN_TEST_EQ: return "TEST_EQ"; - case TOKEN_TEST_NE: return "TEST_NE"; + case TOKEN_TEST_ANY_EQ: return "TEST_ANY_EQ"; + case TOKEN_TEST_ALL_NE: return "TEST_ALL_NE"; + case TOKEN_TEST_ANY_NE: return "TEST_ANY_NE"; case TOKEN_TEST_LT: return "TEST_LT"; case TOKEN_TEST_LE: return "TEST_LE"; case TOKEN_TEST_GT: return "TEST_GT"; @@ -278,6 +279,7 @@ const char *tokenstr(int token) case TOKEN_LBRACKET: return "LBRACKET"; case TOKEN_RBRACKET: return "RBRACKET"; case TOKEN_COMMA: return "COMMA"; + case TOKEN_RANGE: return "RANGE"; case TOKEN_TEST_IN: return "TEST_IN"; case TOKEN_LBRACE: return "LBRACE"; case TOKEN_RBRACE: return "RBRACE"; diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon index b146bdb816..58c5adb1e2 100644 --- a/epan/dfilter/grammar.lemon +++ b/epan/dfilter/grammar.lemon @@ -81,7 +81,8 @@ shifting 3 more symbols. */ /* Associativity */ %left TEST_AND. %left TEST_OR. -%nonassoc TEST_EQ TEST_NE TEST_LT TEST_LE TEST_GT TEST_GE TEST_CONTAINS TEST_MATCHES TEST_BITWISE_AND. +%nonassoc TEST_ANY_EQ TEST_ALL_NE TEST_ANY_NE TEST_LT TEST_LE TEST_GT TEST_GE + TEST_CONTAINS TEST_MATCHES TEST_BITWISE_AND. %right TEST_NOT. /* Top-level targets */ |