using lyplg_ext_get_storage

Author: lePici

src/printer_tree.c

@@ -3840,64 +3840,24 @@ pt_print_groupings(struct pt_tree_ctx *tc)
 /**
  * @brief Read extension and get schema pointer.
  * @param[in] ext Extension to read.
- * @param[in] compiled Set to 1 if @p ext is from lysc tree.
- * @return pointer to lysp or lysc node.
+ * @param[in] stmt_mask First stmt which match will be returned.
+ * @return pointer to lysp node.
  */
 static void *
-pt_ext_read_storage(void *ext, ly_bool compiled)
+pt_ext_parsed_read_storage(struct lysp_ext_instance *ext, int stmt_mask)
 {
     LY_ARRAY_COUNT_TYPE i;
     enum ly_stmt stmt;
-    void *substmts;
-    void **storage_p;
-    void *node = NULL, *child;
+    void *substmts, **storage_p, *node = NULL;
 
-    substmts = compiled ? (void *)((struct lysc_ext_instance *)ext)->substmts :
-            (void *)((struct lysp_ext_instance *)ext)->substmts;
+    substmts = (void *)((struct lysp_ext_instance *)ext)->substmts;
 
     LY_ARRAY_FOR(substmts, i) {
-        if (compiled) {
-            stmt = ((struct lysc_ext_instance *)ext)->substmts[i].stmt;
-            storage_p = ((struct lysc_ext_instance *)ext)->substmts[i].storage_p;
-        } else {
-            stmt = ((struct lysp_ext_instance *)ext)->substmts[i].stmt;
-            storage_p = ((struct lysp_ext_instance *)ext)->substmts[i].storage_p;
-        }
-
-        if (!storage_p) {
-            continue;
-        }
+        stmt = ((struct lysp_ext_instance *)ext)->substmts[i].stmt;
+        storage_p = ((struct lysp_ext_instance *)ext)->substmts[i].storage_p;
 
-        /* find some data node */
-        switch (stmt) {
-        case LY_STMT_NOTIFICATION:
-        case LY_STMT_INPUT:
-        case LY_STMT_OUTPUT:
-        case LY_STMT_ACTION:
-        case LY_STMT_RPC:
-        case LY_STMT_ANYDATA:
-        case LY_STMT_ANYXML:
-        case LY_STMT_CASE:
-        case LY_STMT_CHOICE:
-        case LY_STMT_CONTAINER:
-        case LY_STMT_LEAF:
-        case LY_STMT_LEAF_LIST:
-        case LY_STMT_LIST:
-            node = !node && *storage_p ? *storage_p : node;
-            break;
-        case LY_STMT_AUGMENT:
-            if (compiled) {
-                continue;
-            } else if (!*storage_p) {
-                continue;
-            } else {
-                /* for augment-structure */
-                child = (*((struct lysp_node_augment **)storage_p))->child;
-                node = child ? child : node;
-            }
-            break;
-        default:
-            break;
+        if (storage_p && (stmt & stmt_mask)) {
+            return *storage_p;
         }
     }
 
@@ -3915,44 +3875,45 @@ pt_ext_read_storage(void *ext, ly_bool compiled)
 static void *
 pt_ext_read(void *ext, ly_bool *compiled, struct pt_keyword_stmt *ks)
 {
-    LY_ARRAY_COUNT_TYPE i;
-    const char *name;
     struct lysc_ext_instance *ext_comp;
     struct lysp_ext_instance *ext_pars;
+    const char *name;
     void *schema;
 
-    if (*compiled) {
-        ext_comp = ext;
-        ks->argument = ext_comp->argument;
-        ks->section_name = ext_comp->def->name;
-        /* search in lysc_ext_instance */
-        schema = pt_ext_read_storage(ext_comp, 1);
-        *compiled = 1;
-        if (schema) {
-            return schema;
-        }
-        /* search in lysp_ext_instance */
-        *compiled = 0;
-        if (!ext_comp->module->parsed) {
-            return NULL;
-        }
-        /* find lysp_ext_instance by lysc_ext_instance */
-        ext_pars = ext_comp->module->parsed->exts;
-        LY_ARRAY_FOR(ext_pars, i) {
-            name = strchr(ext_pars->name, ':') + 1;
-            if (!strcmp(name, ext_comp->def->name) && !strcmp(ext_pars[i].argument, ext_comp->argument)) {
-                break;
-            }
-        }
-        assert(ext_pars);
-        schema = pt_ext_read_storage(ext_pars, 0);
-    } else {
+    if (!*compiled) {
         ext_pars = ext;
         ks->argument = ext_pars->argument;
         name = strchr(ext_pars->name, ':') + 1;
         ks->section_name = name;
-        schema = pt_ext_read_storage(ext_pars, 0);
+        if (!strcmp(ks->section_name, "augment-structure")) {
+            schema = pt_ext_parsed_read_storage(ext_pars, LY_STMT_AUGMENT);
+            schema = ((struct lysp_node_augment *)schema)->child;
+        } else {
+            schema = pt_ext_parsed_read_storage(ext_pars, LY_STMT_DATA_NODE_MASK);
+        }
         *compiled = 0;
+        return schema;
+    }
+
+    /* for compiled extension instance */
+    ext_comp = ext;
+    ks->argument = ext_comp->argument;
+    ks->section_name = ext_comp->def->name;
+
+    /* search in lysc_ext_instance */
+    lyplg_ext_get_storage(ext, LY_STMT_DATA_NODE_MASK, sizeof schema, (const void **)&schema);
+    *compiled = 1;
+    if (schema) {
+        return schema;
+    }
+
+    /* no data nodes lysc_ext_instance, so search in lysp_ext_instance */
+    *compiled = 0;
+    if (!strcmp(ks->section_name, "augment-structure")) {
+        lyplg_ext_parsed_get_storage(ext_comp, LY_STMT_AUGMENT, sizeof schema, (const void **)&schema);
+        schema = ((struct lysp_node_augment *)schema)->child;
+    } else {
+        lyplg_ext_parsed_get_storage(ext_comp, LY_STMT_DATA_NODE_MASK, sizeof schema, (const void **)&schema);
     }
 
     return schema;