Some hyper metaop and hash updates.

rakudo · Aug 8, 2011 · 429a183 · 429a183
1 parent 99f5ce9
commit 429a183
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -139,10 +139,10 @@ my class Any {
     multi method postcircumfix:<{ }>($key) is rw {
         self.at_key($key)
     }
-    multi method postcircumfix:<{ }>(Positional $key) {
-        $key.map({ self{$_ } }).eager.Parcel
+    multi method postcircumfix:<{ }>(Positional $key) is rw {
+        $key.map({ self{$_} }).eager.Parcel
     }
-    multi method postcircumfix:<{ }>(Whatever) {
+    multi method postcircumfix:<{ }>(Whatever) is rw {
         self{self.keys}
     }
 

diff --git a/src/core/Hash.pm b/src/core/Hash.pm
@@ -1,5 +1,7 @@
 my class Hash {
     # Has attributes and parent EnumMap declared in BOOTSTRAP
+
+    method new(*@args) { @args.hash }
 
     method at_key($key is copy) is rw {
         $key = $key.Str;

diff --git a/src/core/metaops.pm b/src/core/metaops.pm
@@ -116,18 +116,22 @@ sub METAOP_HYPER_PREFIX(\$op, \$obj) { hyper($op, $obj) }
 
 proto sub hyper(|$) { * }
 multi sub hyper(\$op, \$a, \$b, :$dwim-left, :$dwim-right) { 
-    my @alist := $a.elems < $b.elems && $dwim-left
-                   ?? ($a xx *).munch($b.elems)
-                   !! $a.flat;
-    my @blist := $b.elems < $a.elems && $dwim-right
-                   ?? ($b xx *).munch($a.elems)
-                   !! $b.flat;
-    die "Sorry, lists on both sides of non-dwimmy hyperop are not of same length:\n"
-        ~ "    left: @alist.elems() elements, right: @blist.elems() elements\n"
-      if @alist != @blist;
+    my @alist := $a.flat;
+    my @blist := $b.flat;
+    my $elems;
+    if $dwim-left && $dwim-right { $elems = max(@alist.elems, @blist.elems) }
+    elsif $dwim-left { $elems = @blist.elems }
+    elsif $dwim-right { $elems = @alist.elems }
+    else { 
+        die "Sorry, lists on both sides of non-dwimmy hyperop are not of same length:\n"
+            ~ "    left: @alist.elems() elements, right: @blist.elems() elements\n"
+          if @alist.elems != @blist.elems
+    }
+    @alist := (@alist xx *).munch($elems) if @alist.elems < $elems;
+    @blist := (@blist xx *).munch($elems) if @blist.elems < $elems;
 
     (@alist Z @blist).map(
-        -> $x, $y {
+        -> \$x, \$y {
             Iterable.ACCEPTS($x)
               ?? $x.new(hyper($op, $x, $y, :$dwim-left, :$dwim-right)).item
               !! (Iterable.ACCEPTS($y)
@@ -143,23 +147,26 @@ multi sub hyper(\$op, \$a) {
                 !! $op($_) } ).eager
 }
 
-multi sub hyper(\$op, %h) {
-    hash %h.keys Z hyper($op, %h.values)
+multi sub hyper(\$op, Associative \$h) {
+    my @keys = $h.keys;
+    hash @keys Z hyper($op, $h{@keys})
 }
 
-multi sub hyper(\$op, %a, %b, :$dwim-left, :$dwim-right) {
+multi sub hyper(\$op, Associative \$a, Associative \$b, :$dwim-left, :$dwim-right) {
     my %k;
-    for %a.keys { %k{$_} = 1 if !$dwim-left || %b.exists($_) }
-    for %b.keys { %k{$_} = 1 if !$dwim-right }
+    for $a.keys { %k{$_} = 1 if !$dwim-left || $b.exists($_) }
+    for $b.keys { %k{$_} = 1 if !$dwim-right }
     my @keys = %k.keys;
-    hash @keys Z hyper($op, %a{@keys}, %b{@keys}, :$dwim-left, :$dwim-right)
+    hash @keys Z hyper($op, $a{@keys}, $b{@keys}, :$dwim-left, :$dwim-right)
 }
 
-multi sub hyper(\$op, %a, \$b, :$dwim-left, :$dwim-right) {
-    hash %a.keys Z hyper($op, %a.values, $b, :$dwim-left, :$dwim-right);
+multi sub hyper(\$op, Associative \$a, \$b, :$dwim-left, :$dwim-right) {
+    my @keys = $a.keys;
+    hash @keys Z hyper($op, $a{@keys}, $b, :$dwim-left, :$dwim-right);
 }
 
-multi sub hyper(\$op, \$a, %b, :$dwim-left, :$dwim-right) {
-    hash %b.keys Z hyper($op, $a, %b.values, :$dwim-left, :$dwim-right);
+multi sub hyper(\$op, \$a, Associative \$b, :$dwim-left, :$dwim-right) {
+    my @keys = $b.keys;
+    hash @keys Z hyper($op, $a, $b{@keys}, :$dwim-left, :$dwim-right);
 }