undef($captures) if $captures && !keys %$captures;
my $code = pop;
my $name = $_[0];
- my $outstanding;
+ my $quoted_info;
my $deferred = defer_sub +($options->{no_install} ? undef : $name) => sub {
- unquote_sub($outstanding);
+ unquote_sub($quoted_info->[4]);
};
- $outstanding = "$deferred";
- $QUOTED{$outstanding} = [ $name, $code, $captures ];
- weaken($WEAK_REFS{$outstanding} = $deferred);
+ $quoted_info = [ $name, $code, $captures, undef, $deferred ];
+ weaken($QUOTED{$deferred} = $quoted_info);
return $deferred;
}
sub quoted_from_sub {
my ($sub) = @_;
- $WEAK_REFS{$sub||''} and $QUOTED{$sub||''};
+ $QUOTED{$sub||''};
}
sub unquote_sub {
my $make_sub = "{\n";
- if (keys %$captures) {
- $make_sub .= capture_unroll("\$_[1]", $captures, 2);
- }
+ my %captures = $captures ? %$captures : ();
+ $captures{'$_QUOTED'} = \$QUOTED{$sub};
+ $make_sub .= capture_unroll("\$_[1]", \%captures, 2);
- my $o_quoted = perlstring $sub;
$make_sub .= (
$name
# disable the 'variable $x will not stay shared' warning since
# we're not letting it escape from this scope anyway so there's
# nothing trying to share it
? " no warnings 'closure';\n sub ${name} {\n"
- : " \$Sub::Quote::QUOTED{${o_quoted}}[3] = sub {\n"
+ : " \$_QUOTED->[3] = sub {\n"
);
$make_sub .= $code;
$make_sub .= " }".($name ? '' : ';')."\n";
if ($name) {
- $make_sub .= " \$Sub::Quote::QUOTED{${o_quoted}}[3] = \\&${name}\n";
+ $make_sub .= " \$_QUOTED->[3] = \\&${name}\n";
}
$make_sub .= "}\n1;\n";
$ENV{SUB_QUOTE_DEBUG} && warn $make_sub;
local $@;
no strict 'refs';
local *{$name} if $name;
- unless (_clean_eval $make_sub, $captures) {
+ unless (_clean_eval $make_sub, \%captures) {
die "Eval went very, very wrong:\n\n${make_sub}\n\n$@";
}
}
$QUOTED{$sub}[3];
}
+sub CLONE {
+ %QUOTED = map { defined $_ ? ($_->[4] => $_) : () } values %QUOTED;
+ weaken($_) for values %QUOTED;
+}
+
1;
=head1 NAME
C<$code> is a string that will be turned into code.
C<\%captures> is a hashref of variables that will be made available to the
-code. See the L</SYNOPSIS>'s C<Silly::dagron> for an example using captures.
+code. The keys should be the full name of the variable to be made available,
+including the sigil. The values should be references to the values. The
+variables will contain copies of the values. See the L</SYNOPSIS>'s
+C<Silly::dagron> for an example using captures.
=head3 options