opal 1.7.4 → 1.8.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.eslintrc.js +1 -0
- data/.github/workflows/build.yml +9 -9
- data/.rubocop/todo.yml +2 -2
- data/.rubocop.yml +17 -10
- data/.rubocop_todo.yml +311 -0
- data/CHANGELOG.md +1 -15
- data/README.md +7 -7
- data/UNRELEASED.md +92 -1
- data/benchmark-ips/bm_block_vs_yield.rb +3 -0
- data/benchmark-ips/bm_slice_or_not.rb +53 -0
- data/docs/bridging.md +112 -0
- data/docs/compiled_ruby.md +10 -10
- data/docs/getting_started.md +18 -22
- data/docs/releasing.md +8 -16
- data/lib/opal/cli_runners/chrome_cdp_interface.rb +1 -0
- data/lib/opal/cli_runners/firefox_cdp_interface.rb +1 -0
- data/lib/opal/compiler.rb +33 -1
- data/lib/opal/nodes/args/extract_kwoptarg.rb +2 -1
- data/lib/opal/nodes/call.rb +1 -1
- data/lib/opal/nodes/call_special.rb +71 -47
- data/lib/opal/nodes/closure.rb +15 -7
- data/lib/opal/nodes/defined.rb +1 -1
- data/lib/opal/nodes/hash.rb +14 -30
- data/lib/opal/nodes/if.rb +37 -29
- data/lib/opal/nodes/literal.rb +15 -7
- data/lib/opal/nodes/rescue.rb +1 -1
- data/lib/opal/nodes/x_string.rb +13 -0
- data/lib/opal/parser/patch.rb +1 -0
- data/lib/opal/rewriters/for_rewriter.rb +36 -24
- data/lib/opal/source_map/file.rb +1 -1
- data/lib/opal/version.rb +1 -1
- data/opal/corelib/array/pack.rb +1 -0
- data/opal/corelib/array.rb +110 -64
- data/opal/corelib/basic_object.rb +1 -0
- data/opal/corelib/binding.rb +2 -0
- data/opal/corelib/boolean.rb +1 -0
- data/opal/corelib/class.rb +28 -8
- data/opal/corelib/comparable.rb +1 -0
- data/opal/corelib/complex.rb +3 -1
- data/opal/corelib/constants.rb +2 -2
- data/opal/corelib/dir.rb +2 -0
- data/opal/corelib/enumerable.rb +3 -2
- data/opal/corelib/enumerator/arithmetic_sequence.rb +3 -1
- data/opal/corelib/enumerator/chain.rb +1 -0
- data/opal/corelib/enumerator/generator.rb +1 -0
- data/opal/corelib/enumerator/lazy.rb +1 -0
- data/opal/corelib/enumerator/yielder.rb +2 -0
- data/opal/corelib/enumerator.rb +1 -0
- data/opal/corelib/error/errno.rb +2 -0
- data/opal/corelib/error.rb +22 -0
- data/opal/corelib/file.rb +1 -0
- data/opal/corelib/hash.rb +224 -519
- data/opal/corelib/helpers.rb +1 -0
- data/opal/corelib/io.rb +2 -0
- data/opal/corelib/irb.rb +2 -0
- data/opal/corelib/kernel/format.rb +1 -0
- data/opal/corelib/kernel.rb +70 -15
- data/opal/corelib/main.rb +2 -0
- data/opal/corelib/marshal/read_buffer.rb +2 -0
- data/opal/corelib/marshal/write_buffer.rb +2 -0
- data/opal/corelib/math/polyfills.rb +2 -0
- data/opal/corelib/math.rb +1 -0
- data/opal/corelib/method.rb +2 -0
- data/opal/corelib/module.rb +45 -5
- data/opal/corelib/nil.rb +3 -1
- data/opal/corelib/number.rb +30 -1
- data/opal/corelib/numeric.rb +2 -0
- data/opal/corelib/object_space.rb +1 -0
- data/opal/corelib/pack_unpack/format_string_parser.rb +2 -0
- data/opal/corelib/proc.rb +30 -28
- data/opal/corelib/process.rb +2 -0
- data/opal/corelib/random/formatter.rb +2 -0
- data/opal/corelib/random/math_random.js.rb +2 -0
- data/opal/corelib/random/mersenne_twister.rb +2 -0
- data/opal/corelib/random/seedrandom.js.rb +2 -0
- data/opal/corelib/random.rb +1 -0
- data/opal/corelib/range.rb +35 -13
- data/opal/corelib/rational.rb +3 -1
- data/opal/corelib/regexp.rb +1 -0
- data/opal/corelib/runtime.js +297 -259
- data/opal/corelib/set.rb +2 -0
- data/opal/corelib/string/encoding.rb +3 -0
- data/opal/corelib/string/unpack.rb +2 -0
- data/opal/corelib/string.rb +56 -20
- data/opal/corelib/struct.rb +4 -2
- data/opal/corelib/time.rb +2 -1
- data/opal/corelib/trace_point.rb +2 -0
- data/opal/corelib/unsupported.rb +2 -0
- data/opal/corelib/variables.rb +2 -0
- data/opal.gemspec +2 -2
- data/spec/filters/bugs/array.rb +58 -2
- data/spec/filters/bugs/basicobject.rb +7 -0
- data/spec/filters/bugs/bigdecimal.rb +1 -2
- data/spec/filters/bugs/binding.rb +1 -0
- data/spec/filters/bugs/class.rb +2 -3
- data/spec/filters/bugs/complex.rb +3 -0
- data/spec/filters/bugs/date.rb +5 -2
- data/spec/filters/bugs/datetime.rb +1 -0
- data/spec/filters/bugs/delegate.rb +1 -2
- data/spec/filters/bugs/encoding.rb +1 -1
- data/spec/filters/bugs/enumerable.rb +11 -3
- data/spec/filters/bugs/enumerator.rb +15 -2
- data/spec/filters/bugs/exception.rb +9 -4
- data/spec/filters/bugs/file.rb +2 -0
- data/spec/filters/bugs/float.rb +1 -0
- data/spec/filters/bugs/freeze.rb +5 -49
- data/spec/filters/bugs/hash.rb +1 -13
- data/spec/filters/bugs/integer.rb +5 -6
- data/spec/filters/bugs/kernel.rb +12 -43
- data/spec/filters/bugs/language.rb +33 -15
- data/spec/filters/bugs/marshal.rb +63 -4
- data/spec/filters/bugs/method.rb +2 -10
- data/spec/filters/bugs/module.rb +18 -7
- data/spec/filters/bugs/objectspace.rb +2 -0
- data/spec/filters/bugs/pathname.rb +1 -0
- data/spec/filters/bugs/proc.rb +4 -2
- data/spec/filters/bugs/random.rb +0 -3
- data/spec/filters/bugs/range.rb +1 -2
- data/spec/filters/bugs/rational.rb +2 -0
- data/spec/filters/bugs/refinement.rb +19 -0
- data/spec/filters/bugs/regexp.rb +27 -5
- data/spec/filters/bugs/ruby-32.rb +0 -6
- data/spec/filters/bugs/set.rb +10 -2
- data/spec/filters/bugs/singleton.rb +0 -2
- data/spec/filters/bugs/string.rb +140 -2
- data/spec/filters/bugs/struct.rb +16 -10
- data/spec/filters/bugs/time.rb +56 -2
- data/spec/filters/bugs/trace_point.rb +1 -0
- data/spec/filters/bugs/unboundmethod.rb +4 -9
- data/spec/filters/bugs/warnings.rb +0 -1
- data/spec/filters/platform/firefox/exception.rb +3 -3
- data/spec/filters/platform/firefox/kernel.rb +1 -0
- data/spec/filters/platform/safari/exception.rb +2 -2
- data/spec/filters/platform/safari/float.rb +1 -0
- data/spec/filters/platform/safari/kernel.rb +1 -0
- data/spec/filters/platform/safari/literal_regexp.rb +2 -2
- data/spec/filters/unsupported/hash.rb +1 -0
- data/spec/lib/compiler_spec.rb +28 -17
- data/spec/mspec-opal/formatters.rb +2 -0
- data/spec/mspec-opal/runner.rb +2 -0
- data/spec/opal/core/array/dup_spec.rb +2 -0
- data/spec/opal/core/class/clone_spec.rb +36 -0
- data/spec/opal/core/exception_spec.rb +2 -0
- data/spec/opal/core/hash/internals_spec.rb +154 -206
- data/spec/opal/core/hash_spec.rb +2 -0
- data/spec/opal/core/iterable_props_spec.rb +2 -0
- data/spec/opal/core/kernel/at_exit_spec.rb +2 -0
- data/spec/opal/core/kernel/respond_to_spec.rb +2 -0
- data/spec/opal/core/language/arguments/mlhs_arg_spec.rb +2 -0
- data/spec/opal/core/language/safe_navigator_spec.rb +2 -0
- data/spec/opal/core/language/xstring_send_spec.rb +15 -0
- data/spec/opal/core/language/xstring_spec.rb +2 -0
- data/spec/opal/core/language_spec.rb +2 -0
- data/spec/opal/core/module_spec.rb +44 -0
- data/spec/opal/core/number/to_i_spec.rb +2 -0
- data/spec/opal/core/object_id_spec.rb +2 -6
- data/spec/opal/core/regexp/match_spec.rb +2 -0
- data/spec/opal/core/runtime/bridged_classes_spec.rb +38 -0
- data/spec/opal/core/runtime/constants_spec.rb +2 -0
- data/spec/opal/core/runtime/eval_spec.rb +2 -0
- data/spec/opal/core/runtime/exit_spec.rb +2 -0
- data/spec/opal/core/runtime/is_a_spec.rb +2 -0
- data/spec/opal/core/runtime/loaded_spec.rb +2 -0
- data/spec/opal/core/runtime/method_missing_spec.rb +2 -0
- data/spec/opal/core/runtime/rescue_spec.rb +2 -0
- data/spec/opal/core/runtime/string_spec.rb +2 -0
- data/spec/opal/core/runtime/truthy_spec.rb +2 -0
- data/spec/opal/core/runtime_spec.rb +2 -6
- data/spec/opal/core/string/to_sym_spec.rb +2 -0
- data/spec/opal/language/predefined_spec.rb +20 -0
- data/spec/opal/language/yield_spec.rb +43 -0
- data/spec/opal/stdlib/js_spec.rb +2 -0
- data/spec/opal/stdlib/native/alias_native_spec.rb +2 -0
- data/spec/opal/stdlib/native/array_spec.rb +2 -0
- data/spec/opal/stdlib/native/date_spec.rb +2 -0
- data/spec/opal/stdlib/native/each_spec.rb +2 -0
- data/spec/opal/stdlib/native/element_reference_spec.rb +2 -0
- data/spec/opal/stdlib/native/exposure_spec.rb +2 -0
- data/spec/opal/stdlib/native/ext_spec.rb +2 -0
- data/spec/opal/stdlib/native/hash_spec.rb +30 -2
- data/spec/opal/stdlib/native/initialize_spec.rb +2 -0
- data/spec/opal/stdlib/native/method_missing_spec.rb +2 -0
- data/spec/opal/stdlib/native/native_alias_spec.rb +2 -0
- data/spec/opal/stdlib/native/native_class_spec.rb +2 -0
- data/spec/opal/stdlib/native/native_module_spec.rb +2 -0
- data/spec/opal/stdlib/native/native_reader_spec.rb +2 -0
- data/spec/opal/stdlib/native/native_writer_spec.rb +2 -0
- data/spec/opal/stdlib/native/new_spec.rb +2 -0
- data/spec/opal/stdlib/native/struct_spec.rb +2 -0
- data/spec/ruby_specs +0 -2
- data/spec/spec_helper.rb +2 -0
- data/stdlib/await.rb +1 -0
- data/stdlib/base64.rb +2 -0
- data/stdlib/bigdecimal/bignumber.js.rb +2 -0
- data/stdlib/bigdecimal/util.rb +1 -0
- data/stdlib/bigdecimal.rb +4 -0
- data/stdlib/buffer/array.rb +2 -0
- data/stdlib/buffer/view.rb +2 -0
- data/stdlib/buffer.rb +2 -0
- data/stdlib/cgi.rb +14 -0
- data/stdlib/console.rb +2 -0
- data/stdlib/date/date_time.rb +2 -0
- data/stdlib/date.rb +2 -0
- data/stdlib/delegate.rb +5 -4
- data/stdlib/deno/base.rb +2 -0
- data/stdlib/deno/file.rb +2 -0
- data/stdlib/erb.rb +2 -0
- data/stdlib/gjs/io.rb +2 -0
- data/stdlib/gjs/kernel.rb +2 -0
- data/stdlib/headless_browser/base.rb +2 -0
- data/stdlib/headless_browser/file.rb +1 -0
- data/stdlib/headless_browser.rb +1 -0
- data/stdlib/js.rb +2 -0
- data/stdlib/json.rb +9 -15
- data/stdlib/logger.rb +2 -0
- data/stdlib/nashorn/file.rb +2 -0
- data/stdlib/nashorn/io.rb +2 -0
- data/stdlib/native.rb +48 -48
- data/stdlib/nodejs/base.rb +2 -0
- data/stdlib/nodejs/dir.rb +2 -0
- data/stdlib/nodejs/env.rb +2 -0
- data/stdlib/nodejs/file.rb +2 -0
- data/stdlib/nodejs/fileutils.rb +2 -0
- data/stdlib/nodejs/io.rb +2 -0
- data/stdlib/nodejs/js-yaml-3-6-1.js +1 -1
- data/stdlib/nodejs/kernel.rb +2 -0
- data/stdlib/nodejs/open-uri.rb +2 -0
- data/stdlib/nodejs/pathname.rb +2 -0
- data/stdlib/nodejs/require.rb +2 -0
- data/stdlib/nodejs/yaml.rb +9 -3
- data/stdlib/opal/miniracer.rb +2 -0
- data/stdlib/opal-parser.rb +8 -1
- data/stdlib/opal-platform.rb +2 -0
- data/stdlib/opal-replutils.rb +2 -0
- data/stdlib/open-uri.rb +4 -1
- data/stdlib/ostruct.rb +4 -2
- data/stdlib/pathname.rb +3 -1
- data/stdlib/pp.rb +1 -0
- data/stdlib/promise/v2.rb +24 -7
- data/stdlib/quickjs/io.rb +2 -0
- data/stdlib/quickjs/kernel.rb +2 -0
- data/stdlib/quickjs.rb +2 -0
- data/stdlib/securerandom.rb +2 -0
- data/stdlib/stringio.rb +2 -0
- data/stdlib/strscan.rb +2 -0
- data/stdlib/time.rb +2 -0
- data/stdlib/uri.rb +1 -0
- data/tasks/performance/optimization_status.rb +2 -0
- data/tasks/testing.rake +16 -11
- data/test/nodejs/test_await.rb +1 -0
- data/test/nodejs/test_dir.rb +2 -0
- data/test/nodejs/test_error.rb +2 -0
- data/test/nodejs/test_file.rb +2 -0
- data/test/nodejs/test_string.rb +2 -0
- data/test/nodejs/test_yaml.rb +20 -0
- data/test/opal/promisev2/test_always.rb +14 -0
- data/test/opal/unsupported_and_bugs.rb +0 -8
- metadata +26 -13
- data/spec/filters/bugs/openstruct.rb +0 -8
data/opal/corelib/hash.rb
CHANGED
@@ -1,16 +1,15 @@
|
|
1
|
-
# helpers: yield1,
|
1
|
+
# helpers: yield1, hash_clone, hash_delete, hash_each, hash_get, hash_put, deny_frozen_access, freeze, opal32_init, opal32_add
|
2
|
+
# backtick_javascript: true
|
2
3
|
|
3
4
|
require 'corelib/enumerable'
|
4
5
|
|
5
6
|
# ---
|
6
7
|
# Internal properties:
|
7
8
|
#
|
8
|
-
# - $$
|
9
|
-
# - $$smap [JS::Object<String => hash-bucket>] the hash table for string keys
|
10
|
-
# - $$keys [Array<hash-bucket>] the list of all keys
|
9
|
+
# - $$keys [Map<key-array>] optional Map of key arrays, used when objects are used as keys
|
11
10
|
# - $$proc [Proc,null,nil] the default proc used for missing keys
|
12
|
-
# -
|
13
|
-
class ::Hash
|
11
|
+
# - key-array [JS::Map] an element of a array that holds objects used as keys, `{ key_hash => [objects...] }`
|
12
|
+
class ::Hash < `Map`
|
14
13
|
include ::Enumerable
|
15
14
|
|
16
15
|
# Mark all hash instances as valid hashes (used to check keyword args, etc)
|
@@ -18,7 +17,7 @@ class ::Hash
|
|
18
17
|
|
19
18
|
def self.[](*argv)
|
20
19
|
%x{
|
21
|
-
var hash, argc = argv.length, i;
|
20
|
+
var hash, argc = argv.length, arg, i;
|
22
21
|
|
23
22
|
if (argc === 1) {
|
24
23
|
hash = #{::Opal.coerce_to?(argv[0], ::Hash, :to_hash)};
|
@@ -28,23 +27,22 @@ class ::Hash
|
|
28
27
|
|
29
28
|
argv = #{::Opal.coerce_to?(argv[0], ::Array, :to_ary)};
|
30
29
|
if (argv === nil) {
|
31
|
-
#{::Kernel.raise ::ArgumentError, 'odd number of arguments for Hash'}
|
30
|
+
#{::Kernel.raise ::ArgumentError, 'odd number of arguments for Hash'};
|
32
31
|
}
|
33
32
|
|
34
33
|
argc = argv.length;
|
35
34
|
hash = #{allocate};
|
36
35
|
|
37
36
|
for (i = 0; i < argc; i++) {
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
hash.$store(
|
45
|
-
|
46
|
-
|
47
|
-
#{::Kernel.raise ::ArgumentError, "invalid number of elements (#{`argv[i].length`} for 1..2)"}
|
37
|
+
arg = argv[i];
|
38
|
+
if (!arg.$$is_array)
|
39
|
+
#{::Kernel.raise ::ArgumentError, "invalid element #{`arg`.inspect} for Hash"};
|
40
|
+
if (arg.length === 1) {
|
41
|
+
hash.$store(arg[0], nil);
|
42
|
+
} else if (arg.length === 2) {
|
43
|
+
hash.$store(arg[0], arg[1]);
|
44
|
+
} else {
|
45
|
+
#{::Kernel.raise ::ArgumentError, "invalid number of elements (#{`arg.length`} for #{`arg`.inspect}), must be 1..2"};
|
48
46
|
}
|
49
47
|
}
|
50
48
|
|
@@ -69,8 +67,6 @@ class ::Hash
|
|
69
67
|
%x{
|
70
68
|
var hash = new self.$$constructor();
|
71
69
|
|
72
|
-
$hash_init(hash);
|
73
|
-
|
74
70
|
hash.$$none = nil;
|
75
71
|
hash.$$proc = nil;
|
76
72
|
|
@@ -106,27 +102,17 @@ class ::Hash
|
|
106
102
|
return false;
|
107
103
|
}
|
108
104
|
|
109
|
-
if (self
|
105
|
+
if (self.size !== other.size) {
|
110
106
|
return false;
|
111
107
|
}
|
112
108
|
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
if (key.$$is_string) {
|
117
|
-
value = self.$$smap[key];
|
118
|
-
other_value = other.$$smap[key];
|
119
|
-
} else {
|
120
|
-
value = key.value;
|
121
|
-
other_value = $hash_get(other, key.key);
|
122
|
-
}
|
123
|
-
|
109
|
+
return $hash_each(self, true, function(key, value) {
|
110
|
+
var other_value = $hash_get(other, key);
|
124
111
|
if (other_value === undefined || !value['$eql?'](other_value)) {
|
125
|
-
return false;
|
112
|
+
return [true, false];
|
126
113
|
}
|
127
|
-
|
128
|
-
|
129
|
-
return true;
|
114
|
+
return [false, true];
|
115
|
+
});
|
130
116
|
}
|
131
117
|
end
|
132
118
|
|
@@ -134,8 +120,8 @@ class ::Hash
|
|
134
120
|
other = ::Opal.coerce_to!(other, ::Hash, :to_hash)
|
135
121
|
|
136
122
|
%x{
|
137
|
-
if (self
|
138
|
-
return false
|
123
|
+
if (self.size < other.size) {
|
124
|
+
return false;
|
139
125
|
}
|
140
126
|
}
|
141
127
|
|
@@ -159,8 +145,8 @@ class ::Hash
|
|
159
145
|
other = ::Opal.coerce_to!(other, ::Hash, :to_hash)
|
160
146
|
|
161
147
|
%x{
|
162
|
-
if (self
|
163
|
-
return false
|
148
|
+
if (self.size <= other.size) {
|
149
|
+
return false;
|
164
150
|
}
|
165
151
|
}
|
166
152
|
|
@@ -200,21 +186,12 @@ class ::Hash
|
|
200
186
|
|
201
187
|
def assoc(object)
|
202
188
|
%x{
|
203
|
-
|
204
|
-
key
|
205
|
-
|
206
|
-
if (key.$$is_string) {
|
207
|
-
if (#{`key` == object}) {
|
208
|
-
return [key, self.$$smap[key]];
|
209
|
-
}
|
210
|
-
} else {
|
211
|
-
if (#{`key.key` == object}) {
|
212
|
-
return [key.key, key.value];
|
213
|
-
}
|
189
|
+
return $hash_each(self, nil, function(key, value) {
|
190
|
+
if (#{`key` == object}) {
|
191
|
+
return [true, [key, value]];
|
214
192
|
}
|
215
|
-
|
216
|
-
|
217
|
-
return nil;
|
193
|
+
return [false, nil];
|
194
|
+
});
|
218
195
|
}
|
219
196
|
end
|
220
197
|
|
@@ -222,42 +199,31 @@ class ::Hash
|
|
222
199
|
%x{
|
223
200
|
$deny_frozen_access(self);
|
224
201
|
|
225
|
-
|
202
|
+
self.clear();
|
203
|
+
if (self.$$keys)
|
204
|
+
self.$$keys.clear();
|
205
|
+
|
226
206
|
return self;
|
227
207
|
}
|
228
208
|
end
|
229
209
|
|
230
210
|
def clone
|
231
211
|
%x{
|
232
|
-
var hash =
|
233
|
-
|
234
|
-
$hash_init(hash);
|
235
|
-
Opal.hash_clone(self, hash);
|
236
|
-
|
237
|
-
return hash;
|
212
|
+
var hash = self.$class().$new();
|
213
|
+
return $hash_clone(self, hash);
|
238
214
|
}
|
239
215
|
end
|
240
216
|
|
241
217
|
def compact
|
242
218
|
%x{
|
243
|
-
var hash =
|
244
|
-
|
245
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
|
246
|
-
key = keys[i];
|
247
|
-
|
248
|
-
if (key.$$is_string) {
|
249
|
-
value = self.$$smap[key];
|
250
|
-
} else {
|
251
|
-
value = key.value;
|
252
|
-
key = key.key;
|
253
|
-
}
|
219
|
+
var hash = new Map();
|
254
220
|
|
221
|
+
return $hash_each(self, hash, function(key, value) {
|
255
222
|
if (value !== nil) {
|
256
223
|
$hash_put(hash, key, value);
|
257
224
|
}
|
258
|
-
|
259
|
-
|
260
|
-
return hash;
|
225
|
+
return [false, hash];
|
226
|
+
});
|
261
227
|
}
|
262
228
|
end
|
263
229
|
|
@@ -265,28 +231,15 @@ class ::Hash
|
|
265
231
|
%x{
|
266
232
|
$deny_frozen_access(self);
|
267
233
|
|
268
|
-
var
|
269
|
-
|
270
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
|
271
|
-
key = keys[i];
|
272
|
-
|
273
|
-
if (key.$$is_string) {
|
274
|
-
value = self.$$smap[key];
|
275
|
-
} else {
|
276
|
-
value = key.value;
|
277
|
-
key = key.key;
|
278
|
-
}
|
234
|
+
var result = nil;
|
279
235
|
|
236
|
+
return $hash_each(self, result, function(key, value) {
|
280
237
|
if (value === nil) {
|
281
|
-
|
282
|
-
|
283
|
-
length--;
|
284
|
-
i--;
|
285
|
-
}
|
238
|
+
$hash_delete(self, key);
|
239
|
+
result = self;
|
286
240
|
}
|
287
|
-
|
288
|
-
|
289
|
-
return changes_were_made ? self : nil;
|
241
|
+
return [false, result];
|
242
|
+
});
|
290
243
|
}
|
291
244
|
end
|
292
245
|
|
@@ -294,24 +247,13 @@ class ::Hash
|
|
294
247
|
%x{
|
295
248
|
$deny_frozen_access(self);
|
296
249
|
|
297
|
-
|
250
|
+
if (!self.$$by_identity) {
|
251
|
+
self.$$by_identity = true;
|
298
252
|
|
299
|
-
|
300
|
-
|
301
|
-
self.$$by_identity = true
|
302
|
-
return self;
|
253
|
+
if (self.size !== 0)
|
254
|
+
Opal.hash_rehash(self);
|
303
255
|
}
|
304
256
|
|
305
|
-
identity_hash = #{ {}.compare_by_identity };
|
306
|
-
for(i = 0, ii = keys.length; i < ii; i++) {
|
307
|
-
key = keys[i];
|
308
|
-
if (!key.$$is_string) key = key.key;
|
309
|
-
$hash_put(identity_hash, key, $hash_get(self, key));
|
310
|
-
}
|
311
|
-
|
312
|
-
self.$$by_identity = true;
|
313
|
-
self.$$map = identity_hash.$$map;
|
314
|
-
self.$$smap = identity_hash.$$smap;
|
315
257
|
return self;
|
316
258
|
}
|
317
259
|
end
|
@@ -396,27 +338,14 @@ class ::Hash
|
|
396
338
|
%x{
|
397
339
|
$deny_frozen_access(self);
|
398
340
|
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
if (key.$$is_string) {
|
403
|
-
value = self.$$smap[key];
|
404
|
-
} else {
|
405
|
-
value = key.value;
|
406
|
-
key = key.key;
|
407
|
-
}
|
408
|
-
|
409
|
-
obj = block(key, value);
|
341
|
+
return $hash_each(self, self, function(key, value) {
|
342
|
+
var obj = block(key, value);
|
410
343
|
|
411
344
|
if (obj !== false && obj !== nil) {
|
412
|
-
|
413
|
-
length--;
|
414
|
-
i--;
|
415
|
-
}
|
345
|
+
$hash_delete(self, key);
|
416
346
|
}
|
417
|
-
|
418
|
-
|
419
|
-
return self;
|
347
|
+
return [false, self];
|
348
|
+
});
|
420
349
|
}
|
421
350
|
end
|
422
351
|
|
@@ -440,20 +369,10 @@ class ::Hash
|
|
440
369
|
return enum_for(:each) { size } unless block
|
441
370
|
|
442
371
|
%x{
|
443
|
-
|
444
|
-
key = keys[i];
|
445
|
-
|
446
|
-
if (key.$$is_string) {
|
447
|
-
value = self.$$smap[key];
|
448
|
-
} else {
|
449
|
-
value = key.value;
|
450
|
-
key = key.key;
|
451
|
-
}
|
452
|
-
|
372
|
+
return $hash_each(self, self, function(key, value) {
|
453
373
|
$yield1(block, [key, value]);
|
454
|
-
|
455
|
-
|
456
|
-
return self;
|
374
|
+
return [false, self];
|
375
|
+
});
|
457
376
|
}
|
458
377
|
end
|
459
378
|
|
@@ -461,13 +380,10 @@ class ::Hash
|
|
461
380
|
return enum_for(:each_key) { size } unless block
|
462
381
|
|
463
382
|
%x{
|
464
|
-
|
465
|
-
key
|
466
|
-
|
467
|
-
|
468
|
-
}
|
469
|
-
|
470
|
-
return self;
|
383
|
+
return $hash_each(self, self, function(key, value) {
|
384
|
+
block(key);
|
385
|
+
return [false, self];
|
386
|
+
});
|
471
387
|
}
|
472
388
|
end
|
473
389
|
|
@@ -475,18 +391,15 @@ class ::Hash
|
|
475
391
|
return enum_for(:each_value) { size } unless block
|
476
392
|
|
477
393
|
%x{
|
478
|
-
|
479
|
-
|
480
|
-
|
481
|
-
|
482
|
-
}
|
483
|
-
|
484
|
-
return self;
|
394
|
+
return $hash_each(self, self, function(key, value) {
|
395
|
+
block(value);
|
396
|
+
return [false, self];
|
397
|
+
});
|
485
398
|
}
|
486
399
|
end
|
487
400
|
|
488
401
|
def empty?
|
489
|
-
`self
|
402
|
+
`self.size === 0`
|
490
403
|
end
|
491
404
|
|
492
405
|
def except(*keys)
|
@@ -528,32 +441,22 @@ class ::Hash
|
|
528
441
|
%x{
|
529
442
|
var result = [];
|
530
443
|
|
531
|
-
|
532
|
-
key = keys[i];
|
533
|
-
|
534
|
-
if (key.$$is_string) {
|
535
|
-
value = self.$$smap[key];
|
536
|
-
} else {
|
537
|
-
value = key.value;
|
538
|
-
key = key.key;
|
539
|
-
}
|
540
|
-
|
444
|
+
return $hash_each(self, result, function(key, value) {
|
541
445
|
result.push(key);
|
542
446
|
|
543
447
|
if (value.$$is_array) {
|
544
448
|
if (level === 1) {
|
545
449
|
result.push(value);
|
546
|
-
|
450
|
+
return [false, result];
|
547
451
|
}
|
548
452
|
|
549
453
|
result = result.concat(#{`value`.flatten(`level - 2`)});
|
550
|
-
|
454
|
+
return [false, result];
|
551
455
|
}
|
552
456
|
|
553
457
|
result.push(value);
|
554
|
-
|
555
|
-
|
556
|
-
return result;
|
458
|
+
return [false, result];
|
459
|
+
});
|
557
460
|
}
|
558
461
|
end
|
559
462
|
|
@@ -569,58 +472,62 @@ class ::Hash
|
|
569
472
|
|
570
473
|
def has_value?(value)
|
571
474
|
%x{
|
572
|
-
|
573
|
-
|
574
|
-
|
575
|
-
if (#{`(key.$$is_string ? self.$$smap[key] : key.value)` == value}) {
|
576
|
-
return true;
|
475
|
+
return $hash_each(self, false, function(key, val) {
|
476
|
+
if (#{`val` == value}) {
|
477
|
+
return [true, true];
|
577
478
|
}
|
578
|
-
|
579
|
-
|
580
|
-
return false;
|
479
|
+
return [false, false];
|
480
|
+
});
|
581
481
|
}
|
582
482
|
end
|
583
483
|
|
484
|
+
`var $hash_ids`
|
485
|
+
|
584
486
|
def hash
|
585
487
|
%x{
|
586
|
-
var top = (
|
488
|
+
var top = ($hash_ids === undefined),
|
587
489
|
hash_id = self.$object_id(),
|
588
|
-
result =
|
589
|
-
key, item
|
490
|
+
result = $opal32_init(),
|
491
|
+
key, item, i,
|
492
|
+
size = self.size, ary = new Int32Array(size);
|
590
493
|
|
591
|
-
|
592
|
-
|
593
|
-
Opal.hash_ids = Object.create(null);
|
594
|
-
}
|
494
|
+
result = $opal32_add(result, 0x4);
|
495
|
+
result = $opal32_add(result, size);
|
595
496
|
|
596
|
-
|
597
|
-
|
598
|
-
|
497
|
+
if (top) {
|
498
|
+
$hash_ids = Object.create(null);
|
499
|
+
}
|
500
|
+
else if ($hash_ids[hash_id]) {
|
501
|
+
return $opal32_add(result, 0x01010101);
|
502
|
+
}
|
599
503
|
|
600
|
-
|
601
|
-
|
504
|
+
try {
|
505
|
+
for (key in $hash_ids) {
|
506
|
+
item = $hash_ids[key];
|
602
507
|
if (#{eql?(`item`)}) {
|
603
|
-
return
|
508
|
+
return $opal32_add(result, 0x01010101);
|
604
509
|
}
|
605
510
|
}
|
606
511
|
|
607
|
-
|
512
|
+
$hash_ids[hash_id] = self;
|
513
|
+
i = 0
|
608
514
|
|
609
|
-
|
610
|
-
|
515
|
+
$hash_each(self, false, function(key, value) {
|
516
|
+
ary[i] = [0x70414952, key, value].$hash();
|
517
|
+
i++;
|
518
|
+
return [false, false];
|
519
|
+
});
|
611
520
|
|
612
|
-
|
613
|
-
result.push([key, self.$$smap[key].$hash()]);
|
614
|
-
} else {
|
615
|
-
result.push([key.key_hash, key.value.$hash()]);
|
616
|
-
}
|
617
|
-
}
|
521
|
+
ary = ary.sort();
|
618
522
|
|
619
|
-
|
523
|
+
for (i = 0; i < ary.length; i++) {
|
524
|
+
result = $opal32_add(result, ary[i]);
|
525
|
+
}
|
620
526
|
|
527
|
+
return result;
|
621
528
|
} finally {
|
622
529
|
if (top) {
|
623
|
-
|
530
|
+
$hash_ids = undefined;
|
624
531
|
}
|
625
532
|
}
|
626
533
|
}
|
@@ -628,22 +535,12 @@ class ::Hash
|
|
628
535
|
|
629
536
|
def index(object)
|
630
537
|
%x{
|
631
|
-
|
632
|
-
key = keys[i];
|
633
|
-
|
634
|
-
if (key.$$is_string) {
|
635
|
-
value = self.$$smap[key];
|
636
|
-
} else {
|
637
|
-
value = key.value;
|
638
|
-
key = key.key;
|
639
|
-
}
|
640
|
-
|
538
|
+
return $hash_each(self, nil, function(key, value) {
|
641
539
|
if (#{`value` == object}) {
|
642
|
-
return key;
|
540
|
+
return [true, key];
|
643
541
|
}
|
644
|
-
|
645
|
-
|
646
|
-
return nil;
|
542
|
+
return [false, nil];
|
543
|
+
});
|
647
544
|
}
|
648
545
|
end
|
649
546
|
|
@@ -688,21 +585,13 @@ class ::Hash
|
|
688
585
|
|
689
586
|
inspect_ids[hash_id] = true;
|
690
587
|
|
691
|
-
|
692
|
-
key = keys[i];
|
693
|
-
|
694
|
-
if (key.$$is_string) {
|
695
|
-
value = self.$$smap[key];
|
696
|
-
} else {
|
697
|
-
value = key.value;
|
698
|
-
key = key.key;
|
699
|
-
}
|
700
|
-
|
701
|
-
key = #{Opal.inspect(`key`)}
|
588
|
+
$hash_each(self, false, function(key, value) {
|
702
589
|
value = #{Opal.inspect(`value`)}
|
590
|
+
key = #{Opal.inspect(`key`)}
|
703
591
|
|
704
592
|
result.push(key + '=>' + value);
|
705
|
-
|
593
|
+
return [false, false];
|
594
|
+
})
|
706
595
|
|
707
596
|
return '{' + result.join(', ') + '}';
|
708
597
|
}
|
@@ -714,22 +603,12 @@ class ::Hash
|
|
714
603
|
|
715
604
|
def invert
|
716
605
|
%x{
|
717
|
-
var hash =
|
718
|
-
|
719
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
|
720
|
-
key = keys[i];
|
721
|
-
|
722
|
-
if (key.$$is_string) {
|
723
|
-
value = self.$$smap[key];
|
724
|
-
} else {
|
725
|
-
value = key.value;
|
726
|
-
key = key.key;
|
727
|
-
}
|
606
|
+
var hash = new Map();
|
728
607
|
|
608
|
+
return $hash_each(self, hash, function(key, value) {
|
729
609
|
$hash_put(hash, value, key);
|
730
|
-
|
731
|
-
|
732
|
-
return hash;
|
610
|
+
return [false, hash];
|
611
|
+
});
|
733
612
|
}
|
734
613
|
end
|
735
614
|
|
@@ -739,50 +618,23 @@ class ::Hash
|
|
739
618
|
%x{
|
740
619
|
$deny_frozen_access(self);
|
741
620
|
|
742
|
-
|
743
|
-
|
744
|
-
|
745
|
-
if (key.$$is_string) {
|
746
|
-
value = self.$$smap[key];
|
747
|
-
} else {
|
748
|
-
value = key.value;
|
749
|
-
key = key.key;
|
750
|
-
}
|
751
|
-
|
752
|
-
obj = block(key, value);
|
621
|
+
return $hash_each(self, self, function(key, value) {
|
622
|
+
var obj = block(key, value);
|
753
623
|
|
754
624
|
if (obj === false || obj === nil) {
|
755
|
-
|
756
|
-
length--;
|
757
|
-
i--;
|
758
|
-
}
|
625
|
+
$hash_delete(self, key);
|
759
626
|
}
|
760
|
-
|
761
|
-
|
762
|
-
return self;
|
627
|
+
return [false, self];
|
628
|
+
});
|
763
629
|
}
|
764
630
|
end
|
765
631
|
|
766
632
|
def keys
|
767
|
-
|
768
|
-
var result = [];
|
769
|
-
|
770
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
|
771
|
-
key = keys[i];
|
772
|
-
|
773
|
-
if (key.$$is_string) {
|
774
|
-
result.push(key);
|
775
|
-
} else {
|
776
|
-
result.push(key.key);
|
777
|
-
}
|
778
|
-
}
|
779
|
-
|
780
|
-
return result;
|
781
|
-
}
|
633
|
+
`Array.from(self.keys())`
|
782
634
|
end
|
783
635
|
|
784
636
|
def length
|
785
|
-
`self
|
637
|
+
`self.size`
|
786
638
|
end
|
787
639
|
|
788
640
|
def merge(*others, &block)
|
@@ -792,44 +644,28 @@ class ::Hash
|
|
792
644
|
def merge!(*others, &block)
|
793
645
|
%x{
|
794
646
|
$deny_frozen_access(self);
|
795
|
-
|
647
|
+
|
648
|
+
var i, j, other;
|
796
649
|
for (i = 0; i < others.length; ++i) {
|
797
650
|
other = #{::Opal.coerce_to!(`others[i]`, ::Hash, :to_hash)};
|
798
|
-
other_keys = other.$$keys, length = other_keys.length;
|
799
651
|
|
800
652
|
if (block === nil) {
|
801
|
-
|
802
|
-
key
|
803
|
-
|
804
|
-
|
805
|
-
other_value = other.$$smap[key];
|
806
|
-
} else {
|
807
|
-
other_value = key.value;
|
808
|
-
key = key.key;
|
809
|
-
}
|
810
|
-
|
811
|
-
$hash_put(self, key, other_value);
|
812
|
-
}
|
653
|
+
$hash_each(other, false, function(key, value) {
|
654
|
+
$hash_put(self, key, value);
|
655
|
+
return [false, false];
|
656
|
+
});
|
813
657
|
} else {
|
814
|
-
|
815
|
-
|
816
|
-
|
817
|
-
if (key.$$is_string) {
|
818
|
-
other_value = other.$$smap[key];
|
819
|
-
} else {
|
820
|
-
other_value = key.value;
|
821
|
-
key = key.key;
|
822
|
-
}
|
823
|
-
|
824
|
-
value = $hash_get(self, key);
|
658
|
+
$hash_each(other, false, function(key, value) {
|
659
|
+
var val = $hash_get(self, key);
|
825
660
|
|
826
|
-
if (
|
827
|
-
$hash_put(self, key,
|
828
|
-
|
661
|
+
if (val === undefined) {
|
662
|
+
$hash_put(self, key, value);
|
663
|
+
return [false, false];
|
829
664
|
}
|
830
665
|
|
831
|
-
$hash_put(self, key, block(key,
|
832
|
-
|
666
|
+
$hash_put(self, key, block(key, val, value));
|
667
|
+
return [false, false];
|
668
|
+
});
|
833
669
|
}
|
834
670
|
}
|
835
671
|
|
@@ -839,30 +675,19 @@ class ::Hash
|
|
839
675
|
|
840
676
|
def rassoc(object)
|
841
677
|
%x{
|
842
|
-
|
843
|
-
key = keys[i];
|
844
|
-
|
845
|
-
if (key.$$is_string) {
|
846
|
-
value = self.$$smap[key];
|
847
|
-
} else {
|
848
|
-
value = key.value;
|
849
|
-
key = key.key;
|
850
|
-
}
|
851
|
-
|
678
|
+
return $hash_each(self, nil, function(key, value) {
|
852
679
|
if (#{`value` == object}) {
|
853
|
-
return [key, value];
|
680
|
+
return [true, [key, value]];
|
854
681
|
}
|
855
|
-
|
856
|
-
|
857
|
-
return nil;
|
682
|
+
return [false, nil];
|
683
|
+
});
|
858
684
|
}
|
859
685
|
end
|
860
686
|
|
861
687
|
def rehash
|
862
688
|
%x{
|
863
689
|
$deny_frozen_access(self);
|
864
|
-
Opal.hash_rehash(self);
|
865
|
-
return self;
|
690
|
+
return Opal.hash_rehash(self);
|
866
691
|
}
|
867
692
|
end
|
868
693
|
|
@@ -870,26 +695,16 @@ class ::Hash
|
|
870
695
|
return enum_for(:reject) { size } unless block
|
871
696
|
|
872
697
|
%x{
|
873
|
-
var hash =
|
874
|
-
|
875
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
|
876
|
-
key = keys[i];
|
698
|
+
var hash = new Map();
|
877
699
|
|
878
|
-
|
879
|
-
|
880
|
-
} else {
|
881
|
-
value = key.value;
|
882
|
-
key = key.key;
|
883
|
-
}
|
884
|
-
|
885
|
-
obj = block(key, value);
|
700
|
+
return $hash_each(self, hash, function(key, value) {
|
701
|
+
var obj = block(key, value);
|
886
702
|
|
887
703
|
if (obj === false || obj === nil) {
|
888
704
|
$hash_put(hash, key, value);
|
889
705
|
}
|
890
|
-
|
891
|
-
|
892
|
-
return hash;
|
706
|
+
return [false, hash]
|
707
|
+
});
|
893
708
|
}
|
894
709
|
end
|
895
710
|
|
@@ -899,30 +714,17 @@ class ::Hash
|
|
899
714
|
%x{
|
900
715
|
$deny_frozen_access(self);
|
901
716
|
|
902
|
-
var
|
903
|
-
|
904
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
|
905
|
-
key = keys[i];
|
906
|
-
|
907
|
-
if (key.$$is_string) {
|
908
|
-
value = self.$$smap[key];
|
909
|
-
} else {
|
910
|
-
value = key.value;
|
911
|
-
key = key.key;
|
912
|
-
}
|
717
|
+
var result = nil;
|
913
718
|
|
914
|
-
|
719
|
+
return $hash_each(self, result, function(key, value) {
|
720
|
+
var obj = block(key, value);
|
915
721
|
|
916
722
|
if (obj !== false && obj !== nil) {
|
917
|
-
|
918
|
-
|
919
|
-
length--;
|
920
|
-
i--;
|
921
|
-
}
|
723
|
+
$hash_delete(self, key);
|
724
|
+
result = self;
|
922
725
|
}
|
923
|
-
|
924
|
-
|
925
|
-
return changes_were_made ? self : nil;
|
726
|
+
return [false, result];
|
727
|
+
});
|
926
728
|
}
|
927
729
|
end
|
928
730
|
|
@@ -932,20 +734,12 @@ class ::Hash
|
|
932
734
|
other = ::Opal.coerce_to!(other, ::Hash, :to_hash)
|
933
735
|
|
934
736
|
%x{
|
935
|
-
|
737
|
+
self.$clear();
|
936
738
|
|
937
|
-
|
938
|
-
key
|
939
|
-
|
940
|
-
|
941
|
-
other_value = other.$$smap[key];
|
942
|
-
} else {
|
943
|
-
other_value = key.value;
|
944
|
-
key = key.key;
|
945
|
-
}
|
946
|
-
|
947
|
-
$hash_put(self, key, other_value);
|
948
|
-
}
|
739
|
+
$hash_each(other, false, function(key, value) {
|
740
|
+
$hash_put(self, key, value);
|
741
|
+
return [false, false];
|
742
|
+
});
|
949
743
|
}
|
950
744
|
|
951
745
|
if other.default_proc
|
@@ -961,26 +755,16 @@ class ::Hash
|
|
961
755
|
return enum_for(:select) { size } unless block
|
962
756
|
|
963
757
|
%x{
|
964
|
-
var hash =
|
965
|
-
|
966
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key, value, obj; i < length; i++) {
|
967
|
-
key = keys[i];
|
758
|
+
var hash = new Map();
|
968
759
|
|
969
|
-
|
970
|
-
|
971
|
-
} else {
|
972
|
-
value = key.value;
|
973
|
-
key = key.key;
|
974
|
-
}
|
975
|
-
|
976
|
-
obj = block(key, value);
|
760
|
+
return $hash_each(self, hash, function(key, value) {
|
761
|
+
var obj = block(key, value);
|
977
762
|
|
978
763
|
if (obj !== false && obj !== nil) {
|
979
764
|
$hash_put(hash, key, value);
|
980
765
|
}
|
981
|
-
|
982
|
-
|
983
|
-
return hash;
|
766
|
+
return [false, hash];
|
767
|
+
});
|
984
768
|
}
|
985
769
|
end
|
986
770
|
|
@@ -992,52 +776,31 @@ class ::Hash
|
|
992
776
|
|
993
777
|
var result = nil;
|
994
778
|
|
995
|
-
|
996
|
-
|
997
|
-
|
998
|
-
if (key.$$is_string) {
|
999
|
-
value = self.$$smap[key];
|
1000
|
-
} else {
|
1001
|
-
value = key.value;
|
1002
|
-
key = key.key;
|
1003
|
-
}
|
1004
|
-
|
1005
|
-
obj = block(key, value);
|
779
|
+
return $hash_each(self, result, function(key, value) {
|
780
|
+
var obj = block(key, value);
|
1006
781
|
|
1007
782
|
if (obj === false || obj === nil) {
|
1008
|
-
|
1009
|
-
length--;
|
1010
|
-
i--;
|
1011
|
-
}
|
783
|
+
$hash_delete(self, key);
|
1012
784
|
result = self;
|
1013
785
|
}
|
1014
|
-
|
1015
|
-
|
1016
|
-
return result;
|
786
|
+
return [false, result];
|
787
|
+
});
|
1017
788
|
}
|
1018
789
|
end
|
1019
790
|
|
1020
791
|
def shift
|
1021
792
|
%x{
|
1022
793
|
$deny_frozen_access(self);
|
1023
|
-
var keys = self.$$keys,
|
1024
|
-
key;
|
1025
|
-
|
1026
|
-
if (keys.length > 0) {
|
1027
|
-
key = keys[0];
|
1028
|
-
|
1029
|
-
key = key.$$is_string ? key : key.key;
|
1030
794
|
|
1031
|
-
|
1032
|
-
|
1033
|
-
|
1034
|
-
return nil;
|
795
|
+
return $hash_each(self, nil, function(key, value) {
|
796
|
+
return [true, [key, $hash_delete(self, key)]];
|
797
|
+
});
|
1035
798
|
}
|
1036
799
|
end
|
1037
800
|
|
1038
801
|
def slice(*keys)
|
1039
802
|
%x{
|
1040
|
-
var result =
|
803
|
+
var result = new Map();
|
1041
804
|
|
1042
805
|
for (var i = 0, length = keys.length; i < length; i++) {
|
1043
806
|
var key = keys[i], value = $hash_get(self, key);
|
@@ -1055,20 +818,10 @@ class ::Hash
|
|
1055
818
|
%x{
|
1056
819
|
var result = [];
|
1057
820
|
|
1058
|
-
|
1059
|
-
key = keys[i];
|
1060
|
-
|
1061
|
-
if (key.$$is_string) {
|
1062
|
-
value = self.$$smap[key];
|
1063
|
-
} else {
|
1064
|
-
value = key.value;
|
1065
|
-
key = key.key;
|
1066
|
-
}
|
1067
|
-
|
821
|
+
return $hash_each(self, result, function(key, value) {
|
1068
822
|
result.push([key, value]);
|
1069
|
-
|
1070
|
-
|
1071
|
-
return result;
|
823
|
+
return [false, result];
|
824
|
+
});
|
1072
825
|
}
|
1073
826
|
end
|
1074
827
|
|
@@ -1080,10 +833,9 @@ class ::Hash
|
|
1080
833
|
return self;
|
1081
834
|
}
|
1082
835
|
|
1083
|
-
var hash = new
|
836
|
+
var hash = new Map();
|
1084
837
|
|
1085
|
-
$
|
1086
|
-
Opal.hash_clone(self, hash);
|
838
|
+
$hash_clone(self, hash);
|
1087
839
|
|
1088
840
|
return hash;
|
1089
841
|
}
|
@@ -1105,57 +857,48 @@ class ::Hash
|
|
1105
857
|
end
|
1106
858
|
end
|
1107
859
|
|
1108
|
-
def transform_keys(&block)
|
1109
|
-
return enum_for(:transform_keys) { size }
|
860
|
+
def transform_keys(keys_hash = nil, &block)
|
861
|
+
return enum_for(:transform_keys) { size } if !block && !keys_hash
|
1110
862
|
|
1111
863
|
%x{
|
1112
|
-
var result =
|
1113
|
-
|
1114
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
|
1115
|
-
key = keys[i];
|
864
|
+
var result = new Map();
|
1116
865
|
|
1117
|
-
|
1118
|
-
|
1119
|
-
|
1120
|
-
|
1121
|
-
|
1122
|
-
|
1123
|
-
|
1124
|
-
|
1125
|
-
|
1126
|
-
|
1127
|
-
}
|
1128
|
-
|
1129
|
-
return result;
|
866
|
+
return $hash_each(self, result, function(key, value) {
|
867
|
+
var new_key;
|
868
|
+
if (keys_hash !== nil)
|
869
|
+
new_key = $hash_get(keys_hash, key);
|
870
|
+
if (new_key === undefined && block && block !== nil)
|
871
|
+
new_key = block(key);
|
872
|
+
if (new_key === undefined)
|
873
|
+
new_key = key // key not modified
|
874
|
+
$hash_put(result, new_key, value);
|
875
|
+
return [false, result];
|
876
|
+
});
|
1130
877
|
}
|
1131
878
|
end
|
1132
879
|
|
1133
|
-
def transform_keys!(&block)
|
1134
|
-
return enum_for(:transform_keys!) { size }
|
880
|
+
def transform_keys!(keys_hash = nil, &block)
|
881
|
+
return enum_for(:transform_keys!) { size } if !block && !keys_hash
|
1135
882
|
|
1136
883
|
%x{
|
1137
884
|
$deny_frozen_access(self);
|
1138
885
|
|
1139
|
-
var
|
1140
|
-
|
1141
|
-
|
1142
|
-
|
1143
|
-
|
1144
|
-
|
1145
|
-
if (
|
1146
|
-
|
1147
|
-
|
1148
|
-
|
1149
|
-
|
1150
|
-
|
1151
|
-
|
1152
|
-
new_key = $yield1(block, key);
|
1153
|
-
|
1154
|
-
$hash_delete(self, key);
|
886
|
+
var modified_keys = new Map();
|
887
|
+
|
888
|
+
return $hash_each(self, self, function(key, value) {
|
889
|
+
var new_key;
|
890
|
+
if (keys_hash !== nil)
|
891
|
+
new_key = $hash_get(keys_hash, key);
|
892
|
+
if (new_key === undefined && block && block !== nil)
|
893
|
+
new_key = block(key);
|
894
|
+
if (new_key === undefined)
|
895
|
+
return [false, self]; // key not modified
|
896
|
+
if (!$hash_get(modified_keys, key))
|
897
|
+
$hash_delete(self, key);
|
1155
898
|
$hash_put(self, new_key, value);
|
1156
|
-
|
1157
|
-
|
1158
|
-
|
899
|
+
$hash_put(modified_keys, new_key, true)
|
900
|
+
return [false, self];
|
901
|
+
});
|
1159
902
|
}
|
1160
903
|
end
|
1161
904
|
|
@@ -1163,24 +906,12 @@ class ::Hash
|
|
1163
906
|
return enum_for(:transform_values) { size } unless block
|
1164
907
|
|
1165
908
|
%x{
|
1166
|
-
var result =
|
1167
|
-
|
1168
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key, value; i < length; i++) {
|
1169
|
-
key = keys[i];
|
1170
|
-
|
1171
|
-
if (key.$$is_string) {
|
1172
|
-
value = self.$$smap[key];
|
1173
|
-
} else {
|
1174
|
-
value = key.value;
|
1175
|
-
key = key.key;
|
1176
|
-
}
|
909
|
+
var result = new Map();
|
1177
910
|
|
1178
|
-
|
1179
|
-
|
1180
|
-
|
1181
|
-
}
|
1182
|
-
|
1183
|
-
return result;
|
911
|
+
return $hash_each(self, result, function(key, value) {
|
912
|
+
$hash_put(result, key, block(value));
|
913
|
+
return [false, result];
|
914
|
+
});
|
1184
915
|
}
|
1185
916
|
end
|
1186
917
|
|
@@ -1190,41 +921,15 @@ class ::Hash
|
|
1190
921
|
%x{
|
1191
922
|
$deny_frozen_access(self);
|
1192
923
|
|
1193
|
-
|
1194
|
-
key
|
1195
|
-
|
1196
|
-
|
1197
|
-
value = self.$$smap[key];
|
1198
|
-
} else {
|
1199
|
-
value = key.value;
|
1200
|
-
key = key.key;
|
1201
|
-
}
|
1202
|
-
|
1203
|
-
value = $yield1(block, value);
|
1204
|
-
|
1205
|
-
$hash_put(self, key, value);
|
1206
|
-
}
|
1207
|
-
|
1208
|
-
return self;
|
924
|
+
return $hash_each(self, self, function(key, value) {
|
925
|
+
$hash_put(self, key, block(value));
|
926
|
+
return [false, self];
|
927
|
+
});
|
1209
928
|
}
|
1210
929
|
end
|
1211
930
|
|
1212
931
|
def values
|
1213
|
-
|
1214
|
-
var result = [];
|
1215
|
-
|
1216
|
-
for (var i = 0, keys = self.$$keys, length = keys.length, key; i < length; i++) {
|
1217
|
-
key = keys[i];
|
1218
|
-
|
1219
|
-
if (key.$$is_string) {
|
1220
|
-
result.push(self.$$smap[key]);
|
1221
|
-
} else {
|
1222
|
-
result.push(key.value);
|
1223
|
-
}
|
1224
|
-
}
|
1225
|
-
|
1226
|
-
return result;
|
1227
|
-
}
|
932
|
+
`Array.from(self.values())`
|
1228
933
|
end
|
1229
934
|
|
1230
935
|
alias dup clone
|