diff options
Diffstat (limited to 'src/parser_json.c')
| -rw-r--r-- | src/parser_json.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/parser_json.c b/src/parser_json.c index 7dd621d8..1bb4f1f1 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -1117,27 +1117,27 @@ static struct expr *json_parse_set_expr(struct json_ctx *ctx, static struct expr *json_parse_map_expr(struct json_ctx *ctx, const char *type, json_t *root) { - json_t *jleft, *jright; - struct expr *left, *right; + json_t *jkey, *jdata; + struct expr *key, *data; if (json_unpack_err(ctx, root, "{s:o, s:o}", - "left", &jleft, "right", &jright)) + "key", &jkey, "data", &jdata)) return NULL; - left = json_parse_map_lhs_expr(ctx, jleft); - if (!left) { - json_error(ctx, "Illegal LHS of map expression."); + key = json_parse_map_lhs_expr(ctx, jkey); + if (!key) { + json_error(ctx, "Illegal map expression key."); return NULL; } - right = json_parse_rhs_expr(ctx, jright); - if (!right) { - json_error(ctx, "Illegal RHS of map expression."); - expr_free(left); + data = json_parse_rhs_expr(ctx, jdata); + if (!data) { + json_error(ctx, "Illegal map expression data."); + expr_free(key); return NULL; } - return map_expr_alloc(int_loc, left, right); + return map_expr_alloc(int_loc, key, data); } static struct expr *json_parse_set_elem_expr(struct json_ctx *ctx, |