Bool improvements

rakudo · Nov 21, 2015 · 6d0ca40 · 6d0ca40
1 parent e4af648
commit 6d0ca40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.nqp b/src/Perl6/Metamodel/BOOTSTRAP.nqp
@@ -2861,16 +2861,16 @@ BEGIN {
     }
 
     # Bool::False and Bool::True.
-    my $false := nqp::create(Bool);
+    my $false := nqp::add_I(nqp::create(Int), nqp::create(Int), Bool); #nqp::create(Bool);
     nqp::bindattr_s($false, Bool, '$!key', 'False');
     nqp::bindattr_i($false, Bool, '$!value', 0);
-    nqp::bindattr_i($false, Int, '$!value', 0);
+    #nqp::bindattr($false, Int, '$!value', 0);
     Bool.HOW.add_enum_value(Bool, $false);
     (Bool.WHO)<False> := $false;
-    my $true := nqp::create(Bool);
+    my $true := nqp::add_I(nqp::create(Int), nqp::pow_I(nqp::create(Int), nqp::create(Int), Int, Int), Bool); # 0^0 = 1
     nqp::bindattr_s($true, Bool, '$!key', 'True');
     nqp::bindattr_i($true, Bool, '$!value', 1);
-    nqp::bindattr_i($true, Int, '$!value', 1);
+    #nqp::bindattr($true, Int, '$!value', 1);
     Bool.HOW.add_enum_value(Bool, $true);
     (Bool.WHO)<True> := $true;
 

diff --git a/src/core/Bool.pm b/src/core/Bool.pm
@@ -26,8 +26,8 @@ BEGIN {
     Bool.^add_multi_method('gist',    my multi method gist(Bool:U:)    { '(Bool)' });
     Bool.^add_multi_method('perl', my multi method perl(Bool:U:) { 'Bool' });
 
-    Bool.^add_multi_method('pick', my multi method pick(Bool:U: $n) { (Bool::True,Bool::False).pick($n) });
-    Bool.^add_multi_method('roll', my multi method roll(Bool:U: $n) { (Bool::True,Bool::False).roll($n) });
+    Bool.^add_multi_method('pick', my multi method pick(Bool:U: $n) { self.^enum_value_list.pick($n) });
+    Bool.^add_multi_method('roll', my multi method roll(Bool:U: $n) { self.^enum_value_list.roll($n) });
 
     Bool.^add_method('pred',  my method pred() { Bool::False });
     Bool.^add_method('succ',  my method succ() { Bool::True });