| Index: pkg/front_end/testcases/mixin.dart.direct.expect
|
| diff --git a/pkg/front_end/testcases/mixin.dart.direct.expect b/pkg/front_end/testcases/mixin.dart.direct.expect
|
| index 7d6b06e7feee3e8bfaecbb31329f2f15d2183399..7a39b22c7841cfe8f6faac3182bca8a30caf98a0 100644
|
| --- a/pkg/front_end/testcases/mixin.dart.direct.expect
|
| +++ b/pkg/front_end/testcases/mixin.dart.direct.expect
|
| @@ -2,6 +2,20 @@ library;
|
| import self as self;
|
| import "dart:core" as core;
|
|
|
| +abstract class Object&M1 extends core::Object implements self::M1 {
|
| + constructor •() → void
|
| + : super core::Object::•()
|
| + ;
|
| + method m() → dynamic
|
| + return core::print("M1");
|
| +}
|
| +abstract class Object&M1&M2 extends self::Object&M1 implements self::M2 {
|
| + constructor •() → void
|
| + : super self::Object&M1::•()
|
| + ;
|
| + method m() → dynamic
|
| + return core::print("M2");
|
| +}
|
| class B extends self::Object&M1&M2 {
|
| constructor •(dynamic value) → void
|
| : super self::Object&M1&M2::•()
|
| @@ -33,31 +47,17 @@ abstract class G1<T extends core::Object> extends core::Object {
|
| method m() → dynamic
|
| return core::print(self::G1::T);
|
| }
|
| -class D<S extends core::Object> extends self::D^G1<self::D::S> {
|
| - constructor •() → void
|
| - : super self::D^G1::•()
|
| - ;
|
| -}
|
| -abstract class Object&M1 extends core::Object implements self::M1 {
|
| +abstract class Object&G1^^#T0<#T0 extends core::Object> extends core::Object implements self::G1<self::Object&G1^^#T0::#T0> {
|
| constructor •() → void
|
| : super core::Object::•()
|
| ;
|
| method m() → dynamic
|
| - return core::print("M1");
|
| -}
|
| -abstract class Object&M1&M2 extends self::Object&M1 implements self::M2 {
|
| - constructor •() → void
|
| - : super self::Object&M1::•()
|
| - ;
|
| - method m() → dynamic
|
| - return core::print("M2");
|
| + return core::print(self::Object&G1^^#T0::#T0);
|
| }
|
| -abstract class D^G1<S extends core::Object> extends core::Object implements self::G1<self::D^G1::S> {
|
| +class D<S extends core::Object> extends self::Object&G1^^#T0<self::D::S> {
|
| constructor •() → void
|
| - : super core::Object::•()
|
| + : super self::Object&G1^^#T0::•()
|
| ;
|
| - method m() → dynamic
|
| - return core::print(self::D^G1::S);
|
| }
|
| static method main() → dynamic {
|
| new self::B::•(null).m();
|
|
|