Class::C3 - overload fix

[gitmo/Class-C3.git] / lib / Class / C3.pm

diff --git a/lib/Class/C3.pm b/lib/Class/C3.pm
index ae2635b..6ca3999 100644 (file)
--- a/lib/Class/C3.pm
+++ b/lib/Class/C3.pm
@@ -18,7 +18,8 @@ our $VERSION = '0.06';
 #      methods => {
 #          orig => <original location of method>,
 #          code => \&<ref to original method>
-#      }
+#      },
+#      has_overload_fallback => (1 | 0)
 #   }
 #
 my %MRO;
@@ -85,12 +86,18 @@ sub _calculate_method_dispatch_table {
     no strict 'refs';
     my @MRO = calculateMRO($class);
     $MRO{$class} = { MRO => \@MRO };
+    my $has_overload_fallback = 0;
     my %methods;
     # NOTE: 
     # we do @MRO[1 .. $#MRO] here because it
     # makes no sense to interogate the class
     # which you are calculating for. 
     foreach my $local (@MRO[1 .. $#MRO]) {
+        # if overload has tagged this module to 
+        # have use "fallback", then we want to
+        # grab that value 
+        $has_overload_fallback = ${"${local}::()"} 
+            if defined ${"${local}::()"};
         foreach my $method (grep { defined &{"${local}::$_"} } keys %{"${local}::"}) {
             # skip if already overriden in local class
             next unless !defined *{"${class}::$method"}{CODE};
@@ -101,7 +108,8 @@ sub _calculate_method_dispatch_table {
         }
     }    
     # now stash them in our %MRO table
-    $MRO{$class}->{methods} = \%methods;    
+    $MRO{$class}->{methods} = \%methods; 
+    $MRO{$class}->{has_overload_fallback} = $has_overload_fallback;        
 }
 
 sub _apply_method_dispatch_tables {
@@ -113,6 +121,8 @@ sub _apply_method_dispatch_tables {
 sub _apply_method_dispatch_table {
     my $class = shift;
     no strict 'refs';
+    ${"${class}::()"} = $MRO{$class}->{has_overload_fallback}
+        if $MRO{$class}->{has_overload_fallback};
     foreach my $method (keys %{$MRO{$class}->{methods}}) {
         *{"${class}::$method"} = $MRO{$class}->{methods}->{$method}->{code};
     }    
@@ -127,6 +137,7 @@ sub _remove_method_dispatch_tables {
 sub _remove_method_dispatch_table {
     my $class = shift;
     no strict 'refs';
+    delete ${"${class}::"}{"()"} if $MRO{$class}->{has_overload_fallback};    
     foreach my $method (keys %{$MRO{$class}->{methods}}) {
         delete ${"${class}::"}{$method};
     }