Attribute ordering matters; don't use a hash.

Raku · Feb 27, 2013 · 361feca · 361feca
1 parent 0968572
commit 361feca
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 23 deletions.
diff --git a/src/how/NQPClassHOW.pm b/src/how/NQPClassHOW.pm
@@ -11,7 +11,7 @@ knowhow NQPClassHOW {
     has $!name;
 
     # Attributes, methods, parents and roles directly added.
-    has %!attributes;
+    has @!attributes;
     has %!methods;
     has @!method_order;
     has @!multi_methods_to_incorporate;
@@ -65,7 +65,7 @@ knowhow NQPClassHOW {
 
     method BUILD(:$name = '<anon>') {
         $!name := $name;
-        %!attributes := nqp::hash();
+        @!attributes := nqp::list();
         %!methods := nqp::hash();
         @!method_order := nqp::list();
         @!multi_methods_to_incorporate := nqp::list();
@@ -119,10 +119,12 @@ knowhow NQPClassHOW {
 
     method add_attribute($obj, $meta_attr) {
         my $name := $meta_attr.name;
-        if nqp::existskey(%!attributes, $name) {
-            nqp::die("This class already has an attribute named " ~ $name);
+        for @!attributes {
+            if $_.name eq $name {
+                nqp::die("This class already has an attribute named " ~ $name);
+            }
         }
-        %!attributes{$name} := $meta_attr;
+        nqp::push(@!attributes, $meta_attr);
     }
 
     method add_parent($obj, $parent) {
@@ -630,8 +632,8 @@ knowhow NQPClassHOW {
     method attributes($obj, :$local = 0) {
         my @attrs;
         if $local {
-            for %!attributes {
-                nqp::push(@attrs, nqp::iterval($_));
+            for @!attributes {
+                nqp::push(@attrs, $_);
             }
         }
         else {

diff --git a/src/how/NQPConcreteRoleHOW.pm b/src/how/NQPConcreteRoleHOW.pm
@@ -12,7 +12,7 @@ knowhow NQPConcreteRoleHOW {
     has $!instance_of;
 
     # Attributes and methods.
-    has %!attributes;
+    has @!attributes;
     has %!methods;
     has @!multi_methods_to_incorporate;
     has @!collisions;
@@ -45,7 +45,7 @@ knowhow NQPConcreteRoleHOW {
     method BUILD(:$name!, :$instance_of!) {
         $!name := $name;
         $!instance_of := $instance_of;
-        %!attributes := nqp::hash();
+        @!attributes := nqp::list();
         %!methods := nqp::hash();
         @!multi_methods_to_incorporate := nqp::list();
         @!collisions := nqp::list();
@@ -78,10 +78,12 @@ knowhow NQPConcreteRoleHOW {
 
     method add_attribute($obj, $meta_attr) {
         my $name := $meta_attr.name;
-        if nqp::existskey(%!attributes, $name) {
-            nqp::die("This role already has an attribute named " ~ $name);
+        for @!attributes {
+            if $_.name eq $name {
+                nqp::die("This role already has an attribute named " ~ $name);
+            }
         }
-        %!attributes{$name} := $meta_attr;
+        nqp::push(@!attributes, $meta_attr);
     }
 
     method add_parent($obj, $parent) {
@@ -143,8 +145,8 @@ knowhow NQPConcreteRoleHOW {
 
     method attributes($obj, :$local) {
         my @attrs;
-        for %!attributes {
-            nqp::push(@attrs, nqp::iterval($_));
+        for @!attributes {
+            nqp::push(@attrs, $_);
         }
         @attrs
     }

diff --git a/src/how/NQPParametricRoleHOW.pm b/src/how/NQPParametricRoleHOW.pm
@@ -11,7 +11,7 @@ knowhow NQPParametricRoleHOW {
     has $!name;
 
     # Attributes and methods.
-    has %!attributes;
+    has @!attributes;
     has %!methods;
     has @!multi_methods_to_incorporate;
 
@@ -44,7 +44,7 @@ knowhow NQPParametricRoleHOW {
 
     method BUILD(:$name!) {
         $!name := $name;
-        %!attributes := nqp::hash();
+        @!attributes := nqp::list();
         %!methods := nqp::hash();
         @!multi_methods_to_incorporate := nqp::list();
         @!roles := nqp::list();
@@ -79,10 +79,12 @@ knowhow NQPParametricRoleHOW {
 
     method add_attribute($obj, $meta_attr) {
         my $name := $meta_attr.name;
-        if nqp::existskey(%!attributes, $name) {
-            nqp::die("This role already has an attribute named " ~ $name);
+        for @!attributes {
+            if $_.name eq $name {
+                nqp::die("This role already has an attribute named " ~ $name);
+            }
         }
-        %!attributes{$name} := $meta_attr;
+        nqp::push(@!attributes, $meta_attr);
     }
 
     method add_parent($obj, $parent) {
@@ -129,8 +131,8 @@ knowhow NQPParametricRoleHOW {
 
         # Copy attributes. (Nothing to reify in NQP as we don't currently
         # have parametric types that may end up in the signature.)
-        for %!attributes {
-            $irole.HOW.add_attribute($irole, nqp::iterval($_));
+        for @!attributes {
+            $irole.HOW.add_attribute($irole, $_);
         }
 
         # Capture methods in the correct lexical context.
@@ -182,8 +184,8 @@ knowhow NQPParametricRoleHOW {
 
     method attributes($obj, :$local) {
         my @attrs;
-        for %!attributes {
-            nqp::push(@attrs, nqp::iterval($_));
+        for @!attributes {
+            nqp::push(@attrs, $_);
         }
         @attrs
     }