rbs 3.8.1 → 3.9.0.dev.1

data/stdlib/socket/0/unix_socket.rbs

@@ -104,7 +104,9 @@ class UNIXSocket < BasicSocket
   #
   # *mode* is the same as the argument passed to IO.for_fd
   #
-  def recv_io: (?singleton(BasicSocket), ?String mode) -> BasicSocket
+  def recv_io: () -> IO
+             | (singleton(Integer)?) -> Integer
+             | [T] (IO::_ForFd[T], ?untyped mode) -> T
 
   # <!--
   #   rdoc-file=ext/socket/unixsocket.c
@@ -151,7 +153,7 @@ class UNIXSocket < BasicSocket
   #
   # *io* may be any kind of IO object or integer file descriptor.
   #
-  def send_io: (BasicSocket | Integer) -> void
+  def send_io: (IO | Integer) -> void
 
   private
 

data/stdlib/stringio/0/stringio.rbs

@@ -338,7 +338,7 @@ class StringIO
 
   def readchar: () -> String
 
-  def readline: (?String sep, ?Integer limit) -> String
+  def readline: (?String sep, ?Integer limit, ?chomp: boolish) -> String
 
   # <!--
   #   rdoc-file=ext/stringio/stringio.c

data/stdlib/uri/0/common.rbs

@@ -115,6 +115,14 @@ end
 module URI
   include URI::RFC2396_REGEXP
 
+  # <!--
+  #   rdoc-file=lib/uri/common.rb
+  #   - decode_uri_component(str, enc=Encoding::UTF_8)
+  # -->
+  # Like URI.decode_www_form_component, except that `'+'` is preserved.
+  #
+  def self.decode_uri_component: (String str, ?encoding enc) -> String
+
   # <!--
   #   rdoc-file=lib/uri/common.rb
   #   - decode_www_form(str, enc=Encoding::UTF_8, separator: '&', use__charset_: false, isindex: false)
@@ -189,6 +197,15 @@ module URI
   #
   def self.decode_www_form_component: (String str, ?encoding enc) -> String
 
+  # <!--
+  #   rdoc-file=lib/uri/common.rb
+  #   - encode_uri_component(str, enc=nil)
+  # -->
+  # Like URI.encode_www_form_component, except that `' '` (space) is encoded as
+  # `'%20'` (instead of `'+'`).
+  #
+  def self.encode_uri_component: (String str, ?encoding enc) -> String
+
   # <!--
   #   rdoc-file=lib/uri/common.rb
   #   - encode_www_form(enum, enc=nil)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.9.0.dev.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 bindir: exe
 cert_chain: []
-date: 2024-12-27 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -160,6 +160,7 @@ files:
 - include/rbs.h
 - include/rbs/constants.h
 - include/rbs/ruby_objs.h
+- include/rbs/util/rbs_constant_pool.h
 - lib/rbs.rb
 - lib/rbs/ancestor_graph.rb
 - lib/rbs/annotate.rb
@@ -342,6 +343,7 @@ files:
 - sig/writer.rbs
 - src/constants.c
 - src/ruby_objs.c
+- src/util/rbs_constant_pool.c
 - stdlib/abbrev/0/abbrev.rbs
 - stdlib/abbrev/0/array.rbs
 - stdlib/base64/0/base64.rbs
@@ -513,11 +515,6 @@ files:
 - stdlib/zlib/0/version_error.rbs
 - stdlib/zlib/0/zlib.rbs
 - stdlib/zlib/0/zstream.rbs
-- templates/include/rbs/constants.h.erb
-- templates/include/rbs/ruby_objs.h.erb
-- templates/src/constants.c.erb
-- templates/src/ruby_objs.c.erb
-- templates/template.rb
 homepage: https://github.com/ruby/rbs
 licenses:
 - BSD-2-Clause

data/templates/include/rbs/constants.h.erb

@@ -1,20 +0,0 @@
-#ifndef RBS__CONSTANTS_H
-#define RBS__CONSTANTS_H
-
-extern VALUE RBS;
-
-extern VALUE RBS_AST;
-extern VALUE RBS_AST_Declarations;
-extern VALUE RBS_AST_Directives;
-extern VALUE RBS_AST_Members;
-extern VALUE RBS_Types;
-extern VALUE RBS_Types_Bases;
-extern VALUE RBS_ParsingError;
-
-<%- nodes.each do |node| -%>
-extern VALUE <%= node.c_constant_name %>;
-<%- end -%>
-
-void rbs__init_constants();
-
-#endif

