rbs 3.9.2 → 4.0.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 170d86a49dcb384a18b08feffedd7ff3edef07ff08305c566f84f613765af36d
-  data.tar.gz: '09975862bee26d90936c89c7d461c992829665b866053551ff02bd7a679ebd26'
+  metadata.gz: d0f208999624a32e97044b8427ec19fa233e21a530a6383efe4ea5b9333ab1ce
+  data.tar.gz: d03954e5a4fa29a428085183a90a86b481849b0994e0d454cccca395412a31f0
 SHA512:
-  metadata.gz: 653e269661b10cce36470bf51163e2ecb056bd9a1714de6c9a6aeb2d3d659b95a73460737b74328fd594cdf6455ee3a90308d63898a447ddc99d8e36b10b9733
-  data.tar.gz: 27fe334fe021669723ad96918d6c01543cfe93b64217229668b7a77182df3c4fde89f4c98bb55577b0b12dc04658bfb735a3813f5d56c0f6b951fe6a8d993edb
+  metadata.gz: 56da6e8a6a9336ae251d766b85c0d8ab62b42a8df1f1c828cd8f0c0ce898ac639a024c5b819e2e6a85733fa1d140ca5b06fc61de62b36fdb21074d34710bb003
+  data.tar.gz: de3ac4191be3ec60ab8bd25c4653cc2663effc2004c9d5e33d9fbb6eabace99fa883dfd5201d92c7f574d8730a74116867a853cb525343a639aeef6d0dd6d041

data/.github/workflows/ruby.yml

@@ -83,7 +83,7 @@ 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"

data/.github/workflows/windows.yml

@@ -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/CHANGELOG.md

@@ -1,18 +1,5 @@
 # CHANGELOG
 
-## 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/Rakefile

@@ -36,12 +36,12 @@ end
 multitask :default => [:test, :stdlib_test, :typecheck_test, :rubocop, :validate, :test_doc]
 
 task :lexer do
-  sh "re2c -W --no-generation-date -o ext/rbs_extension/lexer.c ext/rbs_extension/lexer.re"
+  sh "re2c -W --no-generation-date -o src/lexer.c src/lexer.re"
 end
 
 task :confirm_lexer => :lexer do
   puts "Testing if lexer.c is updated with respect to lexer.re"
-  sh "git diff --exit-code ext/rbs_extension/lexer.c"
+  sh "git diff --exit-code src/lexer.c"
 end
 
 task :confirm_templates => :templates do
@@ -70,17 +70,19 @@ task :confirm_annotation do
 end
 
 task :templates do
-  sh "#{ruby} templates/template.rb include/rbs/constants.h"
-  sh "#{ruby} templates/template.rb include/rbs/ruby_objs.h"
-  sh "#{ruby} templates/template.rb src/constants.c"
-  sh "#{ruby} templates/template.rb src/ruby_objs.c"
+  sh "#{ruby} templates/template.rb ext/rbs_extension/ast_translation.h"
+  sh "#{ruby} templates/template.rb ext/rbs_extension/ast_translation.c"
+
+  sh "#{ruby} templates/template.rb ext/rbs_extension/class_constants.h"
+  sh "#{ruby} templates/template.rb ext/rbs_extension/class_constants.c"
+
+  sh "#{ruby} templates/template.rb include/rbs/ast.h"
+  sh "#{ruby} templates/template.rb src/ast.c"
 end
 
-task :compile => "ext/rbs_extension/lexer.c"
-task :compile => "include/rbs/constants.h"
-task :compile => "include/rbs/ruby_objs.h"
-task :compile => "src/constants.c"
-task :compile => "src/ruby_objs.c"
+task :compile => "ext/rbs_extension/class_constants.h"
+task :compile => "ext/rbs_extension/class_constants.c"
+task :compile => "src/lexer.c"
 
 task :test_doc do
   files = Dir.chdir(File.expand_path('..', __FILE__)) do
@@ -141,16 +143,21 @@ task :stdlib_test => :compile do
 end
 
 task :typecheck_test => :compile do
-  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
+  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

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

@@ -2,316 +2,486 @@ nodes:
   - name: RBS::AST::Annotation
     fields:
       - name: string
-      - name: location
+        c_type: rbs_string
+  - name: RBS::AST::Bool
+    expose_to_ruby: false
+    expose_location: false
+    fields:
+      - name: value
+        c_type: bool
   - name: RBS::AST::Comment
     fields:
       - name: string
-      - name: location
+        c_type: rbs_string
   - name: RBS::AST::Declarations::Class
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: type_params
+        c_type: rbs_node_list
       - name: super_class
