rbs 3.10.0 → 4.0.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9e4107a0a29610713b34bf84a13fd4e348257e56e865a40358e61312f158fe0
-  data.tar.gz: d9776ace0cb6e68ba97cd4bcdd2ade5e41ba909dbf562914053d64afad118d1c
+  metadata.gz: d0f208999624a32e97044b8427ec19fa233e21a530a6383efe4ea5b9333ab1ce
+  data.tar.gz: d03954e5a4fa29a428085183a90a86b481849b0994e0d454cccca395412a31f0
 SHA512:
-  metadata.gz: 8805e28d9b760da1aa847fb8fa5ed26f26a2dc7309a37d861a178a511bfac68181955324803b42f64aada55cdd8806522c682b0980457aded2279f6493611eb0
-  data.tar.gz: 4ffa069bffbcaa8e869d30f50dbe42344f624691acea5e9aa1ff8c665f4749c32c8450d5b2dab0e6ed3fc94e4bc67f8c82a833ac5cb167f35c4cb17eaeb59d45
+  metadata.gz: 56da6e8a6a9336ae251d766b85c0d8ab62b42a8df1f1c828cd8f0c0ce898ac639a024c5b819e2e6a85733fa1d140ca5b06fc61de62b36fdb21074d34710bb003
+  data.tar.gz: de3ac4191be3ec60ab8bd25c4653cc2663effc2004c9d5e33d9fbb6eabace99fa883dfd5201d92c7f574d8730a74116867a853cb525343a639aeef6d0dd6d041

data/.github/workflows/comments.yml

@@ -10,13 +10,13 @@ on:
 jobs:
   comments:
     runs-on: "ubuntu-latest"
-    env:
-      RUBY_COMMIT: v4.0.0-preview3
+    # env:
+    #   RUBY_COMMIT: 1b0c46daed9186b82ab4fef1a4ab225afe582ee6
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "4.0.0-preview3"
+          ruby-version: "3.4.1"
           bundler: none
       - name: Install dependencies
         run: |

data/.github/workflows/ruby.yml

@@ -13,24 +13,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.2', '3.3', '3.4', '4.0.0-preview3', head]
+        ruby: ['3.1', '3.2', '3.3', '3.4', head]
         rubyopt: [""]
         job:
           - test
         include:
           - ruby: head
             job: stdlib_test rubocop
-          - ruby: "4.0.0-preview3"
+          - ruby: "3.4"
             job: stdlib_test
-          - ruby: "4.0.0-preview3"
+          - ruby: "3.4"
             job: test
             rubyopt: "--enable-frozen-string-literal"
-          - ruby: "4.0.0-preview3"
+          - ruby: "3.4"
             job: stdlib_test
             rubyopt: "--enable-frozen-string-literal"
-          - ruby: "4.0.0-preview3"
+          - ruby: "3.4"
+            job: lexer templates compile confirm_lexer confirm_templates
+          - ruby: "3.4"
             job: rubocop validate test_doc build test_generate_stdlib raap
-          - ruby: "4.0.0-preview3"
+          - ruby: "3.4"
             job: typecheck_test
     env:
       RANDOMIZE_STDLIB_TEST_ORDER: "true"
@@ -42,10 +44,23 @@ jobs:
           bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
+      - name: Set up permission
+        run: chmod -R o-w /opt/hostedtoolcache/Ruby
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y libdb-dev curl autoconf automake m4 libtool python3
+      - name: Install Re2c
+        if: ${{ contains(matrix.job, 'lexer') }}
+        run: |
+          cd /tmp
+          curl -L https://github.com/skvadrik/re2c/archive/refs/tags/3.1.tar.gz > re2c-3.1.tar.gz
+          tar xf re2c-3.1.tar.gz
+          cd re2c-3.1
+          autoreconf -i -W all
+          ./configure
+          make
+          sudo make install
       - name: Update rubygems & bundler
         run: |
           ruby -v
@@ -68,13 +83,15 @@ jobs:
   valgrind:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.4"
           bundler-cache: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
+      - name: Set up permission
+        run: chmod -R o-w /opt/hostedtoolcache/Ruby
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -89,31 +106,3 @@ jobs:
       - run: bundle exec rake test:valgrind
         env:
           RUBY_FREE_AT_EXIT: 1
