X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FRole.pm;h=c798d6ac7feb2f6ad7e157d29d66fcd60a0e886d;hp=ec74bcc4d431ccdbe47c1612a1498ff8dbce7387;hb=4e8817b825f0f9f3ca39ee5416004f7b70b9722a;hpb=4aaa2ed6a8f267aa74bfbbab9b6880a900ca6063

diff --git a/lib/Mouse/Role.pm b/lib/Mouse/Role.pm
index ec74bcc..c798d6a 100644
--- a/lib/Mouse/Role.pm
+++ b/lib/Mouse/Role.pm
@@ -1,15 +1,14 @@
-#!/usr/bin/env perl
 package Mouse::Role;
 use strict;
 use warnings;
 use base 'Exporter';
 
-use Carp 'confess';
-use Mouse::Util 'blessed';
+use Carp 'confess', 'croak';
+use Scalar::Util 'blessed';
 
 use Mouse::Meta::Role;
 
-our @EXPORT = qw(before after around has extends with requires excludes confess blessed);
+our @EXPORT = qw(before after around super override inner augment has extends with requires excludes confess blessed);
 
 sub before {
     my $meta = Mouse::Meta::Role->initialize(caller);
@@ -38,6 +37,42 @@ sub around {
     }
 }
 
+
+sub super {
+    return unless $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
+        && confess "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->(@_);
+    });
+}
+
+# We keep the same errors messages as Moose::Role emits, here.
+sub inner {
+    croak "Moose::Role cannot support 'inner'";
+}
+
+sub augment {
+    croak "Moose::Role cannot support 'augment'";
+}
+
 sub has {
     my $meta = Mouse::Meta::Role->initialize(caller);
 
@@ -47,7 +82,7 @@ sub has {
     $meta->add_attribute($name => \%opts);
 }
 
-sub extends  { confess "Roles do not support 'extends'" }
+sub extends  { confess "Roles do not currently support 'extends'" }
 
 sub with     {
     my $meta = Mouse::Meta::Role->initialize(caller);
@@ -68,10 +103,19 @@ sub requires {
 sub excludes { confess "Mouse::Role does not currently support 'excludes'" }
 
 sub import {
+    my $class = shift;
+
     strict->import;
     warnings->import;
 
     my $caller = caller;
+
+    # we should never export to main
+    if ($caller eq 'main') {
+        warn qq{$class does not export its sugar to the 'main' package.\n};
+        return;
+    }
+
     my $meta = Mouse::Meta::Role->initialize(caller);
 
     no strict 'refs';
@@ -96,7 +140,7 @@ __END__
 
 =head1 NAME
 
-Mouse::Role
+Mouse::Role - define a role in Mouse
 
 =head1 KEYWORDS
 
@@ -119,6 +163,26 @@ L<Class::Method::Modifiers/after>.
 Sets up an "around" method modifier. See L<Moose/around> or
 L<Class::Method::Modifiers/around>.
 
+=over 4
+
+=item B<super>
+
+Sets up the "super" keyword. See L<Moose/super>.
+
+=item B<override ($name, &sub)>
+
+Sets up an "override" method modifier. See L<Moose/Role/override>.
+
+=item B<inner>
+
+This is not supported and emits an error. See L<Moose/Role>.
+
+=item B<augment ($name, &sub)>
+
+This is not supported and emits an error. See L<Moose/Role>.
+
+=back
+
 =head2 has (name|names) => parameters
 
 Sets up an attribute (or if passed an arrayref of names, multiple attributes) to