Changeset 6093

Timestamp:

08/06/05 21:23:54 (3 years ago)

Author:

Stevan

Message:

Perl6::MetaModel? - ::Class now uses the ::create_P6opaque to create the instance (first step towards maybe bootstrapping this too)

Location:

perl5/Perl6-MetaModel/lib/Perl6

Files:

• Class.pm (modified) (9 diffs)
• MetaModel.pm (modified) (1 diff)

perl5/Perl6-MetaModel/lib/Perl6/Class.pm

@@ -25 +25 @@
     my ($class, $identifier, $params) = @_;
     my ($name, $version, $authority) = _extract_name_from_identifier($identifier);      
-    my $self = bless { 
+    my $self = ::create_P6opaque($class => ( 
         name       => $name,
         version    => $version,
@@ -31 +31 @@
         identifier => $identifier,
         meta       => undef,
-    }, $class;
-    _validate_params($self, $params) if $params;
+        params     => {}
+    ));
+    if ($params) {
+        _validate_params($self, $params);
+    }
     # stash these into the class ...
     $ALL_CLASSES{$identifier} = $self;
@@ -43 +46 @@
 sub _apply_class_to_environment {
     my ($self) = @_;
-    my ($name) = $self->{name};
+    my ($name) = $self->{instance_data}->{name};
     # create the package ...
     my $code = qq|
@@ -55 +58 @@
     eval {  
         no strict 'refs';         
-        *{$self->{identifier} . '::'} = *{$name . '::'};
+        *{$self->{instance_data}->{identifier} . '::'} = *{$name . '::'};
     };
-    confess "Could not create full name " . $self->{identifier} . " : $@" if $@;   
+    confess "Could not create full name " . $self->{instance_data}->{identifier} . " : $@" if $@;   
     _build_class($self); 
 }
@@ -78 +81 @@
     }
 
-    $self->{params} = $params;
+    $self->{instance_data}->{params} = $params;
 }
 
@@ -93 +96 @@
     my ($self) = @_;
     
-    my ($name, $version, $authority) = ($self->{name}, $self->{version}, $self->{authority});    
+    my ($name, $version, $authority) = ($self->{instance_data}->{name}, $self->{instance_data}->{version}, $self->{instance_data}->{authority});    
 
     # create the metaclass ...     
@@ -124 +127 @@
         } 
         # connect the class and the meta;
-        $self->{meta} = $meta; 
+        $self->{instance_data}->{meta} = $meta; 
     };
     confess "Could not initialize the metaclass for $name : $@" if $@; 
 
-    my $superclasses = $self->{params}->{is};
+    my $superclasses = $self->{instance_data}->{params}->{is};
     ::dispatch($meta, 'superclasses', ([ map { ::meta($_) } @{$superclasses} ]));        
 
-    if (my $instance = $self->{params}->{instance}) {
+    if (my $instance = $self->{instance_data}->{params}->{instance}) {
 
         ::dispatch($meta, 'add_method', ('BUILD' => Perl6::Method->create_submethod($name => $instance->{BUILD})))
@@ -164 +167 @@
         }        
     }
-    if (my $class = $self->{params}->{class}) {  
+    if (my $class = $self->{instance_data}->{params}->{class}) {  
         
         if (exists $class->{attrs}) {
@@ -191 +194 @@
 
 
-    Perl6::Role->flatten_roles_into($meta, @{$self->{params}->{does}})
-        if $self->{params}->{does};
+    Perl6::Role->flatten_roles_into($meta, @{$self->{instance_data}->{params}->{does}})
+        if $self->{instance_data}->{params}->{does};
 }
 

perl5/Perl6-MetaModel/lib/Perl6/MetaModel.pm

@@ -47 +47 @@
         # accomidate the Perl6::Class instance
         blessed($class) eq 'Perl6::Class' ?
-            $class->{name}
+            $class->{instance_data}->{name}
             :
             blessed($class)