Index: pkg/kernel/testcases/closures/closure_in_initializer_closure.dart.expect |
diff --git a/pkg/kernel/testcases/closures/closure_in_initializer_closure.dart.expect b/pkg/kernel/testcases/closures/closure_in_initializer_closure.dart.expect |
index 8be11e913ce9fe7d4b941d6d69b9711ce0757fd8..e66d8be0d24346c444183854fa79ac22044bb967 100644 |
--- a/pkg/kernel/testcases/closures/closure_in_initializer_closure.dart.expect |
+++ b/pkg/kernel/testcases/closures/closure_in_initializer_closure.dart.expect |
@@ -5,57 +5,30 @@ import "dart:core" as core; |
class C extends core::Object { |
field dynamic t; |
constructor foo(dynamic f) → void |
- : self::C::t = let final Vector #context = MakeVector(2) in let dynamic #t1 = #context[1] = f in new self::Closure#C#foo#function::•(#context), super core::Object::•() { |
+ : self::C::t = let final Vector #context = MakeVector(2) in let dynamic #t1 = #context[1] = f in MakeClosure<() → dynamic>(self::closure#C#foo#function, #context), super core::Object::•() { |
final Vector #context = MakeVector(2); |
#context[1] = f; |
core::print(1); |
} |
} |
-class Closure#C#foo#function#function extends core::Object implements core::Function { |
- field core::String note = "This is temporary. The VM doesn't need closure classes."; |
- field Vector context; |
- constructor •(final Vector context) → dynamic |
- : self::Closure#C#foo#function#function::context = context |
- ; |
- method call(dynamic x) → dynamic { |
- "This is a temporary solution. In the VM, this will become an additional parameter."; |
- final Vector #contextParameter = this.{self::Closure#C#foo#function#function::context}; |
- (#contextParameter[0][1]).call("${#contextParameter[1]}${x}"); |
- } |
-} |
-class Closure#C#foo#function extends core::Object implements core::Function { |
- field core::String note = "This is temporary. The VM doesn't need closure classes."; |
- field Vector context; |
- constructor •(final Vector context) → dynamic |
- : self::Closure#C#foo#function::context = context |
- ; |
- method call() → dynamic { |
- "This is a temporary solution. In the VM, this will become an additional parameter."; |
- final Vector #contextParameter = this.{self::Closure#C#foo#function::context}; |
- final Vector #context = MakeVector(2); |
- #context[0] = #contextParameter; |
- #context[1] = null; |
- dynamic g = new self::Closure#C#foo#function#function::•(#context); |
- #context[1] = "hest"; |
- return g; |
- } |
-} |
-class Closure#main#function extends core::Object implements core::Function { |
- field core::String note = "This is temporary. The VM doesn't need closure classes."; |
- field Vector context; |
- constructor •(final Vector context) → dynamic |
- : self::Closure#main#function::context = context |
- ; |
- method call(dynamic x) → dynamic { |
- "This is a temporary solution. In the VM, this will become an additional parameter."; |
- final Vector #contextParameter = this.{self::Closure#main#function::context}; |
- return core::print(x); |
- } |
-} |
static method main() → dynamic { |
core::print(0); |
- dynamic c = new self::C::foo(new self::Closure#main#function::•(null)); |
+ dynamic c = new self::C::foo(MakeClosure<(dynamic) → dynamic>(self::closure#main#function, null)); |
core::print(2); |
c.t().call("fisk"); |
core::print(3); |
} |
+static method closure#C#foo#function#function(Vector #contextParameter, dynamic x) → dynamic { |
+ (#contextParameter[0][1]).call("${#contextParameter[1]}${x}"); |
+} |
+static method closure#C#foo#function(Vector #contextParameter) → dynamic { |
+ final Vector #context = MakeVector(2); |
+ #context[0] = #contextParameter; |
+ #context[1] = null; |
+ dynamic g = MakeClosure<(dynamic) → dynamic>(self::closure#C#foo#function#function, #context); |
+ #context[1] = "hest"; |
+ return g; |
+} |
+static method closure#main#function(Vector #contextParameter, dynamic x) → dynamic { |
+ return core::print(x); |
+} |