From: Graham Knop Date: Fri, 13 Jun 2014 12:38:11 +0000 (-0400) Subject: persist hints by rewriting prelude X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bbc1a33fecb81112da93d423db1647a5c9a423bd;p=p5sagit%2FEval-WithLexicals.git persist hints by rewriting prelude --- diff --git a/lib/Eval/WithLexicals/WithHintPersistence.pm b/lib/Eval/WithLexicals/WithHintPersistence.pm index 5624d6f..642887c 100644 --- a/lib/Eval/WithLexicals/WithHintPersistence.pm +++ b/lib/Eval/WithLexicals/WithHintPersistence.pm @@ -10,11 +10,6 @@ has hints => ( default => quote_sub q{ {} }, ); -has _first_eval => ( - is => 'rw', - default => quote_sub q{ 1 }, -); - around eval => sub { my $orig = shift; my($self) = @_; @@ -25,6 +20,11 @@ around eval => sub { my @ret = $orig->(@_); $self->hints({ Eval::WithLexicals::Cage::capture_hints() }); + $self->prelude( + join '', q[ BEGIN { ], + _capture_unroll_global('$Eval::WithLexicals::Cage::hints', $self->hints, 2), + q[ } ], + ); @ret; }; @@ -43,22 +43,6 @@ sub _capture_unroll_global { ); } -sub setup_code { - my($self) = @_; - # Only run the prelude on the first eval, hints will be set after - # that. - if($self->_first_eval) { - $self->_first_eval(0); - return $self->prelude; - } else { - # Seems we can't use the technique of passing via @_ for code in a BEGIN - # block - return q[ BEGIN { ], - _capture_unroll_global('$Eval::WithLexicals::Cage::hints', $self->hints, 2), - q[ } ], - } -}; - around capture_code => sub { my $orig = shift; my($self) = @_;