-  C99_compile:
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ['4.0.0-preview3', head]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install dependencies
-        run: |
-          brew install ruby-build
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler: none
-      - name: Set working directory as safe
-        run: git config --global --add safe.directory $(pwd)
-      - name: Update rubygems & bundler
-        run: |
-          ruby -v
-          gem update --system
-      - name: clang version
-        run: clang --version
-      - name: bin/setup
-        run: |
-          bin/setup
-      - run: bundle exec rake clean compile_c99
-

data/.github/workflows/typecheck.yml

@@ -16,10 +16,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
+          ruby-version: "3.3"
           bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
+      - name: Set up permission
+        run: chmod -R o-w /opt/hostedtoolcache/Ruby
       - name: Install dependencies
         run: |
           sudo apt-get update

data/.github/workflows/windows.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.4', ucrt, mswin]
+        ruby: ['3.2', '3.3', ucrt, mswin]
     steps:
       - uses: actions/checkout@v4
       - name: load ruby
@@ -33,7 +33,7 @@ jobs:
 
             res = URI.parse("https://stdgems.org/bundled_gems.json").read
             bundled_gems = JSON.parse(res)["gems"].map{_1["gem"]}
-            system "gem uninstall --force #{bundled_gems.join(" ")}", exception: true
+            system "gem uninstall #{bundled_gems.join(" ")} --force", exception: true
           '
       - name: bundle install
         run: |

data/.gitignore

