X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FFindVariable.pm;h=91df2fbb57723d5b987e84d46453086acff04f29;hb=refs%2Fheads%2Fmaster;hp=2b357552929d00679990ed44117e23b0bad66a8a;hpb=e93892cd24b9c3a90f80dd4445043513b05211a1;p=p5sagit%2FDevel-REPL.git

diff --git a/lib/Devel/REPL/Plugin/FindVariable.pm b/lib/Devel/REPL/Plugin/FindVariable.pm
index 2b35755..91df2fb 100644
--- a/lib/Devel/REPL/Plugin/FindVariable.pm
+++ b/lib/Devel/REPL/Plugin/FindVariable.pm
@@ -1,11 +1,24 @@
+use strict;
+use warnings;
 package Devel::REPL::Plugin::FindVariable;
+# ABSTRACT: Finds variables by name
 
-use Moose::Role;
-use namespace::clean -except => [ 'meta' ];
+our $VERSION = '1.003030';
+
+use Devel::REPL::Plugin;
+use namespace::autoclean;
 
 sub find_variable {
     my ($self, $name) = @_;
 
+    return \$self if $name eq '$_REPL';
+
+    # XXX: this code needs to live in LexEnv
+    if ($self->can('lexical_environment')) {
+        return \( $self->lexical_environment->get_context('_')->{$name} )
+            if exists $self->lexical_environment->get_context('_')->{$name};
+    }
+
     my $sigil = $name =~ s/^([\$\@\%\&\*])// ? $1 : '';
 
     my $default_package = $self->can('current_package')
@@ -15,9 +28,19 @@ sub find_variable {
 
     my $meta = Class::MOP::Class->initialize($package);
 
-    return unless $meta->has_package_symbol("$sigil$name");
+    # Class::MOP::Package::has_package_symbol method *requires* a sigil
+    return unless length($sigil) and $meta->has_package_symbol("$sigil$name");
     $meta->get_package_symbol("$sigil$name");
 }
 
 1;
 
+__END__
+
+=pod
+
+=head1 AUTHOR
+
+Shawn M Moore, C<< <sartak at gmail dot com> >>
+
+=cut