X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=c0ed04c34dace35eb73a678f22214b1687c4a27f;hb=a4258ffd7a0a2bb8db5f01936068185d4f879b1a;hp=ef479f337d1e7fd86c389296aa4d7a7c637299e4;hpb=ee5e71d43dd6d0b038dfcea1629897926969beed;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm
index ef479f3..c0ed04c 100644
--- a/lib/Class/MOP/Method.pm
+++ b/lib/Class/MOP/Method.pm
@@ -19,7 +19,7 @@ sub meta {
 
 # construction
 
-sub new { 
+sub wrap { 
     my $class = shift;
     my $code  = shift;
     ('CODE' eq (reftype($code) || ''))
@@ -27,95 +27,6 @@ sub new {
     bless $code => blessed($class) || $class;
 }
 
-{
-	my %MODIFIERS;
-	
-	sub wrap {
-		my $code = shift;
-		(blessed($code))
-			|| confess "Can only ask the package name of a blessed CODE";
-		my $modifier_table = { 
-			orig   => $code,
-			before => [],
-			after  => [],		
-			around => {
-				cache   => $code,
-				methods => [],
-			},
-		};
-		my $method = $code->new(sub {
-			$_->(@_) for @{$modifier_table->{before}};
-			my (@rlist, $rval);
-			if (defined wantarray) {
-				if (wantarray) {
-					@rlist = $modifier_table->{around}->{cache}->(@_);
-				}
-				else {
-					$rval = $modifier_table->{around}->{cache}->(@_);
-				}
-			}
-			else {
-				$modifier_table->{around}->{cache}->(@_);
-			}
-			$_->(@_) for @{$modifier_table->{after}};			
-			return unless defined wantarray;
-			return wantarray ? @rlist : $rval;
-		});	
-		$MODIFIERS{$method} = $modifier_table;
-		$method;  
-	}
-	
-	sub add_before_modifier {
-		my $code     = shift;
-		my $modifier = shift;
-		(exists $MODIFIERS{$code})
-			|| confess "You must first wrap your method before adding a modifier";		
-		(blessed($code))
-			|| confess "Can only ask the package name of a blessed CODE";
-    	('CODE' eq (reftype($code) || ''))
-	        || confess "You must supply a CODE reference for a modifier";			
-		unshift @{$MODIFIERS{$code}->{before}} => $modifier;
-	}
-	
-	sub add_after_modifier {
-		my $code     = shift;
-		my $modifier = shift;
-		(exists $MODIFIERS{$code})
-			|| confess "You must first wrap your method before adding a modifier";		
-		(blessed($code))
-			|| confess "Can only ask the package name of a blessed CODE";
-	    ('CODE' eq (reftype($code) || ''))
-	        || confess "You must supply a CODE reference for a modifier";			
-		push @{$MODIFIERS{$code}->{after}} => $modifier;
-	}
-	
-	{
-		my $compile_around_method = sub {{
-	    	my $f1 = pop;
-	    	return $f1 unless @_;
-	    	my $f2 = pop;
-	    	push @_, sub { $f2->( $f1, @_ ) };
-			redo;
-		}};
-	
-		sub add_around_modifier {
-			my $code     = shift;
-			my $modifier = shift;
-			(exists $MODIFIERS{$code})
-				|| confess "You must first wrap your method before adding a modifier";		
-			(blessed($code))
-				|| confess "Can only ask the package name of a blessed CODE";
-		    ('CODE' eq (reftype($code) || ''))
-		        || confess "You must supply a CODE reference for a modifier";			
-			unshift @{$MODIFIERS{$code}->{around}->{methods}} => $modifier;		
-			$MODIFIERS{$code}->{around}->{cache} = $compile_around_method->(
-				@{$MODIFIERS{$code}->{around}->{methods}},
-				$MODIFIERS{$code}->{orig}
-			);
-		}	
-	}
-}
-
 # informational
 
 sub package_name { 
@@ -132,6 +43,106 @@ sub name {
 	svref_2object($code)->GV->NAME;
 }
 
+package Class::MOP::Method::Wrapped;
+
+use strict;
+use warnings;
+
+use Carp         'confess';
+use Scalar::Util 'reftype', 'blessed';
+
+our $VERSION = '0.01';
+
+our @ISA = ('Class::MOP::Method');	
+
+my %MODIFIERS;
+
+sub wrap {
+	my $class = shift;
+	my $code  = shift;
+	(blessed($code) && $code->isa('Class::MOP::Method'))
+		|| confess "Can only wrap blessed CODE";
+	my $modifier_table = { 
+		orig   => $code,
+		before => [],
+		after  => [],		
+		around => {
+			cache   => $code,
+			methods => [],
+		},
+	};
+	my $method = $class->SUPER::wrap(sub {
+		$_->(@_) for @{$modifier_table->{before}};
+		my (@rlist, $rval);
+		if (defined wantarray) {
+			if (wantarray) {
+				@rlist = $modifier_table->{around}->{cache}->(@_);
+			}
+			else {
+				$rval = $modifier_table->{around}->{cache}->(@_);
+			}
+		}
+		else {
+			$modifier_table->{around}->{cache}->(@_);
+		}
+		$_->(@_) for @{$modifier_table->{after}};			
+		return unless defined wantarray;
+		return wantarray ? @rlist : $rval;
+	});	
+	$MODIFIERS{$method} = $modifier_table;
+	$method;  
+}
+
+sub add_before_modifier {
+	my $code     = shift;
+	my $modifier = shift;
+	(exists $MODIFIERS{$code})
+		|| confess "You must first wrap your method before adding a modifier";		
+	(blessed($code))
+		|| confess "Can only ask the package name of a blessed CODE";
+	('CODE' eq (reftype($code) || ''))
+        || confess "You must supply a CODE reference for a modifier";			
+	unshift @{$MODIFIERS{$code}->{before}} => $modifier;
+}
+
+sub add_after_modifier {
+	my $code     = shift;
+	my $modifier = shift;
+	(exists $MODIFIERS{$code})
+		|| confess "You must first wrap your method before adding a modifier";		
+	(blessed($code))
+		|| confess "Can only ask the package name of a blessed CODE";
+    ('CODE' eq (reftype($code) || ''))
+        || confess "You must supply a CODE reference for a modifier";			
+	push @{$MODIFIERS{$code}->{after}} => $modifier;
+}
+
+{
+	my $compile_around_method = sub {{
+    	my $f1 = pop;
+    	return $f1 unless @_;
+    	my $f2 = pop;
+    	push @_, sub { $f2->( $f1, @_ ) };
+		redo;
+	}};
+
+	sub add_around_modifier {
+		my $code     = shift;
+		my $modifier = shift;
+		(exists $MODIFIERS{$code})
+			|| confess "You must first wrap your method before adding a modifier";		
+		(blessed($code))
+			|| confess "Can only ask the package name of a blessed CODE";
+	    ('CODE' eq (reftype($code) || ''))
+	        || confess "You must supply a CODE reference for a modifier";			
+		unshift @{$MODIFIERS{$code}->{around}->{methods}} => $modifier;		
+		$MODIFIERS{$code}->{around}->{cache} = $compile_around_method->(
+			@{$MODIFIERS{$code}->{around}->{methods}},
+			$MODIFIERS{$code}->{orig}
+		);
+	}	
+}
+
 1;
 
 __END__
@@ -173,7 +184,7 @@ to this class.
 
 =over 4
 
-=item B<new (&code)>
+=item B<wrap (&code)>
 
 This simply blesses the C<&code> reference passed to it.