Remove a workaround I couldn't figure out why was needed; turns out i…

…t was just the buggy call from token subset.
rakudo · Apr 15, 2012 · 0227a99 · 0227a99
1 parent 64f70e8
commit 0227a99
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -1433,24 +1433,22 @@ class Perl6::World is HLL::World {
         # the last part of the name (e.g. for infix:<+>). Need to be a
         # little cheaty when compiling the setting due to bootstrapping.
         my @pairs;
-        if pir::isa($longname<colonpair>, 'ResizablePMCArray') {
-            for $longname<colonpair> {
-                if $_<circumfix> && !$_<identifier> {
-                    my $value := $_.ast;
-                    if $value<has_compile_time_value> {
-                        @components[+@components - 1] := @components[+@components - 1] ~
-                            (%*COMPILING<%?OPTIONS><setting> ne 'NULL' ??
-                            ':<' ~ ~$value<compile_time_value> ~ '>' !!
-                            ~$_);
-                    }
-                    else {
-                        pir::die(~$_ ~ ' cannot be resolved at compile time');
-                    }
+        for $longname<colonpair> {
+            if $_<circumfix> && !$_<identifier> {
+                my $value := $_.ast;
+                if $value<has_compile_time_value> {
+                    @components[+@components - 1] := @components[+@components - 1] ~
+                        (%*COMPILING<%?OPTIONS><setting> ne 'NULL' ??
+                        ':<' ~ ~$value<compile_time_value> ~ '>' !!
+                        ~$_);
                 }
                 else {
-                    @pairs.push($_);
+                    pir::die(~$_ ~ ' cannot be resolved at compile time');
                 }
             }
+            else {
+                @pairs.push($_);
+            }
         }
         nqp::bindattr($result, LongName, '@!colonpairs', @pairs);