From 16c6984bb97409029e213154ac4f633ae04af3d8 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Mon, 18 Mar 2019 14:25:47 +0900 Subject: Separate keyword arguments from positional arguments And, allow non-symbol keys as a keyword arugment --- parse.y | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 3c4a9d8a8a..4dfdd5d2a3 100644 --- a/parse.y +++ b/parse.y @@ -5134,12 +5134,6 @@ assocs : assoc assocs = tail; } else if (tail) { - if (assocs->nd_head && - !tail->nd_head && nd_type(tail->nd_next) == NODE_ARRAY && - nd_type(tail->nd_next->nd_head) == NODE_HASH) { - /* DSTAR */ - tail = tail->nd_next->nd_head->nd_head; - } assocs = list_concat(assocs, tail); } $$ = assocs; @@ -5177,11 +5171,7 @@ assoc : arg_value tASSOC arg_value | tDSTAR arg_value { /*%%%*/ - if (nd_type($2) == NODE_HASH && - !($2->nd_head && $2->nd_head->nd_alen)) - $$ = 0; - else - $$ = list_append(p, NEW_LIST(0, &@$), $2); + $$ = list_append(p, NEW_LIST(0, &@$), $2); /*% %*/ /*% ripper: assoc_splat!($2) %*/ } -- cgit v1.2.3