rbs 4.0.0.dev.3 → 4.0.0.dev.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5b2060cc5ad02487c340bb1929f2bb37208e0222d949cc19d7f9dc4ed5898f
-  data.tar.gz: 4e3e4af4a4e4b107794984e04fd73b34812364f8526b05c2f38fcf30ec05213c
+  metadata.gz: 803c356414679e6271a26f25094f449ae5cbf684047ea6d5ea3f973382b34a7e
+  data.tar.gz: 5ee41851402e87dc52910143a0babfed109abd6518b89083d39ee6b88e266078
 SHA512:
-  metadata.gz: eb626cd71636d7f5a7cdd74e3382aa1d19f1f2c13a7c6ff794ed4f2388acc36a87ae54ecc3d722c33ecb7eeade494d2394c8151e1af88c06973a659f4ce509cf
-  data.tar.gz: 2dc1084d7a986fab97e206e4fda8231bad922faa3bf3b9caa201ed67c2ac7a83e0215db3a1ad97f9c41ed7d34f6e62db44204586ccb8dbfd70e067082c65642f
+  metadata.gz: e6feb377cf58019cdadc53a5fad61a365d87c197f871d889d70efd4427db9ba6f433648c9c7684eba85f0f74a15f59a8cb0aef91cdfe5478b8d685547545a787
+  data.tar.gz: 7e5f1555240f1e2f96696aa73b11b12643c020c4ae705d20d84524814c1c5da7245fac88a10636f6a3bcf0488343d3a82b2dd8e7623447d0e9ef8c1618e77b84

data/.github/dependabot.yml

@@ -1,20 +1,20 @@
 version: 2
 updates:
-  - package-ecosystem: bundler
-    directory: "/"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 3
-    allow:
-      - dependency-type: all
+  # - package-ecosystem: bundler
+  #   directory: "/"
+  #   schedule:
+  #     interval: daily
+  #   open-pull-requests-limit: 3
+  #   allow:
+  #     - dependency-type: all
 
-  - package-ecosystem: bundler
-    directory: "/steep"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 3
-    allow:
-      - dependency-type: all
+  # - package-ecosystem: bundler
+  #   directory: "/steep"
+  #   schedule:
+  #     interval: daily
+  #   open-pull-requests-limit: 3
+  #   allow:
+  #     - dependency-type: all
 
   - package-ecosystem: 'github-actions'
     directory: '/'

data/.github/workflows/bundle-update.yml

@@ -0,0 +1,60 @@
+name: Scheduled Bundle Update PR
+
+on:
+  schedule:
+    - cron: '0 0 * * 2'
+  workflow_dispatch:
+
+jobs:
+  bundle-update:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '4.0'
+
+      - name: Set up git
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Switch branch
+        run: |
+          git switch -c bundle-update-$(date +'%Y%m%d')-$(uuidgen | cut -c1-8)
+
+      - name: Install bundler
+        run: gem install bundler
+
+      - name: Run bundle update
+        run: |
+          bundle lock --update
+          bundle lock --update --gemfile=steep/Gemfile
+          git add Gemfile.lock steep/Gemfile.lock
+
+          if git diff --cached --exit-code; then
+            echo "No changes to commit, exiting."
+            exit 0
+          fi
+
+          git commit -m "bundle update"
+          echo "has_update=true" >> $GITHUB_ENV
+
+      - name: Push branch
+        if: env.has_update == 'true'
+        run: git push origin HEAD
+
+      - name: Create Pull Request
+        if: env.has_update == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.DEPENDABOT_MERGE_GH_TOKEN }}
+        run: |
+          gh pr create \
+            --title "bundle update ($(date +'%Y-%m-%d'))" \
+            --body "Automated weekly bundle update" \
+            --head "$(git rev-parse --abbrev-ref HEAD)" \
+            --base "${{ github.event.repository.default_branch }}"

data/.github/workflows/c-check.yml

@@ -9,10 +9,10 @@ jobs:
   format-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
+          ruby-version: "4.0"
           bundler-cache: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
@@ -23,19 +23,22 @@ jobs:
       - name: Install clang-format from LLVM
         run: |
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
+          sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main"
           sudo apt-get update
