| Index: tests/language/dynamic_test.dart
|
| ===================================================================
|
| --- tests/language/dynamic_test.dart (revision 13630)
|
| +++ tests/language/dynamic_test.dart (working copy)
|
| @@ -2,7 +2,7 @@
|
| // 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.
|
| //
|
| -// Dart test program testing the use of 'Dynamic' in generic types.
|
| +// Dart test program testing the use of 'dynamic' in generic types.
|
| // @static-clean
|
|
|
| interface Iface<K,V> {
|
| @@ -11,39 +11,39 @@
|
| class M1<K, V> implements Iface<K, V> {
|
| }
|
|
|
| -class M2<K> implements Iface<K, Dynamic> {
|
| +class M2<K> implements Iface<K, dynamic> {
|
| }
|
|
|
| -class M3 implements Iface<String, Dynamic> {
|
| +class M3 implements Iface<String, dynamic> {
|
| }
|
|
|
| -typedef Dynamic F1<T>(Dynamic x, T y);
|
| +typedef dynamic F1<T>(dynamic x, T y);
|
|
|
| class HasFieldDynamic {
|
| - HasFieldDynamic() : Dynamic = "Dynamic" { }
|
| - var Dynamic; // Field named Dynamic is allowed.
|
| + HasFieldDynamic() : dynamic = "dynamic" { }
|
| + var dynamic; // Field named dynamic is allowed.
|
| }
|
|
|
| class HasMethodDynamic {
|
| - Dynamic() => "Dynamic"; // Method named Dynamic is allowed.
|
| + dynamic() => "dynamic"; // Method named dynamic is allowed.
|
| }
|
|
|
| main() {
|
| - M1<Dynamic, Dynamic> m1 = new M1<Dynamic, Dynamic>();
|
| - Expect.isTrue(m1 is Iface<Dynamic, num>);
|
| - Expect.isTrue(m1 is Iface<String, Dynamic>);
|
| + M1<dynamic, dynamic> m1 = new M1<dynamic, dynamic>();
|
| + Expect.isTrue(m1 is Iface<dynamic, num>);
|
| + Expect.isTrue(m1 is Iface<String, dynamic>);
|
| Expect.isTrue(m1 is Iface<String, num>);
|
| Expect.isTrue(m1 is Iface<num, String>);
|
|
|
| - M2<Dynamic> m2 = new M2<Dynamic>();
|
| - Expect.isTrue(m2 is Iface<Dynamic, num>);
|
| - Expect.isTrue(m2 is Iface<String, Dynamic>);
|
| + M2<dynamic> m2 = new M2<dynamic>();
|
| + Expect.isTrue(m2 is Iface<dynamic, num>);
|
| + Expect.isTrue(m2 is Iface<String, dynamic>);
|
| Expect.isTrue(m2 is Iface<String, num>);
|
| Expect.isTrue(m2 is Iface<num, String>);
|
|
|
| M3 m3 = new M3();
|
| - Expect.isTrue(m3 is Iface<Dynamic, num>);
|
| - Expect.isTrue(m3 is Iface<String, Dynamic>);
|
| + Expect.isTrue(m3 is Iface<dynamic, num>);
|
| + Expect.isTrue(m3 is Iface<String, dynamic>);
|
| Expect.isTrue(m3 is Iface<String, num>);
|
| Expect.isTrue(m3 is !Iface<num, String>);
|
|
|
| @@ -51,13 +51,13 @@
|
| Expect.isTrue(f1 is F1<int>);
|
|
|
| HasFieldDynamic has_field = new HasFieldDynamic();
|
| - Expect.equals("Dynamic", has_field.Dynamic);
|
| + Expect.equals("dynamic", has_field.dynamic);
|
|
|
| HasMethodDynamic has_method = new HasMethodDynamic();
|
| - Expect.equals("Dynamic", has_method.Dynamic());
|
| + Expect.equals("dynamic", has_method.dynamic());
|
|
|
| {
|
| - int Dynamic = 0; // Local variable named Dynamic is allowed.
|
| - Expect.equals(0, Dynamic);
|
| + int dynamic = 0; // Local variable named dynamic is allowed.
|
| + Expect.equals(0, dynamic);
|
| }
|
| }
|
|
|