Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/identity #118

Closed
wants to merge 3 commits into from
Closed

Feature/identity #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25be575
extension: add ExtensionPlugin class
steweg Mar 29, 2024
7c451a5
schema: adds PNode and its exact variants
steweg Mar 1, 2024
ac058c7
schema: adds Identity and PIdentity classes
steweg Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 174 additions & 0 deletions cffi/cdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ enum ly_stmt {
LY_STMT_ARG_VALUE
};

#define LY_STMT_OP_MASK ...
#define LY_STMT_DATA_NODE_MASK ...
#define LY_STMT_NODE_MASK ...

#define LY_LOLOG ...
#define LY_LOSTORE ...
#define LY_LOSTORE_LAST ...
Expand Down Expand Up @@ -353,6 +357,7 @@ LY_ERR lys_print_module(struct ly_out *, const struct lys_module *, LYS_OUTFORMA
#define LYS_PRINT_SHRINK ...

struct lys_module {
struct ly_ctx *ctx;
const char *name;
const char *revision;
const char *ns;
Expand Down Expand Up @@ -422,6 +427,22 @@ struct lysc_node_container {
struct lysc_node_notif *notifs;
};

struct lysp_stmt {
const char *stmt;
const char *arg;
LY_VALUE_FORMAT format;
void *prefix_data;
struct lysp_stmt *next;
struct lysp_stmt *child;
uint16_t flags;
enum ly_stmt kw;
};

struct lysp_ext_substmt {
enum ly_stmt stmt;
void *storage;
};

struct lysp_ext_instance {
const char *name;
const char *argument;
Expand Down Expand Up @@ -449,6 +470,16 @@ struct lysp_ext_instance {
char rev[LY_REV_SIZE];
};

struct lysp_ident {
const char *name;
struct lysp_qname *iffeatures;
const char **bases;
const char *dsc;
const char *ref;
struct lysp_ext_instance *exts;
uint16_t flags;
};

struct lysp_feature {
const char *name;
struct lysp_qname *iffeatures;
Expand Down Expand Up @@ -528,6 +559,25 @@ typedef enum {

char* lysc_path(const struct lysc_node *, LYSC_PATH_TYPE, char *, size_t);

struct lysp_when {
const char *cond;
...;
};

struct lysp_refine {
const char *nodeid;
const char *dsc;
const char *ref;
struct lysp_qname *iffeatures;
struct lysp_restr *musts;
const char *presence;
struct lysp_qname *dflts;
uint32_t min;
uint32_t max;
struct lysp_ext_instance *exts;
uint16_t flags;
};

struct lysp_node_container {
struct lysp_restr *musts;
struct lysp_when *when;
Expand Down Expand Up @@ -615,6 +665,73 @@ struct lysp_node_list {
...;
};

struct lysp_node_choice {
struct lysp_node *child;
struct lysp_when *when;
struct lysp_qname dflt;
...;
};

struct lysp_node_case {
struct lysp_node *child;
struct lysp_when *when;
...;
};

struct lysp_node_anydata {
struct lysp_restr *musts;
struct lysp_when *when;
...;
};

struct lysp_node_uses {
struct lysp_refine *refines;
struct lysp_node_augment *augments;
struct lysp_when *when;
...;
};

struct lysp_node_action_inout {
struct lysp_restr *musts;
struct lysp_tpdf *typedefs;
struct lysp_node_grp *groupings;
struct lysp_node *child;
...;
};

struct lysp_node_action {
struct lysp_tpdf *typedefs;
struct lysp_node_grp *groupings;
struct lysp_node_action_inout input;
struct lysp_node_action_inout output;
...;
};

struct lysp_node_notif {
struct lysp_restr *musts;
struct lysp_tpdf *typedefs;
struct lysp_node_grp *groupings;
struct lysp_node *child;
...;
};

struct lysp_node_grp {
struct lysp_tpdf *typedefs;
struct lysp_node_grp *groupings;
struct lysp_node *child;
struct lysp_node_action *actions;
struct lysp_node_notif *notifs;
...;
};

struct lysp_node_augment {
struct lysp_node *child;
struct lysp_when *when;
struct lysp_node_action *actions;
struct lysp_node_notif *notifs;
...;
};

struct lysc_type {
const char *name;
struct lysc_ext_instance *exts;
Expand All @@ -623,6 +740,16 @@ struct lysc_type {
uint32_t refcount;
};

struct lysp_type_enum {
const char *name;
const char *dsc;
const char *ref;
int64_t value;
struct lysp_qname *iffeatures;
struct lysp_ext_instance *exts;
uint16_t flags;
};

struct lysp_type {
const char *name;
struct lysp_restr *range;
Expand Down Expand Up @@ -822,6 +949,16 @@ struct lysp_restr {
struct lysp_ext_instance *exts;
};

struct lysc_ident {
const char *name;
const char *dsc;
const char *ref;
struct lys_module *module;
struct lysc_ident **derived;
struct lysc_ext_instance *exts;
uint16_t flags;
};

struct lysc_type_num {
const char *name;
struct lysc_ext_instance *exts;
Expand Down Expand Up @@ -1117,5 +1254,42 @@ struct lyd_attr {
LY_ERR lyd_new_attr(struct lyd_node *, const char *, const char *, const char *, struct lyd_attr **);
void lyd_free_attr_single(const struct ly_ctx *ctx, struct lyd_attr *attr);

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 *);
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 *);
typedef LY_ERR (*lyplg_ext_compile_clb)(struct lysc_ctx *, const struct lysp_ext_instance *, struct lysc_ext_instance *);
typedef void (*lyplg_ext_parse_free_clb)(const struct ly_ctx *, struct lysp_ext_instance *);
typedef void (*lyplg_ext_compile_free_clb)(const struct ly_ctx *, struct lysc_ext_instance *);
struct lyplg_ext {
const char *id;
lyplg_ext_parse_clb parse;
lyplg_ext_compile_clb compile;
lyplg_ext_parse_free_clb pfree;
lyplg_ext_compile_free_clb cfree;
...;
};

struct lyplg_ext_record {
const char *module;
const char *revision;
const char *name;
struct lyplg_ext plugin;
...;
};

#define LYPLG_EXT_API_VERSION ...
LY_ERR lyplg_add_extension_plugin(struct ly_ctx *, uint32_t, const struct lyplg_ext_record *);
extern "Python" LY_ERR lypy_lyplg_ext_parse_clb(struct lysp_ctx *, struct lysp_ext_instance *);
extern "Python" LY_ERR lypy_lyplg_ext_compile_clb(struct lysc_ctx *, const struct lysp_ext_instance *, struct lysc_ext_instance *);
extern "Python" void lypy_lyplg_ext_parse_free_clb(const struct ly_ctx *, struct lysp_ext_instance *);
extern "Python" void lypy_lyplg_ext_compile_free_clb(const struct ly_ctx *, struct lysc_ext_instance *);

/* from libc, needed to free allocated strings */
void free(void *);
45 changes: 45 additions & 0 deletions libyang/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,15 @@
UnitsRemoved,
schema_diff,
)
from .extension import ExtensionPlugin, LibyangExtensionError
from .keyed_list import KeyedList
from .log import configure_logging
from .schema import (
Extension,
ExtensionCompiled,
ExtensionParsed,
Feature,
Identity,
IfAndFeatures,
IfFeature,
IfFeatureExpr,
Expand All @@ -76,8 +80,27 @@
IfOrFeatures,
Module,
Must,
PAction,
PActionInOut,
PAnydata,
Pattern,
PAugment,
PCase,
PChoice,
PContainer,
PEnum,
PGrouping,
PIdentity,
PLeaf,
PLeafList,
PList,
PNode,
PNotif,
PRefine,
PType,
PUses,
Revision,
SAnydata,
SCase,
SChoice,
SContainer,
Expand Down Expand Up @@ -124,8 +147,12 @@
"EnumRemoved",
"Extension",
"ExtensionAdded",
"ExtensionCompiled",
"ExtensionParsed",
"ExtensionPlugin",
"ExtensionRemoved",
"Feature",
"Identity",
"IfAndFeatures",
"IfFeature",
"IfFeatureExpr",
Expand All @@ -150,6 +177,24 @@
"NodeTypeRemoved",
"OrderedByUserAdded",
"OrderedByUserRemoved",
"PAction",
"PActionInOut",
"PAnydata",
"PAugment",
"PCase",
"PChoice",
"PContainer",
"PEnum",
"PGrouping",
"PIdentity",
"PLeaf",
"PLeafList",
"PList",
"PNode",
"PNotif",
"PRefine",
"PType",
"PUses",
"Pattern",
"PatternAdded",
"PatternRemoved",
Expand Down
Loading
Loading