diff options
Diffstat (limited to 'lib/Hash')
| -rw-r--r-- | lib/Hash/Merge.pm6 | 95 | ||||
| -rw-r--r-- | lib/Hash/Merge/Augment.pm6 | 63 | ||||
| -rw-r--r-- | lib/Hash/Merge/Unit.pm6 | 60 |
3 files changed, 109 insertions, 109 deletions
diff --git a/lib/Hash/Merge.pm6 b/lib/Hash/Merge.pm6 index b256b8e..607e17b 100644 --- a/lib/Hash/Merge.pm6 +++ b/lib/Hash/Merge.pm6 @@ -1,63 +1,60 @@ #! /usr/bin/env false use v6.c; -use MONKEY-TYPING; - -# 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; +unit module Hash::Merge; + +#| Merge any number of Hashes together. +sub merge-hashes( + *@hashes, #= Hashes to merge together + --> Hash +) is export { + my %merge-into = @hashes.shift; + + # Nothing to do if we only got 1 argument + return %merge-into unless @hashes.elems; + + for ^@hashes.elems { + %merge-into = merge-hash(%merge-into, @hashes.shift); } - 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; - } + %merge-into; +} + +#| Merge two hashes together. +sub merge-hash( + %merge-into, #= The original Hash that should be merged into. + %merge-source, #= Another Hash to merge into the original Hash. + Bool:D :$no-append-array = False, + --> Hash +) is export { + for %merge-source.keys -> $key { + if %merge-into{$key}:exists { + given %merge-source{$key} { + when Hash { + merge-hash(%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}; + default { + %merge-into{$key} = %merge-source{$key} + } } + } else { + %merge-into{$key} = %merge-source{$key}; } - %merge-into; } + + %merge-into; } # vim: ft=perl6 ts=4 sw=4 et diff --git a/lib/Hash/Merge/Augment.pm6 b/lib/Hash/Merge/Augment.pm6 new file mode 100644 index 0000000..b256b8e --- /dev/null +++ b/lib/Hash/Merge/Augment.pm6 @@ -0,0 +1,63 @@ +#! /usr/bin/env false + +use v6.c; +use MONKEY-TYPING; + +# 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; + } +} + +# vim: ft=perl6 ts=4 sw=4 et diff --git a/lib/Hash/Merge/Unit.pm6 b/lib/Hash/Merge/Unit.pm6 deleted file mode 100644 index 5c1d016..0000000 --- a/lib/Hash/Merge/Unit.pm6 +++ /dev/null @@ -1,60 +0,0 @@ -#! /usr/bin/env false - -use v6; - -unit module Hash::Merge::Unit; - -#| Merge any number of Hashes together. -sub merge-hashes( - *@hashes, #= Hashes to merge together - --> Hash -) is export { - my %merge-into = @hashes.shift; - - # Nothing to do if we only got 1 argument - return %merge-into unless @hashes.elems; - - for ^@hashes.elems { - %merge-into = merge-hash(%merge-into, @hashes.shift); - } - - %merge-into; -} - -#| Merge two hashes together. -sub merge-hash( - %merge-into, #= The original Hash that should be merged into. - %merge-source, #= Another Hash to merge into the original Hash. - Bool:D :$no-append-array = False, - --> Hash -) is export { - for %merge-source.keys -> $key { - if %merge-into{$key}:exists { - given %merge-source{$key} { - when Hash { - merge-hash(%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; - } - } - default { - %merge-into{$key} = %merge-source{$key} - } - } - } else { - %merge-into{$key} = %merge-source{$key}; - } - } - - %merge-into; -} - -# vim: ft=perl6 ts=4 sw=4 et |