From 0a31cb1a37f184daa7c2839abd6a827793fdd2f3 Mon Sep 17 00:00:00 2001 From: Ufuk Kayserilioglu Date: Fri, 15 Dec 2023 20:03:44 +0200 Subject: [PATCH] [ruby/prism] Finish keyword hash node flag refactor by renaming flag https://github.com/ruby/prism/commit/7f812389f8 --- prism/config.yml | 4 ++-- prism/parser.h | 6 ------ test/prism/snapshots/arrays.txt | 2 +- test/prism/snapshots/if.txt | 2 +- test/prism/snapshots/method_calls.txt | 20 +++++++++---------- test/prism/snapshots/rescue.txt | 2 +- .../prism/snapshots/seattlerb/assoc_label.txt | 2 +- test/prism/snapshots/seattlerb/bug_249.txt | 2 +- .../snapshots/seattlerb/bug_hash_args.txt | 2 +- .../bug_hash_args_trailing_comma.txt | 2 +- .../seattlerb/call_args_assoc_quoted.txt | 4 ++-- .../seattlerb/call_array_lit_inline_hash.txt | 2 +- .../snapshots/seattlerb/call_assoc_new.txt | 2 +- .../seattlerb/call_assoc_new_if_multiline.txt | 2 +- .../prism/snapshots/seattlerb/difficult2_.txt | 2 +- .../seattlerb/multiline_hash_declaration.txt | 6 +++--- .../seattlerb/quoted_symbol_hash_arg.txt | 2 +- .../seattlerb/return_call_assocs.txt | 10 +++++----- .../snapshots/seattlerb/yield_call_assocs.txt | 10 +++++----- .../unparser/corpus/literal/send.txt | 6 +++--- .../snapshots/whitequark/args_args_assocs.txt | 4 ++-- .../whitequark/args_args_assocs_comma.txt | 2 +- .../snapshots/whitequark/args_assocs.txt | 12 +++++------ .../whitequark/args_assocs_comma.txt | 2 +- .../whitequark/args_assocs_legacy.txt | 12 +++++------ .../prism/snapshots/whitequark/bug_cmdarg.txt | 4 ++-- .../whitequark/keyword_argument_omission.txt | 2 +- .../whitequark/newline_in_hash_argument.txt | 4 ++-- .../snapshots/whitequark/parser_bug_525.txt | 2 +- .../snapshots/whitequark/ruby_bug_11380.txt | 2 +- .../snapshots/whitequark/ruby_bug_12073.txt | 2 +- 31 files changed, 66 insertions(+), 72 deletions(-) diff --git a/prism/config.yml b/prism/config.yml index d3b6b08709c492..7bbe88e6b4fa71 100644 --- a/prism/config.yml +++ b/prism/config.yml @@ -368,8 +368,8 @@ flags: comment: Flags for integer nodes that correspond to the base of the integer. - name: KeywordHashNodeFlags values: - - name: STATIC_KEYS - comment: "a keyword hash which only has `AssocNode` elements all with static literal keys, which means the elements can be treated as keyword arguments" + - name: SYMBOL_KEYS + comment: "a keyword hash which only has `AssocNode` elements all with symbol keys, which means the elements can be treated as keyword arguments" comment: Flags for keyword hash nodes. - name: LoopFlags values: diff --git a/prism/parser.h b/prism/parser.h index 7f26054f099bc9..2c58131b1966e8 100644 --- a/prism/parser.h +++ b/prism/parser.h @@ -17,12 +17,6 @@ #include -// TODO: remove this by renaming the original flag -/** - * Temporary alias for the PM_NODE_FLAG_STATIC_KEYS flag. - */ -#define PM_KEYWORD_HASH_NODE_FLAGS_SYMBOL_KEYS PM_KEYWORD_HASH_NODE_FLAGS_STATIC_KEYS - /** * This enum provides various bits that represent different kinds of states that * the lexer can track. This is used to determine which kind of token to return diff --git a/test/prism/snapshots/arrays.txt b/test/prism/snapshots/arrays.txt index d31cd7afc857a7..93f5c8fbc1a864 100644 --- a/test/prism/snapshots/arrays.txt +++ b/test/prism/snapshots/arrays.txt @@ -79,7 +79,7 @@ │ ├── flags: ∅ │ ├── elements: (length: 1) │ │ └── @ KeywordHashNode (location: (5,1)-(5,12)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (5,1)-(5,12)) │ │ ├── key: diff --git a/test/prism/snapshots/if.txt b/test/prism/snapshots/if.txt index 6733e57bed1f3b..a5ffeac2c25cad 100644 --- a/test/prism/snapshots/if.txt +++ b/test/prism/snapshots/if.txt @@ -250,7 +250,7 @@ │ │ │ ├── flags: ∅ │ │ │ └── arguments: (length: 1) │ │ │ └── @ KeywordHashNode (location: (25,4)-(25,6)) - │ │ │ ├── flags: static_keys + │ │ │ ├── flags: symbol_keys │ │ │ └── elements: (length: 1) │ │ │ └── @ AssocNode (location: (25,4)-(25,6)) │ │ │ ├── key: diff --git a/test/prism/snapshots/method_calls.txt b/test/prism/snapshots/method_calls.txt index 65f0d1df165adb..f8de181d3229c7 100644 --- a/test/prism/snapshots/method_calls.txt +++ b/test/prism/snapshots/method_calls.txt @@ -782,7 +782,7 @@ │ │ │ ├── closing_loc: ∅ │ │ │ └── unescaped: "a" │ │ └── @ KeywordHashNode (location: (60,8)-(60,32)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 2) │ │ ├── @ AssocNode (location: (60,8)-(60,22)) │ │ │ ├── key: @@ -914,7 +914,7 @@ │ │ │ ├── closing_loc: ∅ │ │ │ └── unescaped: "a" │ │ └── @ KeywordHashNode (location: (64,8)-(64,15)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (64,8)-(64,15)) │ │ ├── key: @@ -983,7 +983,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (66,3)-(66,17)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (66,3)-(66,17)) │ │ ├── key: @@ -1173,7 +1173,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (74,3)-(74,20)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (74,3)-(74,20)) │ │ ├── key: @@ -1236,7 +1236,7 @@ │ │ │ ├── closing_loc: ∅ │ │ │ └── unescaped: "a" │ │ └── @ KeywordHashNode (location: (82,0)-(82,5)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (82,0)-(82,5)) │ │ ├── key: @@ -1287,7 +1287,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (87,4)-(87,21)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 2) │ │ ├── @ AssocNode (location: (87,4)-(87,11)) │ │ │ ├── key: @@ -1336,7 +1336,7 @@ │ │ ├── @ IntegerNode (location: (89,10)-(89,11)) │ │ │ └── flags: decimal │ │ └── @ KeywordHashNode (location: (89,13)-(89,21)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (89,13)-(89,21)) │ │ ├── key: @@ -1527,7 +1527,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (103,4)-(103,11)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (103,4)-(103,11)) │ │ ├── key: @@ -1555,7 +1555,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (105,4)-(105,28)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (105,4)-(105,28)) │ │ ├── key: @@ -1612,7 +1612,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (107,4)-(107,24)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (107,4)-(107,24)) │ │ ├── key: diff --git a/test/prism/snapshots/rescue.txt b/test/prism/snapshots/rescue.txt index 3f9dc426a2fd9e..12607e8be2eaab 100644 --- a/test/prism/snapshots/rescue.txt +++ b/test/prism/snapshots/rescue.txt @@ -343,7 +343,7 @@ │ │ │ ├── flags: ∅ │ │ │ └── arguments: (length: 1) │ │ │ └── @ KeywordHashNode (location: (29,4)-(29,6)) - │ │ │ ├── flags: static_keys + │ │ │ ├── flags: symbol_keys │ │ │ └── elements: (length: 1) │ │ │ └── @ AssocNode (location: (29,4)-(29,6)) │ │ │ ├── key: diff --git a/test/prism/snapshots/seattlerb/assoc_label.txt b/test/prism/snapshots/seattlerb/assoc_label.txt index 1d65eef3f9d72c..c8526358f544d6 100644 --- a/test/prism/snapshots/seattlerb/assoc_label.txt +++ b/test/prism/snapshots/seattlerb/assoc_label.txt @@ -15,7 +15,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (1,2)-(1,5)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,2)-(1,5)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/bug_249.txt b/test/prism/snapshots/seattlerb/bug_249.txt index 4c684f32dcd6c8..c29349142924f2 100644 --- a/test/prism/snapshots/seattlerb/bug_249.txt +++ b/test/prism/snapshots/seattlerb/bug_249.txt @@ -66,7 +66,7 @@ │ │ ├── closing_loc: ∅ │ │ └── block: ∅ │ └── @ KeywordHashNode (location: (4,11)-(4,28)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (4,11)-(4,28)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/bug_hash_args.txt b/test/prism/snapshots/seattlerb/bug_hash_args.txt index cea1fc8db00e85..7900bbe0d1a5e5 100644 --- a/test/prism/snapshots/seattlerb/bug_hash_args.txt +++ b/test/prism/snapshots/seattlerb/bug_hash_args.txt @@ -21,7 +21,7 @@ │ │ ├── closing_loc: ∅ │ │ └── unescaped: "bar" │ └── @ KeywordHashNode (location: (1,10)-(1,18)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,10)-(1,18)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/bug_hash_args_trailing_comma.txt b/test/prism/snapshots/seattlerb/bug_hash_args_trailing_comma.txt index e4c2a10f2ea6e0..2b2b24622697a1 100644 --- a/test/prism/snapshots/seattlerb/bug_hash_args_trailing_comma.txt +++ b/test/prism/snapshots/seattlerb/bug_hash_args_trailing_comma.txt @@ -21,7 +21,7 @@ │ │ ├── closing_loc: ∅ │ │ └── unescaped: "bar" │ └── @ KeywordHashNode (location: (1,10)-(1,18)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,10)-(1,18)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/call_args_assoc_quoted.txt b/test/prism/snapshots/seattlerb/call_args_assoc_quoted.txt index 958231a21a708a..9426531d5cada2 100644 --- a/test/prism/snapshots/seattlerb/call_args_assoc_quoted.txt +++ b/test/prism/snapshots/seattlerb/call_args_assoc_quoted.txt @@ -57,7 +57,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (3,2)-(3,8)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (3,2)-(3,8)) │ │ ├── key: @@ -85,7 +85,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (5,2)-(5,8)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (5,2)-(5,8)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/call_array_lit_inline_hash.txt b/test/prism/snapshots/seattlerb/call_array_lit_inline_hash.txt index f8cde2f6a9fda4..f572729b8ac081 100644 --- a/test/prism/snapshots/seattlerb/call_array_lit_inline_hash.txt +++ b/test/prism/snapshots/seattlerb/call_array_lit_inline_hash.txt @@ -24,7 +24,7 @@ │ │ │ ├── closing_loc: ∅ │ │ │ └── unescaped: "b" │ │ └── @ KeywordHashNode (location: (1,7)-(1,14)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (1,7)-(1,14)) │ │ ├── key: diff --git a/test/prism/snapshots/seattlerb/call_assoc_new.txt b/test/prism/snapshots/seattlerb/call_assoc_new.txt index 6d121252607452..decf68ae6eba34 100644 --- a/test/prism/snapshots/seattlerb/call_assoc_new.txt +++ b/test/prism/snapshots/seattlerb/call_assoc_new.txt @@ -15,7 +15,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (1,2)-(1,5)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,2)-(1,5)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/call_assoc_new_if_multiline.txt b/test/prism/snapshots/seattlerb/call_assoc_new_if_multiline.txt index 1c079f9d1d9db2..c9e0ff969304f8 100644 --- a/test/prism/snapshots/seattlerb/call_assoc_new_if_multiline.txt +++ b/test/prism/snapshots/seattlerb/call_assoc_new_if_multiline.txt @@ -15,7 +15,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (1,2)-(5,3)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,2)-(5,3)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/difficult2_.txt b/test/prism/snapshots/seattlerb/difficult2_.txt index a81b0ce45884ea..72cac371f7fe25 100644 --- a/test/prism/snapshots/seattlerb/difficult2_.txt +++ b/test/prism/snapshots/seattlerb/difficult2_.txt @@ -53,7 +53,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (2,2)-(2,6)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (2,2)-(2,6)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/multiline_hash_declaration.txt b/test/prism/snapshots/seattlerb/multiline_hash_declaration.txt index efa6fa242ddd82..f377bda17cfd40 100644 --- a/test/prism/snapshots/seattlerb/multiline_hash_declaration.txt +++ b/test/prism/snapshots/seattlerb/multiline_hash_declaration.txt @@ -15,7 +15,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (1,2)-(3,1)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (1,2)-(3,1)) │ │ ├── key: @@ -45,7 +45,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (5,2)-(6,1)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (5,2)-(6,1)) │ │ ├── key: @@ -75,7 +75,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (8,2)-(8,11)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (8,2)-(8,11)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/quoted_symbol_hash_arg.txt b/test/prism/snapshots/seattlerb/quoted_symbol_hash_arg.txt index 59bd8f0220fa62..8730eb19117cd7 100644 --- a/test/prism/snapshots/seattlerb/quoted_symbol_hash_arg.txt +++ b/test/prism/snapshots/seattlerb/quoted_symbol_hash_arg.txt @@ -15,7 +15,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (1,5)-(1,12)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,5)-(1,12)) │ ├── key: diff --git a/test/prism/snapshots/seattlerb/return_call_assocs.txt b/test/prism/snapshots/seattlerb/return_call_assocs.txt index 8baf6c4c7e06ac..98b7943bac4b05 100644 --- a/test/prism/snapshots/seattlerb/return_call_assocs.txt +++ b/test/prism/snapshots/seattlerb/return_call_assocs.txt @@ -12,7 +12,7 @@ │ ├── @ IntegerNode (location: (1,7)-(1,8)) │ │ └── flags: decimal │ └── @ KeywordHashNode (location: (1,10)-(1,17)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,10)-(1,17)) │ ├── key: @@ -35,7 +35,7 @@ │ ├── @ IntegerNode (location: (3,7)-(3,8)) │ │ └── flags: decimal │ └── @ KeywordHashNode (location: (3,10)-(3,26)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 2) │ ├── @ AssocNode (location: (3,10)-(3,17)) │ │ ├── key: @@ -79,7 +79,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (5,9)-(5,14)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (5,9)-(5,14)) │ │ ├── key: @@ -113,7 +113,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (7,9)-(7,12)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (7,9)-(7,12)) │ │ ├── key: @@ -147,7 +147,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (9,9)-(9,12)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (9,9)-(9,12)) │ │ ├── key: diff --git a/test/prism/snapshots/seattlerb/yield_call_assocs.txt b/test/prism/snapshots/seattlerb/yield_call_assocs.txt index 82d1765f210c36..95d64eaaefae27 100644 --- a/test/prism/snapshots/seattlerb/yield_call_assocs.txt +++ b/test/prism/snapshots/seattlerb/yield_call_assocs.txt @@ -13,7 +13,7 @@ │ │ ├── @ IntegerNode (location: (1,6)-(1,7)) │ │ │ └── flags: decimal │ │ └── @ KeywordHashNode (location: (1,9)-(1,16)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (1,9)-(1,16)) │ │ ├── key: @@ -38,7 +38,7 @@ │ │ ├── @ IntegerNode (location: (3,6)-(3,7)) │ │ │ └── flags: decimal │ │ └── @ KeywordHashNode (location: (3,9)-(3,25)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 2) │ │ ├── @ AssocNode (location: (3,9)-(3,16)) │ │ │ ├── key: @@ -84,7 +84,7 @@ │ │ │ ├── flags: ∅ │ │ │ └── arguments: (length: 1) │ │ │ └── @ KeywordHashNode (location: (5,8)-(5,13)) - │ │ │ ├── flags: static_keys + │ │ │ ├── flags: symbol_keys │ │ │ └── elements: (length: 1) │ │ │ └── @ AssocNode (location: (5,8)-(5,13)) │ │ │ ├── key: @@ -120,7 +120,7 @@ │ │ │ ├── flags: ∅ │ │ │ └── arguments: (length: 1) │ │ │ └── @ KeywordHashNode (location: (7,8)-(7,11)) - │ │ │ ├── flags: static_keys + │ │ │ ├── flags: symbol_keys │ │ │ └── elements: (length: 1) │ │ │ └── @ AssocNode (location: (7,8)-(7,11)) │ │ │ ├── key: @@ -156,7 +156,7 @@ │ │ │ ├── flags: ∅ │ │ │ └── arguments: (length: 1) │ │ │ └── @ KeywordHashNode (location: (9,8)-(9,11)) - │ │ │ ├── flags: static_keys + │ │ │ ├── flags: symbol_keys │ │ │ └── elements: (length: 1) │ │ │ └── @ AssocNode (location: (9,8)-(9,11)) │ │ │ ├── key: diff --git a/test/prism/snapshots/unparser/corpus/literal/send.txt b/test/prism/snapshots/unparser/corpus/literal/send.txt index a96937e87ee7e6..673787f1f1332f 100644 --- a/test/prism/snapshots/unparser/corpus/literal/send.txt +++ b/test/prism/snapshots/unparser/corpus/literal/send.txt @@ -1249,7 +1249,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (63,8)-(63,16)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (63,8)-(63,16)) │ │ ├── key: @@ -1569,7 +1569,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (70,4)-(70,8)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (70,4)-(70,8)) │ │ ├── key: @@ -1615,7 +1615,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (71,6)-(71,10)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (71,6)-(71,10)) │ │ ├── key: diff --git a/test/prism/snapshots/whitequark/args_args_assocs.txt b/test/prism/snapshots/whitequark/args_args_assocs.txt index d5c0d7d13671de..3d467e39a52376 100644 --- a/test/prism/snapshots/whitequark/args_args_assocs.txt +++ b/test/prism/snapshots/whitequark/args_args_assocs.txt @@ -25,7 +25,7 @@ │ │ │ ├── closing_loc: ∅ │ │ │ └── block: ∅ │ │ └── @ KeywordHashNode (location: (1,9)-(1,18)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (1,9)-(1,18)) │ │ ├── key: @@ -63,7 +63,7 @@ │ │ ├── closing_loc: ∅ │ │ └── block: ∅ │ └── @ KeywordHashNode (location: (3,9)-(3,18)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (3,9)-(3,18)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/args_args_assocs_comma.txt b/test/prism/snapshots/whitequark/args_args_assocs_comma.txt index 2aa16446107977..7b74a1886c0968 100644 --- a/test/prism/snapshots/whitequark/args_args_assocs_comma.txt +++ b/test/prism/snapshots/whitequark/args_args_assocs_comma.txt @@ -35,7 +35,7 @@ │ │ ├── closing_loc: ∅ │ │ └── block: ∅ │ └── @ KeywordHashNode (location: (1,9)-(1,18)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,9)-(1,18)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/args_assocs.txt b/test/prism/snapshots/whitequark/args_assocs.txt index bf51dda187b019..e4acaca435bb56 100644 --- a/test/prism/snapshots/whitequark/args_assocs.txt +++ b/test/prism/snapshots/whitequark/args_assocs.txt @@ -15,7 +15,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (1,4)-(1,13)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (1,4)-(1,13)) │ │ ├── key: @@ -43,7 +43,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (3,4)-(3,13)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (3,4)-(3,13)) │ │ ├── key: @@ -95,7 +95,7 @@ │ │ │ ├── closing_loc: ∅ │ │ │ └── block: ∅ │ │ └── @ KeywordHashNode (location: (5,14)-(5,21)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (5,14)-(5,21)) │ │ ├── key: @@ -124,7 +124,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (7,5)-(7,14)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (7,5)-(7,14)) │ │ ├── key: @@ -148,7 +148,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (9,6)-(9,16)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (9,6)-(9,16)) │ │ ├── key: @@ -172,7 +172,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (11,6)-(11,16)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (11,6)-(11,16)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/args_assocs_comma.txt b/test/prism/snapshots/whitequark/args_assocs_comma.txt index b98aa39cb778eb..0ced5c7bc67f24 100644 --- a/test/prism/snapshots/whitequark/args_assocs_comma.txt +++ b/test/prism/snapshots/whitequark/args_assocs_comma.txt @@ -25,7 +25,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (1,4)-(1,13)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,4)-(1,13)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/args_assocs_legacy.txt b/test/prism/snapshots/whitequark/args_assocs_legacy.txt index bf51dda187b019..e4acaca435bb56 100644 --- a/test/prism/snapshots/whitequark/args_assocs_legacy.txt +++ b/test/prism/snapshots/whitequark/args_assocs_legacy.txt @@ -15,7 +15,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (1,4)-(1,13)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (1,4)-(1,13)) │ │ ├── key: @@ -43,7 +43,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (3,4)-(3,13)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (3,4)-(3,13)) │ │ ├── key: @@ -95,7 +95,7 @@ │ │ │ ├── closing_loc: ∅ │ │ │ └── block: ∅ │ │ └── @ KeywordHashNode (location: (5,14)-(5,21)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (5,14)-(5,21)) │ │ ├── key: @@ -124,7 +124,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (7,5)-(7,14)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (7,5)-(7,14)) │ │ ├── key: @@ -148,7 +148,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (9,6)-(9,16)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (9,6)-(9,16)) │ │ ├── key: @@ -172,7 +172,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (11,6)-(11,16)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (11,6)-(11,16)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/bug_cmdarg.txt b/test/prism/snapshots/whitequark/bug_cmdarg.txt index 6779d117351c15..428d061ee41402 100644 --- a/test/prism/snapshots/whitequark/bug_cmdarg.txt +++ b/test/prism/snapshots/whitequark/bug_cmdarg.txt @@ -15,7 +15,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (1,7)-(1,15)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (1,7)-(1,15)) │ │ ├── key: @@ -65,7 +65,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (5,2)-(5,26)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (5,2)-(5,26)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/keyword_argument_omission.txt b/test/prism/snapshots/whitequark/keyword_argument_omission.txt index 3ff3f9a176ed6d..afcfd87c49e809 100644 --- a/test/prism/snapshots/whitequark/keyword_argument_omission.txt +++ b/test/prism/snapshots/whitequark/keyword_argument_omission.txt @@ -15,7 +15,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (1,4)-(1,10)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 2) │ ├── @ AssocNode (location: (1,4)-(1,6)) │ │ ├── key: diff --git a/test/prism/snapshots/whitequark/newline_in_hash_argument.txt b/test/prism/snapshots/whitequark/newline_in_hash_argument.txt index 0e036fbd85f0e7..5f5c1e406c2aa8 100644 --- a/test/prism/snapshots/whitequark/newline_in_hash_argument.txt +++ b/test/prism/snapshots/whitequark/newline_in_hash_argument.txt @@ -93,7 +93,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (10,8)-(11,1)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (10,8)-(11,1)) │ │ ├── key: @@ -131,7 +131,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (13,8)-(14,1)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (13,8)-(14,1)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/parser_bug_525.txt b/test/prism/snapshots/whitequark/parser_bug_525.txt index 087cc76e1b04d7..7289bdf81b54ae 100644 --- a/test/prism/snapshots/whitequark/parser_bug_525.txt +++ b/test/prism/snapshots/whitequark/parser_bug_525.txt @@ -15,7 +15,7 @@ │ ├── flags: ∅ │ └── arguments: (length: 1) │ └── @ KeywordHashNode (location: (1,3)-(1,11)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,3)-(1,11)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/ruby_bug_11380.txt b/test/prism/snapshots/whitequark/ruby_bug_11380.txt index cd2939f8bb2f58..7ab13b891ef14e 100644 --- a/test/prism/snapshots/whitequark/ruby_bug_11380.txt +++ b/test/prism/snapshots/whitequark/ruby_bug_11380.txt @@ -31,7 +31,7 @@ │ │ ├── closing_loc: ∅ │ │ └── unescaped: "hello" │ └── @ KeywordHashNode (location: (1,17)-(1,21)) - │ ├── flags: static_keys + │ ├── flags: symbol_keys │ └── elements: (length: 1) │ └── @ AssocNode (location: (1,17)-(1,21)) │ ├── key: diff --git a/test/prism/snapshots/whitequark/ruby_bug_12073.txt b/test/prism/snapshots/whitequark/ruby_bug_12073.txt index 521df7a0135c61..27f2838bce3e1a 100644 --- a/test/prism/snapshots/whitequark/ruby_bug_12073.txt +++ b/test/prism/snapshots/whitequark/ruby_bug_12073.txt @@ -23,7 +23,7 @@ │ │ ├── flags: ∅ │ │ └── arguments: (length: 1) │ │ └── @ KeywordHashNode (location: (1,9)-(1,13)) - │ │ ├── flags: static_keys + │ │ ├── flags: symbol_keys │ │ └── elements: (length: 1) │ │ └── @ AssocNode (location: (1,9)-(1,13)) │ │ ├── key: