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

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

Issue 10833012: Fix for issue 3783 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « no previous file | compiler/javatests/com/google/dart/compiler/parser/SyntaxTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/parser/DartParser.java
===================================================================
--- compiler/java/com/google/dart/compiler/parser/DartParser.java (revision 9892)
+++ compiler/java/com/google/dart/compiler/parser/DartParser.java (working copy)
@@ -3521,6 +3521,17 @@
return statement;
}
+ private boolean isFunctionExpression(DartStatement statement) {
+ if (!(statement instanceof DartExprStmt)) {
+ return false;
+ }
+ DartExpression expression = ((DartExprStmt) statement).getExpression();
+ if (!(expression instanceof DartFunctionExpression)) {
+ return false;
+ }
+ return ((DartFunctionExpression) expression).getName() == null;
+ }
+
/**
* <pre>
* normalCompletingStatement
@@ -3551,11 +3562,18 @@
private DartStatement parseNonLabelledStatement() {
// Try to parse as function declaration.
if (looksLikeFunctionDeclarationOrExpression()) {
+ ctx.begin();
DartStatement functionDeclaration = parseFunctionDeclaration();
// If "null", then we tried to parse, but found that this is not function declaration.
// So, parsing was rolled back and we can try to parse it as expression.
if (functionDeclaration != null) {
- return functionDeclaration;
+ if (!isFunctionExpression(functionDeclaration)) {
+ ctx.done(null);
+ return functionDeclaration;
+ }
+ ctx.rollback();
+ } else {
+ ctx.done(null);
}
}
// Check possible statement kind.
« no previous file with comments | « no previous file | compiler/javatests/com/google/dart/compiler/parser/SyntaxTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698