Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X fa55e14ca -> a1ba548cc
Minor refactoring (cherry picked from commit 7c237bb) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a1ba548c Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a1ba548c Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a1ba548c Branch: refs/heads/GROOVY_2_6_X Commit: a1ba548cc6aff3da149910bb920f1c49d6fbb39c Parents: fa55e14 Author: sunlan <[email protected]> Authored: Thu Aug 24 07:42:37 2017 +0800 Committer: sunlan <[email protected]> Committed: Thu Aug 24 07:43:02 2017 +0800 ---------------------------------------------------------------------- .../org/apache/groovy/parser/antlr4/SemanticPredicates.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/a1ba548c/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java index eb3dbd9..32939b4 100644 --- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java +++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java @@ -143,10 +143,9 @@ public class SemanticPredicates { tokenType3 = ts.LT(index + 2).getType(); return //VOID == tokenType || - !(BuiltInPrimitiveType == tokenType || MODIFIER_SET.contains(tokenType)) - && Character.isLowerCase(token.getText().codePointAt(0)) - && !(ASSIGN == tokenType3 || (LT == tokenType2 || LBRACK == tokenType2)); - + !(ASSIGN == tokenType3 || (LT == tokenType2 || LBRACK == tokenType2)) + && !(BuiltInPrimitiveType == tokenType || MODIFIER_SET.contains(tokenType)) + && Character.isLowerCase(token.getText().codePointAt(0)); } }
