BagHash/MixHash accept values of correct type only

rakudo · Oct 4, 2015 · 2765b6a · 2765b6a
1 parent b14723d
commit 2765b6a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/src/core/BagHash.pm b/src/core/BagHash.pm
@@ -20,7 +20,8 @@ my class BagHash does Baggy {
           },
           STORE => -> $, $value is copy {
               if $value > 0 {
-                  (%!elems.AT-KEY(k.WHICH) //= ((k) => my $ = 0)).value = $value;
+                  (%!elems.AT-KEY(k.WHICH) //=
+                    ((k) => my Int $ = 0)).value = $value;
               }
               elsif $value == 0 {
                   %!elems.DELETE-KEY(k.WHICH);

diff --git a/src/core/Baggy.pm b/src/core/Baggy.pm
@@ -145,17 +145,17 @@ my role Baggy does QuantHash {
     multi method new(Baggy: +@args) {
         my %e;
         # need explicit signature because of #119609
-        -> $_ { (%e{$_.WHICH} //= ($_ => my $ = 0)).value++ } for @args;
+        -> $_ { (%e{$_.WHICH} //= ($_ => my Int $ = 0)).value++ } for @args;
         self.bless(:elems(%e));
     }
     method new-from-pairs(*@pairs) {
         my %e;
         for @pairs {
             when Pair {
-                (%e.AT-KEY($_.key.WHICH) //= ($_.key => my $ = 0)).value += $_.value.Int;
+                (%e.AT-KEY($_.key.WHICH) //= ($_.key => my Int $ = 0)).value += $_.value.Int;
             }
             default {
-                (%e.AT-KEY($_.WHICH) //= ($_ => my $ = 0)).value++;
+                (%e.AT-KEY($_.WHICH) //= ($_ => my Int $ = 0)).value++;
             }
         }
         my @toolow;

diff --git a/src/core/MixHash.pm b/src/core/MixHash.pm
@@ -20,7 +20,8 @@ my class MixHash does Mixy {
           },
           STORE => -> $, $value is copy {
               if $value != 0 {
-                  (%!elems.AT-KEY(k.WHICH) //= ((k) => my $ = 0)).value = $value;
+                  (%!elems.AT-KEY(k.WHICH) //=
+                    ((k) => my Real $ = 0)).value = $value;
               }
               else {
                   %!elems.DELETE-KEY(k.WHICH);

diff --git a/src/core/Mixy.pm b/src/core/Mixy.pm
@@ -2,14 +2,22 @@ my role Mixy does Baggy  {
     method default(--> Real) { 0 }
     method total(--> Real) { [+] self.values }
 
+    multi method new(Mixy: +@args) {
+        my %e;
+        # need explicit signature because of #119609
+        -> $_ { (%e{$_.WHICH} //= ($_ => my Real $ = 0)).value++ } for @args;
+        self.bless(:elems(%e));
+    }
     method new-from-pairs(*@pairs --> Mixy) {
         my %e;
         for @pairs {
             when Pair {
-                (%e.AT-KEY($_.key.WHICH) //= ($_.key => my $ = 0)).value += $_.value;
+                (%e.AT-KEY($_.key.WHICH) //=
+                  ($_.key => my Real $ = 0)).value += $_.value;
             }
             default {
-                (%e.AT-KEY($_.WHICH) //= ($_ => my $ = 0)).value++;
+                (%e.AT-KEY($_.WHICH) //=
+                  ($_ => my Real $ = 0)).value++;
             }
         }
         for %e -> $p {