allow if-feature in enums

Author: dhubler

meta/core.go

@@ -1163,10 +1163,12 @@ type Bit struct {
 }
 
 type Enum struct {
+	parent     Meta
 	ident      string
 	desc       string
 	ref        string
 	val        int
+	ifs        []*IfFeature
 	extensions []*Extension
 }
 

meta/core_gen.go

@@ -4216,6 +4216,14 @@ func (m *Enum) Ident() string {
 	return m.ident
 }
 
+// Parent is where this extension is define unless the extension is a
+// secondary extension like a description and then this is the parent
+// of that description
+func (m *Enum) Parent() Meta {
+	return m.parent
+}
+
+
 // Description of Enum
 func (m *Enum) Description() string {
 	return m.desc
@@ -4242,6 +4250,15 @@ func (m *Enum) addExtension(extension *Extension) {
 }
 
 
+func (m *Enum) IfFeatures() []*IfFeature {
+	return m.ifs
+}
+
+func (m *Enum) addIfFeature(i *IfFeature) {
+	i.parent = m
+    m.ifs = append(m.ifs, i)
+}
+
 
 
 // Description of Range

parser/parser.go

@@ -608,7 +608,6 @@ error_app_tag_stmt :
         }        
     }
 
-
 if_feature_stmt :
     kywd_if_feature string_value statement_end {
         l := yylex.(*lexer)
@@ -1489,6 +1488,7 @@ enum_body_stmt :
     | status_stmt
     | reference_stmt
     | enum_value
+    | if_feature_stmt
     | unknown_stmt
 
 enum_value :

parser/parser.y

@@ -23,7 +23,20 @@
             "leaf":{
               "type":{
                 "ident":"string",
-                "format":"string"}}}]}}],
+                "format":"string"}}}]}},
+    {
+      "ident":"l3",
+      "leaf":{
+        "type":{
+          "ident":"enumeration",
+          "enumeration":[
+            {
+              "label":"one",
+              "id":0},
+            {
+              "label":"two",
+              "id":1}],
+          "format":"enum"}}}],
   "feature":[
     {
       "ident":"blacklisted"},

parser/testdata/feature/gold/x.json

@@ -47,6 +47,24 @@ type "type"
 ; ";"
 } "}"
 } "}"
+leaf "leaf"
+[ident] "l3"
+{ "{"
+type "type"
+[ident] "enumeratio"...
+{ "{"
+enum "enum"
+[string] "one"
+{ "{"
+if-feature "if-feature"
+[string] "\"x\""
+; ";"
+} "}"
+enum "enum"
+[string] "two"
+; ";"
+} "}"
+} "}"
 uses "uses"
 [ident] "g"
 { "{"

parser/testdata/feature/gold/x.lex

@@ -24,6 +24,15 @@ module x {
         }
     }
 
+    leaf l3 {
+        type enumeration {
+            enum one {
+                if-feature "x";
+            }
+            enum two;
+        }
+    }
+
     uses g {
         if-feature blacklisted;
     }

parser/testdata/feature/x.yang

@@ -13,7 +13,7 @@ module fc-yang {
 
     /* 
      *   NOTES:
-
+     *
      *   !! contains CIRCULAR references however there is no other way around
      *   this.  According to RFC7950 this is not allowed.
      */