Add action/anydata/modifier stmt for yang2yin

Author: fredgan

tools/yang2yin/main.c

@@ -30,6 +30,8 @@ enum yang_arg {
 
 enum yang_token {
     YANG_UNKNOWN = 0,
+    YANG_ACTION,
+    YANG_ANYDATA,
     YANG_ANYXML,
     YANG_ARGUMENT,
     YANG_AUGMENT,
@@ -65,6 +67,7 @@ enum yang_token {
     YANG_MANDATORY,
     YANG_MAX_ELEMENTS,
     YANG_MIN_ELEMENTS,
+    YANG_MODIFIER,
     YANG_MODULE,
     YANG_MUST,
     YANG_NAMESPACE,
@@ -106,6 +109,10 @@ static const char *
 keyword2str(enum yang_token keyword)
 {
     switch (keyword) {
+    case YANG_ACTION:
+        return "action";
+    case YANG_ANYDATA:
+        return "anydata";
     case YANG_ANYXML:
         return "anyxml";
     case YANG_ARGUMENT:
@@ -176,6 +183,8 @@ keyword2str(enum yang_token keyword)
         return "max-elements";
     case YANG_MIN_ELEMENTS:
         return "min-elements";
+    case YANG_MODIFIER:
+        return "modifier";
     case YANG_MODULE:
         return "module";
     case YANG_MUST:
@@ -508,7 +517,15 @@ get_keyword(char *word, enum yang_arg *arg)
     switch (word[0]) {
     case 'a':
         ++word;
-        if (!strncmp(word, "nyxml", 5)) {
+        if (!strncmp(word, "ction", 5)) {
+            word += 5;
+            ret = YANG_ACTION;
+            *arg = Y_STR_ARG;
+	} else if (!strncmp(word, "nydata", 6)) {
+            word += 6;
+            ret = YANG_ANYDATA;
+            *arg = Y_IDENTIF_ARG;
+	} else if (!strncmp(word, "nyxml", 5)) {
             word += 5;
             ret = YANG_ANYXML;
             *arg = Y_IDENTIF_ARG;
@@ -714,6 +731,10 @@ get_keyword(char *word, enum yang_arg *arg)
             word += 11;
             ret = YANG_MIN_ELEMENTS;
             *arg = Y_STR_ARG;
+        } else if (!strncmp(word, "odifier", 7)) {
+            word += 7;
+            ret = YANG_MODIFIER;
+            *arg = Y_STR_ARG;
         } else if (!strncmp(word, "odule", 5)) {
             word += 5;
             ret = YANG_MODULE;
@@ -998,6 +1019,14 @@ print_keyword(enum yang_token keyword, enum yang_arg arg, FILE *out, int level,
     const char *yin_element = NULL, *close_tag;
 
     switch (keyword) {
+    case YANG_ACTION:
+        fprintf(out, "%*s<action name=\"", LEVEL(level), INDENT(level));
+        close_tag = "action";
+        break;
+    case YANG_ANYDATA:
+        fprintf(out, "%*s<anydata name=\"", LEVEL(level), INDENT(level));
+        close_tag = "anydata";
+        break;
     case YANG_ANYXML:
         fprintf(out, "%*s<anyxml name=\"", LEVEL(level), INDENT(level));
         close_tag = "anyxml";
@@ -1141,6 +1170,10 @@ print_keyword(enum yang_token keyword, enum yang_arg arg, FILE *out, int level,
         fprintf(out, "%*s<min-elements value=\"", LEVEL(level), INDENT(level));
         close_tag = "min-elements";
         break;
+    case YANG_MODIFIER:
+        fprintf(out, "%*s<modifier value=\"", LEVEL(level), INDENT(level));
+        close_tag = "modifier";
+        break;
     case YANG_MUST:
         fprintf(out, "%*s<must condition=\"", LEVEL(level), INDENT(level));
         close_tag = "must";
@@ -1601,6 +1634,7 @@ find_namespace_imports(FILE *in, char **buf, int *buf_len, char **name_space, ch
         case YANG_LIST:
         case YANG_CHOICE:
         case YANG_ANYXML:
+        case YANG_ANYDATA:
         case YANG_USES:
         case YANG_AUGMENT:
         case YANG_RPC: