Fix up constant folder, thus fixing compilation of Order enum.

rakudo · Jul 21, 2012 · aff12ef · aff12ef
1 parent 35d8ceb
commit aff12ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/QPerl6/ConstantFolder.pm b/src/QPerl6/ConstantFolder.pm
@@ -6,7 +6,7 @@ class QPerl6::ConstantFolder {
             # It's already got a compile time value, just hand it back.
             $expr
         }
-        elsif $expr.isa(PAST::Op) && $expr.name && ($expr.pasttype eq '' || $expr.pasttype eq 'call') {
+        elsif nqp::istype($expr, QAST::Op) && $expr.name && $expr.op eq 'call' {
             # Potentially foldable call. Try to get compile time args (which
             # my involve recursively folding).
             my @args;

diff --git a/src/QPerl6/World.pm b/src/QPerl6/World.pm
@@ -1164,7 +1164,10 @@ class QPerl6::World is HLL::World {
     # returns a reference to it.
     method add_constant_folded_result($r) {
         self.add_object($r);
-        QAST::WVal.new( :value($r) );
+        my $ast := QAST::WVal.new( :value($r) );
+        $ast<has_compile_time_value> := 1;
+        $ast<compile_time_value> := $r;
+        $ast
     }
 
     # Creates a meta-object for a package, adds it to the root objects and