Fix instance compound assignment.

tests/language/src/InstanceCompoundAssignmentOperatorTest.dart

Index: tests/language/src/InstanceCompoundAssignmentOperatorTest.dart
diff --git a/tests/language/src/InstanceCompoundAssignmentOperatorTest.dart b/tests/language/src/InstanceCompoundAssignmentOperatorTest.dart
index 7b3e15316fe0e7558991108f7b0b53257be17c22..f27528953f002a65148eb8ad54ff7bf27c3fe592 100644
--- a/tests/language/src/InstanceCompoundAssignmentOperatorTest.dart
+++ b/tests/language/src/InstanceCompoundAssignmentOperatorTest.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 // Test correct instance compound assignment operator.
@@ -6,6 +6,20 @@
 class A {
   A() : f = 2 {}
   var f;
+  operator [](index) => f;
+  operator []=(index, value) => f = value;
+
+  var _g = 0;
+  var gGetCount = 0;
+  var gSetCount = 0;
+  get g() {
+    gGetCount++;
+    return _g;
+  }
+  set g(value) {
+    gSetCount++;
+    _g = value;
+  }
 }
 
 
@@ -19,21 +33,49 @@ class B {
   var count;
 }
 
-
-class InstanceCompoundAssignmentOperatorTest {
-  static void testMain() {
-    B b = new B();
-    Expect.equals(0, b.count);
-    Expect.equals(2, b.a.f);
-    Expect.equals(1, b.count);
-    var o = b.a;
-    Expect.equals(2, b.count);
-    b.a.f = 1;
-    Expect.equals(3, b.count);
-    b.a.f += 1;
-    Expect.equals(4, b.count);
-  }
+var globalA;
+var fooCounter = 0;
+foo() {
+  fooCounter++;
+  return globalA;
 }
+
 main() {
-  InstanceCompoundAssignmentOperatorTest.testMain();
+  B b = new B();
+  Expect.equals(0, b.count);
+  Expect.equals(2, b.a.f);
+  Expect.equals(1, b.count);
+  var o = b.a;
+  Expect.equals(2, b.count);
+  b.a.f = 1;
+  Expect.equals(3, b.count);
+  Expect.equals(1, b._a.f);
+  b.a.f += 1;
+  Expect.equals(4, b.count);
+  Expect.equals(2, b._a.f);
+
+  b.count = 0;
+  b._a.f = 2;
+  Expect.equals(0, b.count);
+  Expect.equals(2, b.a[0]);
+  Expect.equals(1, b.count);
+  o = b.a;
+  Expect.equals(2, b.count);
+  b.a[0] = 1;
+  Expect.equals(3, b.count);
+  Expect.equals(1, b._a.f);
+  b.a[0] += 1;
+  Expect.equals(4, b.count);
+  Expect.equals(2, b._a.f);
+
+  b._a.g++;
+  Expect.equals(1, b._a.gGetCount);
+  Expect.equals(1, b._a.gSetCount);
+  Expect.equals(1, b._a._g);
+
+  globalA = b._a;
+  globalA.f = 0;
+  foo().f += 1;
+  Expect.equals(1, fooCounter);
+  Expect.equals(1, globalA.f);
 }