Changeset 2910

Timestamp:

05/10/05 02:02:04 (4 years ago)

Author:

Stevan

svk:copy_cache_prev:

4437

Message:

Perl::MetaClass? - adding visibility property to MetaProperty?; finishing the clsMethod and clsAssoc methods in MetaClass?

Location:

ext/Perl-MetaClass/lib/Perl

Files:

• MetaClass.pm (modified) (1 diff)
• MetaProperty.pm (modified) (3 diffs)

ext/Perl-MetaClass/lib/Perl/MetaClass.pm

@@ -92 +92 @@
 }
 
-sub clsMethods(Str $inv: Hash ?%methods) returns Hash {
+sub clsMethods(Str $inv: Array *@methods) returns Hash {
     my %self := get_instance($inv, "Perl::MetaClass");
-    %self<methods> = \%methods if %methods.defined;
+    if @methods {
+        for @methods -> $key, $value {
+            ($value.instance_isa('Perl::MetaMethod'))
+                || die "Method values must be a Perl::MetaMethod instance (got: '$value')";             
+            my %methods = %self<methods>;
+            %methods{$key} = $value;
+            %self<methods> = \%methods;                 
+        }
+    }
     return %self<methods>;
 }
 
-sub clsAssocs(Str $inv: Hash ?%assocs) returns Hash {
+sub clsAssocs(Str $inv: Array *@assocs) returns Hash {
     my %self := get_instance($inv, "Perl::MetaClass");
-    %self<assocs> = \%assocs if %assocs.defined;
+    if @assocs {
+        for @assocs -> $key, $value {
+            ($value.instance_isa('Perl::MetaAssoc'))
+                || die "Assoc values must be a Perl::MetaAssoc instance (got: '$value')";             
+            my %assocs = %self<assocs>;
+            %assocs{$key} = $value;
+            %self<assocs> = \%assocs;                 
+        }
+    }
     return %self<assocs>;
 }

ext/Perl-MetaClass/lib/Perl/MetaProperty.pm

@@ -5 +5 @@
 use Hack::Instances; 
 
-sub Perl::MetaProperty::new(Str $type, Any +$default) returns Str is export {
+sub Perl::MetaProperty::new(Str $type, Any +$default, Str +$visibility) returns Str is export {
     my $id = make_instance("Perl::MetaProperty", { 
-        'type'    => $type,
-        'default' => undef
+        'type'       => $type,
+        'default'    => undef,
+        'visibility' => undef,
     });
-    $id.propDefault($default) if $default.defined;
+    $id.propDefault($default)       if $default.defined;
+    $id.propVisibility($visibility) if $visibility.defined;    
     return $id;
 }
@@ -48 +50 @@
 }
 
+sub propVisibility(Str $inv: Str ?$visibility) returns Str {
+    my %self := get_instance($inv, "Perl::MetaProperty");
+    if $visibility.defined {
+        ($visibility ~~ rx:perl5:i/(private|public)/)
+            || die "Visibility must be either 'Private' of 'Public' (got: '$visibility')";
+        %self<visibility> = $visibility;
+    }
+    return %self<visibility>;
+}
+
 =pod
 
@@ -70 +82 @@
 =item B<propDefault($inv: ?$default)>
 
+=item B<propVisibility($inv: ?$visibility)>
+
 =back