@@ -21,7 +21,3 @@ lib/**/*.dll
 doc/
 
 **/*.gem
-
-# For clangd's editor integration
-ext/rbs_extension/compile_commands.json
-ext/rbs_extension/.cache

data/CHANGELOG.md

@@ -1,93 +1,5 @@
 # CHANGELOG
 
-## 3.10.0 (2025-12-23)
-
-RBS 3.10.0 ships with a pure C parser implementation, signature updates for Ruby 4.0, and various bug fixes.
-
-### Pure C parser implementation
-
-The new parser implementation was announced at [RubyKaigi 2025](https://rubykaigi.org/2025/presentations/amomchilov.html) and is finally shipped as a RubyGem!
-
-The new parser is faster than the one in 3.9 and is portable — it is independent of the Ruby runtime and is used to implement Sorbet’s RBS support.
-
-### Type definition of bundled gems
-
-The type definitions of `cgi` have been moved to [gem_rbs_collection](https://github.com/ruby/gem_rbs_collection/tree/main/gems/cgi), as it has been migrated to a bundled gem in Ruby 4.0
-
-`cgi-escape` has been added to `stdlib`. You may need to declare a dependency on `cgi-escape` in your `manifest.yaml`, add `-r cgi-escape` to your command line, or update your type checker configuration.
-
-```yaml
-dependencies:
-  - name: cgi-escape
-```
-
-The type definitions for `pathname` have also been moved from `stdlib` to `core`, as it is now implemented as part of the core library.
-
-### Pull Requests
-
-* [Backport] Support rdoc v7 ([#2770](https://github.com/ruby/rbs/pull/2770))
-* [Backport] Check tuple type length ([#2766](https://github.com/ruby/rbs/pull/2766))
-* Backport update to 4.0.0-preview3 ([#2768](https://github.com/ruby/rbs/pull/2768))
-* [Backport] Remove test code for bundled gems ([#2762](https://github.com/ruby/rbs/pull/2762))
-* Merge pull request #2761 from ruby/update-minitest ([#2763](https://github.com/ruby/rbs/pull/2763))
-* [Backport] Support BigDecimal v4 ([#2759](https://github.com/ruby/rbs/pull/2759))
-* Parser/lexer backports ([#2756](https://github.com/ruby/rbs/pull/2756))
-* Merge pull request #2753 from ruby/delete-printf ([#2754](https://github.com/ruby/rbs/pull/2754))
-* Backports ([#2751](https://github.com/ruby/rbs/pull/2751))
-* Merge pull request #2728 from ruby/cgi ([#2747](https://github.com/ruby/rbs/pull/2747))
-* Merge pull request #2729 from ruby/rbs-assert ([#2748](https://github.com/ruby/rbs/pull/2748))
-* Merge pull request #2749 from ruby/fix-test ([#2750](https://github.com/ruby/rbs/pull/2750))
-* Backport RBS file updates ([#2742](https://github.com/ruby/rbs/pull/2742))
-* Backport JSON PRs ([#2740](https://github.com/ruby/rbs/pull/2740))
-* Merge pull request #2718 from ruby/ruby-4 ([#2741](https://github.com/ruby/rbs/pull/2741))
-* [Backport] Move Pathname to core from stdlib ([#2730](https://github.com/ruby/rbs/pull/2730))
-* Backport rdoc 6.16 ([#2722](https://github.com/ruby/rbs/pull/2722))
-* Backport rdoc support ([#2719](https://github.com/ruby/rbs/pull/2719))
-* Backport "Remove sig for IO#{ready?,nread}" ([#2720](https://github.com/ruby/rbs/pull/2720))
-* Backport more pure C parsers ([#2679](https://github.com/ruby/rbs/pull/2679))
-* Backport module name normalization ([#2673](https://github.com/ruby/rbs/pull/2673))
-* Backport pure-C parser ([#2671](https://github.com/ruby/rbs/pull/2671))
-* Fix test failure ([#2672](https://github.com/ruby/rbs/pull/2672))
-
-## 3.9.5 (2025-09-08)
-
-### Signature updates
-
-* Merge pull request #2655 from ruby/silence-string-deprecation ([#2656](https://github.com/ruby/rbs/pull/2656))
-
-### Miscellaneous
-
-* Allows the use of a path list as RBS_SKIP_TESTS ([#2641](https://github.com/ruby/rbs/pull/2641))
-* Suppress to GCC warning with multi-line comment ([#2646](https://github.com/ruby/rbs/pull/2646))
-* Backport to 3.9 ([#2487](https://github.com/ruby/rbs/pull/2487))
-* Use erb instead of set for load path testing ([#2468](https://github.com/ruby/rbs/pull/2468))
-
-## 3.9.4 (2025-05-15)
-
-### Miscellaneous
-
-* Backport test/CI fixes to 3.9 ([#2487](https://github.com/ruby/rbs/pull/2487))
-* Use erb instead of set for load path testing ([#2468](https://github.com/ruby/rbs/pull/2468))
-
-## 3.9.3 (2025-05-09)
-
-### Miscellaneous
-
-* Use erb instead of set for load path testing ([#2468](https://github.com/ruby/rbs/pull/2468))
-
-## 3.9.2 (2025-03-31)
-
-### Library changes
-
-* Change `{}` to `{ 0 }` ([#2354](https://github.com/ruby/rbs/pull/2354))
-
-## 3.9.1 (2025-03-24)
-
-### Miscellaneous
-
-* `did_you_mean` is a default gem ([#2348](https://github.com/ruby/rbs/pull/2348))
-* Skip loading ruby_memcheck ([#2347](https://github.com/ruby/rbs/pull/2347))
-
 ## 3.9.0 (2025-03-18)
 
 ### Miscellaneous

data/README.md

@@ -141,7 +141,7 @@ require "rbs"
 loader = RBS::EnvironmentLoader.new()
 
 # loader.add(path: Pathname("sig"))   # Load .rbs files from `sig` directory
-# loader.add(library: "logger")       # Load logger library
+# loader.add(library: "pathname")     # Load pathname library
 
 environment = RBS::Environment.from_loader(loader).resolve_type_names
 
@@ -198,43 +198,6 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-### C Code Formatting
-
-This project uses `clang-format` to enforce consistent formatting of C code with a `.clang-format` configuration in the root directory.
-
-#### Setup
-
-First, install clang-format:
-
-```bash
-# macOS
-brew install clang-format
-
-# Ubuntu/Debian
-sudo apt-get install clang-format
-
-# Windows
-choco install llvm
-```
-
-#### Usage
-
-Format all C source files:
-
-```bash
-rake format:c
-```
-
-Check formatting without making changes:
-
-```bash
-rake format:c_check
-```
-
-#### Editor Integration
-
-For VS Code users, install the "clangd" extension which will automatically use the project's `.clang-format` file.
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/ruby/rbs.

data/Rakefile

@@ -11,26 +11,12 @@ bin = File.join(__dir__, "bin")
 
 Rake::ExtensionTask.new("rbs_extension")
 
-compile_task = Rake::Task[:compile]
-
-task :setup_extconf_compile_commands_json do
-  ENV["COMPILE_COMMANDS_JSON"] = "1"
-end
-
-compile_task.prerequisites.unshift(:setup_extconf_compile_commands_json)
-
 test_config = lambda do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"].reject do |path|
     path =~ %r{test/stdlib/}
   end
-  if defined?(RubyMemcheck)
-    if t.is_a?(RubyMemcheck::TestTask)
-      t.verbose = true
-      t.options = '-v'
-    end
-  end
 end
 
 Rake::TestTask.new(test: :compile, &test_config)
@@ -51,7 +37,6 @@ multitask :default => [:test, :stdlib_test, :typecheck_test, :rubocop, :validate
 
 task :lexer do
   sh "re2c -W --no-generation-date -o src/lexer.c src/lexer.re"
-  sh "clang-format -i -style=file src/lexer.c"
 end
 
 task :confirm_lexer => :lexer do
@@ -64,84 +49,6 @@ task :confirm_templates => :templates do
   sh "git diff --exit-code -- include src"
 end
 
-# Task to format C code using clang-format
-namespace :format do
-  dirs = ["src", "ext", "include"]
-
-  # Find all C source and header files
-  files = `find #{dirs.join(" ")} -type f \\( -name "*.c" -o -name "*.h" \\)`.split("\n")
-
-  desc "Format C source files using clang-format"
-  task :c do
-    puts "Formatting C files..."
-
-    # Check if clang-format is installed
-    unless system("which clang-format > /dev/null 2>&1")
-      abort "Error: clang-format not found. Please install clang-format first."
-    end
-
-    if files.empty?
-      puts "No C files found to format"
-      next
-    end
-
-    puts "Found #{files.length} files to format (excluding generated files)"
-
-    exit_status = 0
-    files.each do |file|
-      puts "Formatting #{file}"
-      unless system("clang-format -i -style=file #{file}")
-        puts "❌ Error formatting #{file}"
-        exit_status = 1
-      end
-    end
-
-    exit exit_status unless exit_status == 0
-    puts "✅ All files formatted successfully"
-  end
-
-  desc "Check if C source files are properly formatted"
-  task :c_check do
-    puts "Checking C file formatting..."
-
-    # Check if clang-format is installed
-    unless system("which clang-format > /dev/null 2>&1")
-      abort "Error: clang-format not found. Please install clang-format first."
-    end
-
-    if files.empty?
-      puts "No C files found to check"
-      next
-    end
-
-    puts "Found #{files.length} files to check (excluding generated files)"
-
-    needs_format = false
-    files.each do |file|
-      formatted = `clang-format -style=file #{file}`
-      original = File.read(file)
-
-      if formatted != original
-        puts "❌ #{file} needs formatting"
-        puts "Diff:"
-        # Save formatted version to temp file and run diff
-        temp_file = "#{file}.formatted"
-        File.write(temp_file, formatted)
-        system("diff -u #{file} #{temp_file}")
-        File.unlink(temp_file)
-        needs_format = true
-      end
-    end
-
-    if needs_format
-      warn "Some files need formatting. Run 'rake format:c' to format them."
-      exit 1
-    else
-      puts "✅ All files are properly formatted"
-    end
-  end
-end
-
 rule ".c" => ".re" do |t|
   puts "⚠️⚠️⚠️ #{t.name} is older than #{t.source}. You may need to run `rake lexer` ⚠️⚠️⚠️"
 end
@@ -171,9 +78,6 @@ task :templates do
 
   sh "#{ruby} templates/template.rb include/rbs/ast.h"
   sh "#{ruby} templates/template.rb src/ast.c"
-
-  # Format the generated files
-  Rake::Task["format:c"].invoke
 end
 
 task :compile => "ext/rbs_extension/class_constants.h"
@@ -212,14 +116,7 @@ task :validate => :compile do
   end
 
   libs.each do |lib|
-    args = ["-r", lib]
-
-    if lib == "rbs"
-      args << "-r"
-      args << "prism"
-    end
-
-    sh "#{ruby} #{rbs} #{args.join(' ')} validate --exit-error-on-syntax-error"
+    sh "#{ruby} #{rbs} -r #{lib} validate --exit-error-on-syntax-error"
   end
 end
 
@@ -231,7 +128,7 @@ end
 
 task :stdlib_test => :compile do
   test_files = FileList["test/stdlib/**/*_test.rb"].reject do |path|
