Configurable prelude

[p5sagit/Eval-WithLexicals.git] / lib / Eval / WithLexicals.pm

diff --git a/lib/Eval/WithLexicals.pm b/lib/Eval/WithLexicals.pm
index 1a3168f..fab265c 100644 (file)
--- a/lib/Eval/WithLexicals.pm
+++ b/lib/Eval/WithLexicals.pm
@@ -3,7 +3,7 @@ package Eval::WithLexicals;
 use Moo;
 use Sub::Quote;
 
-our $VERSION = '1.000000'; # 1.0.0
+our $VERSION = '1.001000'; # 1.1.0
 $VERSION = eval $VERSION;
 
 has lexicals => (is => 'rw', default => quote_sub q{ {} });
@@ -25,6 +25,10 @@ has in_package => (
   is => 'rw', default => quote_sub q{ 'Eval::WithLexicals::Scratchpad' }
 );
 
+has prelude => (
+  is => 'rw', default => quote_sub q{ 'use strictures 1;' }
+);
+
 sub eval {
   my ($self, $to_eval) = @_;
   local *Eval::WithLexicals::Cage::current_line;
@@ -32,10 +36,12 @@ sub eval {
   local *Eval::WithLexicals::Cage::grab_captures;
   my $setup = Sub::Quote::capture_unroll('$_[2]', $self->lexicals, 2);
   my $package = $self->in_package;
-  local our $current_code = qq!use strictures 1;
+  my $prelude = $self->prelude;
+  local our $current_code = qq!${prelude}
 ${setup}
 sub Eval::WithLexicals::Cage::current_line {
 package ${package};
+#line 1 "(eval)"
 ${to_eval}
 ;sub Eval::WithLexicals::Cage::pad_capture { }
 BEGIN { Eval::WithLexicals::Util::capture_list() }
@@ -92,7 +98,7 @@ sub _eval_do {
 
   sub capture_list {
     my $pad_capture = \&Eval::WithLexicals::Cage::pad_capture;
-    my @names = map $_->PV, grep $_->isa('B::PV'),
+    my @names = grep $_ ne '&', map $_->PV, grep $_->isa('B::PV'),
       svref_2object($pad_capture)->OUTSIDE->PADLIST->ARRAYelt(0)->ARRAY;
     $Eval::WithLexicals::current_code .=
       '+{ '.join(', ', map "'$_' => \\$_", @names).' };'
@@ -154,6 +160,7 @@ Eval::WithLexicals - pure perl eval with persistent lexical variables
     lexicals => { '$x' => \1 },      # default {}
     in_package => 'PackageToEvalIn', # default Eval::WithLexicals::Scratchpad
     context => 'scalar',             # default 'list'
+    prelude => 'use warnings',       # default 'use strictures 1'
   );
 
 =head2 eval
@@ -178,13 +185,21 @@ Eval::WithLexicals - pure perl eval with persistent lexical variables
 
   $eval->context($new_context); # 'list', 'scalar' or 'void'
 
+=head2 prelude
+
+Code to run before evaling code. Loads L<strictures> by default.
+
+  my $current_prelude = $eval->prelude;
+
+  $eval->prelude(q{use warnings}); # only warnings, not strict.
+
 =head1 AUTHOR
 
 Matt S. Trout <mst@shadowcat.co.uk>
 
 =head1 CONTRIBUTORS
 
-None required yet. Maybe this module is perfect (hahahahaha ...).
+David Leadbeater <dgl@dgl.cx>
 
 =head1 COPYRIGHT