improved quoted sub inlining

diff --git a/lib/Method/Generate/Accessor.pm b/lib/Method/Generate/Accessor.pm
index f6093eb..48cb964 100644 (file)
--- a/lib/Method/Generate/Accessor.pm
+++ b/lib/Method/Generate/Accessor.pm
@@ -35,11 +35,11 @@ sub generate_method {
         getters => $into, $reader, $name
       );
     } else {
-      local $self->{captures} = {};
+      $self->{captures} = {};
       $methods{$reader} =
         quote_sub "${into}::${reader}"
           => $self->_generate_get($name, $spec)
-          => $self->{captures}
+          => delete $self->{captures}
         ;
     }
   }
@@ -53,11 +53,11 @@ sub generate_method {
         accessors => $into, $accessor, $name
       );
     } else {
-      local $self->{captures} = {};
+      $self->{captures} = {};
       $methods{$accessor} =
         quote_sub "${into}::${accessor}"
           => $self->_generate_getset($name, $spec)
-          => $self->{captures}
+          => delete $self->{captures}
         ;
     }
   }
@@ -70,11 +70,11 @@ sub generate_method {
         setters => $into, $writer, $name
       );
     } else {
-      local $self->{captures} = {};
+      $self->{captures} = {};
       $methods{$writer} =
         quote_sub "${into}::${writer}"
           => $self->_generate_set($name, $spec)
-          => $self->{captures}
+          => delete $self->{captures}
         ;
     }
   }
@@ -106,20 +106,20 @@ sub generate_method {
     };
     foreach my $spec (@specs) {
       my ($proxy, $target, @args) = @$spec;
-      local $self->{captures} = {};
+      $self->{captures} = {};
       $methods{$proxy} =
         quote_sub "${into}::${proxy}" =>
           $self->_generate_delegation($asserter, $target, \@args),
-          $self->{captures}
+          delete $self->{captures}
         ;
     }
   }
   if (my $asserter = $spec->{asserter}) {
-    local $self->{captures} = {};
+    $self->{captures} = {};
     $methods{$asserter} =
       quote_sub "${into}::${asserter}" =>
         'do { '.$self->_generate_get($name, $spec).qq! }||die "Attempted to access '${name}' but it is not set"!,
-        $self->{captures}
+        delete $self->{captures}
       ;
   }
   \%methods;
