commit 468f8283e4f87ff30f73b7f987b40eaf0a3133e2
author Vidyashree Rama <vidyashree.rama@huawei.com> Fri Mar 04 19:08:35 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Tue Mar 08 19:01:08 2016 +0000
tree 7337fbc7b84d937adb2f67d858623a0f8fbcfb2e
parent fd46e1d293662cff66f9963da25e9ed37f5c7662

Identifier issue fix for module, list, container, leaf, leaf-list, prefix + date agr string for revision fix

Change-Id: Id9d596512f35b54f6359d361402bcd0180b71678

utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/PrefixListener.java

diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/PrefixListener.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/PrefixListener.java
index e59cda0..1fbe6dd 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/PrefixListener.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/PrefixListener.java
@@ -24,6 +24,7 @@
 import org.onosproject.yangutils.parser.exceptions.ParserException;
 import org.onosproject.yangutils.parser.impl.TreeWalkListener;
 
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerUtil.getValidIdentifier;
 import static org.onosproject.yangutils.utils.YangConstructType.PREFIX_DATA;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation.ENTRY;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction.constructListenerErrorMessage;
@@ -51,7 +52,7 @@
  *                         | prefix_stmt namespace_stmt yang_version_stmt?
  *                         | prefix_stmt yang_version_stmt? namespace_stmt
  *                         ;
- * prefix_stmt : PREFIX_KEYWORD IDENTIFIER STMTEND;
+ * prefix_stmt : PREFIX_KEYWORD identifier STMTEND;
  */
 
 /**
@@ -76,29 +77,31 @@
     public static void processPrefixEntry(TreeWalkListener listener, GeneratedYangParser.PrefixStatementContext ctx) {
 
         // Check for stack to be non empty.
-        checkStackIsNotEmpty(listener, MISSING_HOLDER, PREFIX_DATA, ctx.IDENTIFIER().getText(), ENTRY);
+        checkStackIsNotEmpty(listener, MISSING_HOLDER, PREFIX_DATA, ctx.identifier().getText(), ENTRY);
+
+        String identifier = getValidIdentifier(ctx.identifier().getText(), PREFIX_DATA, ctx);
 
         // Obtain the node of the stack.
         Parsable tmpNode = listener.getParsedDataStack().peek();
         switch (tmpNode.getYangConstructType()) {
         case MODULE_DATA: {
             YangModule module = (YangModule) tmpNode;
-            module.setPrefix(ctx.IDENTIFIER().getText());
+            module.setPrefix(identifier);
             break;
         }
         case IMPORT_DATA: {
             YangImport importNode = (YangImport) tmpNode;
-            importNode.setPrefixId(ctx.IDENTIFIER().getText());
+            importNode.setPrefixId(identifier);
             break;
         }
         case BELONGS_TO_DATA: {
             YangBelongsTo belongstoNode = (YangBelongsTo) tmpNode;
-            belongstoNode.setPrefix(ctx.IDENTIFIER().getText());
+            belongstoNode.setPrefix(identifier);
             break;
         }
         default:
             throw new ParserException(constructListenerErrorMessage(INVALID_HOLDER, PREFIX_DATA,
-                                                                    ctx.IDENTIFIER().getText(), ENTRY));
+                                                                    ctx.identifier().getText(), ENTRY));
         }
     }
 }