From 5849c96fa6a058a8e3d79a17e0de845ab4d03fc8 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 12 Nov 2020 20:36:08 +0100
Subject: Rewrite module

---
 lib/Hash/Merge/Augment.pm6 | 73 ++++++++++++++--------------------------------
 1 file changed, 22 insertions(+), 51 deletions(-)

(limited to 'lib/Hash/Merge/Augment.pm6')

diff --git a/lib/Hash/Merge/Augment.pm6 b/lib/Hash/Merge/Augment.pm6
index b256b8e..3a8cde6 100644
--- a/lib/Hash/Merge/Augment.pm6
+++ b/lib/Hash/Merge/Augment.pm6
@@ -3,61 +3,32 @@
 use v6.c;
 use MONKEY-TYPING;
 
+use Hash::Merge;
+use X::Hash::Merge::TypeObject;
+
 # Don't use precompilation in order to not conflict with other MONKEY-TYPING
 # modules.
 no precompilation;
 
-augment class Hash
-{
-    #| Merges a second hash into the hash the method is called on. Hash given as
-    #| the argument is not modified.
-    #| Traverses the full tree, replacing items in the original hash with the
-    #| hash given in the argument. Does not replace positional elements by default,
-    #| and instead appends the items from the supplied hash's array to the original
-    #| hash's array. The object type of positionals is not retained and instead
-    #| becomes an Array type.
-    #| Use :no-append-array to replace arrays and positionals instead, which will
-    #| also retain the original type and not convert to an Array
-    multi method merge (Hash:U: %b, Bool:D :$no-append-array = False) {
-        warn "Cannot merge an undefined Hash!";
-        return %b;
-    }
-
-    multi method merge (Hash:D: %b, Bool:D :$no-append-array = False)
-    {
-        hashmerge self, %b, :$no-append-array;
-    }
-
-    sub hashmerge (%merge-into, %merge-source, Bool:D :$no-append-array)
-    {
-        for %merge-source.keys -> $key {
-            if %merge-into{$key}:exists {
-                given %merge-source{$key} {
-                    when Hash {
-                        hashmerge %merge-into{$key},
-                                  %merge-source{$key},
-                                  :$no-append-array;
-                    }
-                    when Positional {
-                        %merge-into{$key} = $no-append-array
-                            ?? %merge-source{$key}
-                            !!
-                            do {
-                                my @a;
-                                @a.push: $_ for %merge-into{$key}.list;
-                                @a.push: $_ for %merge-source{$key}.list;
-                                @a;
-                            }
-                    }
-                    # Non-positionals, so strings or Bools or whatever
-                    default { %merge-into{$key} = %merge-source{$key} }
-                }
-            } else {
-                %merge-into{$key} = %merge-source{$key};
-            }
-        }
-        %merge-into;
-    }
+augment class Hash {
+	method merge (
+		Hash:D:
+
+		#| The Hash to merge into this one.
+		%hash,
+
+		#| Boolean to set whether Associative objects should be merged on their
+		#| own. When set to False, Associative objects in %second will
+		#| overwrite those from %first.
+		Bool:D :$deep = True,
+
+		#| Boolean to set whether Positional objects should be appended. When
+		#| set to False, Positional objects in %second will overwrite those
+		#| from %first.
+		Bool:D :$positional-append = True,
+	) {
+		self = merge-hash(self, %hash, :$deep, :$positional-append);
+	}
 }
 
 # vim: ft=perl6 ts=4 sw=4 et
-- 
cgit v1.1