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=66eb920905e8a66993dd2b838e605dbf52cf6837;hp=4b9c012032f6b0b9c3d3af2a77576b82ae1ba74a;hb=e2d0b0198529e2e06593df8ebab7a8413bc932e1;hpb=cfd1094b45c394258ccda08216f1435bf40e1d50

diff --git a/lib/Devel/REPL/Plugin/FindVariable.pm b/lib/Devel/REPL/Plugin/FindVariable.pm
index 4b9c012..66eb920 100644
--- a/lib/Devel/REPL/Plugin/FindVariable.pm
+++ b/lib/Devel/REPL/Plugin/FindVariable.pm
@@ -1,11 +1,14 @@
 package Devel::REPL::Plugin::FindVariable;
 
-use Moose::Role;
-use namespace::clean -except => [ 'meta' ];
+use Devel::REPL::Plugin;
+use namespace::sweep;
+use Package::Stash;
 
 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} )
@@ -19,10 +22,11 @@ sub find_variable {
                         : 'main';
     my $package = $name =~ s/^(.*)(::|')// ? $1 : $default_package;
 
-    my $meta = Class::MOP::Class->initialize($package);
+    my $meta = Package::Stash->new($package);
 
-    return unless $meta->has_package_symbol("$sigil$name");
-    $meta->get_package_symbol("$sigil$name");
+    # Package::Stash::has_symbol method *requires* a sigil
+    return unless length($sigil) and $meta->has_symbol("$sigil$name");
+    $meta->get_symbol("$sigil$name");
 }
 
 1;
@@ -33,5 +37,9 @@ __END__
 
 Devel::REPL::Plugin::FindVariable - Finds variables by name
 
+=head1 AUTHOR
+
+Shawn M Moore, C<< <sartak at gmail dot com> >>
+
 =cut