commit 80d281ebca67af594af4057f4553cd21b3d1e9e2
author Radek Krejci <rkrejci@cesnet.cz> Mon Sep 14 17:42:54 2020 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Mon Sep 21 09:19:59 2020 +0200
tree 1f1e726ff510ee566593952deaaae1945c2b0bf1
parent 14915cc728946804601807c582f116555ccac6e0

schema tree CHANGE keep compiled identities on a single place

Instead of moving identities between lys_module and lysc_module, keep them
in lys_module structure and save some work and confusion which member is
used.

tests/utests/schema/test_schema_stmts.c

diff --git a/tests/utests/schema/test_schema_stmts.c b/tests/utests/schema/test_schema_stmts.c
index fbd9443..eeb0673 100644
--- a/tests/utests/schema/test_schema_stmts.c
+++ b/tests/utests/schema/test_schema_stmts.c
@@ -96,26 +96,25 @@
                    "identity b1; identity b2; identity b3 {base b1; base b:b2; base a:a1;}"
                    "identity b4 {base b:b1; base b3;}", mod);
     assert_non_null(mod_imp->compiled);
-    assert_non_null(mod_imp->compiled->identities);
-    assert_non_null(mod->compiled);
-    assert_non_null(mod->compiled->identities);
-    assert_non_null(mod_imp->compiled->identities[0].derived);
-    assert_int_equal(1, LY_ARRAY_COUNT(mod_imp->compiled->identities[0].derived));
-    assert_ptr_equal(mod_imp->compiled->identities[0].derived[0], &mod->compiled->identities[2]);
-    assert_non_null(mod->compiled->identities[0].derived);
-    assert_int_equal(2, LY_ARRAY_COUNT(mod->compiled->identities[0].derived));
-    assert_ptr_equal(mod->compiled->identities[0].derived[0], &mod->compiled->identities[2]);
-    assert_ptr_equal(mod->compiled->identities[0].derived[1], &mod->compiled->identities[3]);
-    assert_non_null(mod->compiled->identities[1].derived);
-    assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->identities[1].derived));
-    assert_ptr_equal(mod->compiled->identities[1].derived[0], &mod->compiled->identities[2]);
-    assert_non_null(mod->compiled->identities[2].derived);
-    assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->identities[2].derived));
-    assert_ptr_equal(mod->compiled->identities[2].derived[0], &mod->compiled->identities[3]);
+    assert_non_null(mod_imp->identities);
+    assert_non_null(mod->identities);
+    assert_non_null(mod_imp->identities[0].derived);
+    assert_int_equal(1, LY_ARRAY_COUNT(mod_imp->identities[0].derived));
+    assert_ptr_equal(mod_imp->identities[0].derived[0], &mod->identities[2]);
+    assert_non_null(mod->identities[0].derived);
+    assert_int_equal(2, LY_ARRAY_COUNT(mod->identities[0].derived));
+    assert_ptr_equal(mod->identities[0].derived[0], &mod->identities[2]);
+    assert_ptr_equal(mod->identities[0].derived[1], &mod->identities[3]);
+    assert_non_null(mod->identities[1].derived);
+    assert_int_equal(1, LY_ARRAY_COUNT(mod->identities[1].derived));
+    assert_ptr_equal(mod->identities[1].derived[0], &mod->identities[2]);
+    assert_non_null(mod->identities[2].derived);
+    assert_int_equal(1, LY_ARRAY_COUNT(mod->identities[2].derived));
+    assert_ptr_equal(mod->identities[2].derived[0], &mod->identities[3]);
 
     TEST_SCHEMA_OK(ctx, 1, 0, "c", "identity c2 {base c1;} identity c1;", mod);
-    assert_int_equal(1, LY_ARRAY_COUNT(mod->compiled->identities[1].derived));
-    assert_ptr_equal(mod->compiled->identities[1].derived[0], &mod->compiled->identities[0]);
+    assert_int_equal(1, LY_ARRAY_COUNT(mod->identities[1].derived));
+    assert_ptr_equal(mod->identities[1].derived[0], &mod->identities[0]);
 
     TEST_SCHEMA_ERR(ctx, 0, 0, "inv", "identity i1;identity i1;", "Duplicate identifier \"i1\" of identity statement. /inv:{identity='i1'}");