| Index: tests/language_strong/rewrite_implicit_this_test.dart
|
| diff --git a/tests/language_strong/rewrite_implicit_this_test.dart b/tests/language_strong/rewrite_implicit_this_test.dart
|
| index f4e24d243336c73fae5041c1e9c447a057031216..6fcba68d82e173ff7928f7444b4804d5ce475e27 100644
|
| --- a/tests/language_strong/rewrite_implicit_this_test.dart
|
| +++ b/tests/language_strong/rewrite_implicit_this_test.dart
|
| @@ -7,87 +7,88 @@ import "package:expect/expect.dart";
|
| String toplevel = 'A';
|
|
|
| class Foo {
|
| - String x = 'x';
|
| + String x = 'x';
|
|
|
| - easy(z) {
|
| + easy(z) {
|
| return x + y + z; //# 01: static type warning
|
| - }
|
| + }
|
|
|
| - // Shadow the 'y' field in various ways
|
| - shadow_y_parameter(y) {
|
| + // Shadow the 'y' field in various ways
|
| + shadow_y_parameter(y) {
|
| return x + this.y + y; //# 01: continued
|
| - }
|
| + }
|
|
|
| - shadow_y_local(z) {
|
| - var y = z;
|
| + shadow_y_local(z) {
|
| + var y = z;
|
| return x + this.y + y; //# 01: continued
|
| - }
|
| + }
|
|
|
| - shadow_y_capturedLocal(z) {
|
| - var y = z;
|
| - foo() {
|
| + shadow_y_capturedLocal(z) {
|
| + var y = z;
|
| + foo() {
|
| return x + this.y + y; //# 01: continued
|
| - }
|
| - return foo();
|
| }
|
| + return foo();
|
| + }
|
|
|
| - shadow_y_closureParam(z) {
|
| - foo(y) {
|
| + shadow_y_closureParam(z) {
|
| + foo(y) {
|
| return x + this.y + y; //# 01: continued
|
| - }
|
| - return foo(z);
|
| }
|
| + return foo(z);
|
| + }
|
|
|
| - shadow_y_localInsideClosure(z) {
|
| - foo() {
|
| - var y = z;
|
| + shadow_y_localInsideClosure(z) {
|
| + foo() {
|
| + var y = z;
|
| return x + this.y + y; //# 01: continued
|
| - }
|
| - return foo();
|
| }
|
|
|
| - // Shadow the 'x' field in various ways
|
| - shadow_x_parameter(x) {
|
| + return foo();
|
| + }
|
| +
|
| + // Shadow the 'x' field in various ways
|
| + shadow_x_parameter(x) {
|
| return this.x + y + x; //# 01: continued
|
| - }
|
| + }
|
|
|
| - shadow_x_local(z) {
|
| - var x = z;
|
| + shadow_x_local(z) {
|
| + var x = z;
|
| return this.x + y + x; //# 01: continued
|
| - }
|
| + }
|
|
|
| - shadow_x_capturedLocal(z) {
|
| - var x = z;
|
| - foo() {
|
| + shadow_x_capturedLocal(z) {
|
| + var x = z;
|
| + foo() {
|
| return this.x + y + x; //# 01: continued
|
| - }
|
| - return foo();
|
| }
|
| + return foo();
|
| + }
|
|
|
| - shadow_x_closureParam(z) {
|
| - foo(x) {
|
| + shadow_x_closureParam(z) {
|
| + foo(x) {
|
| return this.x + y + x; //# 01: continued
|
| - }
|
| - return foo(z);
|
| }
|
| + return foo(z);
|
| + }
|
|
|
| - shadow_x_localInsideClosure(z) {
|
| - foo() {
|
| - var x = z;
|
| + shadow_x_localInsideClosure(z) {
|
| + foo() {
|
| + var x = z;
|
| return this.x + y + x; //# 01: continued
|
| - }
|
| - return foo();
|
| }
|
|
|
| - shadow_x_toplevel() {
|
| + return foo();
|
| + }
|
| +
|
| + shadow_x_toplevel() {
|
| return x + this.y + toplevel + this.toplevel; //# 01: continued
|
| - }
|
| -
|
| + }
|
| }
|
|
|
| class Sub extends Foo {
|
| - String y = 'y';
|
| - String toplevel = 'B';
|
| + String y = 'y';
|
| + String toplevel = 'B';
|
| }
|
|
|
| main() {
|
|
|