[Moose-commits] r7589 - in Class-MOP/trunk: . lib/Class/MOP

[rafl at code2.0beta.co.uk]

Author: rafl
Date: 2009-02-08 19:51:00 -0800 (Sun, 08 Feb 2009)
New Revision: 7589

Modified:
   Class-MOP/trunk/Changes
   Class-MOP/trunk/MOP.xs
   Class-MOP/trunk/lib/Class/MOP/Package.pm
Log:
Disable deprecated get_all_packge_symbols in list context.

Modified: Class-MOP/trunk/Changes
===================================================================
--- Class-MOP/trunk/Changes	2009-02-08 21:21:51 UTC (rev 7588)
+++ Class-MOP/trunk/Changes	2009-02-09 03:51:00 UTC (rev 7589)
@@ -8,6 +8,10 @@
     * Class::MOP::Class
       - Add get_all_method_names (Sartak)
 
+    * Class::MOP::Package
+      - Disable deprecated get_all_package_symbols in list context. (Florian
+        Ragwitz)
+
 0.76 Thu, January 22, 2008
     * Class::MOP::Method::Generated
       - Added new private methods to support code generation, which

Modified: Class-MOP/trunk/MOP.xs
===================================================================
--- Class-MOP/trunk/MOP.xs	2009-02-08 21:21:51 UTC (rev 7588)
+++ Class-MOP/trunk/MOP.xs	2009-02-09 03:51:00 UTC (rev 7589)
@@ -425,7 +425,6 @@
             XSRETURN_EMPTY;
         }
 
-
         PUTBACK;
 
         if ( (he = hv_fetch_ent((HV *)SvRV(self), key_package, 0, hash_package)) ) {
@@ -434,35 +433,12 @@
 
 
         if (!stash) {
-            switch (GIMME_V) {
-                case G_SCALAR: XSRETURN_UNDEF; break;
-                case G_ARRAY:  XSRETURN_EMPTY; break;
-            }
+            XSRETURN_UNDEF;
         }
 
         symbols = get_all_package_symbols(stash, filter);
+        PUSHs(sv_2mortal(newRV_noinc((SV *)symbols)));
 
-        switch (GIMME_V) {
-            case G_SCALAR:
-                PUSHs(sv_2mortal(newRV_inc((SV *)symbols)));
-                break;
-            case G_ARRAY:
-                warn("Class::MOP::Package::get_all_package_symbols in list context is deprecated. use scalar context instead.");
-
-                EXTEND(SP, HvKEYS(symbols) * 2);
-
-                while ((he = hv_iternext(symbols))) {
-                    PUSHs(hv_iterkeysv(he));
-                    PUSHs(sv_2mortal(SvREFCNT_inc(HeVAL(he))));
-                }
-
-                break;
-            default:
-                break;
-        }
-
-        SvREFCNT_dec((SV *)symbols);
-
 void
 name(self)
     SV *self

Modified: Class-MOP/trunk/lib/Class/MOP/Package.pm
===================================================================
--- Class-MOP/trunk/lib/Class/MOP/Package.pm	2009-02-08 21:21:51 UTC (rev 7588)
+++ Class-MOP/trunk/lib/Class/MOP/Package.pm	2009-02-09 03:51:00 UTC (rev 7589)
@@ -284,12 +284,8 @@
 
     my $namespace = $self->namespace;
 
-    if (wantarray) {
-        warn 'Class::MOP::Package::get_all_package_symbols in list context is deprecated. use scalar context instead.';
-    }
+    return $namespace unless defined $type_filter;
 
-    return (wantarray ? %$namespace : $namespace) unless defined $type_filter;
-
     my %ret;
     # for some reason this nasty impl is orders of magnitude faster than a clean version
     if ( $type_filter eq 'CODE' ) {
@@ -316,7 +312,7 @@
         } keys %$namespace;
     }
 
-    return wantarray ? %ret : \%ret;
+    return \%ret;
 }
 
 1;