X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FLexEnv.pm;h=05ac905edfcf53c8482f0ec2f73bbd7c2aae8634;hp=f78fb018169f6650f4ae6c8514ee7acbe0a814f4;hb=88d6bf36484ce580aa093654129e9b707ccb1c66;hpb=85cd27808a3e9294c1b5345fb5bbca046821933d

diff --git a/lib/Devel/REPL/Plugin/LexEnv.pm b/lib/Devel/REPL/Plugin/LexEnv.pm
index f78fb01..05ac905 100644
--- a/lib/Devel/REPL/Plugin/LexEnv.pm
+++ b/lib/Devel/REPL/Plugin/LexEnv.pm
@@ -1,9 +1,14 @@
 package Devel::REPL::Plugin::LexEnv;
 
-use Moose::Role;
+use Devel::REPL::Plugin;
 use namespace::clean -except => [ 'meta' ];
 use Lexical::Persistence;
 
+sub BEFORE_PLUGIN {
+    my $self = shift;
+    $self->load_plugin('FindVariable');
+}
+
 has 'lexical_environment' => (
   isa => 'Lexical::Persistence',
   is => 'rw',
@@ -12,12 +17,27 @@ has 'lexical_environment' => (
   default => sub { Lexical::Persistence->new }
 );
 
+has '_hints' => (
+  isa => "ArrayRef",
+  is => "rw",
+  predicate => '_has_hints',
+);
+
 around 'mangle_line' => sub {
   my $orig = shift;
   my ($self, @rest) = @_;
   my $line = $self->$orig(@rest);
   my $lp = $self->lexical_environment;
-  return join('', map { "my $_;\n" } keys %{$lp->get_context('_')}).$line;
+  # Collate my declarations for all LP context vars then add '';
+  # so an empty statement doesn't return anything (with a no warnings
+  # to prevent "Useless use ..." warning)
+  return join('',
+    'BEGIN { if ( $_REPL->_has_hints ) { ( $^H, %^H ) = @{ $_REPL->_hints } } }',
+    ( map { "my $_;\n" } keys %{$lp->get_context('_')} ),
+    qq{{ no warnings 'void'; ''; }\n},
+    $line,
+    '; BEGIN { $_REPL->_hints([ $^H, %^H ]) }',
+  );
 };
 
 around 'execute' => sub {
@@ -27,4 +47,26 @@ around 'execute' => sub {
   return $self->$orig($wrapped, @rest);
 };
 
+# this doesn't work! yarg. we now just check $self->can('lexical_environment')
+# in FindVariable
+
+#around 'find_variable' => sub {
+#  my $orig = shift;
+#  my ($self, $name) = @_;
+#
+#  return \( $self->lexical_environment->get_context('_')->{$name} )
+#    if exists $self->lexical_environment->get_context('_')->{$name};
+#
+#  return $orig->(@_);
+#};
+
 1;
+
+__END__
+
+=head1 NAME
+
+Devel::REPL::Plugin::LexEnv - Provide a lexical environment for the REPL
+
+=cut
+