fix: fix #2102, #2108 (#2131)

* g4 code generation * Update grammar * g4 code generation * fix #2108 * fix #2102 * Remove comments
2022-07-20 22:49:41 +08:00
parent d9218e1551
commit 1b51d0ce82
24 changed files with 2481 additions and 2288 deletions
--- a/tools/goctl/api/parser/g4/ApiLexer.g4
+++ b/tools/goctl/api/parser/g4/ApiLexer.g4
@@ -16,6 +16,10 @@ LINE_VALUE:         ':' [ \t]* (STRING|(~[\r\n"`]*));
 ID:         Letter LetterOrDigit*;


+LetterOrDigit
+    : Letter
+    | [0-9]
+    ;
 fragment ExponentPart
    : [eE] [+-]? Digits
    ;
@@ -35,10 +39,6 @@ fragment Digits
    : [0-9] ([0-9_]* [0-9])?
    ;

-fragment LetterOrDigit
-    : Letter
-    | [0-9]
-    ;
 fragment Letter
    : [a-zA-Z$_] // these are the "java letters" below 0x7F
    | ~[\u0000-\u007F\uD800-\uDBFF] // covers all characters above 0x7F which are not a surrogate