aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2018-03-28 14:34:24 +0200
committerPatrick Spek <p.spek@tyil.nl>2018-03-28 14:34:33 +0200
commit09a8131c63667d9de9ee3921e7f877c09c9092c8 (patch)
treeba6b4107c59fa10678d2e1057f2672c494fa78ac
parent3cf9f5e0c5180d21cce9ec3a2650d6200ac3c2b4 (diff)
downloadHash::Merge-09a8131c63667d9de9ee3921e7f877c09c9092c8.tar.gz
Hash::Merge-09a8131c63667d9de9ee3921e7f877c09c9092c8.tar.bz2
Move Hash::Merge -> Hash::Merge::Augment, new Hash::Merge from Hash::Merge::F
Original Hash::Merge is incredibly slow due to the MONKEY. This is someone that is very unlikely to be what people want. App::Assixt reports parse time to go from 13s to 7s on first run, 13s to 0.3s on subsequent runs, which is *massive*.
-rw-r--r--CHANGELOG.md8
-rw-r--r--META6.json5
-rw-r--r--lib/Hash/Merge.pm695
-rw-r--r--lib/Hash/Merge/Augment.pm663
-rw-r--r--lib/Hash/Merge/Unit.pm660
-rw-r--r--t/01-thing.t2
-rw-r--r--t/02-empty-source.t2
-rw-r--r--t/03-unit.t2
8 files changed, 123 insertions, 114 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f3687a..2232d9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic
Versioning](http://semver.org/spec/v2.0.0.html).
+## [UNRELEASED]
+### Added
+- `:api` key in `META6.json`
+- New `Hash::Merge` that exposes subs instead of augmenting `Hash`
+
+### Changed
+- Old `Hash::Merge` functionality moved to `Hash::Merge::Augment`
+
## [0.2.0] - 2018-03-14
### Added
- `LICENSE` file for Artistic License 2.0 ([GitHub#2](https://github.com/scriptkitties/p6-Hash-Merge/issues/2))
diff --git a/META6.json b/META6.json
index 97adef3..df8fa3e 100644
--- a/META6.json
+++ b/META6.json
@@ -10,10 +10,10 @@
"description": "Module to add deep merge functionality to Hashes",
"license": "Artistic-2.0",
"name": "Hash::Merge",
- "perl": "6",
+ "perl": "6.c",
"provides": {
"Hash::Merge": "lib/Hash/Merge.pm6",
- "Hash::Merge::Unit": "lib/Hash/Merge/Unit.pm6"
+ "Hash::Merge::Augment": "lib/Hash/Merge/Augment.pm6"
},
"source-url": "https://github.com/scriptkitties/p6-Hash-Merge.git",
"tags": [
@@ -23,5 +23,6 @@
"test-depends": [
"Test::META"
],
+ "api": "1",
"version": "0.2.0"
}
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
diff --git a/t/01-thing.t b/t/01-thing.t
index 4741929..ef674ec 100644
--- a/t/01-thing.t
+++ b/t/01-thing.t
@@ -4,7 +4,7 @@ use v6;
use lib 'lib';
use Test;
-use Hash::Merge;
+use Hash::Merge::Augment;
my %a;
my %b;
diff --git a/t/02-empty-source.t b/t/02-empty-source.t
index b404a63..2737d2d 100644
--- a/t/02-empty-source.t
+++ b/t/02-empty-source.t
@@ -6,7 +6,7 @@ use Test;
plan 3;
-use Hash::Merge;
+use Hash::Merge::Augment;
my Hash $hash = {
a => "a",
diff --git a/t/03-unit.t b/t/03-unit.t
index 43d70ff..5230398 100644
--- a/t/03-unit.t
+++ b/t/03-unit.t
@@ -2,7 +2,7 @@
use v6.c;
-use Hash::Merge::Unit;
+use Hash::Merge;
use Test;
plan 2;