+        c_type: rbs_ast_declarations_class_super
       - name: members
+        c_type: rbs_node_list
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Declarations::Class::Super
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: args
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::AST::Declarations::ClassAlias
     fields:
       - name: new_name
+        c_type: rbs_type_name
       - name: old_name
-      - name: location
+        c_type: rbs_type_name
       - name: comment
+        c_type: rbs_ast_comment
       - name: annotations
+        c_type: rbs_node_list
   - name: RBS::AST::Declarations::Constant
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: type
-      - name: location
+        c_type: rbs_node
       - name: comment
+        c_type: rbs_ast_comment
       - name: annotations
+        c_type: rbs_node_list
   - name: RBS::AST::Declarations::Global
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: type
-      - name: location
+        c_type: rbs_node
       - name: comment
+        c_type: rbs_ast_comment
       - name: annotations
+        c_type: rbs_node_list
   - name: RBS::AST::Declarations::Interface
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: type_params
+        c_type: rbs_node_list
       - name: members
+        c_type: rbs_node_list
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Declarations::Module
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: type_params
+        c_type: rbs_node_list
       - name: self_types
+        c_type: rbs_node_list
       - name: members
+        c_type: rbs_node_list
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Declarations::Module::Self
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: args
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::AST::Declarations::ModuleAlias
     fields:
       - name: new_name
+        c_type: rbs_type_name
       - name: old_name
-      - name: location
+        c_type: rbs_type_name
       - name: comment
+        c_type: rbs_ast_comment
       - name: annotations
+        c_type: rbs_node_list
   - name: RBS::AST::Declarations::TypeAlias
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: type_params
+        c_type: rbs_node_list
       - name: type
+        c_type: rbs_node
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Directives::Use
     fields:
       - name: clauses
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::AST::Directives::Use::SingleClause
     fields:
       - name: type_name
+        c_type: rbs_type_name
       - name: new_name
-      - name: location
+        c_type: rbs_ast_symbol
   - name: RBS::AST::Directives::Use::WildcardClause
     fields:
       - name: namespace
-      - name: location
+        c_type: rbs_namespace
+        c_name: rbs_namespace
   - name: RBS::AST::Members::Alias
     fields:
       - name: new_name
+        c_type: rbs_ast_symbol
       - name: old_name
+        c_type: rbs_ast_symbol
       - name: kind
+        c_type: rbs_keyword
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Members::AttrAccessor
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: type
+        c_type: rbs_node
       - name: ivar_name
+        c_type: rbs_node # rbs_ast_symbol_t, NULL or rbs_ast_bool_new(false)
       - name: kind
+        c_type: rbs_keyword
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
       - name: visibility
+        c_type: rbs_keyword
   - name: RBS::AST::Members::AttrReader
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: type
+        c_type: rbs_node
       - name: ivar_name
+        c_type: rbs_node # rbs_ast_symbol_t, NULL or rbs_ast_bool_new(false)
       - name: kind
+        c_type: rbs_keyword
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
       - name: visibility
+        c_type: rbs_keyword
   - name: RBS::AST::Members::AttrWriter
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: type
+        c_type: rbs_node
       - name: ivar_name
+        c_type: rbs_node # rbs_ast_symbol_t, NULL or rbs_ast_bool_new(false)
       - name: kind
+        c_type: rbs_keyword
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
       - name: visibility
+        c_type: rbs_keyword
   - name: RBS::AST::Members::ClassInstanceVariable
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: type
-      - name: location
+        c_type: rbs_node
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Members::ClassVariable
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: type
-      - name: location
+        c_type: rbs_node
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Members::Extend
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: args
+        c_type: rbs_node_list
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Members::Include
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: args
+        c_type: rbs_node_list
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Members::InstanceVariable
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: type
-      - name: location
+        c_type: rbs_node
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Members::MethodDefinition
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: kind
+        c_type: rbs_keyword
       - name: overloads
+        c_type: rbs_node_list
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
       - name: overloading
+        c_type: bool
       - name: visibility
+        c_type: rbs_keyword
   - name: RBS::AST::Members::MethodDefinition::Overload
+    expose_location: false
     fields:
       - name: annotations
+        c_type: rbs_node_list
       - name: method_type
+        c_type: rbs_node
   - name: RBS::AST::Members::Prepend
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: args
+        c_type: rbs_node_list
       - name: annotations
-      - name: location
+        c_type: rbs_node_list
       - name: comment
+        c_type: rbs_ast_comment
   - name: RBS::AST::Members::Private
-    fields:
-      - name: location
   - name: RBS::AST::Members::Public
-    fields:
-      - name: location
   - name: RBS::AST::TypeParam
     fields:
       - name: name
