X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FAccessor.pm;h=3891fd03ef103b15fa963f6188ffb9897b2a6f16;hb=a02f24cbc720ab9fd5e04ed96f36406654f3740a;hp=df99060ab10016a030b0198e5d9a950542c5061a;hpb=ea23e618007d485838d922d35c709936e09e9a35;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Method/Accessor.pm b/lib/Class/MOP/Method/Accessor.pm
index df99060..3891fd0 100644
--- a/lib/Class/MOP/Method/Accessor.pm
+++ b/lib/Class/MOP/Method/Accessor.pm
@@ -7,7 +7,7 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed', 'weaken';
 
-our $VERSION   = '0.87';
+our $VERSION   = '0.94';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -43,11 +43,28 @@ sub new {
 
 sub _new {
     my $class = shift;
-    my $options = @_ == 1 ? $_[0] : {@_};
 
-    $options->{is_inline} ||= 0;
+    return Class::MOP::Class->initialize($class)->new_object(@_)
+        if $class ne __PACKAGE__;
 
-    return bless $options, $class;
+    my $params = @_ == 1 ? $_[0] : {@_};
+
+    return bless {
+        # inherited from Class::MOP::Method
+        body                 => $params->{body},
+        associated_metaclass => $params->{associated_metaclass},
+        package_name         => $params->{package_name},
+        name                 => $params->{name},
+        original_method      => $params->{original_method},
+
+        # inherit from Class::MOP::Generated
+        is_inline            => $params->{is_inline} || 0,
+        definition_context   => $params->{definition_context},
+
+        # defined in this class
+        attribute            => $params->{attribute},
+        accessor_type        => $params->{accessor_type},
+    } => $class;
 }
 
 ## accessors
@@ -57,12 +74,6 @@ sub accessor_type        { (shift)->{'accessor_type'} }
 
 ## factory
 
-sub initialize_body {
-    Carp::cluck('The initialize_body method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_initialize_body;
-}
-
 sub _initialize_body {
     my $self = shift;
 
@@ -78,12 +89,6 @@ sub _initialize_body {
 
 ## generators
 
-sub generate_accessor_method {
-    Carp::cluck('The generate_accessor_method method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_accessor_method;
-}
-
 sub _generate_accessor_method {
     my $attr = (shift)->associated_attribute;
     return sub {
@@ -92,12 +97,6 @@ sub _generate_accessor_method {
     };
 }
 
-sub generate_reader_method {
-    Carp::cluck('The generate_reader_method method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_reader_method;
-}
-
 sub _generate_reader_method {
     my $attr = (shift)->associated_attribute;
     return sub {
@@ -106,11 +105,6 @@ sub _generate_reader_method {
     };
 }
 
-sub generate_writer_method {
-    Carp::cluck('The generate_writer_method method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_writer_method;
-}
 
 sub _generate_writer_method {
     my $attr = (shift)->associated_attribute;
@@ -119,12 +113,6 @@ sub _generate_writer_method {
     };
 }
 
-sub generate_predicate_method {
-    Carp::cluck('The generate_predicate_method method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_predicate_method;
-}
-
 sub _generate_predicate_method {
     my $attr = (shift)->associated_attribute;
     return sub {
@@ -132,12 +120,6 @@ sub _generate_predicate_method {
     };
 }
 
-sub generate_clearer_method {
-    Carp::cluck('The generate_clearer_method method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_clearer_method;
-}
-
 sub _generate_clearer_method {
     my $attr = (shift)->associated_attribute;
     return sub {
@@ -147,12 +129,6 @@ sub _generate_clearer_method {
 
 ## Inline methods
 
-sub generate_accessor_method_inline {
-    Carp::cluck('The generate_accessor_method_inline method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_accessor_method_inline;
-}
-
 sub _generate_accessor_method_inline {
     my $self          = shift;
     my $attr          = $self->associated_attribute;
@@ -172,12 +148,6 @@ sub _generate_accessor_method_inline {
     return $code;
 }
 
-sub generate_reader_method_inline {
-    Carp::cluck('The generate_reader_method_inline method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_reader_method_inline;
-}
-
 sub _generate_reader_method_inline {
     my $self          = shift;
     my $attr          = $self->associated_attribute;
@@ -196,12 +166,6 @@ sub _generate_reader_method_inline {
     return $code;
 }
 
-sub generate_writer_method_inline {
-    Carp::cluck('The generate_writer_method_inline method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_writer_method_inline;
-}
-
 sub _generate_writer_method_inline {
     my $self          = shift;
     my $attr          = $self->associated_attribute;
@@ -219,12 +183,6 @@ sub _generate_writer_method_inline {
     return $code;
 }
 
-sub generate_predicate_method_inline {
-    Carp::cluck('The generate_predicate_method_inline method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_predicate_method_inline;
-}
-
 sub _generate_predicate_method_inline {
     my $self          = shift;
     my $attr          = $self->associated_attribute;
@@ -242,12 +200,6 @@ sub _generate_predicate_method_inline {
     return $code;
 }
 
-sub generate_clearer_method_inline {
-    Carp::cluck('The generate_clearer_method_inline method has been made private.'
-        . " The public version is deprecated and will be removed in a future release.\n");
-    shift->_generate_clearer_method_inline;
-}
-
 sub _generate_clearer_method_inline {
     my $self          = shift;
     my $attr          = $self->associated_attribute;