Include method name in immutable methods (fixes #49680)

[gitmo/Class-MOP.git] / lib / Class / MOP / Class / Immutable / Trait.pm

diff --git a/lib/Class/MOP/Class/Immutable/Trait.pm b/lib/Class/MOP/Class/Immutable/Trait.pm
index bb1b7e1..2bf6074 100644 (file)
--- a/lib/Class/MOP/Class/Immutable/Trait.pm
+++ b/lib/Class/MOP/Class/Immutable/Trait.pm
@@ -8,14 +8,12 @@ use MRO::Compat;
 use Carp 'confess';
 use Scalar::Util 'blessed', 'weaken';
 
-our $VERSION   = '0.89';
+our $VERSION   = '0.92_01';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 # the original class of the metaclass instance
-sub get_mutable_metaclass_name { $_[0]{__immutable}{original_class} }
-
-sub immutable_options { %{ $_[0]{__immutable}{options} } }
+sub _get_mutable_metaclass_name { $_[0]{__immutable}{original_class} }
 
 sub is_mutable   { 0 }
 sub is_immutable { 1 }
@@ -30,16 +28,14 @@ sub superclasses {
 }
 
 sub _immutable_cannot_call {
-    Carp::confess "This method cannot be called on an immutable instance";
+    my $name = shift;
+    Carp::confess "The '$name' method cannot be called on an immutable instance";
 }
 
-sub add_method            { _immutable_cannot_call() }
-sub alias_method          { _immutable_cannot_call() }
-sub remove_method         { _immutable_cannot_call() }
-sub add_attribute         { _immutable_cannot_call() }
-sub remove_attribute      { _immutable_cannot_call() }
-sub remove_package_symbol { _immutable_cannot_call() }
-sub add_package_symbol    { _immutable_cannot_call() }
+for my $name (qw/add_method alias_method remove_method add_attribute remove_attribute remove_package_symbol/) {
+    no strict 'refs';
+    *{__PACKAGE__."::$name"} = sub { _immutable_cannot_call($name) };
+}
 
 sub class_precedence_list {
     my $orig = shift;
@@ -84,6 +80,15 @@ sub get_method_map {
     $self->{__immutable}{get_method_map} ||= $self->$orig;
 }
 
+sub add_package_symbol {
+    my $orig = shift;
+    my $self = shift;
+    confess "Cannot add package symbols to an immutable metaclass"
+        unless ( caller(3) )[3] eq 'Class::MOP::Package::get_package_symbol';
+
+    $self->$orig(@_);
+}
+
 1;
 
 __END__