two enum fixups, jnthn++ JimmyZ++

rakudo · May 12, 2012 · f72c306 · f72c306
1 parent f48c49d
commit f72c306
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -2372,7 +2372,7 @@ class Perl6::Actions is HLL::Actions {
             }
         }
         # create a type object even for empty enums
-        make_type_obj unless $has_base_type;
+        make_type_obj($*W.find_symbol(['Int'])) unless $has_base_type;
 
         $*W.install_package($/, $longname.type_name_parts('enum name', :decl(1)),
             ($*SCOPE || 'our'), 'enum', $*PACKAGE, $*W.cur_lexpad(), $type_obj);

diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -1214,8 +1214,9 @@ class Perl6::World is HLL::World {
     # Adds a value to an enumeration.
     method create_enum_value($enum_type_obj, $key, $value) {
         # Create directly.
-        my $val       := pir::repr_change_type__0PP(pir::repr_clone__PP($value), $enum_type_obj);
+        my $val := pir::repr_change_type__0PP(pir::repr_clone__PP($value), $enum_type_obj);
         nqp::bindattr($val, $enum_type_obj, '$!key', $key);
+        nqp::bindattr($val, $enum_type_obj, '$!value', $value);
         self.add_object($val);
 
         # Add to meta-object.