-          sudo apt-get install -y clang-format
+          sudo apt-get install -y clang-format-20
+          sudo ln -sf /usr/bin/clang-format-20 /usr/local/bin/clang-format
           clang-format --version
+      - name: Count processors
+        run: nproc
       - name: Install Re2c
         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
+          curl -L https://github.com/skvadrik/re2c/archive/refs/tags/4.3.tar.gz > re2c-4.3.tar.gz
+          tar xf re2c-4.3.tar.gz
+          cd re2c-4.3
           autoreconf -i -W all
           ./configure
-          make
+          make -j"$(nproc)" -l"$(nproc)"
           sudo make install
       - name: Update rubygems & bundler
         run: |

data/.github/workflows/comments.yml

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

data/.github/workflows/dependabot.yml

@@ -17,7 +17,7 @@ jobs:
         uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b # v2.4.0
         id: metadata
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Abort if blocker files are changed

data/.github/workflows/ruby.yml

@@ -13,29 +13,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.1', '3.2', '3.3', '3.4', head]
+        ruby: ['3.2', '3.3', '3.4', '4.0', head]
         rubyopt: [""]
         job:
           - test
         include:
           - ruby: head
             job: stdlib_test rubocop
-          - ruby: "3.4"
+          - ruby: "4.0"
             job: stdlib_test
-          - ruby: "3.4"
+          - ruby: "4.0"
             job: test
             rubyopt: "--enable-frozen-string-literal"
-          - ruby: "3.4"
+          - ruby: "4.0"
             job: stdlib_test
             rubyopt: "--enable-frozen-string-literal"
-          - ruby: "3.4"
+          - ruby: "4.0"
             job: rubocop validate test_doc build test_generate_stdlib raap
-          - ruby: "3.4"
+          - ruby: "4.0"
             job: typecheck_test
     env:
       RANDOMIZE_STDLIB_TEST_ORDER: "true"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -55,6 +55,10 @@ jobs:
           echo "NO_MINITEST=true" >> $GITHUB_ENV
           bundle config set --local without 'minitest'
         if: ${{ contains(matrix.ruby, 'head') }}
+      - name: bundle config set force_ruby_platform true if head
+        if: ${{ contains(matrix.ruby, 'head') }}
+        run: |
+          bundle config set force_ruby_platform true
       - name: Skip installing type checkers
         if: ${{ ! contains(matrix.job, 'typecheck_test') }}
         run: |
@@ -65,38 +69,14 @@ jobs:
       - name: Run test
         run: |
           bundle exec rake ${{ matrix.job }}
-  valgrind:
-    runs-on: ubuntu-latest
-    steps:
-      - 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: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libdb-dev curl autoconf automake m4 libtool python3 valgrind
-      - name: Update rubygems & bundler
-        run: |
-          ruby -v
-          gem update --system
-      - name: bin/setup
-        run: |
-          bin/setup
-      - run: bundle exec rake test:valgrind
-        env:
-          RUBY_FREE_AT_EXIT: 1
   C99_compile:
     runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.4', head]
+        ruby: ['4.0', head]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install dependencies
         run: |
           brew install ruby-build
@@ -112,8 +92,11 @@ jobs:
           gem update --system
       - name: clang version
         run: clang --version
+      - name: bundle config set force_ruby_platform true if head
+        if: ${{ contains(matrix.ruby, 'head') }}
+        run: |
+          bundle config set force_ruby_platform true
       - name: bin/setup
         run: |
           bin/setup
       - run: bundle exec rake clean compile_c99
-

data/.github/workflows/typecheck.yml

@@ -13,10 +13,10 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)

data/.github/workflows/valgrind.yml

@@ -0,0 +1,42 @@
+name: Valgrind
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "ext/**"
+      - "include/**"
+      - "src/**"
+  pull_request:
+    paths:
+      - "ext/**"
+      - "include/**"
+      - "src/**"
+  merge_group: {}
+
+jobs:
+  valgrind:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - 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: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libdb-dev curl autoconf automake m4 libtool python3 valgrind
+      - name: Update rubygems & bundler
+        run: |
+          ruby -v
+          gem update --system
+      - name: bin/setup
+        run: |
+          bin/setup
+      - run: bundle exec rake test:valgrind
+        env:
+          RUBY_FREE_AT_EXIT: 1

