schema compilation CHANGE partial support for types
- resolving types
- support for binary type
- support for range/length restriction of the type, but missing checking
that the derived type strictly narrows the defined range/length
diff --git a/tests/src/test_parser_yang.c b/tests/src/test_parser_yang.c
index f50e565..674ba2f 100644
--- a/tests/src/test_parser_yang.c
+++ b/tests/src/test_parser_yang.c
@@ -909,7 +909,6 @@
test_identity(void **state)
{
(void) state; /* unused */
- int dict = 1; /* magic variable for FREE macros */
struct ly_parser_ctx ctx;
struct lysp_module *mod = NULL;
@@ -960,7 +959,6 @@
test_feature(void **state)
{
(void) state; /* unused */
- int dict = 1; /* magic variable for FREE macros */
struct ly_parser_ctx ctx;
struct lysp_module *mod = NULL;
@@ -1011,7 +1009,6 @@
test_deviation(void **state)
{
(void) state; /* unused */
- int dict = 1; /* magic variable for FREE macros */
struct ly_parser_ctx ctx;
struct lysp_deviation *d = NULL;
@@ -1074,7 +1071,7 @@
/* invalid cardinality */
#define TEST_DUP(TYPE, MEMBER, VALUE1, VALUE2) \
TEST_DUP_GENERIC(TYPE" {", MEMBER, VALUE1, VALUE2, parse_deviate, \
- &d, "1", lysp_deviate_free(ctx.ctx, d, 1); free(d); d = NULL)
+ &d, "1", lysp_deviate_free(ctx.ctx, d); free(d); d = NULL)
TEST_DUP("add", "config", "true", "false");
TEST_DUP("replace", "default", "int8", "uint8");
@@ -1089,29 +1086,29 @@
assert_int_equal(LY_SUCCESS, parse_deviate(&ctx, &str, &d));
assert_non_null(d);
assert_string_equal(" ...", str);
- lysp_deviate_free(ctx.ctx, d, 1); free(d); d = NULL;
+ lysp_deviate_free(ctx.ctx, d); free(d); d = NULL;
str = " add {units meters; must 1; must 2; unique x; unique y; default a; default b; config true; mandatory true; min-elements 1; max-elements 2; prefix:ext;} ...";
assert_int_equal(LY_SUCCESS, parse_deviate(&ctx, &str, &d));
assert_non_null(d);
assert_string_equal(" ...", str);
- lysp_deviate_free(ctx.ctx, d, 1); free(d); d = NULL;
+ lysp_deviate_free(ctx.ctx, d); free(d); d = NULL;
str = " delete {units meters; must 1; must 2; unique x; unique y; default a; default b; prefix:ext;} ...";
assert_int_equal(LY_SUCCESS, parse_deviate(&ctx, &str, &d));
assert_non_null(d);
assert_string_equal(" ...", str);
- lysp_deviate_free(ctx.ctx, d, 1); free(d); d = NULL;
+ lysp_deviate_free(ctx.ctx, d); free(d); d = NULL;
str = " replace {type string; units meters; default a; config true; mandatory true; min-elements 1; max-elements 2; prefix:ext;} ...";
assert_int_equal(LY_SUCCESS, parse_deviate(&ctx, &str, &d));
assert_non_null(d);
assert_string_equal(" ...", str);
- lysp_deviate_free(ctx.ctx, d, 1); free(d); d = NULL;
+ lysp_deviate_free(ctx.ctx, d); free(d); d = NULL;
/* invalid substatements */
#define TEST_NOT_SUP(DEV, STMT, VALUE) \
str = " "DEV" {"STMT" "VALUE";}..."; \
assert_int_equal(LY_EVALID, parse_deviate(&ctx, &str, &d)); \
logbuf_assert("Deviate \""DEV"\" does not support keyword \""STMT"\". Line number 1."); \
- lysp_deviate_free(ctx.ctx, d, 1); free(d); d = NULL
+ lysp_deviate_free(ctx.ctx, d); free(d); d = NULL
TEST_NOT_SUP("not-supported", "units", "meters");
TEST_NOT_SUP("not-supported", "must", "1");
@@ -1162,7 +1159,7 @@
str = "cont {" MEMBER" "VALUE1";"MEMBER" "VALUE2";} ..."; \
assert_int_equal(LY_EVALID, parse_container(&ctx, &str, NULL, (struct lysp_node**)&c)); \
logbuf_assert("Duplicate keyword \""MEMBER"\". Line number 1."); \
- lysp_node_free(ctx.ctx, (struct lysp_node*)c, 1); c = NULL;
+ lysp_node_free(ctx.ctx, (struct lysp_node*)c); c = NULL;
TEST_DUP("config", "true", "false");
TEST_DUP("description", "text1", "text2");
@@ -1193,17 +1190,17 @@
assert_null(c->next);
assert_int_equal(LYS_CONFIG_R | LYS_STATUS_CURR, c->flags);
ly_set_erase(&ctx.tpdfs_nodes, NULL);
- lysp_node_free(ctx.ctx, (struct lysp_node*)c, 1); c = NULL;
+ lysp_node_free(ctx.ctx, (struct lysp_node*)c); c = NULL;
/* invalid */
str = " cont {augment /root;} ...";
assert_int_equal(LY_EVALID, parse_container(&ctx, &str, NULL, (struct lysp_node**)&c));
logbuf_assert("Invalid keyword \"augment\" as a child of \"container\". Line number 1.");
- lysp_node_free(ctx.ctx, (struct lysp_node*)c, 1); c = NULL;
+ lysp_node_free(ctx.ctx, (struct lysp_node*)c); c = NULL;
str = " cont {nonsence true;} ...";
assert_int_equal(LY_EVALID, parse_container(&ctx, &str, NULL, (struct lysp_node**)&c));
logbuf_assert("Invalid character sequence \"nonsence\", expected a keyword. Line number 1.");
- lysp_node_free(ctx.ctx, (struct lysp_node*)c, 1); c = NULL;
+ lysp_node_free(ctx.ctx, (struct lysp_node*)c); c = NULL;
ly_ctx_destroy(ctx.ctx, NULL);
}