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

dfilter: Minor grammar fixups 

Clean up syntax error code. TEST and SET are never returned by
the tokenizer.

Remove unnecessary range_body() grammar element. Fix a comment.

Move the stnode_token_value() function to its proper place.
This commit is contained in:
João Valverde 2021-10-05 06:18:28 +01:00
parent d45ba348fd
commit a940318f37
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dfilter/grammar.lemon
View File

@ -79,14 +79,11 @@ any "error" symbols are shifted, if possible. */
switch(stnode_type_id(TOKEN)) {
case STTYPE_UNINITIALIZED:
if ((TOKEN)->token_value != NULL)
if (stnode_token_value(TOKEN) != NULL)
dfilter_fail(dfw, "Syntax error near \"%s\".", stnode_token_value(TOKEN));
else
dfilter_fail(dfw, "Syntax error.");
break;
case STTYPE_TEST:
dfilter_fail(dfw, "Syntax error, TEST.");
break;
case STTYPE_STRING:
dfilter_fail(dfw, "The string \"%s\" was unexpected in this context.",
(char *)stnode_data(TOKEN));
@ -111,10 +108,6 @@ any "error" symbols are shifted, if possible. */
dfilter_fail(dfw, "The function \"%s\" was unexpected in this context.",
sttype_function_funcdef(TOKEN)->name);
break;
case STTYPE_SET:
dfilter_fail(dfw, "Syntax error, SET.");
break;
/* These aren't handed to use as terminal tokens from
the scanner, so was can assert that we'll never
see them here. */
@ -122,6 +115,8 @@ any "error" symbols are shifted, if possible. */
case STTYPE_RANGE:
case STTYPE_FVALUE:
case STTYPE_PCRE:
case STTYPE_SET:
case STTYPE_TEST:
ws_assert_not_reached();
break;
}
@ -186,13 +181,12 @@ entity(E) ::= CHARCONST(C). { E = C; }
entity(E) ::= UNPARSED(U). { E = U; }
entity(E) ::= range(R). { E = R; }
range_body(B) ::= entity(E). { B = E; }
/* Ranges */
range(R) ::= range_body(B) LBRACKET range_node_list(L) RBRACKET.
range(R) ::= entity(E) LBRACKET range_node_list(L) RBRACKET.
{
R = stnode_new(STTYPE_RANGE, NULL, NULL);
sttype_range_set(R, B, L);
sttype_range_set(R, E, L);
/* Delete the list, but not the drange_nodes that
* the list contains. */
@ -320,7 +314,7 @@ set_node_list(L) ::= set_node_list(P) WHITESPACE entity(E).
L = g_slist_append(L, NULL);
}
/* Range elements. */
/* Set elements. */
set_node_list(L) ::= entity(X) DOTDOT entity(Y).
{
L = g_slist_append(NULL, X);

18
epan/dfilter/syntax-tree.c
View File

@ -215,6 +215,15 @@ stnode_value(stnode_t *node)
return node->value;
}
const char *
stnode_token_value(stnode_t *node)
{
if (node->token_value) {
return node->token_value;
}
return "<unknown token>";
}
gboolean
stnode_inside_parens(stnode_t *node)
{
@ -324,15 +333,6 @@ visit_tree(wmem_strbuf_t *buf, stnode_t *node, int level)
}
}
const char *
stnode_token_value(stnode_t *node)
{
if (node->token_value) {
return node->token_value;
}
return "<unknown token>";
}
void
log_syntax_tree(enum ws_log_level level, stnode_t *root, const char *msg)
{

6
epan/dfilter/syntax-tree.h
View File

@ -114,15 +114,15 @@ stnode_steal_data(stnode_t *node);
gint32
stnode_value(stnode_t *node);
const char *
stnode_token_value(stnode_t *node);
char *
stnode_tostr(stnode_t *node);
gboolean
stnode_inside_parens(stnode_t *node);
const char *
stnode_token_value(stnode_t *node);
void
stnode_set_inside_parens(stnode_t *node, gboolean inside);