Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(478)

Unified Diff: compiler/java/com/google/dart/compiler/parser/DartParser.java

Issue 10546168: Issue 3540. Better error message for string concatenation (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: compiler/java/com/google/dart/compiler/parser/DartParser.java
diff --git a/compiler/java/com/google/dart/compiler/parser/DartParser.java b/compiler/java/com/google/dart/compiler/parser/DartParser.java
index 8fb0716a93ab58ef74f8614d319a1b3fcd108005..03b6ac51acd6dddc19b772801603b88df985c811 100644
--- a/compiler/java/com/google/dart/compiler/parser/DartParser.java
+++ b/compiler/java/com/google/dart/compiler/parser/DartParser.java
@@ -1864,7 +1864,8 @@ public class DartParser extends CompletionHooksParserBase {
if (token.isAssignmentOperator()) {
ensureAssignable(result);
consume(token);
- result = done(new DartBinaryExpression(token, result, parseExpression()));
+ int tokenOffset = ctx.getTokenLocation().getBegin().getPos();
+ result = done(new DartBinaryExpression(token, tokenOffset, result, parseExpression()));
} else {
done(null);
}
@@ -1882,7 +1883,8 @@ public class DartParser extends CompletionHooksParserBase {
DartExpression result = parseExpression();
// Must keep in sync with @Terminals above
while (optional(Token.COMMA)) {
- result = new DartBinaryExpression(Token.COMMA, result, parseExpression());
+ int tokenOffset = ctx.getTokenLocation().getBegin().getPos();
+ result = new DartBinaryExpression(Token.COMMA, tokenOffset, result, parseExpression());
if (match(Token.COMMA)) {
result = doneWithoutConsuming(result);
}
@@ -1948,6 +1950,7 @@ public class DartParser extends CompletionHooksParserBase {
Position prevPositionStart = ctx.getTokenLocation().getBegin();
Position prevPositionEnd = ctx.getTokenLocation().getEnd();
Token token = next();
+ int tokenOffset = ctx.getTokenLocation().getBegin().getPos();
if (lastResult instanceof DartSuperExpression
&& (token == Token.AND || token == Token.OR)) {
reportErrorAtPosition(prevPositionStart, prevPositionEnd,
@@ -1975,7 +1978,7 @@ public class DartParser extends CompletionHooksParserBase {
}
lastResult = right;
- result = doneWithoutConsuming(new DartBinaryExpression(token, result, right));
+ result = doneWithoutConsuming(new DartBinaryExpression(token, tokenOffset, result, right));
if (token == Token.IS
|| token == Token.AS
|| token.isRelationalOperator()

Powered by Google App Engine
This is Rietveld 408576698