X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FFindVariable.pm;h=cf2fd7788558fa65b6b56c9295eebf1d8a299790;hp=4b9c012032f6b0b9c3d3af2a77576b82ae1ba74a;hb=aa8b764738156914d48d182ee0706e4c3d4e5c99;hpb=cfd1094b45c394258ccda08216f1435bf40e1d50

diff --git a/lib/Devel/REPL/Plugin/FindVariable.pm b/lib/Devel/REPL/Plugin/FindVariable.pm
index 4b9c012..cf2fd77 100644
--- a/lib/Devel/REPL/Plugin/FindVariable.pm
+++ b/lib/Devel/REPL/Plugin/FindVariable.pm
@@ -1,11 +1,13 @@
 package Devel::REPL::Plugin::FindVariable;
 
-use Moose::Role;
-use namespace::clean -except => [ 'meta' ];
+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} )
@@ -21,7 +23,8 @@ 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");
 }
 
@@ -33,5 +36,9 @@ __END__
 
 Devel::REPL::Plugin::FindVariable - Finds variables by name
 
+=head1 AUTHOR
+
+Shawn M Moore, C<< <sartak at gmail dot com> >>
+
 =cut