From 40d5898acdbae40c1b74370d5f007756bce4ca52 Mon Sep 17 00:00:00 2001 From: Samantha McVey Date: Mon, 24 Apr 2017 14:49:30 -0700 Subject: Clean up the code some --- lib/mergehash.pm6 | 3 --- t/01-thing.t | 15 ++++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/mergehash.pm6 b/lib/mergehash.pm6 index 6e84aa8..cc9b9cb 100644 --- a/lib/mergehash.pm6 +++ b/lib/mergehash.pm6 @@ -12,11 +12,9 @@ augment class Hash { elsif %merge-source{$key} ~~ Positional { my @a; for %merge-into{$key}.list { - say $_; @a.push: $_; } for %merge-source{$key}.list { - say $_; @a.push: $_; } %merge-into{$key} = @a; @@ -26,7 +24,6 @@ augment class Hash { } } else { - note 'source'; %merge-into{$key} = %merge-source{$key}; } } diff --git a/t/01-thing.t b/t/01-thing.t index 9a906a7..402c157 100644 --- a/t/01-thing.t +++ b/t/01-thing.t @@ -5,27 +5,32 @@ use mergehash; use Test; my %a; my %b; -#%a = "orig"; -#%b = "new"; %a = 1; %b = 2; %a = 2; %b = 1; my %b-orig = %b; my %a-orig = %a; + + %a.merge(%b); is-deeply %b, %b-orig; is-deeply %a, {:a(2), :b(1), :y(${:a(1), :z(2)})}; + + %a = %a-orig; %b = %b-orig; %a = "orig"; %b = "new"; +%a.merge(%b); is-deeply %a, {Z => 'new', a => 2, b => 1, y => {a => 1, z => 2}}; -say %a; -my %z; + + +my (%z, %y); %z

= (1,2,3,4); -my %y; %y

= (5,4,6,7); %z.merge(%y); is %z, {y => {p => [1, 2, 3, 4, 5, 4, 6, 7]}}, "merges arrays"; + + done-testing; -- cgit v1.1