summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2020-02-27 11:15:04 -0800
committerJeremy Evans <code@jeremyevans.net>2020-03-17 12:09:43 -0700
commitac04b778c12120ab91986822b71edf16fea61465 (patch)
tree8f1eda4d451709c54c7ed540007218e2488169d4
parent3325194ac0fd9e14ab5535c80b3a9b329d030e76 (diff)
Make {**{}} return unfrozen empty hash
Previously, method call keyword splats and hash keyword splats were compiled exactly the same. This is because parse-wise, they operate on indentical nodes when it comes to compiling the **{}. Fix this by using an ugly hack of temporarily modifying the nd_brace flag in the method call keyword splat case. Inside compile_hash, only optimize the **{} case for hashes where the nd_brace flag has been modified to reflect we are in the method call keyword splat case and it is safe to do so. Since compile_keyword_args is only called in one place, move the keyword_node_p call out of that method to the single caller to avoid duplicating the code.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/2945
-rw-r--r--compile.c26
-rw-r--r--test/ruby/test_syntax.rb11
2 files changed, 31 insertions, 6 deletions
diff --git a/compile.c b/compile.c
index 9c8f4ddbc7..f55c76f591 100644
--- a/compile.c
+++ b/compile.c
@@ -3898,10 +3898,14 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *co
return COMPILE_OK;
}
+#define HASH_NO_BRACE 0
+#define HASH_BRACE 1
+#define METHOD_CALL_KEYWORDS 2
+
static int
keyword_node_p(const NODE *const node)
{
- return nd_type(node) == NODE_HASH && node->nd_brace == FALSE;
+ return nd_type(node) == NODE_HASH && (node->nd_brace & HASH_BRACE) != HASH_BRACE;
}
static int
@@ -3912,7 +3916,7 @@ compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
{
if (kw_arg_ptr == NULL) return FALSE;
- if (keyword_node_p(root_node) && root_node->nd_head && nd_type(root_node->nd_head) == NODE_LIST) {
+ if (root_node->nd_head && nd_type(root_node->nd_head) == NODE_LIST) {
const NODE *node = root_node->nd_head;
while (node) {
@@ -3970,9 +3974,18 @@ compile_args(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node,
EXPECT_NODE("compile_args", node, NODE_LIST, -1);
}
- if (node->nd_next == NULL /* last node */ &&
- compile_keyword_arg(iseq, ret, node->nd_head, keywords_ptr, flag)) {
- len--;
+ if (node->nd_next == NULL && keyword_node_p(node->nd_head)) { /* last node */
+ if (compile_keyword_arg(iseq, ret, node->nd_head, keywords_ptr, flag)) {
+ len--;
+ }
+ else {
+ /* Bad Hack: temporarily mark hash node with flag so compile_hash
+ * can compile call differently.
+ */
+ node->nd_head->nd_brace = METHOD_CALL_KEYWORDS;
+ NO_CHECK(COMPILE_(ret, "array element", node->nd_head, FALSE));
+ node->nd_head->nd_brace = HASH_NO_BRACE;
+ }
}
else {
NO_CHECK(COMPILE_(ret, "array element", node->nd_head, FALSE));
@@ -4165,6 +4178,7 @@ static int
compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped)
{
int line = (int)nd_line(node);
+ int method_call_keywords = node->nd_brace == METHOD_CALL_KEYWORDS;
node = node->nd_head;
@@ -4297,7 +4311,7 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popp
int only_kw = last_kw && first_kw; /* foo(1,2,3, **kw) */
if (empty_kw) {
- if (only_kw) {
+ if (only_kw && method_call_keywords) {
/* **{} appears at the last, so it won't be modified.
* kw is a special NODE_LIT that contains a special empty hash,
* so this emits: putobject {}
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index f92966fda9..a0c2bf62b7 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -93,6 +93,17 @@ class TestSyntax < Test::Unit::TestCase
assert_valid_syntax("tap (proc do end)", __FILE__, bug9726)
end
+ def test_hash_kwsplat_hash
+ kw = {}
+ h = {a: 1}
+ assert_equal({}, {**{}})
+ assert_equal({}, {**kw})
+ assert_equal(h, {**h})
+ assert_equal(false, {**{}}.frozen?)
+ assert_equal(false, {**kw}.equal?(kw))
+ assert_equal(false, {**h}.equal?(h))
+ end
+
def test_array_kwsplat_hash
kw = {}
h = {a: 1}