You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/07/05 08:52:18 UTC
[groovy] branch GROOVY_3_0_X updated: Trivial refactoring: avoid
redundant method calls
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 24b796b Trivial refactoring: avoid redundant method calls
24b796b is described below
commit 24b796b3fed606bb88df95994e263846dc9021c7
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jul 5 16:48:47 2020 +0800
Trivial refactoring: avoid redundant method calls
(cherry picked from commit 679e945f5d229fb6d272e1264351095172c806eb)
---
src/antlr/GroovyLexer.g4 | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/antlr/GroovyLexer.g4 b/src/antlr/GroovyLexer.g4
index 4c3b76d..9f14346 100644
--- a/src/antlr/GroovyLexer.g4
+++ b/src/antlr/GroovyLexer.g4
@@ -219,6 +219,14 @@ options {
return Integer.MIN_VALUE;
}
+
+ private static boolean isJavaIdentifierStartAndNotIdentifierIgnorable(int codePoint) {
+ return Character.isJavaIdentifierStart(codePoint) && !Character.isIdentifierIgnorable(codePoint);
+ }
+
+ private static boolean isJavaIdentifierPartAndNotIdentifierIgnorable(int codePoint) {
+ return Character.isJavaIdentifierPart(codePoint) && !Character.isIdentifierIgnorable(codePoint);
+ }
}
@@ -891,7 +899,7 @@ JavaLetter
: [a-zA-Z$_] // these are the "java letters" below 0x7F
| // covers all characters above 0x7F which are not a surrogate
~[\u0000-\u007F\uD800-\uDBFF]
- { Character.isJavaIdentifierStart(_input.LA(-1)) && !Character.isIdentifierIgnorable(_input.LA(-1)) }?
+ { isJavaIdentifierStartAndNotIdentifierIgnorable(_input.LA(-1)) }?
| // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF
[\uD800-\uDBFF] [\uDC00-\uDFFF]
{ Character.isJavaIdentifierStart(Character.toCodePoint((char) _input.LA(-2), (char) _input.LA(-1))) }?
@@ -907,7 +915,7 @@ JavaLetterOrDigit
: [a-zA-Z0-9$_] // these are the "java letters or digits" below 0x7F
| // covers all characters above 0x7F which are not a surrogate
~[\u0000-\u007F\uD800-\uDBFF]
- { Character.isJavaIdentifierPart(_input.LA(-1)) && !Character.isIdentifierIgnorable(_input.LA(-1)) }?
+ { isJavaIdentifierPartAndNotIdentifierIgnorable(_input.LA(-1)) }?
| // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF
[\uD800-\uDBFF] [\uDC00-\uDFFF]
{ Character.isJavaIdentifierPart(Character.toCodePoint((char) _input.LA(-2), (char) _input.LA(-1))) }?