@@ -163,9 +163,9 @@ sub _generate_simple_has {
 
 sub generate_get_default {
   my $self = shift;
-  local $self->{captures} = {};
+  $self->{captures} = {};
   my $code = $self->_generate_get_default(@_);
-  ($code, $self->{captures});
+  ($code, delete $self->{captures});
 }
 
 sub _generate_use_default {
@@ -195,20 +195,20 @@ sub _generate_simple_get {
 
 sub _generate_set {
   my ($self, $name, $spec) = @_;
-  my $simple = $self->_generate_simple_set('$_[0]', $name, '$_[1]');
   if ($self->is_simple_set($name, $spec)) {
-    $simple;
+    $self->_generate_simple_set('$_[0]', $name, '$_[1]');
   } else {
     my ($trigger, $isa_check) = @{$spec}{qw(trigger isa)};
-    my $code = "do {\n";
+    my $simple = $self->_generate_simple_set('$self', $name, '$value');
+    my $code = "do { my (\$self, \$value) = \@_;\n";
     if ($isa_check) {
       $code .= 
-        "        ".$self->_generate_isa_check($name, '$_[1]', $isa_check).";\n";
+        "        ".$self->_generate_isa_check($name, '$value', $isa_check).";\n";
     }
     if ($trigger) {
-      my $fire = $self->_generate_trigger($name, '$_[0]', '$value', $trigger);
+      my $fire = $self->_generate_trigger($name, '$self', '$value', $trigger);
       $code .=
-        "        my \$value = ".$simple.";\n        ".$fire.";\n"
+        "        ".$simple.";\n        ".$fire.";\n"
         ."        \$value;\n";
     } else {
       $code .= "        ".$simple.";\n";
@@ -220,9 +220,9 @@ sub _generate_set {
   
 sub generate_trigger {
   my $self = shift;
-  local $self->{captures} = {};
+  $self->{captures} = {};
   my $code = $self->_generate_trigger(@_);
-  ($code, $self->{captures});
+  ($code, delete $self->{captures});
 }
 
 sub _generate_trigger {
@@ -232,9 +232,9 @@ sub _generate_trigger {
 
 sub generate_isa_check {
   my ($self, @args) = @_;
-  local $self->{captures} = {};
+  $self->{captures} = {};
   my $code = $self->_generate_isa_check(@args);
-  ($code, $self->{captures});
+  ($code, delete $self->{captures});
 }
 
 sub _generate_isa_check {
@@ -246,15 +246,16 @@ sub _generate_call_code {
   my ($self, $name, $type, $values, $sub) = @_;
   if (my $quoted = quoted_from_sub($sub)) {
     my $code = $quoted->[1];
-    my $at_ = 'local @_ = ('.$values.');';
+    my $at_ = '@_ = ('.$values.');';
     if (my $captures = $quoted->[2]) {
       my $cap_name = qq{\$${type}_captures_for_${name}};
       $self->{captures}->{$cap_name} = \$captures;
-      return "do {\n".'      '.$at_."\n"
-        .Sub::Quote::capture_unroll($cap_name, $captures, 6)
-        ."     ${code}\n    }";
+      Sub::Quote::inlinify(
+        $code, $values, Sub::Quote::capture_unroll($cap_name, $captures, 6)
+      );
+    } else {
+      Sub::Quote::inlinify($code, $values);
     }
-    'do { local @_ = ('.$values.'); '.$code.' }';
   } else {
     my $cap_name = qq{\$${type}_for_${name}};
     $self->{captures}->{$cap_name} = \$sub;
@@ -264,9 +265,9 @@ sub _generate_call_code {
 
 sub generate_populate_set {
   my $self = shift;
-  local $self->{captures} = {};
+  $self->{captures} = {};
   my $code = $self->_generate_populate_set(@_);
-  ($code, $self->{captures});
+  ($code, delete $self->{captures});
 }
 
 sub _generate_populate_set {
@@ -326,9 +327,9 @@ sub generate_multi_set {
 
 sub generate_simple_set {
   my $self = shift;
-  local $self->{captures} = {};
+  $self->{captures} = {};
   my $code = $self->_generate_simple_set(@_);
-  ($code, $self->{captures});
+  ($code, delete $self->{captures});
 }
 
 sub _generate_simple_set {

diff --git a/lib/Sub/Quote.pm b/lib/Sub/Quote.pm
index cd6bff6..2f6c463 100644 (file)
--- a/lib/Sub/Quote.pm
+++ b/lib/Sub/Quote.pm
@@ -26,6 +26,20 @@ sub capture_unroll {
   );
 }
 
+sub inlinify {
+  my ($code, $args, $extra, $local) = @_;
+  my $do = 'do { '.($extra||'');
+  if (my ($code_args, $body) = $code =~ / +my \(([^)]+)\) = \@_;(.*)$/s) {
+    if ($code_args eq $args) {
+      $do.$body.' }'
+    } else {
+      $do.'my '.$code_args.' = ('.$args.'); '.$body.' }';
+    }
+  } else {
+    $do.($local ? 'local ' : '').'@_ = ('.$args.'); '.$code.' }';
+  }
+}
+
 sub _unquote_all_outstanding {
   return unless %QUOTE_OUTSTANDING;
   my ($assembled_code, @assembled_captures, @localize_these) = '';

diff --git a/t/accessor-isa.t b/t/accessor-isa.t
index 1529bc1..1e8f88f 100644 (file)
--- a/t/accessor-isa.t
+++ b/t/accessor-isa.t
@@ -7,29 +7,30 @@ sub run_for {
 
   my $obj = $class->new(less_than_three => 1);
 
-  is($obj->less_than_three, 1, 'initial value set');
+  is($obj->less_than_three, 1, "initial value set (${class})");
 
   like(
     exception { $obj->less_than_three(4) },
-    qr/4 is not less than three/, 'exception thrown on bad set'
+    qr/4 is not less than three/, "exception thrown on bad set (${class})"
   );
 
-  is($obj->less_than_three, 1, 'initial value remains after bad set');
+  is($obj->less_than_three, 1, "initial value remains after bad set (${class})");
 
   my $ret;
 
   is(
     exception { $ret = $obj->less_than_three(2) },
-    undef, 'no exception on correct set'
+    undef, "no exception on correct set (${class})"
   );
 
-  is($ret, 2, 'correct setter return');
-  is($obj->less_than_three, 2, 'correct getter return');
+  is($ret, 2, "correct setter return (${class})");
+  is($obj->less_than_three, 2, "correct getter return (${class})");
 
-  is(exception { $class->new }, undef, 'no exception with no value');
+  is(exception { $class->new }, undef, "no exception with no value (${class})");
   like(
     exception { $class->new(less_than_three => 12) },
-    qr/12 is not less than three/, 'exception thrown on bad constructor arg'
+    qr/12 is not less than three/,
+    "exception thrown on bad constructor arg (${class})"
   );
 }
 
@@ -54,7 +55,10 @@ run_for 'Foo';
 
   has less_than_three => (
     is => 'rw',
-    isa => quote_sub q{ die "$_[0] is not less than three" unless $_[0] < 3 }
+    isa => quote_sub q{
+      my ($x) = @_;
+      die "$x is not less than three" unless $x < 3
+    }
   );
 }
 
@@ -69,7 +73,10 @@ run_for 'Bar';
   has less_than_three => (
     is => 'rw',
     isa => quote_sub(
-      q{ die "$_[0] is not less than ${word}" unless $_[0] < $limit },
+      q{
+        my ($value) = @_;
+        die "$value is not less than ${word}" unless $value < $limit
+      },
       { '$limit' => \3, '$word' => \'three' }
     )
   );