syntax_tree 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec83d4ecf5722316de95bb541d45d6213db7917ff6bb6e13fef397a65075bffa
-  data.tar.gz: 6171e1b60ab99eea54a761d5feec302554133b97fea8f95ed473a799e4005542
+  metadata.gz: 4d2e2bb8b41f091f6895ef5207081790c08ddaab126e8d5ddac324d9c13ea012
+  data.tar.gz: 9383e5f306415f9ad9e52c1cc58766fc629ae612644006a794229641a68cc7e7
 SHA512:
-  metadata.gz: 5266b33544de3aae02d4d200f7239ed388a1e1bb045e93ed46c1d14d1fb618ee8592238ce21040cc05708c7947ed564dd3477d757849da080758c9399d883309
-  data.tar.gz: 398685af92d3b506382feba646f5d24e4151b6dc3d25e19a018b8fdfe5e0d301a53c54a0684a584c083951267e9205be46ab36420d075536bbe1a08d12de7b3d
+  metadata.gz: 1da6c505691e7a07716c26c57e536f38cae5b4c13a370a9e95e75aeda01e460bb6c9d7e21bc2cc8c226cdba412d064d4a386a8b6418e729af2243913b86c1087
+  data.tar.gz: b72d5dc5173edbeba46427278297f6b5c90d755f5806fa154084faef72978895e1a84ebb2cb3a52401b231b1c73e07c3f90f7268c14d115dc4036cee0632c0c2

data/.github/workflows/auto-merge.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.4.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

data/.github/workflows/gh-pages.yml

@@ -5,8 +5,8 @@ on:
     branches:
       - main
 
-    # Allows you to run this workflow manually from the Actions tab
-    workflow_dispatch:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
@@ -27,7 +27,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -39,7 +39,7 @@ jobs:
           rdoc --main README.md --op _site --exclude={Gemfile,Rakefile,"coverage/*","vendor/*","bin/*","test/*","tmp/*"}
           cp -r doc _site/doc
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
 
   # Deployment job
   deploy:
@@ -51,4 +51,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

data/.github/workflows/main.yml

@@ -14,7 +14,8 @@ jobs:
         - '3.0'
         - '3.1'
         - '3.2'
-        - head
+        - '3.3'
+        - '3.4'
         - truffleruby-head
     name: CI
     runs-on: ubuntu-latest

data/.rubocop.yml

@@ -136,6 +136,9 @@ Style/KeywordParametersOrder:
 Style/MissingRespondToMissing:
   Enabled: false
 
+Style/MultipleComparison:
+  Enabled: false
+
 Style/MutableConstant:
   Enabled: false
 
@@ -157,6 +160,9 @@ Style/PerlBackrefs:
 Style/RedundantArrayConstructor:
   Enabled: false
 
+Style/RedundantParentheses:
+  Enabled: false
+
 Style/SafeNavigation:
   Enabled: false
 

data/CHANGELOG.md

@@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [6.3.0] - 2025-07-16
+
+### Added
+
+- The `--extension` command line option has been added to the CLI to specify what type of content is coming from stdin.
+- The `--config` command line option has been added to the CLI to specify the path to the configuration file.
+
+### Changed
+
+- Fix formatting of character literals when single quotes is enabled.
+- Pass ignore files option to the language server.
+- Hash keys should remain unchanged when there are any omitted values in the hash.
+- We now properly handle compilation errors in the parser.
+
 ## [6.2.0] - 2023-09-20
 
 ### Added

data/Gemfile

@@ -3,3 +3,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "fiddle"

data/Gemfile.lock

@@ -1,50 +1,53 @@
 PATH
   remote: .
   specs:
