extension: update the logic based on libyang v4

This patch updates the logic of extension to use updated version of
libyang v4 API

Signed-off-by: Stefan Gula <[email protected]>

Author: steweg

cffi/cdefs.h

@@ -467,12 +467,11 @@ struct lysp_ext_instance {
     const char *argument;
     LY_VALUE_FORMAT format;
     void *prefix_data;
-    struct lysp_ext *def;
+    uintptr_t plugin_ref;
     void *parent;
     enum ly_stmt parent_stmt;
     uint64_t parent_stmt_index;
     uint16_t flags;
-    const struct lyplg_ext_record *record;
     struct lysp_ext_substmt *substmts;
     void *parsed;
     struct lysp_stmt *child;
@@ -1325,13 +1324,14 @@ struct lyd_leafref_links_rec {
 
 LY_ERR lyd_leafref_get_links(const struct lyd_node_term *, const struct lyd_leafref_links_rec **);
 LY_ERR lyd_leafref_link_node_tree(struct lyd_node *);
+struct lyplg_ext *lysc_get_ext_plugin(uintptr_t);
 const char *lyplg_ext_stmt2str(enum ly_stmt stmt);
 const struct lysp_module *lyplg_ext_parse_get_cur_pmod(const struct lysp_ctx *);
 struct ly_ctx *lyplg_ext_compile_get_ctx(const struct lysc_ctx *);
 void lyplg_ext_parse_log(const struct lysp_ctx *, const struct lysp_ext_instance *, LY_LOG_LEVEL, LY_ERR, const char *, ...);
 void lyplg_ext_compile_log(const struct lysc_ctx *, const struct lysc_ext_instance *, LY_LOG_LEVEL, LY_ERR, const char *, ...);
 LY_ERR lyplg_ext_parse_extension_instance(struct lysp_ctx *, struct lysp_ext_instance *);
-LY_ERR lyplg_ext_compile_extension_instance(struct lysc_ctx *, const struct lysp_ext_instance *, struct lysc_ext_instance *);
+LY_ERR lyplg_ext_compile_extension_instance(struct lysc_ctx *, const struct lysp_ext_instance *, struct lysc_ext_instance *, struct lysc_node *);
 void lyplg_ext_pfree_instance_substatements(const struct ly_ctx *ctx, struct lysp_ext_substmt *substmts);
 void lyplg_ext_cfree_instance_substatements(const struct ly_ctx *ctx, struct lysc_ext_substmt *substmts);
 typedef LY_ERR (*lyplg_ext_parse_clb)(struct lysp_ctx *, struct lysp_ext_instance *);

libyang/extension.py

@@ -8,7 +8,7 @@
 from _libyang import ffi, lib
 from .context import Context
 from .log import get_libyang_level
-from .schema import ExtensionCompiled, ExtensionParsed, Module
+from .schema import ExtensionCompiled, ExtensionParsed, Module, SNode
 from .util import LibyangError, c2str, str2c
 
 
@@ -25,7 +25,7 @@ def __init__(self, message: str, ret: int, log_level: int) -> None:
 
 @ffi.def_extern(name="lypy_lyplg_ext_parse_clb")
 def libyang_c_lyplg_ext_parse_clb(pctx, pext):
-    plugin = extensions_plugins[pext.record.plugin]
+    plugin = extensions_plugins[lib.lysc_get_ext_plugin(pext.plugin_ref)]
     module_cdata = lib.lyplg_ext_parse_get_cur_pmod(pctx).mod
     context = Context(cdata=module_cdata.ctx)
     module = Module(context, module_cdata)
@@ -46,7 +46,7 @@ def libyang_c_lyplg_ext_parse_clb(pctx, pext):
 
 @ffi.def_extern(name="lypy_lyplg_ext_compile_clb")
 def libyang_c_lyplg_ext_compile_clb(cctx, pext, cext):
-    plugin = extensions_plugins[pext.record.plugin]
+    plugin = extensions_plugins[lib.lysc_get_ext_plugin(pext.plugin_ref)]
     context = Context(cdata=lib.lyplg_ext_compile_get_ctx(cctx))
     module = Module(context, cext.module)
     parsed_ext = ExtensionParsed(context, pext, module)
@@ -67,7 +67,7 @@ def libyang_c_lyplg_ext_compile_clb(cctx, pext, cext):
 
 @ffi.def_extern(name="lypy_lyplg_ext_parse_free_clb")
 def libyang_c_lyplg_ext_parse_free_clb(ctx, pext):
-    plugin = extensions_plugins[pext.record.plugin]
+    plugin = extensions_plugins[lib.lysc_get_ext_plugin(pext.plugin_ref)]
     context = Context(cdata=ctx)
     parsed_ext = ExtensionParsed(context, pext, None)
     plugin.parse_free_clb(parsed_ext)
@@ -200,9 +200,17 @@ def set_compile_ctx(self, cctx) -> None:
     def parse_substmts(self, ext: ExtensionParsed) -> int:
         return lib.lyplg_ext_parse_extension_instance(self._pctx, ext.cdata)
 
-    def compile_substmts(self, pext: ExtensionParsed, cext: ExtensionCompiled) -> int:
+    def compile_substmts(
+        self,
+        pext: ExtensionParsed,
+        cext: ExtensionCompiled,
+        parent: Optional[SNode] = None,
+    ) -> int:
         return lib.lyplg_ext_compile_extension_instance(
-            self._cctx, pext.cdata, cext.cdata
+            self._cctx,
+            pext.cdata,
+            cext.cdata,
+            ffi.NULL if parent is None else parent.cdata,
         )
 
     def free_parse_substmts(self, ext: ExtensionParsed) -> None: