Repository: groovy Updated Branches: refs/heads/parrot 5392eb4fa -> 8c644fa73
Minor refactoring Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8c644fa7 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8c644fa7 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8c644fa7 Branch: refs/heads/parrot Commit: 8c644fa7311c15191fc3b9def0290ed8339bd0ea Parents: 5392eb4 Author: sunlan <[email protected]> Authored: Sun Jan 29 02:01:49 2017 +0800 Committer: sunlan <[email protected]> Committed: Sun Jan 29 02:01:49 2017 +0800 ---------------------------------------------------------------------- .../antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/8c644fa7/subprojects/groovy-parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4 ---------------------------------------------------------------------- diff --git a/subprojects/groovy-parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4 b/subprojects/groovy-parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4 index c892a0f..2df6b50 100644 --- a/subprojects/groovy-parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4 +++ b/subprojects/groovy-parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4 @@ -370,7 +370,7 @@ options { baseContext = type; } type : primitiveType (LBRACK RBRACK)* - | classOrInterfaceType (LBRACK RBRACK)* + | generalClassOrInterfaceType (LBRACK RBRACK)* ; classOrInterfaceType @@ -379,6 +379,11 @@ classOrInterfaceType ) typeArguments? ; +generalClassOrInterfaceType +options { baseContext = classOrInterfaceType; } + : qualifiedClassName typeArguments? + ; + standardClassOrInterfaceType options { baseContext = classOrInterfaceType; } : qualifiedStandardClassName typeArguments?
