Focus on RubyTopLevelRootNode by default in parsing tests

andrykonchin · andrykonchin · commit e4932d1d9a57 · 2024-02-01T16:32:57.000+02:00
diff --git a/spec/truffle/parsing/fixtures/BEGIN/BEGIN.yaml b/spec/truffle/parsing/fixtures/BEGIN/BEGIN.yaml
@@ -8,7 +8,6 @@ notes: >
   a
   b
   ```
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"
 ruby: |
   b
   BEGIN {
diff --git a/spec/truffle/parsing/fixtures/BEGIN/when_multiple_occurrences.yaml b/spec/truffle/parsing/fixtures/BEGIN/when_multiple_occurrences.yaml
@@ -9,7 +9,6 @@ notes: >
   b
   c
   ```
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"
 ruby: |
   BEGIN {
     a
diff --git a/spec/truffle/parsing/fixtures/TOPLEVEL_BINDING.yaml b/spec/truffle/parsing/fixtures/TOPLEVEL_BINDING.yaml
@@ -2,7 +2,6 @@ subject: "TOPLEVEL_BINDING"
 description: TOPLEVEL_BINDING constant is defined in main Ruby script
 notes: >
   TOPLEVEL_BINDING is defined by SetTopLevelBindingNode node
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"
 main_script: true
 ruby: |
   a = 1
diff --git a/spec/truffle/parsing/fixtures/__END__.yaml b/spec/truffle/parsing/fixtures/__END__.yaml
@@ -2,7 +2,6 @@ subject: "__END__"
 description: Presence of __END__ in main Ruby script means a DATA constant should be defined
 notes: >
   DATA is defined by DataNode node
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"
 main_script: true
 ruby: |
   a = 1
diff --git a/spec/truffle/parsing/fixtures/for/multi_assignment/with_multiple_variables.yaml b/spec/truffle/parsing/fixtures/for/multi_assignment/with_multiple_variables.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "multi-assignment / with multiple variables (for a, b, c in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a, b, c in [42, 100500]
     array = [a, b, c]
diff --git a/spec/truffle/parsing/fixtures/for/multi_assignment/with_nested_multi_assignment.yaml b/spec/truffle/parsing/fixtures/for/multi_assignment/with_nested_multi_assignment.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "multi-assignment / with nested multi assignment (for a, (b, c) in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a, (b, c) in [42, 100500]
     array = [a, b, c]
diff --git a/spec/truffle/parsing/fixtures/for/multi_assignment/with_preceding_splat_operator_and_following_variables.yaml b/spec/truffle/parsing/fixtures/for/multi_assignment/with_preceding_splat_operator_and_following_variables.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "multi-assignment / with preceding variables, splat operator and following variables (for a, *b, c in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a, *b, c in [42, 100500]
     array = [a, b, c]
diff --git a/spec/truffle/parsing/fixtures/for/multi_assignment/with_preceding_variables_and_implicit_rest.yaml b/spec/truffle/parsing/fixtures/for/multi_assignment/with_preceding_variables_and_implicit_rest.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "multi-assignment / with preceding variables and implicit rest (for a, in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a, in [42, 100500]
     b = a
diff --git a/spec/truffle/parsing/fixtures/for/multi_assignment/with_preceding_variables_and_splat_operator.yaml b/spec/truffle/parsing/fixtures/for/multi_assignment/with_preceding_variables_and_splat_operator.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "multi-assignment / with preceding variables and splat operator (for a, b, *c in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a, b, *c in [42, 100500]
     array = [a, b, c]
diff --git a/spec/truffle/parsing/fixtures/for/multi_assignment/with_splat_operator_and_following_variables.yaml b/spec/truffle/parsing/fixtures/for/multi_assignment/with_splat_operator_and_following_variables.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "multi-assignment / with splat operator and following variables (for *a, b, c in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for *a, b, c in [42, 100500]
     array = [a, b, c]
diff --git a/spec/truffle/parsing/fixtures/for/with_attribute_assignment.yaml b/spec/truffle/parsing/fixtures/for/with_attribute_assignment.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with attribute assignment (for a.b in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a.foo in [42, 100500]
     b = a.foo
diff --git a/spec/truffle/parsing/fixtures/for/with_class_variable.yaml b/spec/truffle/parsing/fixtures/for/with_class_variable.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with class variable (for @@a in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for @@a in [42, 100500]
     b = @@a
diff --git a/spec/truffle/parsing/fixtures/for/with_constant.yaml b/spec/truffle/parsing/fixtures/for/with_constant.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with constant (for A in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for A in [42, 100500]
     b = A
diff --git a/spec/truffle/parsing/fixtures/for/with_fully_qualified_constant.yaml b/spec/truffle/parsing/fixtures/for/with_fully_qualified_constant.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with fully qualified constant (for A in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for A::B in [42, 100500]
     b = A::B
diff --git a/spec/truffle/parsing/fixtures/for/with_global_variable.yaml b/spec/truffle/parsing/fixtures/for/with_global_variable.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with global variable (for $a in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for $a in [42, 100500]
     b = $a
diff --git a/spec/truffle/parsing/fixtures/for/with_instance_variable.yaml b/spec/truffle/parsing/fixtures/for/with_instance_variable.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with instance variable (for @a in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for @a in [42, 100500]
     b = @a
diff --git a/spec/truffle/parsing/fixtures/for/with_local_variable.yaml b/spec/truffle/parsing/fixtures/for/with_local_variable.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with local variable (for a in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a in [42, 100500]
     b = a
diff --git a/spec/truffle/parsing/fixtures/for/with_reference_assignment.yaml b/spec/truffle/parsing/fixtures/for/with_reference_assignment.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with reference assignment (for a[b] in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a[:foo] in [42, 100500]
     b = a[:foo]
diff --git a/spec/truffle/parsing/fixtures/for/with_reference_assignment_and_multiple_explicit_arguments.yaml b/spec/truffle/parsing/fixtures/for/with_reference_assignment_and_multiple_explicit_arguments.yaml
@@ -1,6 +1,7 @@
 subject: "For operator"
 description: "with reference assignment and multiple explicit arguments (for a[b, c] in [])"
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode" # to dump local variable declarations in outer scope
+notes: >
+  Focus on RubyTopLevelRootNode (default behaviour) to dump local variable declarations in outer scope
 ruby: |
   for a[:foo, :bar] in [42, 100500]
     b = a[:foo, :bar]
diff --git a/spec/truffle/parsing/fixtures/local_variables/at_top_level/writing.yaml b/spec/truffle/parsing/fixtures/local_variables/at_top_level/writing.yaml
@@ -3,7 +3,6 @@ description: "at top level / assigning local variable leads to its declaration"
 notes: >
   Declaration is represented by a RubyTopLevelRootNode's attribute frameDescriptor:
     frameDescriptor = FrameDescriptor@...{#0:(self), #1:%$~_, #2:foo}
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"
 ruby: |
   foo = 42
 ast: |
diff --git a/spec/truffle/parsing/fixtures/method_calls/primitive.yaml b/spec/truffle/parsing/fixtures/method_calls/primitive.yaml
@@ -4,7 +4,6 @@ notes: >
   Primitive is replaced with a node implementing this method.
   
   Focus on the top node instead of a particular Primitive method implementation.
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"
 ruby: |
   # truffleruby_primitives: true
   
diff --git a/spec/truffle/parsing/fixtures/return/at_top_level_in_ensure_block.yaml b/spec/truffle/parsing/fixtures/return/at_top_level_in_ensure_block.yaml
@@ -2,7 +2,6 @@ subject: "Return"
 description: "return operator at the top level in ensure block"
 notes: >
   Is represented by LocalReturnNode node
-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"
 ruby: |
   begin
   ensure
diff --git a/spec/truffle/parsing/parsing_spec.rb b/spec/truffle/parsing/parsing_spec.rb
@@ -17,7 +17,7 @@
 #   description: "long description"
 #   notes: >
 #     "some additional details to explain what this case actually tests (optional)"
-#   focused_on_node: "a node class name"
+#   focused_on_node: "a node class name" (optional)
 #   main_script: true
 #   index: "integer, position of a node to focus on in AST when there are several such nodes and we need not the first one (optional)"
 #   ruby: |
@@ -69,7 +69,9 @@
   filenames.each do |filename|
     yaml = YAML.safe_load_file(filename)
     subject, description, focused_on_node, index, main_script, source_code, expected_ast = yaml.values_at("subject", "description", "focused_on_node", "index", "main_script", "ruby", "ast")
+
     description&.strip!
+    focused_on_node ||= "org.truffleruby.language.RubyTopLevelRootNode"
     source_code.strip!
     expected_ast.strip!
     index = index.to_i

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ notes: >`
`8`	`8`	`a`
`9`	`9`	`b`
`10`	`10`	```
`11`		`-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"`
`12`	`11`	`ruby: \|`
`13`	`12`	`b`
`14`	`13`	`BEGIN {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ notes: >`
`9`	`9`	`b`
`10`	`10`	`c`
`11`	`11`	```
`12`		`-focused_on_node: "org.truffleruby.language.RubyTopLevelRootNode"`
`13`	`12`	`ruby: \|`
`14`	`13`	`BEGIN {`
`15`	`14`	`a`