Changeset 25176

Timestamp:

11/28/08 10:23:41 (4 years ago)

Author:

tokuhirom

Message:

Role をぶちこむときに has も処理してくれ

Location:

lang/perl/Shika/trunk

Files:

• lib/Shika.pm (modified) (3 diffs)
• lib/Shika/Role.pm (modified) (1 diff)
• t/020_role/04_has_injection.t (added)

lang/perl/Shika/trunk/lib/Shika.pm

@@ -95 +95 @@
     }
     
-    my $f1 =       $attr{lazy} ? 'lazy'
-                               :
-             $attr{lazy_build} ? 'lazy_build'
-                               : 'normal';
-    my $f2 = $attr{coerce} ? '_coerce' : '';
+    Shika::_has_install($pkg, $n, \%attr);
+}
+
+sub _has_install {
+    my ($pkg, $name, $attr) = @_;
+    my $f1 =       $attr->{lazy} ? 'lazy'
+                                 :
+             $attr->{lazy_build} ? 'lazy_build'
+                                 : 'normal';
+    my $f2 = $attr->{coerce} ? '_coerce' : '';
     my $meth = "_has_install_${f1}${f2}";
-    __PACKAGE__->can($meth)->( $pkg, $n );
+    __PACKAGE__->can($meth)->( $pkg, $name );
 }
 
@@ -208 +213 @@
         }
 
-        if (@_==2) { 
+       if (@_==2) { 
             return $_[0]->{$n} = $has->{coerce}->($_[1]);
         }
@@ -236 +241 @@
             no strict 'refs';
             *{"$target\::$method"} = *{"$role\::$method"};
+        }
+
+        for my $attr (@{ $role->meta->{has} }) {
+            my ($name, $attrbody) = @$attr;
+            Shika::_has_install($target, $name, $attrbody);
         }
     }

lang/perl/Shika/trunk/lib/Shika/Role.pm

@@ -26 +26 @@
 sub _has {
     my $pkg = caller(0);
-    push @{ $pkg->meta->{hash} }, [ @_ ];
+    push @{ $pkg->meta->{has} }, [ @_ ];
 }