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

Unified Diff: runtime/vm/parser.cc

Issue 11225006: Handle super != and ? (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 2 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 | tests/co19/co19-runtime.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
===================================================================
--- runtime/vm/parser.cc (revision 13829)
+++ runtime/vm/parser.cc (working copy)
@@ -1463,10 +1463,17 @@
super_op = new StaticCallNode(
operator_pos, assign_index_operator, operator_args);
}
- } else if (Token::CanBeOverloaded(CurrentToken())) {
+ } else if (Token::CanBeOverloaded(CurrentToken()) ||
+ (CurrentToken() == Token::kNE)) {
Token::Kind op = CurrentToken();
ConsumeToken();
+ bool negate_result = false;
+ if (op == Token::kNE) {
+ op = Token::kEQ;
+ negate_result = true;
+ }
+
// Resolve the operator function in the superclass.
const String& operator_function_name =
String::Handle(Symbols::New(Token::Str(op)));
@@ -1492,6 +1499,9 @@
*op_arguments);
}
super_op = new StaticCallNode(operator_pos, super_operator, op_arguments);
+ if (negate_result) {
+ super_op = new UnaryOpNode(operator_pos, Token::kNOT, super_op);
+ }
}
return super_op;
}
@@ -9428,7 +9438,8 @@
primary = ParseSuperFieldAccess(ident);
}
} else if ((CurrentToken() == Token::kLBRACK) ||
- Token::CanBeOverloaded(CurrentToken())) {
+ Token::CanBeOverloaded(CurrentToken()) ||
+ (CurrentToken() == Token::kNE)) {
primary = ParseSuperOperator();
} else {
ErrorMsg("illegal super call");
@@ -9632,6 +9643,12 @@
case Token::kINDEX:
SkipCompoundLiteral();
break;
+ case Token::kCONDITIONAL:
+ ConsumeToken();
+ if (IsIdentifier()) {
+ ConsumeToken();
+ }
+ break;
default:
if (IsIdentifier()) {
ConsumeToken(); // Handle pseudo-keyword identifiers.
« no previous file with comments | « no previous file | tests/co19/co19-runtime.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698