WIP

rakudo · Oct 28, 2013 · 2e5e1e3 · 2e5e1e3
1 parent 27fcd70
commit 2e5e1e3
Showing 1 changed file with 37 additions and 2 deletions.
diff --git a/src/core/Mu.pm b/src/core/Mu.pm
@@ -123,10 +123,24 @@ my class Mu { # declared in BOOTSTRAP
                     $attr = nqp::atpos($task, 3)(self, $attr);
                 }
             }
-            elsif nqp::iseq_i($code, 5) || nqp::iseq_i($code, 6) || nqp::iseq_i($code, 7) {
+            elsif nqp::iseq_i($code, 5) {
                 my $key_name := nqp::p6box_s(nqp::atpos($task, 2));
                 if %attrinit.exists_key($key_name) {
-                    nqp::bindattr(self, nqp::atpos($task, 1), nqp::atpos($task, 3),
+                    nqp::bindattr_i(self, nqp::atpos($task, 1), nqp::atpos($task, 3),
+                        nqp::decont(%attrinit{$key_name}));
+                }
+            }
+            elsif nqp::iseq_i($code, 6) {
+                my $key_name := nqp::p6box_s(nqp::atpos($task, 2));
+                if %attrinit.exists_key($key_name) {
+                    nqp::bindattr_n(self, nqp::atpos($task, 1), nqp::atpos($task, 3),
+                        nqp::decont(%attrinit{$key_name}));
+                }
+            }
+            elsif nqp::iseq_i($code, 7) {
+                my $key_name := nqp::p6box_s(nqp::atpos($task, 2));
+                if %attrinit.exists_key($key_name) {
+                    nqp::bindattr_s(self, nqp::atpos($task, 1), nqp::atpos($task, 3),
                         nqp::decont(%attrinit{$key_name}));
                 }
             }
@@ -272,6 +286,27 @@ my class Mu { # declared in BOOTSTRAP
                         nqp::decont(%attrinit{$key_name}));
                 }
             }
+            elsif nqp::iseq_i($code, 5) {
+                my $key_name := nqp::p6box_s(nqp::atpos($task, 2));
+                if %attrinit.exists_key($key_name) {
+                    nqp::bindattr_i(self, nqp::atpos($task, 1), nqp::atpos($task, 3),
+                        nqp::decont(%attrinit{$key_name}));
+                }
+            }
+            elsif nqp::iseq_i($code, 6) {
+                my $key_name := nqp::p6box_s(nqp::atpos($task, 2));
+                if %attrinit.exists_key($key_name) {
+                    nqp::bindattr_n(self, nqp::atpos($task, 1), nqp::atpos($task, 3),
+                        nqp::decont(%attrinit{$key_name}));
+                }
+            }
+            elsif nqp::iseq_i($code, 7) {
+                my $key_name := nqp::p6box_s(nqp::atpos($task, 2));
+                if %attrinit.exists_key($key_name) {
+                    nqp::bindattr_s(self, nqp::atpos($task, 1), nqp::atpos($task, 3),
+                        nqp::decont(%attrinit{$key_name}));
+                }
+            }
             else {
                 die "Invalid BUILDALLPLAN";
             }