switch to hashref-based _eval_closure

[gitmo/Class-MOP.git] / lib / Class / MOP / Method / Generated.pm

diff --git a/lib/Class/MOP/Method/Generated.pm b/lib/Class/MOP/Method/Generated.pm
index 9d9a46f..428d808 100644 (file)
--- a/lib/Class/MOP/Method/Generated.pm
+++ b/lib/Class/MOP/Method/Generated.pm
@@ -45,8 +45,17 @@ sub initialize_body {
 }
 
 sub _eval_closure {
-    my $self = shift;
-    eval join("\n",@_);
+    # my ($self, $captures, $sub_body) = @_;
+    my $__captures = $_[1];
+    eval join(
+        "\n",
+        (map {
+            /^([\@\%\$])/
+                or die "capture key should start with \@, \% or \$: $_";
+            q!my !.$_.q! = !.$1.q!{$__captures->{'!.$_.q!'}};!;
+        } keys %$__captures),
+        $_[2]
+    );
 }
 
 1;