feat: upgrade antl4 java parser to antl 4.8

phodal · Oct 22, 2020 · f63d7f9 · f63d7f9
1 parent 5be03a2
commit f63d7f9
Show file tree

Hide file tree

Showing 7 changed files with 2,126 additions and 1,745 deletions.
diff --git a/languages/comment/comment_lexer.go b/languages/comment/comment_lexer.go
diff --git a/languages/g4/JavaParser.g4 b/languages/g4/JavaParser.g4
@@ -85,7 +85,7 @@ typeParameters
     ;
 
 typeParameter
-    : annotation* IDENTIFIER (EXTENDS typeBound)?
+    : annotation* IDENTIFIER (EXTENDS annotation* typeBound)?
     ;
 
 typeBound
@@ -246,7 +246,7 @@ classOrInterfaceType
 
 typeArgument
     : typeType
-    | '?' ((EXTENDS | SUPER) typeType)?
+    | annotation* '?' ((EXTENDS | SUPER) typeType)?
     ;
 
 qualifiedNameList
@@ -267,7 +267,7 @@ formalParameter
     ;
 
 lastFormalParameter
-    : variableModifier* typeType '...' variableDeclaratorId
+    : variableModifier* typeType annotation* '...' variableDeclaratorId
     ;
 
 qualifiedName
@@ -296,9 +296,12 @@ floatLiteral
     ;
 
 // ANNOTATIONS
+altAnnotationQualifiedName
+    : (IDENTIFIER DOT)* '@' IDENTIFIER
+    ;
 
 annotation
-    : '@' qualifiedName ('(' ( elementValuePairs | elementValue )? ')')?
+    : ('@' qualifiedName | altAnnotationQualifiedName) ('(' ( elementValuePairs | elementValue )? ')')?
     ;
 
 elementValuePairs
@@ -478,7 +481,7 @@ expression
     | expression '[' expression ']'
     | methodCall
     | NEW creator
-    | '(' typeType ')' expression
+    | '(' annotation* typeType ')' expression
     | expression postfix=('++' | '--')
     | prefix=('+'|'-'|'++'|'--') expression
     | prefix=('~'|'!') expression
@@ -582,7 +585,7 @@ typeList
     ;
 
 typeType
-    : annotation? (classOrInterfaceType | primitiveType) ('[' ']')*
+    : annotation* (classOrInterfaceType | primitiveType) (annotation* '[' ']')*
     ;
 
 primitiveType
@@ -612,4 +615,4 @@ explicitGenericInvocationSuffix
 
 arguments
     : '(' expressionList? ')'
-    ;
+    ;
diff --git a/languages/java/JavaParser.interp b/languages/java/JavaParser.interp
diff --git a/languages/java/java_lexer.go b/languages/java/java_lexer.go
diff --git a/languages/java/java_parser.go b/languages/java/java_parser.go
diff --git a/languages/java/javaparser_base_listener.go b/languages/java/javaparser_base_listener.go
diff --git a/languages/java/javaparser_listener.go b/languages/java/javaparser_listener.go