issue #16 - imply case in choice when it is not there. YANG 1.1

freeconf · Jul 8, 2018 · 9bc5c8f · 9bc5c8f
1 parent dbbe6fa
commit 9bc5c8f
Show file tree

Hide file tree

Showing 7 changed files with 467 additions and 413 deletions.
diff --git a/meta/core.go b/meta/core.go
@@ -3,6 +3,7 @@ package meta
 import (
 	"errors"
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/freeconf/gconf/c2"
@@ -542,8 +543,14 @@ func (y *Choice) resolve(pool schemaPool) error {
 
 func (y *Choice) buildCases() {
 	y.cases = make(map[string]*ChoiceCase)
-	for _, ddef := range y.defs.dataDefs {
-		y.cases[ddef.Ident()] = ddef.(*ChoiceCase)
+	for i, ddef := range y.defs.dataDefs {
+		if ddef, ok := ddef.(*ChoiceCase); ok {
+			y.cases[ddef.Ident()] = ddef
+		} else {
+			implicit := NewChoiceCase(y, strconv.Itoa(i))
+			implicit.add(ddef)
+			y.cases[implicit.Ident()] = implicit
+		}
 	}
 }
 

diff --git a/meta/yang/parser.go b/meta/yang/parser.go
diff --git a/meta/yang/parser.y b/meta/yang/parser.y
@@ -460,6 +460,7 @@ choice_stmt_body :
     | description
     | reference_stmt    
     | case_stmts
+    | body_stmts
     | if_feature_stmt
     | when_stmt
 
@@ -530,7 +531,7 @@ type_stmt :
 
 type_stmt_def :
     kywd_type token_ident {
-        if push(yylex, meta.NewDataType($2)) {
+        if push(yylex, meta.NewType($2)) {
             goto ret1
         }
     }

diff --git a/meta/yang/parser_test.go b/meta/yang/parser_test.go
@@ -168,6 +168,7 @@ var yangTestFiles = []struct {
 	{"/feature", "x"},
 	{"/when", "x"},
 	{"/must", "x"},
+	{"/choice", "no-case"},
 	{"", "turing-machine"},
 }
 

diff --git a/meta/yang/testdata/choice/gold/no-case.json b/meta/yang/testdata/choice/gold/no-case.json
@@ -0,0 +1,16 @@
+{
+"module":{
+  "ident":"x",
+  "revision":{
+    "rev-date":"0"},
+  "dataDef":[
+    {
+      "ident":"c",
+      "choice":{
+        "dataDef":[
+          {
+            "ident":"x",
+            "leaf":{
+              "type":{
+                "ident":"string",
+                "format":"string"}}}]}}]}}
diff --git a/meta/yang/testdata/choice/gold/no-case.lex b/meta/yang/testdata/choice/gold/no-case.lex
@@ -0,0 +1,18 @@
+module "module"
+[ident] "x"
+{ "{"
+revision "revision"
+[string] "0"
+; ";"
+choice "choice"
+[ident] "c"
+{ "{"
+leaf "leaf"
+[ident] "x"
+{ "{"
+type "type"
+[ident] "string"
+; ";"
+} "}"
+} "}"
+} "}"
diff --git a/meta/yang/testdata/choice/no-case.yang b/meta/yang/testdata/choice/no-case.yang
@@ -0,0 +1,8 @@
+module x {
+    revision 0;
+    choice c {
+        leaf x {
+            type string;
+        }
+    }
+}