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/ApiParser.g4
+++ b/tools/goctl/api/parser/g4/ApiParser.g4
@@ -70,4 +70,5 @@ replybody:      returnToken='returns' lp='(' dataType? rp=')';
 kvLit:          key=ID {checkKeyValue(p)}value=LINE_VALUE;

 serviceName:    (ID '-'?)+;
-path:           (('/' (ID ('-' ID)*))|('/:' (ID ('-' ID)?)))+ | '/';
+path:           (('/' (pathItem ('-' pathItem)*))|('/:' (pathItem ('-' pathItem)?)))+ | '/';
+pathItem:       (ID|LetterOrDigit)+;