diff options
author | Yigit Boyar <yboyar@google.com> | 2016-04-07 15:16:07 -0700 |
---|---|---|
committer | Yigit Boyar <yboyar@google.com> | 2016-04-11 12:26:49 -0700 |
commit | 15b6682cf3505b117329e2190967c92a89b179e9 (patch) | |
tree | ff1c4e3d790450da0c86fb616365d7707cd49653 /compiler | |
parent | bfec8f58feb977598336a3d4ed86dcd9dd372b98 (diff) | |
download | data-binding-15b6682cf3505b117329e2190967c92a89b179e9.tar.gz |
Move to org.antlr from tunnelvision
We were using a version of antlr that is published by
tunnelvision which works fine but this becomes a problem
when another gradle plugin wants to depend on antlr as
well. It is best if we depend on the original one to
avoid conflicts with other libs.
Bug: 27175207
Change-Id: I0a87f9902361ace5dc6d03d838e2ad431c844de8
Diffstat (limited to 'compiler')
4 files changed, 38 insertions, 37 deletions
diff --git a/compiler/build.gradle b/compiler/build.gradle index 8a9e9919..0b2c6b25 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -16,8 +16,8 @@ apply plugin: 'java' apply plugin: 'kotlin' -sourceCompatibility = dataBindingConfig.javaTargetCompatibility -targetCompatibility = dataBindingConfig.javaSourceCompatibility +sourceCompatibility = dataBindingConfig.compilerJavaTargetCompatibility +targetCompatibility = dataBindingConfig.compilerJavaSourceCompatibility sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -38,7 +38,7 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile 'commons-io:commons-io:2.4' compile 'commons-codec:commons-codec:1.10' - compile 'com.tunnelvisionlabs:antlr4:4.5' + compile 'org.antlr:antlr4:4.5.3' compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' testCompile 'junit:junit:4.12' } diff --git a/compiler/src/main/java/android/databinding/tool/ExpressionParser.java b/compiler/src/main/java/android/databinding/tool/ExpressionParser.java index 5468c936..8deebc4d 100644 --- a/compiler/src/main/java/android/databinding/tool/ExpressionParser.java +++ b/compiler/src/main/java/android/databinding/tool/ExpressionParser.java @@ -23,7 +23,6 @@ import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.misc.Nullable; import org.antlr.v4.runtime.tree.ErrorNode; import org.antlr.v4.runtime.tree.ParseTreeListener; import org.antlr.v4.runtime.tree.TerminalNode; @@ -37,6 +36,8 @@ import android.databinding.tool.store.Location; import android.databinding.tool.util.L; import android.databinding.tool.util.Preconditions; +import com.android.annotations.Nullable; + import java.util.ArrayList; import java.util.List; @@ -56,9 +57,8 @@ public class ExpressionParser { final BindingExpressionParser parser = new BindingExpressionParser(tokenStream); parser.addErrorListener(new BaseErrorListener() { @Override - public <T extends Token> void syntaxError(Recognizer<T, ?> recognizer, - @Nullable T offendingSymbol, int line, int charPositionInLine, String msg, - @Nullable RecognitionException e) { + public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, + int charPositionInLine, String msg, RecognitionException e) { L.e(ErrorMessages.SYNTAX_ERROR, msg); } }); diff --git a/compiler/src/main/java/android/databinding/tool/ExpressionVisitor.java b/compiler/src/main/java/android/databinding/tool/ExpressionVisitor.java index f35b1e2b..87426c0f 100644 --- a/compiler/src/main/java/android/databinding/tool/ExpressionVisitor.java +++ b/compiler/src/main/java/android/databinding/tool/ExpressionVisitor.java @@ -31,10 +31,10 @@ import android.databinding.tool.reflection.ModelAnalyzer; import android.databinding.tool.reflection.ModelClass; import android.databinding.tool.util.Preconditions; +import com.android.annotations.NonNull; import com.google.common.base.Objects; import org.antlr.v4.runtime.ParserRuleContext; -import org.antlr.v4.runtime.misc.NotNull; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeListener; import org.antlr.v4.runtime.tree.TerminalNode; @@ -43,16 +43,16 @@ import java.util.ArrayDeque; import java.util.ArrayList; import java.util.List; -public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { +class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { private ExprModel mModel; private ParseTreeListener mParseTreeListener; private ArrayDeque<ExprModel> mModelStack = new ArrayDeque<ExprModel>(); - public ExpressionVisitor(ExprModel model) { + ExpressionVisitor(ExprModel model) { mModel = model; } - public void setParseTreeListener(ParseTreeListener parseTreeListener) { + void setParseTreeListener(ParseTreeListener parseTreeListener) { mParseTreeListener = parseTreeListener; } @@ -82,7 +82,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitRootLambda(@NotNull BindingExpressionParser.RootLambdaContext ctx) { + public Expr visitRootLambda(@NonNull BindingExpressionParser.RootLambdaContext ctx) { try { onEnter(ctx); CallbackExprModel callbackModel = new CallbackExprModel(mModel); @@ -100,7 +100,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { @Override public Expr visitSingleLambdaParameter( - @NotNull BindingExpressionParser.SingleLambdaParameterContext ctx) { + @NonNull BindingExpressionParser.SingleLambdaParameterContext ctx) { try { onEnter(ctx); Preconditions.check(mModel instanceof CallbackExprModel, "Lambdas can only be used in" @@ -115,7 +115,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { @Override public Expr visitLambdaParameterList( - @NotNull BindingExpressionParser.LambdaParameterListContext ctx) { + @NonNull BindingExpressionParser.LambdaParameterListContext ctx) { try { onEnter(ctx); Preconditions.check(mModel instanceof CallbackExprModel, "Lambdas can only be used in" @@ -136,7 +136,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitStringLiteral(@NotNull BindingExpressionParser.StringLiteralContext ctx) { + public Expr visitStringLiteral(@NonNull BindingExpressionParser.StringLiteralContext ctx) { try { onEnter(ctx); final String javaString; @@ -155,7 +155,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitRootExpr(@NotNull BindingExpressionParser.RootExprContext ctx) { + public Expr visitRootExpr(@NonNull BindingExpressionParser.RootExprContext ctx) { try { onEnter(ctx); // TODO handle defaults @@ -170,7 +170,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitGrouping(@NotNull BindingExpressionParser.GroupingContext ctx) { + public Expr visitGrouping(@NonNull BindingExpressionParser.GroupingContext ctx) { try { onEnter(ctx); Preconditions.check(ctx.children.size() == 3, "Grouping expression should have" @@ -182,7 +182,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitDotOp(@NotNull BindingExpressionParser.DotOpContext ctx) { + public Expr visitDotOp(@NonNull BindingExpressionParser.DotOpContext ctx) { try { onEnter(ctx); ModelAnalyzer analyzer = ModelAnalyzer.getInstance(); @@ -202,7 +202,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitFunctionRef(@NotNull BindingExpressionParser.FunctionRefContext ctx) { + public Expr visitFunctionRef(@NonNull BindingExpressionParser.FunctionRefContext ctx) { try { onEnter(ctx); return mModel.methodReference(ctx.expression().accept(this), @@ -213,7 +213,8 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitQuestionQuestionOp(@NotNull BindingExpressionParser.QuestionQuestionOpContext ctx) { + public Expr visitQuestionQuestionOp( + @NonNull BindingExpressionParser.QuestionQuestionOpContext ctx) { try { onEnter(ctx); final Expr left = ctx.left.accept(this); @@ -225,9 +226,9 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitTerminal(@NotNull TerminalNode node) { + public Expr visitTerminal(@NonNull TerminalNode node) { try { - onEnter((ParserRuleContext) node.getParent().getRuleContext()); + onEnter((ParserRuleContext) node.getParent()); final int type = node.getSymbol().getType(); Class classType; switch (type) { @@ -259,12 +260,12 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } return mModel.symbol(node.getText(), classType); } finally { - onExit((ParserRuleContext) node.getParent().getRuleContext()); + onExit((ParserRuleContext) node.getParent()); } } @Override - public Expr visitComparisonOp(@NotNull BindingExpressionParser.ComparisonOpContext ctx) { + public Expr visitComparisonOp(@NonNull BindingExpressionParser.ComparisonOpContext ctx) { try { onEnter(ctx); return mModel.comparison(ctx.op.getText(), ctx.left.accept(this), ctx.right.accept(this)); @@ -274,7 +275,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitIdentifier(@NotNull BindingExpressionParser.IdentifierContext ctx) { + public Expr visitIdentifier(@NonNull BindingExpressionParser.IdentifierContext ctx) { try { onEnter(ctx); return mModel.identifier(ctx.getText()); @@ -284,7 +285,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitTernaryOp(@NotNull BindingExpressionParser.TernaryOpContext ctx) { + public Expr visitTernaryOp(@NonNull BindingExpressionParser.TernaryOpContext ctx) { try { onEnter(ctx); return mModel.ternary(ctx.left.accept(this), ctx.iftrue.accept(this), @@ -297,7 +298,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { @Override public Expr visitMethodInvocation( - @NotNull BindingExpressionParser.MethodInvocationContext ctx) { + @NonNull BindingExpressionParser.MethodInvocationContext ctx) { try { onEnter(ctx); List<Expr> args = new ArrayList<Expr>(); @@ -317,7 +318,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitMathOp(@NotNull BindingExpressionParser.MathOpContext ctx) { + public Expr visitMathOp(@NonNull BindingExpressionParser.MathOpContext ctx) { try { onEnter(ctx); return mModel.math(ctx.left.accept(this), ctx.op.getText(), ctx.right.accept(this)); @@ -327,7 +328,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitAndOrOp(@NotNull AndOrOpContext ctx) { + public Expr visitAndOrOp(@NonNull AndOrOpContext ctx) { try { onEnter(ctx); return mModel.logical(ctx.left.accept(this), ctx.op.getText(), ctx.right.accept(this)); @@ -337,7 +338,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitBinaryOp(@NotNull BinaryOpContext ctx) { + public Expr visitBinaryOp(@NonNull BinaryOpContext ctx) { try { onEnter(ctx); return mModel.math(ctx.left.accept(this), ctx.op.getText(), ctx.right.accept(this)); @@ -347,7 +348,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitBitShiftOp(@NotNull BitShiftOpContext ctx) { + public Expr visitBitShiftOp(@NonNull BitShiftOpContext ctx) { try { onEnter(ctx); return mModel.bitshift(ctx.left.accept(this), ctx.op.getText(), ctx.right.accept(this)); @@ -357,7 +358,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitInstanceOfOp(@NotNull InstanceOfOpContext ctx) { + public Expr visitInstanceOfOp(@NonNull InstanceOfOpContext ctx) { try { onEnter(ctx); return mModel.instanceOfOp(ctx.expression().accept(this), ctx.type().getText()); @@ -367,7 +368,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitUnaryOp(@NotNull UnaryOpContext ctx) { + public Expr visitUnaryOp(@NonNull UnaryOpContext ctx) { try { onEnter(ctx); return mModel.unary(ctx.op.getText(), ctx.expression().accept(this)); @@ -377,7 +378,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitResources(@NotNull BindingExpressionParser.ResourcesContext ctx) { + public Expr visitResources(@NonNull BindingExpressionParser.ResourcesContext ctx) { try { onEnter(ctx); final List<Expr> args = new ArrayList<Expr>(); @@ -404,7 +405,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitBracketOp(@NotNull BindingExpressionParser.BracketOpContext ctx) { + public Expr visitBracketOp(@NonNull BindingExpressionParser.BracketOpContext ctx) { try { onEnter(ctx); return mModel.bracketExpr(visit(ctx.expression(0)), visit(ctx.expression(1))); @@ -414,7 +415,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { } @Override - public Expr visitCastOp(@NotNull BindingExpressionParser.CastOpContext ctx) { + public Expr visitCastOp(@NonNull BindingExpressionParser.CastOpContext ctx) { try { onEnter(ctx); return mModel.castExpr(ctx.type().getText(), visit(ctx.expression())); diff --git a/compiler/src/main/java/android/databinding/tool/LayoutBinder.java b/compiler/src/main/java/android/databinding/tool/LayoutBinder.java index 7969854a..c7704682 100644 --- a/compiler/src/main/java/android/databinding/tool/LayoutBinder.java +++ b/compiler/src/main/java/android/databinding/tool/LayoutBinder.java @@ -30,7 +30,7 @@ import android.databinding.tool.util.Preconditions; import android.databinding.tool.writer.LayoutBinderWriter; import android.databinding.tool.writer.LayoutBinderWriterKt; -import org.antlr.v4.runtime.misc.Nullable; +import com.android.annotations.Nullable; import java.util.ArrayList; import java.util.Collections; |