-    path =~ %r{Ractor} || path =~ %r{Encoding} || path =~ %r{CGI-escape_test}
+    path =~ %r{Ractor} || path =~ %r{Encoding} || path =~ %r{CGI_test}
   end
 
   if ENV["RANDOMIZE_STDLIB_TEST_ORDER"] == "true"
@@ -240,24 +137,27 @@ task :stdlib_test => :compile do
 
   sh "#{ruby} -Ilib #{bin}/test_runner.rb #{test_files.join(' ')}"
   # TODO: Ractor tests need to be run in a separate process
-  sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/CGI-escape_test.rb"
+  sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/CGI_test.rb"
   sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Ractor_test.rb"
   sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/Encoding_test.rb"
 end
 
 task :typecheck_test => :compile do
-  Bundler.with_unbundled_env do
-    FileList["test/typecheck/*"].each do |test|
-      Dir.chdir(test) do
-        expectations = File.join(test, "steep_expectations.yml")
-        if File.exist?(expectations)
-          sh "#{__dir__}/bin/steep check --with_expectations"
-        else
-          sh "#{__dir__}/bin/steep check"
-        end
-      end
-    end
-  end
+  puts
+  puts
+  puts "⛔️⛔️⛔️⛔️⛔️⛔️ Skipping type check test because RBS is incompatible with Steep (#{__FILE__}:#{__LINE__})"
+  puts
+  puts
+  # FileList["test/typecheck/*"].each do |test|
+  #   Dir.chdir(test) do
+  #     expectations = File.join(test, "steep_expectations.yml")
+  #     if File.exist?(expectations)
+  #       sh "steep check --with_expectations"
+  #     else
+  #       sh "steep check"
+  #     end
+  #   end
+  # end
 end
 
 task :raap => :compile do