data/templates/include/rbs/ruby_objs.h.erb

@@ -1,10 +0,0 @@
-#ifndef RBS__RUBY_OBJS_H
-#define RBS__RUBY_OBJS_H
-
-#include "ruby.h"
-
-<%- nodes.each do |node| -%>
-VALUE <%= node.c_function_name %>(<%= node.fields.map { |field| "#{field.c_type} #{field.name}" }.join(", ") %>);
-<%- end -%>
-
-#endif

data/templates/src/constants.c.erb

@@ -1,36 +0,0 @@
-#include "rbs_extension.h"
-
-VALUE RBS_Parser;
-
-VALUE RBS;
-VALUE RBS_AST;
-VALUE RBS_AST_Declarations;
-VALUE RBS_AST_Directives;
-VALUE RBS_AST_Members;
-VALUE RBS_Parser;
-VALUE RBS_Types;
-VALUE RBS_Types_Bases;
-
-<%- nodes.each do |node| -%>
-VALUE <%= node.c_constant_name %>;
-<%- end -%>
-
-VALUE RBS_ParsingError;
-
-#define IMPORT_CONSTANT(var, parent, name) { var = rb_const_get(parent, rb_intern(name)); rb_gc_register_mark_object(var); }
-
-void rbs__init_constants(void) {
-  IMPORT_CONSTANT(RBS, rb_cObject, "RBS");
-  IMPORT_CONSTANT(RBS_ParsingError, RBS, "ParsingError");
-
-  IMPORT_CONSTANT(RBS_AST, RBS, "AST");
-  IMPORT_CONSTANT(RBS_AST_Declarations, RBS_AST, "Declarations");
-  IMPORT_CONSTANT(RBS_AST_Directives, RBS_AST, "Directives");
-  IMPORT_CONSTANT(RBS_AST_Members, RBS_AST, "Members");
-  IMPORT_CONSTANT(RBS_Types, RBS, "Types");
-  IMPORT_CONSTANT(RBS_Types_Bases, RBS_Types, "Bases");
-
-  <%- nodes.each do |node| -%>
-  IMPORT_CONSTANT(<%= node.c_constant_name %>, <%= node.c_parent_constant_name %>, "<%= node.ruby_class_name %>");
-  <%- end -%>
-}

data/templates/src/ruby_objs.c.erb

@@ -1,27 +0,0 @@
-#include "rbs_extension.h"
-
-#ifdef RB_PASS_KEYWORDS
-  // Ruby 2.7 or later
-  #define CLASS_NEW_INSTANCE(klass, argc, argv)\
-          rb_class_new_instance_kw(argc, argv, klass, RB_PASS_KEYWORDS)
-#else
-  // Ruby 2.6
-  #define CLASS_NEW_INSTANCE(receiver, argc, argv)\
-          rb_class_new_instance(argc, argv, receiver)
-#endif
-
-<%- nodes.each do |node| -%>
-VALUE <%= node.c_function_name %>(<%= node.fields.map { |field| "#{field.c_type} #{field.name}" }.join(", ") %>) {
-  VALUE _init_kwargs = rb_hash_new();
-  <%- node.fields.each do |field| -%>
-  rb_hash_aset(_init_kwargs, ID2SYM(rb_intern("<%= field.name %>")), <%= field.name %>);
-  <%- end -%>
-
-  return CLASS_NEW_INSTANCE(
-    <%= node.c_constant_name %>,
-    1,
-    &_init_kwargs
-  );
-}
-
-<%- end -%>

data/templates/template.rb

