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

Unified Diff: pkg/compiler/lib/src/resolution/send_structure.dart

Issue 1151163004: Implementation of null-aware operators. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 7 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 | « pkg/compiler/lib/src/resolution/send_resolver.dart ('k') | pkg/compiler/lib/src/resolved_visitor.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/resolution/send_structure.dart
diff --git a/pkg/compiler/lib/src/resolution/send_structure.dart b/pkg/compiler/lib/src/resolution/send_structure.dart
index bfac00369b868e02b971a81e985a73a1e5262003..96f2b42ea5e577d8437201ed35cbcbb7f435f00c 100644
--- a/pkg/compiler/lib/src/resolution/send_structure.dart
+++ b/pkg/compiler/lib/src/resolution/send_structure.dart
@@ -59,6 +59,21 @@ class InvalidAssertStructure<R, A> implements SendStructure<R, A> {
String toString() => 'invalid assert';
}
+/// The structure for a [Send] of the form `a ?? b`.
+class IfNullStructure<R, A> implements SendStructure<R, A> {
+ const IfNullStructure();
+
+ R dispatch(SemanticSendVisitor<R, A> visitor, Send node, A arg) {
+ return visitor.visitIfNull(
+ node,
+ node.receiver,
+ node.arguments.single,
+ arg);
+ }
+
+ String toString() => '??';
+}
+
/// The structure for a [Send] of the form `a && b`.
class LogicalAndStructure<R, A> implements SendStructure<R, A> {
const LogicalAndStructure();
@@ -161,6 +176,14 @@ class InvokeStructure<R, A> implements SendStructure<R, A> {
R dispatch(SemanticSendVisitor<R, A> visitor, Send node, A arg) {
switch (semantics.kind) {
case AccessKind.DYNAMIC_PROPERTY:
+ if (node.isConditional) {
+ return visitor.visitIfNotNullDynamicPropertyInvoke(
+ node,
+ node.receiver,
+ node.argumentsNode,
+ selector,
+ arg);
+ }
return visitor.visitDynamicPropertyInvoke(
node,
node.receiver,
@@ -424,6 +447,13 @@ class GetStructure<R, A> implements SendStructure<R, A> {
R dispatch(SemanticSendVisitor<R, A> visitor, Send node, A arg) {
switch (semantics.kind) {
case AccessKind.DYNAMIC_PROPERTY:
+ if (node.isConditional) {
+ return visitor.visitIfNotNullDynamicPropertyGet(
+ node,
+ node.receiver,
+ selector,
+ arg);
+ }
return visitor.visitDynamicPropertyGet(
node,
node.receiver,
@@ -578,12 +608,20 @@ class SetStructure<R, A> implements SendStructure<R, A> {
R dispatch(SemanticSendVisitor<R, A> visitor, Send node, A arg) {
switch (semantics.kind) {
case AccessKind.DYNAMIC_PROPERTY:
- return visitor.visitDynamicPropertySet(
+ if (node.isConditional) {
+ return visitor.visitIfNotNullDynamicPropertySet(
node,
node.receiver,
selector,
node.arguments.single,
arg);
+ }
+ return visitor.visitDynamicPropertySet(
+ node,
+ node.receiver,
+ selector,
+ node.arguments.single,
+ arg);
case AccessKind.LOCAL_FUNCTION:
return visitor.visitLocalFunctionSet(
node,
@@ -1257,6 +1295,16 @@ class CompoundStructure<R, A> implements SendStructure<R, A> {
R dispatch(SemanticSendVisitor<R, A> visitor, Send node, A arg) {
switch (semantics.kind) {
case AccessKind.DYNAMIC_PROPERTY:
+ if (node.isConditional) {
+ return visitor.visitIfNotNullDynamicPropertyCompound(
+ node,
+ node.receiver,
+ operator,
+ node.arguments.single,
+ getterSelector,
+ setterSelector,
+ arg);
+ }
return visitor.visitDynamicPropertyCompound(
node,
node.receiver,
@@ -1674,6 +1722,15 @@ class PrefixStructure<R, A> implements SendStructure<R, A> {
R dispatch(SemanticSendVisitor<R, A> visitor, Send node, A arg) {
switch (semantics.kind) {
case AccessKind.DYNAMIC_PROPERTY:
+ if (node.isConditional) {
+ return visitor.visitIfNotNullDynamicPropertyPrefix(
+ node,
+ node.receiver,
+ operator,
+ getterSelector,
+ setterSelector,
+ arg);
+ }
return visitor.visitDynamicPropertyPrefix(
node,
node.receiver,
@@ -1982,6 +2039,15 @@ class PostfixStructure<R, A> implements SendStructure<R, A> {
R dispatch(SemanticSendVisitor<R, A> visitor, Send node, A arg) {
switch (semantics.kind) {
case AccessKind.DYNAMIC_PROPERTY:
+ if (node.isConditional) {
+ return visitor.visitIfNotNullDynamicPropertyPostfix(
+ node,
+ node.receiver,
+ operator,
+ getterSelector,
+ setterSelector,
+ arg);
+ }
return visitor.visitDynamicPropertyPostfix(
node,
node.receiver,
« no previous file with comments | « pkg/compiler/lib/src/resolution/send_resolver.dart ('k') | pkg/compiler/lib/src/resolved_visitor.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698