json: catchall element support
Florian Westphal
maintainerPATCH 1/1 json: catchall element support
Treat '*' as catchall element, not as a symbol. Also add missing json test cases for wildcard set support.
Signed-off-by Florian Westphal <[email protected]>
--- include/json.h | 1 + src/expression.c | 1 + src/json.c | 5 +++ src/parser_json.c | 11 +----- tests/py/ip/sets.t.json | 84 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 10 deletions(-)
include/json.h +1 -0
@@ -37,6 +37,7 @@ json_t *concat_expr_json(const struct expr *expr, struct output_ctx *octx);json_t *set_expr_json (const struct expr *expr,struct output_ctx *octx);json_t *set_ref_expr_json (const struct expr *expr,struct output_ctx *octx);json_t *set_elem_expr_json (const struct expr *expr,struct output_ctx *octx); +json_t *set_elem_catchall_expr_json (const struct expr *expr,struct output_ctx *octx);json_t *prefix_expr_json (const struct expr *expr,struct output_ctx *octx);json_t *list_expr_json (const struct expr *expr,struct output_ctx *octx);json_t *unary_expr_json (const struct expr *expr,struct output_ctx *octx);
src/expression.c +1 -0
@@ -1341,6 +1341,7 @@ static const struct expr_ops set_elem_catchall_expr_ops = { .type = EXPR_SET_ELEM_CATCHALL, .name = "catch-all set element", .print = set_elem_catchall_expr_print, + .json = set_elem_catchall_expr_json, };struct expr *set_elem_catchall_expr_alloc (const struct location *loc)
src/json.c +5 -0
@@ -889,6 +889,11 @@ static json_t *symbolic_constant_json(const struct symbol_table *tbl,return json_string (s->identifier); } +json_t *set_elem_catchall_expr_json (const struct expr *expr,struct output_ctx *octx) +{ +return json_string ("*" ); +} +static json_t *datatype_json (const struct expr *expr,struct output_ctx *octx) {const struct datatype *dtype = expr->dtype;
src/parser_json.c +1 -10
@@ -315,15 +315,6 @@ static struct expr *json_parse_constant(struct json_ctx *ctx, const char *name)return NULL ; } -static struct expr *wildcard_expr_alloc (void ) -{ -struct expr *expr; - - expr =constant_expr_alloc (int_loc, &integer_type, -BYTEORDER_HOST_ENDIAN ,0 ,NULL ); -return prefix_expr_alloc (int_loc, expr,0 ); -} -/* this is a combination of symbol_expr, integer_expr, boolean_expr ... */ static struct expr *json_parse_immediate (struct json_ctx *ctx,json_t *root) {
@@ -338,7 +329,7 @@ static struct expr *json_parse_immediate(struct json_ctx *ctx, json_t *root) symtype =SYMBOL_SET ; str++; }else if (str[0 ] =='*' && str[1 ] =='\0' ) { -return wildcard_expr_alloc (); +return set_elem_catchall_expr_alloc (int_loc); }else if (is_keyword (str)) {return symbol_expr_alloc (int_loc,SYMBOL_VALUE ,NULL , str);
tests/py/ip/sets.t.json +84 -0
87 lines not on this page · raw message
Signature · 1 line
2.31.1