Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 5b75fb8e1 -> a761dfad4
Use the recommended API (cherry picked from commit 6c2eb77) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a761dfad Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a761dfad Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a761dfad Branch: refs/heads/GROOVY_2_6_X Commit: a761dfad4aee8977a331ac23d43420a8394819f5 Parents: 5b75fb8 Author: sunlan <[email protected]> Authored: Mon Aug 21 00:57:58 2017 +0800 Committer: sunlan <[email protected]> Committed: Mon Aug 21 00:59:05 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/groovy/parser/antlr4/AstBuilder.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/a761dfad/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java index 70de057..92d06f5 100644 --- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java +++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java @@ -20,8 +20,8 @@ package org.apache.groovy.parser.antlr4; import groovy.lang.IntRange; import org.antlr.v4.runtime.ANTLRErrorListener; -import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; @@ -153,9 +153,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov this.moduleNode = new ModuleNode(sourceUnit); this.classLoader = classLoader; // unused for the time being - CharStream charStream = - new ANTLRInputStream( - this.readSourceCode(sourceUnit)); + CharStream charStream = CharStreams.fromString(this.readSourceCode(sourceUnit)); this.lexer = new GroovyLangLexer(charStream); this.parser = @@ -199,7 +197,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov if (PredictionMode.SLL.equals(predictionMode)) { this.removeErrorListeners(); } else { - ((CommonTokenStream) parser.getInputStream()).reset(); + parser.getInputStream().seek(0); this.addErrorListeners(); }