@@ -335,7 +235,7 @@ namespace :generate do
           class <%= target %>SingletonTest < Test::Unit::TestCase
             include TestHelper
 
-            # library "logger", "securerandom"     # Declare library signatures to load
+            # library "pathname", "securerandom"     # Declare library signatures to load
             testing "singleton(::<%= target %>)"
 
           <%- class_methods.each do |method_name, definition| -%>
@@ -354,7 +254,7 @@ namespace :generate do
           class <%= target %>Test < Test::Unit::TestCase
             include TestHelper
 
-            # library "logger", "securerandom"     # Declare library signatures to load
+            # library "pathname", "securerandom"     # Declare library signatures to load
             testing "::<%= target %>"
 
           <%- instance_methods.each do |method_name, definition| -%>
@@ -537,25 +437,3 @@ task :changelog do
     puts "  (🤑 There is no *unreleased* pull request associated to the milestone.)"
   end
 end
-
-desc "Compile extension without C23 extensions"
-task :compile_c99 do
-  ENV["TEST_NO_C23"] = "true"
-  Rake::Task[:"compile"].invoke
-ensure
-  ENV.delete("TEST_NO_C23")
-end
-
-task :prepare_bench do
-  ENV.delete("DEBUG")
-  Rake::Task[:"clobber"].invoke
-  Rake::Task[:"templates"].invoke
-  Rake::Task[:"compile"].invoke
-end
-
-task :prepare_profiling do
-  ENV["DEBUG"] = "1"
-  Rake::Task[:"clobber"].invoke
-  Rake::Task[:"templates"].invoke
-  Rake::Task[:"compile"].invoke
-end

data/Steepfile

@@ -9,6 +9,7 @@ target :lib do
   )
 
   library "pathname", "json", "logger", "monitor", "tsort", "uri", 'dbm', 'pstore', 'singleton', 'shellwords', 'fileutils', 'find', 'digest', 'prettyprint', 'yaml', "psych", "securerandom"
+  library "prism"
   signature "stdlib/strscan/0/"
   signature "stdlib/optparse/0/"
   signature "stdlib/rdoc/0/"

data/config.yml

@@ -345,7 +345,7 @@ nodes:
   - name: RBS::Types::Bases::Top
   - name: RBS::Types::Bases::Void
   - name: RBS::Types::Block
-    expose_location: true
+    expose_location: false
     fields:
       - name: type
         c_type: rbs_node
@@ -443,3 +443,45 @@ nodes:
     fields:
       - name: name
         c_type: rbs_ast_symbol
+  - name: RBS::AST::Ruby::Annotations::NodeTypeAssertion
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: type
+        c_type: rbs_node
+  - name: RBS::AST::Ruby::Annotations::ColonMethodTypeAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: annotations
+        c_type: rbs_node_list
+      - name: method_type
+        c_type: rbs_node
+  - name: RBS::AST::Ruby::Annotations::MethodTypesAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: overloads
+        c_type: rbs_node_list
+      - name: vertical_bar_locations
+        c_type: rbs_location_list
+  - name: RBS::AST::Ruby::Annotations::SkipAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: skip_location
+        c_type: rbs_location
+      - name: comment_location
+        c_type: rbs_location
+  - name: RBS::AST::Ruby::Annotations::ReturnTypeAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: return_location
+        c_type: rbs_location
+      - name: colon_location
+        c_type: rbs_location
+      - name: return_type
+        c_type: rbs_node
+      - name: comment_location
+        c_type: rbs_location