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=fd91a91eae527760faa362ec01acf3beb093ada3;hb=3a40071593734bf02e987a076b6408095ecfad41;hpb=bd67131f89dd3b141458a20e3b456f23d6f62ee0

diff --git a/lib/Devel/REPL/Plugin/LexEnv.pm b/lib/Devel/REPL/Plugin/LexEnv.pm
index fd91a91..05ac905 100644
--- a/lib/Devel/REPL/Plugin/LexEnv.pm
+++ b/lib/Devel/REPL/Plugin/LexEnv.pm
@@ -1,10 +1,13 @@
 package Devel::REPL::Plugin::LexEnv;
 
-use Moose::Role;
+use Devel::REPL::Plugin;
 use namespace::clean -except => [ 'meta' ];
 use Lexical::Persistence;
 
-with 'Devel::REPL::Plugin::FindVariable';
+sub BEFORE_PLUGIN {
+    my $self = shift;
+    $self->load_plugin('FindVariable');
+}
 
 has 'lexical_environment' => (
   isa => 'Lexical::Persistence',
@@ -44,12 +47,26 @@ around 'execute' => sub {
   return $self->$orig($wrapped, @rest);
 };
 
-around 'find_variable' => sub {
-  my $orig = shift;
-  my ($self, $name) = @_;
-  my $variable = $self->lexical_environment->get_context('_')->{$name};
-  return \$variable if $variable;
-  return $orig->(@_);
-};
+# 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
+