| Index: tests/compiler/dart2js/type_representation_test.dart
|
| diff --git a/tests/compiler/dart2js/type_representation_test.dart b/tests/compiler/dart2js/type_representation_test.dart
|
| index d1c5c9359bacb0a42fbf869a44d14a876e0b531b..76b2cebc511bd93c93e54ee3568d8ea6a9ceb7a2 100644
|
| --- a/tests/compiler/dart2js/type_representation_test.dart
|
| +++ b/tests/compiler/dart2js/type_representation_test.dart
|
| @@ -142,55 +142,55 @@ void testTypeRepresentations() {
|
| expect(instantiate(List_, [int_]), '[$List_rep, $int_rep]');
|
| // List<Typedef>
|
| expect(instantiate(List_, [Typedef_]),
|
| - '[$List_rep, {$func: "void_", $retvoid: true}]',
|
| - '[$List_rep, {$func: "void_", $retvoid: true,'
|
| + '[$List_rep, {$func: "", $retvoid: true}]',
|
| + '[$List_rep, {$func: "", $retvoid: true,'
|
| ' $typedefTag: $Typedef_rep}]');
|
| expect(instantiate(List_, [Typedef2_]),
|
| - '[$List_rep, {$func: "int_", $ret: $int_rep}]',
|
| - '[$List_rep, {$func: "int_", $ret: $int_rep,'
|
| + '[$List_rep, {$func: "", $ret: $int_rep}]',
|
| + '[$List_rep, {$func: "", $ret: $int_rep,'
|
| ' $typedefTag: $Typedef2_rep}]');
|
| expect(instantiate(List_, [Typedef3_]),
|
| - '[$List_rep, {$func: "List_", $ret: [$List_rep, $int_rep]}]',
|
| - '[$List_rep, {$func: "List_", $ret: [$List_rep, $int_rep],'
|
| + '[$List_rep, {$func: "", $ret: [$List_rep, $int_rep]}]',
|
| + '[$List_rep, {$func: "", $ret: [$List_rep, $int_rep],'
|
| ' $typedefTag: $Typedef3_rep}]');
|
| expect(instantiate(List_, [Typedef4_]),
|
| - '[$List_rep, {$func: "args0"}]',
|
| - '[$List_rep, {$func: "args0", $typedefTag: $Typedef4_rep}]');
|
| + '[$List_rep, {$func: ""}]',
|
| + '[$List_rep, {$func: "", $typedefTag: $Typedef4_rep}]');
|
| expect(instantiate(List_, [Typedef5_]),
|
| - '[$List_rep, {$func: "dynamic__int_String",'
|
| + '[$List_rep, {$func: "",'
|
| ' $args: [$int_rep, $String_rep]}]',
|
| - '[$List_rep, {$func: "dynamic__int_String",'
|
| + '[$List_rep, {$func: "",'
|
| ' $args: [$int_rep, $String_rep], $typedefTag: $Typedef5_rep}]');
|
| expect(instantiate(List_, [Typedef6_]),
|
| - '[$List_rep, {$func: "dynamic__int__String",'
|
| + '[$List_rep, {$func: "",'
|
| ' $args: [$int_rep], $opt: [$String_rep]}]',
|
| - '[$List_rep, {$func: "dynamic__int__String",'
|
| + '[$List_rep, {$func: "",'
|
| ' $args: [$int_rep], $opt: [$String_rep],'
|
| ' $typedefTag: $Typedef6_rep}]');
|
| expect(instantiate(List_, [Typedef7_]),
|
| - '[$List_rep, {$func: "dynamic__int_String__List_dynamic", $args: '
|
| + '[$List_rep, {$func: "", $args: '
|
| '[$int_rep, $String_rep], $opt: [[$List_rep, $int_rep], null]}]',
|
| - '[$List_rep, {$func: "dynamic__int_String__List_dynamic", $args: '
|
| + '[$List_rep, {$func: "", $args: '
|
| '[$int_rep, $String_rep], $opt: [[$List_rep, $int_rep], null], '
|
| '$typedefTag: $Typedef7_rep}]');
|
| expect(instantiate(List_, [Typedef8_]),
|
| - '[$List_rep, {$func: "dynamic__int__String0", $args: [$int_rep],'
|
| + '[$List_rep, {$func: "", $args: [$int_rep],'
|
| ' $named: {b: $String_rep}}]',
|
| - '[$List_rep, {$func: "dynamic__int__String0", $args: [$int_rep],'
|
| + '[$List_rep, {$func: "", $args: [$int_rep],'
|
| ' $named: {b: $String_rep}, $typedefTag: $Typedef8_rep}]');
|
| expect(instantiate(List_, [Typedef9_]),
|
| - '[$List_rep, {$func: "dynamic__int_String__List_dynamic0", '
|
| + '[$List_rep, {$func: "", '
|
| '$args: [$int_rep, $String_rep], $named: '
|
| '{c: [$List_rep, $int_rep], d: null}}]',
|
| - '[$List_rep, {$func: "dynamic__int_String__List_dynamic0", '
|
| + '[$List_rep, {$func: "", '
|
| '$args: [$int_rep, $String_rep], $named: {c: [$List_rep, $int_rep],'
|
| ' d: null}, $typedefTag: $Typedef9_rep}]');
|
| expect(instantiate(List_, [Typedef10_]),
|
| - '[$List_rep, {$func: "dynamic__void__int__dynamic", '
|
| - '$args: [{$func: "void__int__dynamic", $retvoid: true, '
|
| + '[$List_rep, {$func: "", '
|
| + '$args: [{$func: "", $retvoid: true, '
|
| '$args: [$int_rep], $opt: [null]}]}]',
|
| - '[$List_rep, {$func: "dynamic__void__int__dynamic", '
|
| - '$args: [{$func: "void__int__dynamic", $retvoid: true, '
|
| + '[$List_rep, {$func: "", '
|
| + '$args: [{$func: "", $retvoid: true, '
|
| '$args: [$int_rep], $opt: [null]}], $typedefTag: $Typedef10_rep}]');
|
|
|
| // Map<K,V>
|
| @@ -207,50 +207,50 @@ void testTypeRepresentations() {
|
|
|
| // void m1() {}
|
| expect(env.getElement('m1').computeType(env.compiler),
|
| - '{$func: "void_", $retvoid: true}');
|
| + '{$func: "", $retvoid: true}');
|
|
|
| // int m2() => 0;
|
| expect(env.getElement('m2').computeType(env.compiler),
|
| - '{$func: "int_", $ret: $int_rep}');
|
| + '{$func: "", $ret: $int_rep}');
|
|
|
| // List<int> m3() => null;
|
| expect(env.getElement('m3').computeType(env.compiler),
|
| - '{$func: "List_", $ret: [$List_rep, $int_rep]}');
|
| + '{$func: "", $ret: [$List_rep, $int_rep]}');
|
|
|
| // m4() {}
|
| expect(env.getElement('m4').computeType(env.compiler),
|
| - '{$func: "args0"}');
|
| + '{$func: ""}');
|
|
|
| // m5(int a, String b) {}
|
| expect(env.getElement('m5').computeType(env.compiler),
|
| - '{$func: "dynamic__int_String", $args: [$int_rep, $String_rep]}');
|
| + '{$func: "", $args: [$int_rep, $String_rep]}');
|
|
|
| // m6(int a, [String b]) {}
|
| expect(env.getElement('m6').computeType(env.compiler),
|
| - '{$func: "dynamic__int__String", $args: [$int_rep],'
|
| + '{$func: "", $args: [$int_rep],'
|
| ' $opt: [$String_rep]}');
|
|
|
| // m7(int a, String b, [List<int> c, d]) {}
|
| expect(env.getElement('m7').computeType(env.compiler),
|
| - '{$func: "dynamic__int_String__List_dynamic",'
|
| + '{$func: "",'
|
| ' $args: [$int_rep, $String_rep],'
|
| ' $opt: [[$List_rep, $int_rep], null]}');
|
|
|
| // m8(int a, {String b}) {}
|
| expect(env.getElement('m8').computeType(env.compiler),
|
| - '{$func: "dynamic__int__String0",'
|
| + '{$func: "",'
|
| ' $args: [$int_rep], $named: {b: $String_rep}}');
|
|
|
| // m9(int a, String b, {List<int> c, d}) {}
|
| expect(env.getElement('m9').computeType(env.compiler),
|
| - '{$func: "dynamic__int_String__List_dynamic0",'
|
| + '{$func: "",'
|
| ' $args: [$int_rep, $String_rep],'
|
| ' $named: {c: [$List_rep, $int_rep], d: null}}');
|
|
|
| // m10(void f(int a, [b])) {}
|
| expect(env.getElement('m10').computeType(env.compiler),
|
| - '{$func: "dynamic__void__int__dynamic", $args:'
|
| - ' [{$func: "void__int__dynamic",'
|
| + '{$func: "", $args:'
|
| + ' [{$func: "",'
|
| ' $retvoid: true, $args: [$int_rep], $opt: [null]}]}');
|
| }));
|
| }
|
|
|