commit 9b0187d20959c95ea4e918194e1edd2052a0ec6e
author Naoki Miyata <naoki.miyata.ml@gmail.com> Thu Jun 22 12:26:15 2017 +0900
committer GauravAgrawal-Huawei <gauravjbp3ster@gmail.com> Wed Jun 28 04:30:45 2017 +0000
tree a80356143c2ebd3fb2665f640e43c0fbdd273c3a
parent ba5bacb671aed6f84a6cd017a4cdb9f732c97d29

ONOS-6678 YANG Compiler: Comments after module end and {\ to be handled

* add an exclusion of '}' in STRING token
* add a test case which has '}//' token

Change-Id: I4d74a496eeaa9b6d4600f09377ff3b57aaf1d4a5

compiler/base/parser/src/main/resources/YangLexer.g4

diff --git a/compiler/base/parser/src/main/resources/YangLexer.g4 b/compiler/base/parser/src/main/resources/YangLexer.g4
index 792a2cb..d020371 100644
--- a/compiler/base/parser/src/main/resources/YangLexer.g4
+++ b/compiler/base/parser/src/main/resources/YangLexer.g4
@@ -126,7 +126,7 @@
     WS  :   [ \r\t\u000C\n]+ -> channel(HIDDEN)
         ;
     LINE_COMMENT
-        : '//' ~[\r\n]* '\r'? '\n' -> channel(HIDDEN)
+        : '//' ~[\r\n]* -> channel(HIDDEN)
         ;
 
     // Additional rules
@@ -144,7 +144,7 @@
 
     UNKNOWN_STATEMENT : IDENTIFIER COLON IDENTIFIER;
 
-    STRING : ((~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '"' | '+' | '\'')~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '+')* ) | SUB_STRING );
+    STRING : ((~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '}' | '"' | '+' | '\'')~( '\r' | '\n' | '\t' | ' ' | ';' | '{' | '+')* ) | SUB_STRING );
 
     //Fragment rules
     fragment SUB_STRING : ('"' (ESC | ~["])*'"') | ('\'' (ESC | ~['])*'\'') ;