X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FRole.pm;h=956ab99f1e5fc989d1e60099a60809e6d34d63b7;hp=bc326656c02deb05988b025ab2b61e26278b9583;hb=85bd3f44fbee036b39fedb1e2ca2b566c1a6d08f;hpb=98ab51333533a85f044f893160daaf525fb6da2c diff --git a/lib/Mouse/Role.pm b/lib/Mouse/Role.pm index bc32665..956ab99 100644 --- a/lib/Mouse/Role.pm +++ b/lib/Mouse/Role.pm @@ -57,29 +57,13 @@ sub around { sub super { - return unless $Mouse::SUPER_BODY; + return if !defined $Mouse::SUPER_BODY; $Mouse::SUPER_BODY->(@Mouse::SUPER_ARGS); } sub override { - my $classname = caller; - my $meta = Mouse::Meta::Role->initialize($classname); - - my $name = shift; - my $code = shift; - my $fullname = "${classname}::${name}"; - - defined &$fullname - && $meta->throw_error("Cannot add an override of method '$fullname' " - . "because there is a local version of '$fullname'"); - - $meta->add_override_method_modifier($name => sub { - local $Mouse::SUPER_PACKAGE = shift; - local $Mouse::SUPER_BODY = shift; - local @Mouse::SUPER_ARGS = @_; - - $code->(@_); - }); + # my($name, $code) = @_; + Mouse::Meta::Role->initialize(scalar caller)->add_override_method_modifier(@_); } # We keep the same errors messages as Moose::Role emits, here.