-    syntax_tree (6.2.0)
+    syntax_tree (6.3.0)
       prettier_print (>= 1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    base64 (0.1.1)
-    docile (1.4.0)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
-    minitest (5.20.0)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    ast (2.4.3)
+    docile (1.4.1)
+    fiddle (1.1.8)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    minitest (5.25.5)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
-    racc (1.7.1)
+    prism (1.4.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.6)
-    rubocop (1.56.3)
-      base64 (~> 0.1.1)
+    rake (13.3.0)
+    regexp_parser (2.10.0)
+    rubocop (1.78.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.45.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.4.2)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   arm64-darwin-21
@@ -55,6 +58,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  fiddle
   minitest
   rake
   rubocop

data/README.md

@@ -187,7 +187,7 @@ SyntaxTree::Binary[
 
 ### format
 
-This command will output the formatted version of each of the listed files. Importantly, it will not write that content back to the source files. It is meant to display the formatted version only.
+This command will output the formatted version of each of the listed files to stdout. Importantly, it will not write that content back to the source files – for that, you want [`write`](#write).
 
 ```sh
 stree format path/to/file.rb

data/lib/syntax_tree/cli.rb

@@ -63,12 +63,13 @@ module SyntaxTree
     class ScriptItem
       attr_reader :source
 
-      def initialize(source)
+      def initialize(source, extension)
         @source = source
+        @extension = extension
       end
 
       def handler
-        HANDLERS[".rb"]
+        HANDLERS[@extension]
       end
 
       def filepath
@@ -82,8 +83,12 @@ module SyntaxTree
 
     # An item of work that correspond to the content passed in via stdin.
     class STDINItem
+      def initialize(extension)
+        @extension = extension
+      end
+
       def handler
-        HANDLERS[".rb"]
+        HANDLERS[@extension]
       end
 
       def filepath
@@ -159,7 +164,7 @@ module SyntaxTree
       attr_reader :entries
 
       def initialize(options)
-        super(options)
+        super
         @entries = []
       end
 
@@ -450,14 +455,26 @@ module SyntaxTree
       #{Color.bold("stree write [--plugins=...] [--print-width=NUMBER] [-e SCRIPT] FILE")}
         Read, format, and write back the source of the given files
 
+      --ignore-files=...
+        A glob pattern to ignore files when processing. This can be specified
+        multiple times to ignore multiple patterns.
+
       --plugins=...
         A comma-separated list of plugins to load.
 
-      --print-width=NUMBER
+      --print-width=...
         The maximum line width to use when formatting.
 
-      -e SCRIPT
-        Parse an inline Ruby string.
+      -e ...
+        Parse an inline string.
+
+      --extension=...
+        A file extension matching the content passed in via STDIN or -e.
+        Defaults to '.rb'.
+
+      --config=...
+        Path to a configuration file. Defaults to .streerc in the current
+        working directory.
     HELP
 
     # This represents all of the options that can be passed to the CLI. It is
@@ -468,6 +485,7 @@ module SyntaxTree
                   :plugins,
                   :print_width,
                   :scripts,
+                  :extension,
                   :target_ruby_version
 
       def initialize
@@ -475,6 +493,7 @@ module SyntaxTree
         @plugins = []
         @print_width = DEFAULT_PRINT_WIDTH
         @scripts = []
+        @extension = ".rb"
         @target_ruby_version = DEFAULT_RUBY_VERSION
       end
 
@@ -523,6 +542,13 @@ module SyntaxTree
           # it and add it to the list of scripts to run.
           opts.on("-e SCRIPT") { |script| @scripts << script }
 
+          # If there is a extension specified, then parse it and use it for
+          # STDIN and scripts.
+          opts.on("--extension=EXTENSION") do |extension|
+            # Both ".rb" and "rb" are going to work
+            @extension = ".#{extension.delete_prefix(".")}"
+          end
+
           # If there is a target ruby version specified on the command line,
           # parse that out and use it when formatting.
           opts.on("--target-ruby-version=VERSION") do |version|
@@ -546,8 +572,16 @@ module SyntaxTree
 
       attr_reader :filepath
 
-      def initialize
-        @filepath = File.join(Dir.pwd, FILENAME)
+      def initialize(filepath = nil)
+        if filepath
+          if File.readable?(filepath)
+            @filepath = filepath
+          else
+            raise ArgumentError, "Invalid configuration file: #{filepath}"
+          end
+        else
+          @filepath = File.join(Dir.pwd, FILENAME)
+        end
       end
 
       def exists?
@@ -565,8 +599,24 @@ module SyntaxTree
       def run(argv)
         name, *arguments = argv
 
-        config_file = ConfigFile.new
-        arguments.unshift(*config_file.arguments)
+        # First, we need to check if there's a --config option specified
+        # so we can use the custom config file path.
+        config_filepath = nil
+        arguments.each_with_index do |arg, index|
+          if arg.start_with?("--config=")
+            config_filepath = arg.split("=", 2)[1]
+            arguments.delete_at(index)
+            break
+          elsif arg == "--config" && arguments[index + 1]
+            config_filepath = arguments[index + 1]
+            arguments.delete_at(index + 1)
+            arguments.delete_at(index)
+            break
+          end
+        end
+
+        config_file = ConfigFile.new(config_filepath)
+        arguments = config_file.arguments.concat(arguments)
 
         options = Options.new
         options.parse(arguments)
@@ -593,7 +643,10 @@ module SyntaxTree
           when "j", "json"
             Json.new(options)
           when "lsp"
-            LanguageServer.new(print_width: options.print_width).run
+            LanguageServer.new(
+              print_width: options.print_width,
+              ignore_files: options.ignore_files
+            ).run
             return 0
           when "m", "match"
             Match.new(options)
@@ -630,9 +683,11 @@ module SyntaxTree
               end
           end
 
-          options.scripts.each { |script| queue << ScriptItem.new(script) }
+          options.scripts.each do |script|
+            queue << ScriptItem.new(script, options.extension)
+          end
         else
-          queue << STDINItem.new
+          queue << STDINItem.new(options.extension)
         end
 
         # At the end, we're going to return whether or not this worker ever

data/lib/syntax_tree/language_server.rb

@@ -217,11 +217,13 @@ module SyntaxTree
     def initialize(
       input: $stdin,
       output: $stdout,
-      print_width: DEFAULT_PRINT_WIDTH
+      print_width: DEFAULT_PRINT_WIDTH,
+      ignore_files: []
     )
       @input = input.binmode
       @output = output.binmode
       @print_width = print_width
+      @ignore_files = ignore_files
     end
 
     # rubocop:disable Layout/LineLength
@@ -255,8 +257,12 @@ module SyntaxTree
           store.delete(request.dig(:params, :textDocument, :uri))
         when Request[method: "textDocument/formatting", id: :any, params: { textDocument: { uri: :any } }]
           uri = request.dig(:params, :textDocument, :uri)
+          filepath = uri.split("///").last
+          ignore = @ignore_files.any? do |glob|
+            File.fnmatch(glob, filepath)
+          end
           contents = store[uri]
-          write(id: request[:id], result: contents ? format(contents, uri.split(".").last) : nil)
+          write(id: request[:id], result: contents && !ignore ? format(contents, uri.split(".").last) : nil)
         when Request[method: "textDocument/inlayHint", id: :any, params: { textDocument: { uri: :any } }]
           uri = request.dig(:params, :textDocument, :uri)
           contents = store[uri]

data/lib/syntax_tree/node.rb

@@ -288,7 +288,7 @@ module SyntaxTree
         q.text(value)
       else
         q.text(q.quote)
-        q.text(value[1] == "\"" ? "\\\"" : value[1])
+        q.text(value[1] == q.quote ? "\\#{q.quote}" : value[1])
         q.text(q.quote)
       end
     end
@@ -1783,45 +1783,60 @@ module SyntaxTree
       end
     end
 
-    def self.for(container)
-      container.assocs.each do |assoc|
-        if assoc.is_a?(AssocSplat)
-          # Splat nodes do not impact the formatting choice.
-        elsif assoc.value.nil?
-          # If the value is nil, then it has been omitted. In this case we have
-          # to match the existing formatting because standardizing would
-          # potentially break the code. For example:
-          #
-          #     { first:, "second" => "value" }
-          #
-          return Identity.new
-        else
-          # Otherwise, we need to check the type of the key. If it's a label or
-          # dynamic symbol, we can use labels. If it's a symbol literal then it
-          # needs to match a certain pattern to be used as a label. If it's
-          # anything else, then we need to use hash rockets.
-          case assoc.key
-          when Label, DynaSymbol
-            # Here labels can be used.
-          when SymbolLiteral
-            # When attempting to convert a hash rocket into a hash label,
-            # you need to take care because only certain patterns are
-            # allowed. Ruby source says that they have to match keyword
-            # arguments to methods, but don't specify what that is. After
-            # some experimentation, it looks like it's:
-            value = assoc.key.value.value
-
-            if !value.match?(/^[_A-Za-z]/) || value.end_with?("=")
-              return Rockets.new
-            end
+    class << self
+      def for(container)
+        (assocs = container.assocs).each_with_index do |assoc, index|
+          if assoc.is_a?(AssocSplat)
+            # Splat nodes do not impact the formatting choice.
+          elsif assoc.value.nil?
+            # If the value is nil, then it has been omitted. In this case we
+            # have to match the existing formatting because standardizing would
+            # potentially break the code. For example:
+            #
+            #     { first:, "second" => "value" }
+            #
+            return Identity.new
           else
-            # If the value is anything else, we have to use hash rockets.
-            return Rockets.new
+            # Otherwise, we need to check the type of the key. If it's a label
+            # or dynamic symbol, we can use labels. If it's a symbol literal
+            # then it needs to match a certain pattern to be used as a label. If
+            # it's anything else, then we need to use hash rockets.
+            case assoc.key
+            when Label, DynaSymbol
+              # Here labels can be used.
+            when SymbolLiteral
+              # When attempting to convert a hash rocket into a hash label,
+              # you need to take care because only certain patterns are
+              # allowed. Ruby source says that they have to match keyword
+              # arguments to methods, but don't specify what that is. After
+              # some experimentation, it looks like it's:
+              value = assoc.key.value.value
+
+              if !value.match?(/^[_A-Za-z]/) || value.end_with?("=")
+                if omitted_value?(assocs[(index + 1)..])
+                  return Identity.new
+                else
+                  return Rockets.new
+                end
+              end
+            else
+              if omitted_value?(assocs[(index + 1)..])
+                return Identity.new
+              else
+                return Rockets.new
+              end
+            end
           end
         end
+
+        Labels.new
       end
 
-      Labels.new
+      private
+
+      def omitted_value?(assocs)
+        assocs.any? { |assoc| !assoc.is_a?(AssocSplat) && assoc.value.nil? }
+      end
     end
   end
 
@@ -11644,6 +11659,10 @@ module SyntaxTree
           elsif value.is_a?(Array) && (index = value.index(self))
             parent.public_send(key)[index] = replace
             break
+          elsif value.is_a?(Array) &&
+                (index = value.index { |(_k, v)| v == self })
+            parent.public_send(key)[index][1] = replace
+            break
           end
         end
     end

data/lib/syntax_tree/parser.rb

@@ -670,7 +670,11 @@ module SyntaxTree
 
       visit_methods do
         def visit_var_ref(node)
-          node.pin(stack[-2], pins.shift)
+          if node.start_char > pins.first.start_char
+            node.pin(stack[-2], pins.shift)
+          else
+            super
+          end
         end
       end
 
@@ -1732,13 +1736,13 @@ module SyntaxTree
     # :call-seq:
     #   on_field: (
     #     untyped parent,
-    #     (:"::" | Op | Period) operator
+    #     (:"::" | Op | Period | 73) operator
     #     (Const | Ident) name
     #   ) -> Field
     def on_field(parent, operator, name)
       Field.new(
         parent: parent,
-        operator: operator,
+        operator: operator == 73 ? :"::" : operator,
         name: name,
         location: parent.location.to(name.location)
       )
@@ -2867,6 +2871,7 @@ module SyntaxTree
     alias on_assign_error on_parse_error
     alias on_class_name_error on_parse_error
     alias on_param_error on_parse_error
+    alias compile_error on_parse_error
 
     # :call-seq:
     #   on_period: (String value) -> Period

data/lib/syntax_tree/pattern.rb

@@ -70,6 +70,7 @@ module SyntaxTree
           raise CompilationError, query
         end
 
+      raise CompilationError, query if program.nil?
       compile_node(program.statements.body.first.consequent.pattern)
     end
 

data/lib/syntax_tree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SyntaxTree
-  VERSION = "6.2.0"
+  VERSION = "6.3.0"
 end

data/lib/syntax_tree/yarv/assembler.rb

@@ -408,7 +408,7 @@ module SyntaxTree
       def find_local(iseq, operands)
         name_string, level_string = operands.split(/,\s*/)
         name = name_string.to_sym
-        level = level_string&.to_i || 0
+        level = level_string.to_i
 
         iseq.local_table.plain(name)
         iseq.local_table.find(name, level)
@@ -455,7 +455,7 @@ module SyntaxTree
             CallData::CALL_ARGS_SIMPLE
           end
 
-        YARV.calldata(message.to_sym, argc_value&.to_i || 0, flags)
+        YARV.calldata(message.to_sym, argc_value.to_i, flags)
       end
     end
   end

data/lib/syntax_tree/yarv/calldata.rb

@@ -41,7 +41,7 @@ module SyntaxTree
       end
 
       def flag?(mask)
-        (flags & mask) > 0
+        flags.anybits?(mask)
       end
 
       def to_h

data/lib/syntax_tree/yarv/decompiler.rb

@@ -45,7 +45,7 @@ module SyntaxTree
         when Integer
           Int(value.to_s)
         when Symbol
-          SymbolLiteral(Ident(value.to_s))
+          SymbolLiteral(Ident(value.name))
         end
       end
 
@@ -88,10 +88,10 @@ module SyntaxTree
 
             clause << HashLiteral(LBrace("{"), assocs)
           when GetGlobal
-            clause << VarRef(GVar(insn.name.to_s))
+            clause << VarRef(GVar(insn.name.name))
           when GetLocalWC0
             local = iseq.local_table.locals[insn.index]
-            clause << VarRef(Ident(local.name.to_s))
+            clause << VarRef(Ident(local.name.name))
           when Jump
             clause << Assign(block_label.field, node_for(insn.label.name))
             clause << Next(Args([]))
@@ -123,7 +123,7 @@ module SyntaxTree
             left, right = clause.pop(2)
             clause << Binary(left, :"!=", right)
           when OptSendWithoutBlock
-            method = insn.calldata.method.to_s
+            method = insn.calldata.method.name
             argc = insn.calldata.argc
 
             if insn.calldata.flag?(CallData::CALL_FCALL)
@@ -182,7 +182,7 @@ module SyntaxTree
           when PutSelf
             clause << VarRef(Kw("self"))
           when SetGlobal
-            target = GVar(insn.name.to_s)
+            target = GVar(insn.name.name)
             value = clause.pop
 
             clause << if value.is_a?(Binary) && VarRef(target) === value.left
@@ -256,7 +256,7 @@ module SyntaxTree
       def local_name(index, level)
         current = iseq
         level.times { current = current.parent_iseq }
-        current.local_table.locals[index].name.to_s
+        current.local_table.locals[index].name.name
       end
     end
   end

data/lib/syntax_tree/yarv/instruction_sequence.rb

@@ -252,19 +252,23 @@ module SyntaxTree
         dumped_options = argument_options.dup
         dumped_options[:opt].map!(&:name) if dumped_options[:opt]
 
+        metadata = {
+          arg_size: argument_size,
+          local_size: local_table.size,
+          stack_max: stack.maximum_size,
+          node_id: -1,
+          node_ids: [-1] * insns.length
+        }
+
+        metadata[:parser] = :prism if RUBY_VERSION >= "3.3"
+
         # Next, return the instruction sequence as an array.
         [
           MAGIC,
           versions[0],
           versions[1],
           1,
-          {
-            arg_size: argument_size,
-            local_size: local_table.size,
-            stack_max: stack.maximum_size,
-            node_id: -1,
-            node_ids: [-1] * insns.length
-          },
+          metadata,
           name,
           file,
           "<compiled>",
@@ -689,6 +693,10 @@ module SyntaxTree
         push(ConcatStrings.new(number))
       end
 
+      def concattoarray(object)
+        push(ConcatToArray.new(object))
+      end
+
       def defineclass(name, class_iseq, flags)
         push(DefineClass.new(name, class_iseq, flags))
       end
@@ -897,6 +905,14 @@ module SyntaxTree
         push(Pop.new)
       end
 
+      def pushtoarraykwsplat
+        push(PushToArrayKwSplat.new)
+      end
+
+      def putchilledstring(object)
+        push(PutChilledString.new(object))
+      end
+
       def putnil
         push(PutNil.new)
       end
@@ -1079,6 +1095,8 @@ module SyntaxTree
             iseq.concatarray
           when :concatstrings
             iseq.concatstrings(opnds[0])
+          when :concattoarray
+            iseq.concattoarray(opnds[0])
           when :defineclass
             iseq.defineclass(opnds[0], from(opnds[1], options, iseq), opnds[2])
           when :defined
@@ -1191,8 +1209,13 @@ module SyntaxTree
             iseq.newarray(opnds[0])
             iseq.send(YARV.calldata(:min))
           when :opt_newarray_send
+            mid = opnds[1]
+            if RUBY_VERSION >= "3.4"
+              mid = %i[max min hash pack pack_buffer include?][mid - 1]
+            end
+
             iseq.newarray(opnds[0])
-            iseq.send(CallData.new(opnds[1]))
+            iseq.send(CallData.new(mid))
           when :opt_neq
             iseq.push(
               OptNEq.new(CallData.from(opnds[0]), CallData.from(opnds[1]))
@@ -1207,6 +1230,10 @@ module SyntaxTree
             iseq.send(YARV.calldata(:-@))
           when :pop
             iseq.pop
+          when :pushtoarraykwsplat
+            iseq.pushtoarraykwsplat
+          when :putchilledstring
+            iseq.putchilledstring(opnds[0])
           when :putnil
             iseq.putnil
           when :putobject

data/lib/syntax_tree/yarv/instructions.rb

@@ -757,6 +757,59 @@ module SyntaxTree
       end
     end
 
+    # ### Summary
+    #
+    # `concattoarray` pops a single value off the stack and attempts to concat
+    # it to the Array on top of the stack. If the value is not an Array, it
+    # will be coerced into one.
+    #
+    # ### Usage
+    #
+    # ~~~ruby
+    # [1, *2]
+    # ~~~
+    #
+    class ConcatToArray < Instruction
+      attr_reader :object
+
+      def initialize(object)
+        @object = object
+      end
+
+      def disasm(fmt)
+        fmt.instruction("concattoarray", [fmt.object(object)])
+      end
+
+      def to_a(_iseq)
+        [:concattoarray, object]
+      end
+
+      def deconstruct_keys(_keys)
+        { object: object }
+      end
+
+      def ==(other)
+        other.is_a?(ConcatToArray) && other.object == object
+      end
+
+      def length
+        2
+      end
+
+      def pops
+        1
+      end
+
+      def pushes
+        1
+      end
+
+      def call(vm)
+        array, value = vm.pop(2)
+        vm.push(array.concat(Array(value)))
+      end
+    end
+
     # ### Summary
     #
     # `defineclass` defines a class. First it pops the superclass off the
@@ -4472,6 +4525,52 @@ module SyntaxTree
       end
     end
 
+    # ### Summary
+    #
+    # `pushtoarraykwsplat` is used to append a hash literal that is being
+    # splatted onto an array.
+    #
+    # ### Usage
+    #
+    # ~~~ruby
+    # ["string", **{ foo: "bar" }]
+    # ~~~
+    #
+    class PushToArrayKwSplat < Instruction
+      def disasm(fmt)
+        fmt.instruction("pushtoarraykwsplat")
+      end
+
+      def to_a(_iseq)
+        [:pushtoarraykwsplat]
+      end
+
+      def deconstruct_keys(_keys)
+        {}
+      end
+
+      def ==(other)
+        other.is_a?(PushToArrayKwSplat)
+      end
+
+      def length
+        2
+      end
+
+      def pops
+        2
+      end
+
+      def pushes
+        1
+      end
+
+      def call(vm)
+        array, hash = vm.pop(2)
+        vm.push(array << hash)
+      end
+    end
+
     # ### Summary
     #
     # `putnil` pushes a global nil object onto the stack.
@@ -4759,6 +4858,54 @@ module SyntaxTree
       end
     end
 
+    # ### Summary
+    #
+    # `putchilledstring` pushes an unfrozen string literal onto the stack that
+    # acts like a frozen string. This is a migration path to frozen string
+    # literals as the default in the future.
+    #
+    # ### Usage
+    #
+    # ~~~ruby
+    # "foo"
+    # ~~~
+    #
+    class PutChilledString < Instruction
+      attr_reader :object
+
+      def initialize(object)
+        @object = object
+      end
+
+      def disasm(fmt)
+        fmt.instruction("putchilledstring", [fmt.object(object)])
+      end
+
+      def to_a(_iseq)
+        [:putchilledstring, object]
+      end
+
+      def deconstruct_keys(_keys)
+        { object: object }
+      end
+
+      def ==(other)
+        other.is_a?(PutChilledString) && other.object == object
+      end
+
+      def length
+        2
+      end
+
+      def pushes
+        1
+      end
+
+      def call(vm)
+        vm.push(object.dup)
+      end
+    end
+
     # ### Summary
     #
     # `putstring` pushes an unfrozen string literal onto the stack.

data/tasks/whitequark.rake

@@ -43,8 +43,13 @@ module ParseHelper
     # that we do not support.
     return if (versions & %w[3.1 3.2]).empty?
 
-    entry = caller.find { _1.include?("test_parser.rb") }
-    _, lineno, name = *entry.match(/(\d+):in `(.+)'/)
+    entry =
+      caller.find do |call|
+        call.include?("test_parser.rb") && call.match?(%r{(?<!/)test_})
+      end
+
+    _, lineno, name =
+      *entry.match(/(\d+):in [`'](?:block in )?(?:TestParser#)?(.+)'/)
 
     COLLECTED["#{name}:#{lineno}"] << code
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Kevin Newton
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2025-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettier_print
@@ -94,7 +93,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - kddnewton@gmail.com
 executables:
@@ -110,7 +108,6 @@ files:
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -184,7 +181,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A parser based on ripper
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-3.2.0