data parsers REFACTOR unify unres set names
diff --git a/src/parser_json.c b/src/parser_json.c
index 79d58e1..776379a 100644
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -46,9 +46,9 @@
uint32_t int_opts; /**< internal data parser options */
uint32_t path_len; /**< used bytes in the path buffer */
char path[LYD_PARSER_BUFSIZE]; /**< buffer for the generated path */
- struct ly_set unres_node_type; /**< set of nodes validated with LY_EINCOMPLETE result */
- struct ly_set unres_meta_type; /**< set of metadata validated with LY_EINCOMPLETE result */
- struct ly_set when_check; /**< set of nodes with "when" conditions */
+ struct ly_set node_types; /**< set of nodes validated with LY_EINCOMPLETE result */
+ struct ly_set meta_types; /**< set of metadata validated with LY_EINCOMPLETE result */
+ struct ly_set node_when; /**< set of nodes with "when" conditions */
struct lyd_node *op_node; /**< if an RPC/action/notification is being parsed, store the pointer to it */
/* callbacks */
@@ -658,7 +658,7 @@
}
}
/* add/correct flags */
- lyd_parse_set_data_flags(node, &lydctx->when_check, &node->meta, lydctx->parse_options);
+ lyd_parse_set_data_flags(node, &lydctx->node_when, &node->meta, lydctx->parse_options);
/* done */
break;
@@ -835,7 +835,7 @@
LY_CHECK_GOTO(ret, cleanup);
/* add/correct flags */
- lyd_parse_set_data_flags(node, &lydctx->when_check, &meta, lydctx->parse_options);
+ lyd_parse_set_data_flags(node, &lydctx->node_when, &meta, lydctx->parse_options);
} else {
/* create attribute */
struct ly_prefix *val_prefs = NULL;
@@ -1143,8 +1143,8 @@
LY_CHECK_RET(ret);
/* add any missing default children */
- ret = lyd_new_implicit_r(*node, lyd_node_children_p(*node), NULL, NULL, &lydctx->unres_node_type,
- &lydctx->when_check, (lydctx->validate_options & LYD_VALIDATE_NO_STATE) ?
+ ret = lyd_new_implicit_r(*node, lyd_node_children_p(*node), NULL, NULL, &lydctx->node_types,
+ &lydctx->node_when, (lydctx->validate_options & LYD_VALIDATE_NO_STATE) ?
LYD_IMPLICIT_NO_STATE : 0, NULL);
LY_CHECK_RET(ret);
}
@@ -1443,8 +1443,8 @@
cleanup:
/* there should be no unresolved types stored */
- assert(!(parse_options & LYD_PARSE_ONLY) || (!lydctx->unres_node_type.count && !lydctx->unres_meta_type.count &&
- !lydctx->when_check.count));
+ assert(!(parse_options & LYD_PARSE_ONLY) || (!lydctx->node_types.count && !lydctx->meta_types.count &&
+ !lydctx->node_when.count));
if (ret) {
lyd_json_ctx_free((struct lyd_ctx *)lydctx);
@@ -1610,7 +1610,7 @@
cleanup:
/* we have used parse_only flag */
- assert(!lydctx || (!lydctx->unres_node_type.count && !lydctx->unres_meta_type.count && !lydctx->when_check.count));
+ assert(!lydctx || (!lydctx->node_types.count && !lydctx->meta_types.count && !lydctx->node_when.count));
lyd_json_ctx_free((struct lyd_ctx *)lydctx);
if (ret) {
@@ -1781,7 +1781,7 @@
cleanup:
/* we have used parse_only flag */
- assert(!lydctx || (!lydctx->unres_node_type.count && !lydctx->unres_meta_type.count && !lydctx->when_check.count));
+ assert(!lydctx || (!lydctx->node_types.count && !lydctx->meta_types.count && !lydctx->node_when.count));
lyd_json_ctx_free((struct lyd_ctx *)lydctx);
if (ret) {
@@ -1865,7 +1865,7 @@
cleanup:
/* we have used parse_only flag */
- assert(!lydctx || (!lydctx->unres_node_type.count && !lydctx->unres_meta_type.count && !lydctx->when_check.count));
+ assert(!lydctx || (!lydctx->node_types.count && !lydctx->meta_types.count && !lydctx->node_when.count));
lyd_json_ctx_free((struct lyd_ctx *)lydctx);
if (ret) {