+        c_type: rbs_ast_symbol
       - name: variance
+        c_type: rbs_keyword
       - name: upper_bound
+        c_type: rbs_node
       - name: default_type
+        c_type: rbs_node
       - name: unchecked
-      - name: location
+        c_type: bool
+  - name: RBS::AST::Integer
+    expose_to_ruby: false
+    expose_location: false
+    fields:
+      - name: string_representation
+        c_type: rbs_string
+  - name: RBS::AST::String
+    expose_to_ruby: false
+    expose_location: false
+    fields:
+      - name: string
+        c_type: rbs_string
   - name: RBS::MethodType
     fields:
       - name: type_params
+        c_type: rbs_node_list
       - name: type
+        c_type: rbs_node
       - name: block
-      - name: location
+        c_type: rbs_types_block
   - name: RBS::Namespace
+    expose_location: false
     fields:
       - name: path
+        c_type: rbs_node_list
       - name: absolute
+        c_type: bool
+  - name: RBS::Signature
+    expose_to_ruby: false
+    expose_location: false
+    fields:
+      - name: directives
+        c_type: rbs_node_list
+      - name: declarations
+        c_type: rbs_node_list
   - name: RBS::TypeName
+    expose_location: false
     fields:
       - name: namespace
+        c_type: rbs_namespace
+        c_name: rbs_namespace
       - name: name
+        c_type: rbs_ast_symbol
   - name: RBS::Types::Alias
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: args
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::Types::Bases::Any
     fields:
       - name: todo
-      - name: location
+        c_type: bool
   - name: RBS::Types::Bases::Bool
-    fields:
-      - name: location
   - name: RBS::Types::Bases::Bottom
-    fields:
-      - name: location
   - name: RBS::Types::Bases::Class
-    fields:
-      - name: location
   - name: RBS::Types::Bases::Instance
-    fields:
-      - name: location
   - name: RBS::Types::Bases::Nil
-    fields:
-      - name: location
   - name: RBS::Types::Bases::Self
-    fields:
-      - name: location
   - name: RBS::Types::Bases::Top
-    fields:
-      - name: location
   - name: RBS::Types::Bases::Void
-    fields:
-      - name: location
   - name: RBS::Types::Block
+    expose_location: false
     fields:
       - name: type
+        c_type: rbs_node
       - name: required
+        c_type: bool
       - name: self_type
+        c_type: rbs_node
   - name: RBS::Types::ClassInstance
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: args
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::Types::ClassSingleton
     fields:
       - name: name
-      - name: location
+        c_type: rbs_type_name
   - name: RBS::Types::Function
+    expose_location: false
     fields:
       - name: required_positionals
+        c_type: rbs_node_list
       - name: optional_positionals
+        c_type: rbs_node_list
       - name: rest_positionals
+        c_type: rbs_node
       - name: trailing_positionals
+        c_type: rbs_node_list
       - name: required_keywords
+        c_type: rbs_hash
       - name: optional_keywords
+        c_type: rbs_hash
       - name: rest_keywords
+        c_type: rbs_node
       - name: return_type
+        c_type: rbs_node
   - name: RBS::Types::Function::Param
     fields:
       - name: type
+        c_type: rbs_node
       - name: name
-      - name: location
+        c_type: rbs_ast_symbol
   - name: RBS::Types::Interface
     fields:
       - name: name
+        c_type: rbs_type_name
       - name: args
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::Types::Intersection
     fields:
       - name: types
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::Types::Literal
     fields:
       - name: literal
-      - name: location
+        c_type: rbs_node
   - name: RBS::Types::Optional
     fields:
       - name: type
-      - name: location
+        c_type: rbs_node
   - name: RBS::Types::Proc
     fields:
       - name: type
+        c_type: rbs_node
       - name: block
-      - name: location
+        c_type: rbs_types_block
       - name: self_type
+        c_type: rbs_node
   - name: RBS::Types::Record
     fields:
       - name: all_fields
-      - name: location
+        c_type: rbs_hash
+  - name: RBS::Types::Record::FieldType
+    expose_to_ruby: false
+    expose_location: false
+    fields:
+      - name: type
+        c_type: rbs_node
+      - name: required
+        c_type: bool
   - name: RBS::Types::Tuple
     fields:
       - name: types
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::Types::Union
     fields:
       - name: types
-      - name: location
+        c_type: rbs_node_list
   - name: RBS::Types::UntypedFunction
+    expose_location: false
     fields:
       - name: return_type
+        c_type: rbs_node
   - name: RBS::Types::Variable
     fields:
       - name: name
-      - name: location
+        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