From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 2 Jan 2011 11:56:54 +0000 (-0600)
Subject: work with new package::stash api
X-Git-Tag: 0.19~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5da81a068e1e3bdf31bb3eb52b4f4cb069fdc947;p=p5sagit%2Fnamespace-clean.git

work with new package::stash api
---

diff --git a/lib/namespace/clean.pm b/lib/namespace/clean.pm
index c208de0..4062eab 100644
--- a/lib/namespace/clean.pm
+++ b/lib/namespace/clean.pm
@@ -10,6 +10,24 @@ use Sub::Identify 0.04 qw(sub_fullname);
 use Package::Stash 0.03;
 use B::Hooks::EndOfScope 0.07;
 
+my ($ADD_SYMBOL, $HAS_SYMBOL, $GET_SYMBOL, $LIST_ALL_SYMBOLS, $REMOVE_GLOB);
+BEGIN {
+    if ($Package::Stash::VERSION > 0.13) {
+        $ADD_SYMBOL = 'add_symbol';
+        $HAS_SYMBOL = 'has_symbol';
+        $GET_SYMBOL = 'get_symbol';
+        $LIST_ALL_SYMBOLS = 'list_all_symbols';
+        $REMOVE_GLOB = 'remove_glob';
+    }
+    else {
+        $ADD_SYMBOL = 'add_package_symbol';
+        $HAS_SYMBOL = 'has_package_symbol';
+        $GET_SYMBOL = 'get_package_symbol';
+        $LIST_ALL_SYMBOLS = 'list_all_package_symbols';
+        $REMOVE_GLOB = 'remove_package_glob';
+    }
+}
+
 $STORAGE_VAR = '__NAMESPACE_CLEAN_STORAGE';
 
 =head1 SYNOPSIS
@@ -150,7 +168,7 @@ my $RemoveSubs = sub {
         # ignore already removed symbols
         next SYMBOL if $store->{exclude}{ $f };
 
-        next SYMBOL unless $cleanee_stash->has_package_symbol($variable);
+        next SYMBOL unless $cleanee_stash->$HAS_SYMBOL($variable);
 
         if (ref(\$cleanee_stash->namespace->{$f}) eq 'GLOB') {
             # convince the Perl debugger to work
@@ -158,21 +176,21 @@ my $RemoveSubs = sub {
             # since we are deleting the glob where the subroutine was originally
             # defined, that assumption no longer holds, so we need to move it
             # elsewhere and point the CV's name to the new glob.
-            my $sub = $cleanee_stash->get_package_symbol($variable);
+            my $sub = $cleanee_stash->$GET_SYMBOL($variable);
             if ( sub_fullname($sub) eq ($cleanee_stash->name . "::$f") ) {
                 my $new_fq = $deleted_stash->name . "::$f";
                 subname($new_fq, $sub);
-                $deleted_stash->add_package_symbol($variable, $sub);
+                $deleted_stash->$ADD_SYMBOL($variable, $sub);
             }
         }
 
         my ($scalar, $array, $hash, $io) = map {
-            $cleanee_stash->get_package_symbol($_ . $f)
+            $cleanee_stash->$GET_SYMBOL($_ . $f)
         } '$', '@', '%', '';
-        $cleanee_stash->remove_package_glob($f);
+        $cleanee_stash->$REMOVE_GLOB($f);
         for my $var (['$', $scalar], ['@', $array], ['%', $hash], ['', $io]) {
             next unless defined $var->[1];
-            $cleanee_stash->add_package_symbol($var->[0] . $f, $var->[1]);
+            $cleanee_stash->$ADD_SYMBOL($var->[0] . $f, $var->[1]);
         }
     }
 };
@@ -231,7 +249,7 @@ sub import {
         # register symbols for removal, if they have a CODE entry
         for my $f (keys %$functions) {
             next if     $except{ $f };
-            next unless $stash->has_package_symbol("&$f");
+            next unless $stash->$HAS_SYMBOL("&$f");
             $store->{remove}{ $f } = 1;
         }
 
@@ -286,9 +304,9 @@ sub get_class_store {
     my ($pragma, $class) = @_;
     my $stash = Package::Stash->new($class);
     my $var = "%$STORAGE_VAR";
-    $stash->add_package_symbol($var, {})
-        unless $stash->has_package_symbol($var);
-    return $stash->get_package_symbol($var);
+    $stash->$ADD_SYMBOL($var, {})
+        unless $stash->$HAS_SYMBOL($var);
+    return $stash->$GET_SYMBOL($var);
 }
 
 =method get_functions
@@ -304,8 +322,8 @@ sub get_functions {
 
     my $stash = Package::Stash->new($class);
     return {
-        map { $_ => $stash->get_package_symbol("&$_") }
-            $stash->list_all_package_symbols('CODE')
+        map { $_ => $stash->$GET_SYMBOL("&$_") }
+            $stash->$LIST_ALL_SYMBOLS('CODE')
     };
 }