tree schema UPDATE store YANG version in main mod struct

Author: michalvasko

src/printer_context.c

@@ -1740,6 +1740,7 @@ ctxp_module(const struct lys_module *orig_mod, struct lys_module *mod, struct ly
     /* flags */
     mod->implemented = orig_mod->implemented;
     mod->to_compile = orig_mod->to_compile;
+    mod->version = orig_mod->version;
     mod->latest_revision = orig_mod->latest_revision;
 }
 

src/schema_features.c

@@ -217,20 +217,31 @@ LIBYANG_API_DEF LY_ERR
 lys_feature_value(const struct lys_module *module, const char *feature)
 {
     const struct lysp_feature *f;
+    LY_ARRAY_COUNT_TYPE u;
 
-    LY_CHECK_ARG_RET(NULL, module, module->parsed, feature, LY_EINVAL);
+    LY_CHECK_ARG_RET(NULL, module, module->parsed || module->compiled, feature, !strchr(feature, ':'), LY_EINVAL);
 
-    /* search for the specified feature */
-    f = lysp_feature_find(module->parsed, feature, strlen(feature), 0);
-    LY_CHECK_RET(!f, LY_ENOTFOUND);
+    if (module->parsed) {
+        /* search for the specified feature */
+        f = lysp_feature_find(module->parsed, feature, strlen(feature), 0);
+        LY_CHECK_RET(!f, LY_ENOTFOUND);
 
-    /* feature disabled */
-    if (!(f->flags & LYS_FENABLED)) {
-        return LY_ENOT;
+        /* feature enabled */
+        if (f->flags & LYS_FENABLED) {
+            return LY_SUCCESS;
+        }
+    } else {
+        /* find the feature in the compiled enabled features */
+        LY_ARRAY_FOR(module->compiled->features, u) {
+            if (!strcmp(module->compiled->features[u], feature)) {
+                /* feature enabled */
+                return LY_SUCCESS;
+            }
+        }
     }
 
-    /* feature enabled */
-    return LY_SUCCESS;
+    /* feature disabled */
+    return LY_ENOT;
 }
 
 /**

src/tree_schema.c

@@ -2066,6 +2066,17 @@ lys_parse_in(struct ly_ctx *ctx, struct ly_in *in, LYS_INFORMAT format, const st
         LY_CHECK_GOTO(rc = lysdict_insert(ctx, mod->parsed->revs[0].date, 0, &mod->revision), cleanup);
     }
 
+    /* set YANG version */
+    switch (mod->parsed->version) {
+    case LYS_VERSION_UNDEF:
+    case LYS_VERSION_1_0:
+        mod->version = LYS_VERSION_1_0;
+        break;
+    case LYS_VERSION_1_1:
+        mod->version = LYS_VERSION_1_1;
+        break;
+    }
+
     /* decide the latest revision */
     latest = ly_ctx_get_module_latest(ctx, mod->name);
     if (latest) {

src/tree_schema.h

@@ -2194,7 +2194,8 @@ struct lys_module {
     ly_bool implemented;                /**< flag if the module is implemented, not just imported */
     ly_bool to_compile;                 /**< flag marking a module that was changed but not (re)compiled, see
                                              ::LY_CTX_EXPLICIT_COMPILE. */
-    uint8_t latest_revision;            /**< Flag to mark the latest available revision,
+    uint8_t version : 2;                /**< yang-version (LYS_VERSION values) */
+    uint8_t latest_revision : 4;        /**< Flag to mark the latest available revision,
                                              see [latest_revision options](@ref latestrevflags). */
 };