@@ -1,122 +0,0 @@
-# frozen_string_literal: true
-
-require "erb"
-require "fileutils"
-require "yaml"
-
-module RBS
-  class Template
-    class Field
-      attr_reader :name
-      attr_reader :c_type
-
-      def initialize(yaml)
-        @name = yaml["name"]
-        @c_type = "VALUE"
-      end
-    end
-
-    class Type
-      # The fully-qualified name of the auto-generated Ruby class for this type,
-      # e.g. `RBS::AST::Declarations::TypeAlias`
-      attr_reader :ruby_full_name #: String
-
-      # The name of the name of the auto-generated Ruby class for this type,
-      # e.g. `TypeAlias`
-      attr_reader :ruby_class_name #: String
-
-      # The name of the auto-generated C struct for this type,
-      # e.g. `rbs_ast_declarations_typealias_t`
-      attr_reader :c_type_name #: String
-
-      # The name of the pre-existing C function which constructs new Ruby objects of this type.
-      # e.g. `rbs_ast_declarations_typealias_new`
-      attr_reader :c_function_name #: String
-
-      # The name of the C constant which stores the Ruby VALUE pointing to the generated class.
-      # e.g. `RBS_AST_Declarations_TypeAlias`
-      attr_reader :c_constant_name #: String
-
-      # The name of the C constant in which the `c_constant_name` is nested.
-      # e.g. `RBS_AST_Declarations`
-      attr_reader :c_parent_constant_name #: String
-
-      attr_reader :fields #: Array[RBS::Template::Field]
-
-      def initialize(yaml)
-        @ruby_full_name = yaml["name"]
-        @ruby_class_name = @ruby_full_name[/[^:]+\z/] # demodulize-like
-        name = @ruby_full_name.gsub("::", "_")
-        @c_function_name = name.gsub(/(^)?(_)?([A-Z](?:[A-Z]*(?=[A-Z_])|[a-z0-9]*))/) { ($1 || $2 || "_") + $3.downcase } # underscore-like
-        @c_function_name.gsub!(/^rbs_types_/, 'rbs_')
-        @c_function_name.gsub!(/^rbs_ast_declarations_/, 'rbs_ast_decl_')
-        @c_constant_name = @ruby_full_name.gsub("::", "_")
-        @c_parent_constant_name = @ruby_full_name.split("::")[0..-2].join("::").gsub("::", "_")
-
-        @fields = yaml.fetch("fields", []).map { |field| Field.new(field) }.freeze
-      end
-    end
-
-    class << self
-      def render(out_file)
-        filepath = "templates/#{out_file}.erb"
-        template = File.expand_path("../#{filepath}", __dir__)
-
-        erb = read_template(template)
-        extension = File.extname(filepath.gsub(".erb", ""))
-
-        heading = <<~HEADING
-          /*----------------------------------------------------------------------------*/
-          /* This file is generated by the templates/template.rb script and should not  */
-          /* be modified manually.                                                      */
-          /* To change the template see                                                 */
-          /* #{filepath + " " * (74 - filepath.size) } */
-          /*----------------------------------------------------------------------------*/
-        HEADING
-
-        write_to = File.expand_path("../#{out_file}", __dir__)
-        contents = heading + "\n" + erb.result_with_hash(locals)
-
-        if (extension == ".c" || extension == ".h") && !contents.ascii_only?
-          # Enforce that we only have ASCII characters here. This is necessary
-          # for non-UTF-8 locales that only allow ASCII characters in C source
-          # files.
-          contents.each_line.with_index(1) do |line, line_number|
-            raise "Non-ASCII character on line #{line_number} of #{write_to}" unless line.ascii_only?
-          end
-        end
-
-        FileUtils.mkdir_p(File.dirname(write_to))
-        File.write(write_to, contents)
-      end
-
-      private
-
-      def read_template(filepath)
-        template = File.read(filepath, encoding: Encoding::UTF_8)
-        erb = erb(template)
-        erb.filename = filepath
-        erb
-      end
-
-      def erb(template)
-        ERB.new(template, trim_mode: "-")
-      end
-
-      def locals
-        config = YAML.load_file(File.expand_path("../config.yml", __dir__))
-        {
-          nodes: config.fetch("nodes").map { |node| Type.new(node) }.sort_by(&:ruby_full_name),
-        }
-      end
-    end
-  end
-end
-
-unless ARGV.size == 1
-  $stderr.puts "Usage: ruby template.rb <out_file>"
-  exit 1
-end
-
-out_file = ARGV.first
-RBS::Template.render(out_file)