data/.github/workflows/windows.yml

@@ -13,9 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.2', '3.3', ucrt, mswin]
+        ruby: ['3.4', ucrt, mswin]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: load ruby
         uses: ruby/setup-ruby@v1
         with:

data/.rubocop.yml

@@ -3,7 +3,7 @@ plugins:
   - rubocop-on-rbs
 
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.4
   DisabledByDefault: true
   Exclude:
     - 'vendor/bundle/**/*'

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: "pathname")     # Load pathname library
+# loader.add(library: "logger")       # Load logger library
 
 environment = RBS::Environment.from_loader(loader).resolve_type_names
 

data/Rakefile

@@ -11,12 +11,26 @@ 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)
@@ -198,7 +212,14 @@ task :validate => :compile do
   end
 
   libs.each do |lib|
-    sh "#{ruby} #{rbs} -r #{lib} validate --exit-error-on-syntax-error"
+    args = ["-r", lib]
+
+    if lib == "rbs"
+      args << "-r"
+      args << "prism"
+    end
+
+    sh "#{ruby} #{rbs} #{args.join(' ')} validate --exit-error-on-syntax-error"
   end
 end
 
@@ -210,7 +231,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_test}
+    path =~ %r{Ractor} || path =~ %r{Encoding} || path =~ %r{CGI-escape_test}
   end
 
   if ENV["RANDOMIZE_STDLIB_TEST_ORDER"] == "true"
@@ -219,7 +240,7 @@ 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_test.rb"
+  sh "#{ruby} -Ilib #{bin}/test_runner.rb test/stdlib/CGI-escape_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
@@ -317,7 +338,7 @@ namespace :generate do
           class <%= target %>SingletonTest < Test::Unit::TestCase
             include TestHelper
 
-            # library "pathname", "securerandom"     # Declare library signatures to load
+            # library "logger", "securerandom"     # Declare library signatures to load
             testing "singleton(::<%= target %>)"
 
           <%- class_methods.each do |method_name, definition| -%>
@@ -336,7 +357,7 @@ namespace :generate do
           class <%= target %>Test < Test::Unit::TestCase
             include TestHelper
 
-            # library "pathname", "securerandom"     # Declare library signatures to load
+            # library "logger", "securerandom"     # Declare library signatures to load
             testing "::<%= target %>"
 
           <%- instance_methods.each do |method_name, definition| -%>
@@ -527,3 +548,17 @@ task :compile_c99 do
 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/config.yml

@@ -279,6 +279,8 @@ nodes:
         c_type: rbs_keyword
       - name: upper_bound
         c_type: rbs_node
+      - name: lower_bound
+        c_type: rbs_node
       - name: default_type
         c_type: rbs_node
       - name: unchecked
@@ -485,3 +487,47 @@ nodes:
         c_type: rbs_node
       - name: comment_location
         c_type: rbs_location
+  - name: RBS::AST::Ruby::Annotations::TypeApplicationAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: type_args
+        c_type: rbs_node_list
+      - name: close_bracket_location
+        c_type: rbs_location
+      - name: comma_locations
+        c_type: rbs_location_list
+  - name: RBS::AST::Ruby::Annotations::InstanceVariableAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: ivar_name
+        c_type: rbs_ast_symbol
+      - name: ivar_name_location
+        c_type: rbs_location
+      - name: colon_location
+        c_type: rbs_location
+      - name: type
+        c_type: rbs_node
+      - name: comment_location
+        c_type: rbs_location
+  - name: RBS::AST::Ruby::Annotations::ClassAliasAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: keyword_location
+        c_type: rbs_location
+      - name: type_name
+        c_type: rbs_type_name
+      - name: type_name_location
+        c_type: rbs_location
+  - name: RBS::AST::Ruby::Annotations::ModuleAliasAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: keyword_location
+        c_type: rbs_location
+      - name: type_name
+        c_type: rbs_type_name
+      - name: type_name_location
+        c_type: rbs_location