Index: pkg/kernel/testcases/closures/type_variables.dart.expect |
diff --git a/pkg/kernel/testcases/closures/type_variables.dart.expect b/pkg/kernel/testcases/closures/type_variables.dart.expect |
index 45d06e3f4a2dfab6ce713f0c2ed234e15928445a..3b1f3295007464e4cd1015a15ad748ba99b6ee29 100644 |
--- a/pkg/kernel/testcases/closures/type_variables.dart.expect |
+++ b/pkg/kernel/testcases/closures/type_variables.dart.expect |
@@ -1,15 +1,14 @@ |
library; |
import self as self; |
import "dart:core" as core; |
-import "dart:mock" as mock; |
class C<T extends core::Object, S extends core::Object> extends core::Object { |
constructor internal() → void |
: super core::Object::•() |
; |
method foo(self::C::S s) → dynamic { |
- final mock::Context #context = new mock::Context::•(1); |
- #context.[]=(0, this); |
+ final Vector #context = MakeVector(2); |
+ #context[1] = this; |
return new self::Closure#C#foo#function::•<self::C::T, self::C::S>(#context); |
} |
method bar() → dynamic { |
@@ -25,52 +24,52 @@ class C<T extends core::Object, S extends core::Object> extends core::Object { |
} |
class Closure#C#foo#function<T extends core::Object, S extends core::Object> extends core::Object implements core::Function { |
field core::String note = "This is temporary. The VM doesn't need closure classes."; |
- field mock::Context context; |
- constructor •(final mock::Context context) → dynamic |
+ field Vector context; |
+ constructor •(final Vector context) → dynamic |
: self::Closure#C#foo#function::context = context |
; |
method call(self::Closure#C#foo#function::T x) → dynamic { |
"This is a temporary solution. In the VM, this will become an additional parameter."; |
- final mock::Context #contextParameter = this.{self::Closure#C#foo#function::context}; |
+ final Vector #contextParameter = this.{self::Closure#C#foo#function::context}; |
self::Closure#C#foo#function::T y = x; |
core::Object z = y; |
- self::C<self::Closure#C#foo#function::T, self::Closure#C#foo#function::S> self = #contextParameter.[](0); |
+ self::C<self::Closure#C#foo#function::T, self::Closure#C#foo#function::S> self = #contextParameter[1]; |
return z as self::Closure#C#foo#function::T; |
} |
} |
class Closure#C#baz#function#function<T extends core::Object, S extends core::Object> extends core::Object implements core::Function { |
field core::String note = "This is temporary. The VM doesn't need closure classes."; |
- field mock::Context context; |
- constructor •(final mock::Context context) → dynamic |
+ field Vector context; |
+ constructor •(final Vector context) → dynamic |
: self::Closure#C#baz#function#function::context = context |
; |
method call() → dynamic { |
"This is a temporary solution. In the VM, this will become an additional parameter."; |
- final mock::Context #contextParameter = this.{self::Closure#C#baz#function#function::context}; |
+ final Vector #contextParameter = this.{self::Closure#C#baz#function#function::context}; |
return self::C::•<self::Closure#C#baz#function#function::T, self::Closure#C#baz#function#function::S>(); |
} |
} |
class Closure#C#baz#function<T extends core::Object, S extends core::Object> extends core::Object implements core::Function { |
field core::String note = "This is temporary. The VM doesn't need closure classes."; |
- field mock::Context context; |
- constructor •(final mock::Context context) → dynamic |
+ field Vector context; |
+ constructor •(final Vector context) → dynamic |
: self::Closure#C#baz#function::context = context |
; |
method call() → dynamic { |
"This is a temporary solution. In the VM, this will become an additional parameter."; |
- final mock::Context #contextParameter = this.{self::Closure#C#baz#function::context}; |
+ final Vector #contextParameter = this.{self::Closure#C#baz#function::context}; |
return new self::Closure#C#baz#function#function::•<self::Closure#C#baz#function::T, self::Closure#C#baz#function::S>(#contextParameter); |
} |
} |
class Closure#C#function#local<T extends core::Object, S extends core::Object> extends core::Object implements core::Function { |
field core::String note = "This is temporary. The VM doesn't need closure classes."; |
- field mock::Context context; |
- constructor •(final mock::Context context) → dynamic |
+ field Vector context; |
+ constructor •(final Vector context) → dynamic |
: self::Closure#C#function#local::context = context |
; |
method call() → dynamic { |
"This is a temporary solution. In the VM, this will become an additional parameter."; |
- final mock::Context #contextParameter = this.{self::Closure#C#function#local::context}; |
+ final Vector #contextParameter = this.{self::Closure#C#function#local::context}; |
self::C<self::Closure#C#function#local::T, self::Closure#C#function#local::S> self = new self::C::internal<self::Closure#C#function#local::T, self::Closure#C#function#local::S>(); |
return self; |
} |