Repository: groovy Updated Branches: refs/heads/parrot 7d0c69092 -> 5a773a8a6
Minor refactoring Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5a773a8a Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5a773a8a Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5a773a8a Branch: refs/heads/parrot Commit: 5a773a8a6283a793732f32197d53a39d5995f3e4 Parents: 7d0c690 Author: sunlan <[email protected]> Authored: Fri Jan 27 01:02:02 2017 +0800 Committer: sunlan <[email protected]> Committed: Fri Jan 27 01:02:02 2017 +0800 ---------------------------------------------------------------------- .../org/apache/groovy/parser/antlr4/AstBuilder.java | 2 ++ .../apache/groovy/parser/antlr4/util/StringUtils.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/5a773a8a/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java index d46019c..522ca5b 100644 --- a/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java +++ b/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java @@ -3844,6 +3844,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov ); } + /* private org.codehaus.groovy.syntax.Token createGroovyToken(String text, int startLine, int startColumn) { return new org.codehaus.groovy.syntax.Token( Types.lookup(text, Types.ANY), @@ -3852,6 +3853,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov startColumn ); } + */ /** * set the script source position http://git-wip-us.apache.org/repos/asf/groovy/blob/5a773a8a/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java b/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java index 1c16679..739a737 100644 --- a/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java +++ b/subprojects/groovy-parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/util/StringUtils.java @@ -36,7 +36,7 @@ public class StringUtils { Pattern p = Pattern.compile("(\\\\*)\\\\u+([0-9abcdefABCDEF]{4})"); return StringGroovyMethods.replaceAll((CharSequence) text, p, new Closure<Void>(null, null) { Object doCall(String _0, String _1, String _2) { - if (null != _1 && _1.length() % 2 == 1) { + if (isLengthOdd(_1)) { return _0; } @@ -49,7 +49,7 @@ public class StringUtils { Pattern p = Pattern.compile("(\\\\*)\\\\([0-3]?[0-7]?[0-7])"); return StringGroovyMethods.replaceAll((CharSequence) text, p, new Closure<Void>(null, null) { Object doCall(String _0, String _1, String _2) { - if (null != _1 && _1.length() % 2 == 1) { + if (isLengthOdd(_1)) { return _0; } @@ -73,7 +73,7 @@ public class StringUtils { String result = StringGroovyMethods.replaceAll((CharSequence) text, p, new Closure<Void>(null, null) { Object doCall(String _0, String _1, String _2) { - if (null != _1 && _1.length() % 2 == 1) { + if (isLengthOdd(_1)) { return _0; } @@ -124,7 +124,7 @@ public class StringUtils { Pattern p = Pattern.compile("(\\\\*)\\\\\r?\n"); text = StringGroovyMethods.replaceAll((CharSequence) text, p, new Closure<Void>(null, null) { Object doCall(String _0, String _1) { - if (null != _1 && _1.length() % 2 == 1) { + if (isLengthOdd(_1)) { return _0; } @@ -135,6 +135,10 @@ public class StringUtils { return text; } + private static boolean isLengthOdd(String str) { + return null != str && str.length() % 2 == 1; + } + public static String removeCR(String text) { return text.replace("\r\n", "\n"); }
