rbs 3.9.2 → 4.0.0.dev.2

data/src/util/rbs_unescape.c

@@ -0,0 +1,130 @@
+#include "rbs/util/rbs_unescape.h"
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+// Define the escape character mappings
+// TODO: use a switch instead
+static const struct {
+    const char* from;
+    const char* to;
+} TABLE[] = {
+    {"\\a", "\a"},
+    {"\\b", "\b"},
+    {"\\e", "\033"},
+    {"\\f", "\f"},
+    {"\\n", "\n"},
+    {"\\r", "\r"},
+    {"\\s", " "},
+    {"\\t", "\t"},
+    {"\\v", "\v"},
+    {"\\\"", "\""},
+    {"\\'", "'"},
+    {"\\\\", "\\"},
+    {"\\", ""}
+};
+
+// Helper function to convert hex string to integer
+static int hex_to_int(const char* hex, int length) {
+    int result = 0;
+    for (int i = 0; i < length; i++) {
+        result = result * 16 + (isdigit(hex[i]) ? hex[i] - '0' : tolower(hex[i]) - 'a' + 10);
+    }
+    return result;
+}
+
+// Helper function to convert octal string to integer
+static int octal_to_int(const char* octal, int length) {
+    int result = 0;
+    for (int i = 0; i < length; i++) {
+        result = result * 8 + (octal[i] - '0');
+    }
+    return result;
+}
+
+int rbs_utf8_codelen(unsigned int c) {
+    if (c <= 0x7F) return 1;
+    if (c <= 0x7FF) return 2;
+    if (c <= 0xFFFF) return 3;
+    if (c <= 0x10FFFF) return 4;
+    return 1; // Invalid Unicode codepoint, treat as 1 byte
+}
+
+rbs_string_t unescape_string(rbs_allocator_t *allocator, const rbs_string_t string, bool is_double_quote) {
+    if (!string.start) return RBS_STRING_NULL;
+
+    size_t len = string.end - string.start;
+    const char* input = string.start;
+
+    char* output = rbs_allocator_alloc_many(allocator, len + 1, char);
+    if (!output) return RBS_STRING_NULL;
+
+    size_t i = 0, j = 0;
+    while (i < len) {
+        if (input[i] == '\\' && i + 1 < len) {
+            if (is_double_quote) {
+                if (isdigit(input[i+1])) {
+                    // Octal escape
+                    int octal_len = 1;
+                    while (octal_len < 3 && i + 1 + octal_len < len && isdigit(input[i + 1 + octal_len])) octal_len++;
+                    int value = octal_to_int(input + i + 1, octal_len);
+                    output[j++] = (char)value;
+                    i += octal_len + 1;
+                } else if (input[i+1] == 'x' && i + 3 < len) {
+                    // Hex escape
+                    int hex_len = isxdigit(input[i+3]) ? 2 : 1;
+                    int value = hex_to_int(input + i + 2, hex_len);
+                    output[j++] = (char)value;
+                    i += hex_len + 2;
+                } else if (input[i+1] == 'u' && i + 5 < len) {
+                    // Unicode escape
+                    int value = hex_to_int(input + i + 2, 4);
+                    output[j++] = (char)value;
+                    i += 6;
+                } else {
+                    // Other escapes
+                    int found = 0;
+                    for (size_t k = 0; k < sizeof(TABLE) / sizeof(TABLE[0]); k++) {
+                        if (strncmp(input + i, TABLE[k].from, strlen(TABLE[k].from)) == 0) {
+                            output[j++] = TABLE[k].to[0];
+                            i += strlen(TABLE[k].from);
+                            found = 1;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        output[j++] = input[i++];
+                    }
+                }
+            } else {
+                /* Single quote: only escape ' and \ */
+                if (input[i+1] == '\'' || input[i+1] == '\\') {
+                    output[j++] = input[i+1];
+                    i += 2;
+                } else {
+                    output[j++] = input[i++];
+                }
+            }
+        } else {
+            output[j++] = input[i++];
+        }
+    }
+    output[j] = '\0';
+    return rbs_string_new(output, output + j);
+}
+
+rbs_string_t rbs_unquote_string(rbs_allocator_t *allocator, rbs_string_t input) {
+    unsigned int first_char = rbs_utf8_string_to_codepoint(input);
+    size_t byte_length = rbs_string_len(input);
+
+    ptrdiff_t start_offset = 0;
+    if (first_char == '"' || first_char == '\'' || first_char == '`') {
+      int bs = rbs_utf8_codelen(first_char);
+      start_offset += bs;
+      byte_length -= 2 * bs;
+    }
+
+    const char *new_start = input.start + start_offset;
+    rbs_string_t string = rbs_string_new(new_start, new_start + byte_length);
+    return unescape_string(allocator, string, first_char == '"');
+}

data/stdlib/rdoc/0/code_object.rbs

@@ -30,7 +30,7 @@ module RDoc
     # <!-- rdoc-file=lib/rdoc/code_object.rb -->
     # Our comment
     #
-    attr_reader comment: Markup::Document | Comment | String
+    attr_reader comment: Comment | String
 
     # <!--
     #   rdoc-file=lib/rdoc/code_object.rb
@@ -46,6 +46,6 @@ module RDoc
     # -->
     # Replaces our comment with `comment`, unless it is empty.
     #
-    def comment=: (Markup::Document | Comment | String | nil) -> (Markup::Document | Comment | String)
+    def comment=: (Comment | String | nil) -> (Comment | String | nil)
   end
 end

data/stdlib/rdoc/0/comment.rbs

@@ -20,6 +20,8 @@ module RDoc
     #
     attr_accessor location: String
 
+    alias file location
+
     # <!--
     #   rdoc-file=lib/rdoc/comment.rb
     #   - new(text = nil, location = nil, language = nil)

data/stdlib/rdoc/0/options.rbs

@@ -0,0 +1,76 @@
+%a{annotate:rdoc:skip}
+module RDoc
+  # <!-- rdoc-file=lib/rdoc/options.rb -->
+  # RDoc::Options handles the parsing and storage of options
+  #
+  # ## Saved Options
+  #
+  # You can save some options like the markup format in the `.rdoc_options` file
+  # in your gem.  The easiest way to do this is:
+  #
+  #     rdoc --markup tomdoc --write-options
+  #
+  # Which will automatically create the file and fill it with the options you
+  # specified.
+  #
+  # The following options will not be saved since they interfere with the user's
+  # preferences or with the normal operation of RDoc:
+  #
+  # *   `--coverage-report`
+  # *   `--dry-run`
+  # *   `--encoding`
+  # *   `--force-update`
+  # *   `--format`
+  # *   `--pipe`
+  # *   `--quiet`
+  # *   `--template`
+  # *   `--verbose`
+  #
+  # ## Custom Options
+  #
+  # Generators can hook into RDoc::Options to add generator-specific command line
+  # options.
+  #
+  # When `--format` is encountered in ARGV, RDoc calls ::setup_options on the
+  # generator class to add extra options to the option parser.  Options for custom
+  # generators must occur after `--format`.  `rdoc --help` will list options for
+  # all installed generators.
+  #
+  # Example:
+  #
+  #     class RDoc::Generator::Spellcheck
+  #       RDoc::RDoc.add_generator self
+  #
+  #       def self.setup_options rdoc_options
+  #         op = rdoc_options.option_parser
+  #
+  #         op.on('--spell-dictionary DICTIONARY',
+  #               RDoc::Options::Path) do |dictionary|
+  #           rdoc_options.spell_dictionary = dictionary
+  #         end
+  #       end
+  #     end
+  #
+  # Of course, RDoc::Options does not respond to `spell_dictionary` by default so
+  # you will need to add it:
+  #
+  #     class RDoc::Options
+  #
+  #       ##
+  #       # The spell dictionary used by the spell-checking plugin.
+  #
+  #       attr_accessor :spell_dictionary
+  #
+  #     end
+  #
+  # ## Option Validators
+  #
+  # OptionParser validators will validate and cast user input values.  In addition
+  # to the validators that ship with OptionParser (String, Integer, Float,
+  # TrueClass, FalseClass, Array, Regexp, Date, Time, URI, etc.), RDoc::Options
+  # adds Path, PathArray and Template.
+  #
+  class Options
+    def initialize: (?untyped loaded_options) -> void
+  end
+end

data/stdlib/rdoc/0/rdoc.rbs

@@ -190,7 +190,7 @@ module RDoc
     #
     # Usually this is called by super from a subclass.
     #
-    def initialize: (String text, String name) -> void
+    def initialize: (String text, String name, ?singleton: bool) -> void
 
     # <!--
     #   rdoc-file=lib/rdoc/method_attr.rb
@@ -267,7 +267,7 @@ module RDoc
     # -->
     # Creates a new AnyMethod with a token stream `text` and `name`
     #
-    def initialize: (String? text, String name) -> void
+    def initialize: (String? text, String name, ?singleton: bool) -> void
   end
 
   # <!-- rdoc-file=lib/rdoc/attr.rb -->
@@ -286,7 +286,7 @@ module RDoc
     # Creates a new Attr with body `text`, `name`, read/write status `rw` and
     # `comment`.  `singleton` marks this as a class attribute.
     #
-    def initialize: (String? text, String name, String rw, RDoc::Comment? comment, ?bool `singleton`) -> void
+    def initialize: (String? text, String name, String rw, RDoc::Comment? comment, ?singleton: bool) -> void
   end
 
   # <!-- rdoc-file=lib/rdoc/constant.rb -->
@@ -372,6 +372,8 @@ module RDoc
     #
     attr_accessor old_name: String
 
+    attr_reader singleton: bool
+
     # <!--
     #   rdoc-file=lib/rdoc/alias.rb
     #   - new(text, old_name, new_name, comment, singleton = false)
@@ -379,7 +381,7 @@ module RDoc
     # Creates a new Alias with a token stream of `text` that aliases `old_name` to
     # `new_name`, has `comment` and is a `singleton` context.
     #
-    def initialize: (String? text, String name, String old_name, RDoc::Comment? comment, ?bool `singleton`) -> void
+    def initialize: (String? text, String name, String old_name, RDoc::Comment? comment, ?singleton: bool) -> void
   end
 
   # <!-- rdoc-file=lib/rdoc/stats.rb -->

data/stdlib/rdoc/0/store.rbs

@@ -26,7 +26,7 @@ module RDoc
     # -->
     # Creates a new Store of `type` that will load or save to `path`
     #
-    def initialize: (?String? path, ?Symbol? type) -> void
+    def initialize: (Options, ?path: String? , ?type: Symbol?) -> void
 
     # <!--
     #   rdoc-file=lib/rdoc/store.rb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 4.0.0.dev.2
 platform: ruby
 authors:
 - Soutaro Matsumoto
 bindir: exe
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: RBS is the language for type signatures for Ruby and standard library
   definitions.
 email:
@@ -142,25 +156,32 @@ files:
 - docs/syntax.md
 - docs/tools.md
 - exe/rbs
+- ext/rbs_extension/ast_translation.c
+- ext/rbs_extension/ast_translation.h
+- ext/rbs_extension/class_constants.c
+- ext/rbs_extension/class_constants.h
+- ext/rbs_extension/compat.h
 - ext/rbs_extension/extconf.rb
-- ext/rbs_extension/lexer.c
-- ext/rbs_extension/lexer.h
-- ext/rbs_extension/lexer.re
-- ext/rbs_extension/lexstate.c
-- ext/rbs_extension/location.c
-- ext/rbs_extension/location.h
+- ext/rbs_extension/legacy_location.c
+- ext/rbs_extension/legacy_location.h
 - ext/rbs_extension/main.c
-- ext/rbs_extension/parser.c
-- ext/rbs_extension/parser.h
-- ext/rbs_extension/parserstate.c
-- ext/rbs_extension/parserstate.h
 - ext/rbs_extension/rbs_extension.h
-- ext/rbs_extension/unescape.c
+- ext/rbs_extension/rbs_string_bridging.c
+- ext/rbs_extension/rbs_string_bridging.h
 - goodcheck.yml
 - include/rbs.h
-- include/rbs/constants.h
-- include/rbs/ruby_objs.h
+- include/rbs/ast.h
+- include/rbs/defines.h
+- include/rbs/lexer.h
+- include/rbs/location.h
+- include/rbs/parser.h
+- include/rbs/string.h
+- include/rbs/util/rbs_allocator.h
+- include/rbs/util/rbs_assert.h
+- include/rbs/util/rbs_buffer.h
 - include/rbs/util/rbs_constant_pool.h
+- include/rbs/util/rbs_encoding.h
+- include/rbs/util/rbs_unescape.h
 - lib/rbs.rb
 - lib/rbs/ancestor_graph.rb
 - lib/rbs/annotate.rb
@@ -173,6 +194,12 @@ files:
 - lib/rbs/ast/declarations.rb
 - lib/rbs/ast/directives.rb
 - lib/rbs/ast/members.rb
+- lib/rbs/ast/ruby/annotations.rb
+- lib/rbs/ast/ruby/comment_block.rb
+- lib/rbs/ast/ruby/declarations.rb
+- lib/rbs/ast/ruby/helpers/constant_helper.rb
+- lib/rbs/ast/ruby/helpers/location_helper.rb
+- lib/rbs/ast/ruby/members.rb
 - lib/rbs/ast/type_param.rb
 - lib/rbs/ast/visitor.rb
 - lib/rbs/buffer.rb
@@ -200,12 +227,16 @@ files:
 - lib/rbs/definition_builder/method_builder.rb
 - lib/rbs/diff.rb
 - lib/rbs/environment.rb
+- lib/rbs/environment/class_entry.rb
+- lib/rbs/environment/module_entry.rb
 - lib/rbs/environment/use_map.rb
 - lib/rbs/environment_loader.rb
 - lib/rbs/environment_walker.rb
 - lib/rbs/errors.rb
 - lib/rbs/factory.rb
 - lib/rbs/file_finder.rb
+- lib/rbs/inline_parser.rb
+- lib/rbs/inline_parser/comment_association.rb
 - lib/rbs/location_aux.rb
 - lib/rbs/locator.rb
 - lib/rbs/method_type.rb
@@ -225,6 +256,7 @@ files:
 - lib/rbs/resolver/constant_resolver.rb
 - lib/rbs/resolver/type_name_resolver.rb
 - lib/rbs/sorter.rb
+- lib/rbs/source.rb
 - lib/rbs/substitution.rb
 - lib/rbs/subtractor.rb
 - lib/rbs/test.rb
@@ -269,6 +301,12 @@ files:
 - sig/annotate/rdoc_annotater.rbs
 - sig/annotate/rdoc_source.rbs
 - sig/annotation.rbs
+- sig/ast/ruby/annotations.rbs
+- sig/ast/ruby/comment_block.rbs
+- sig/ast/ruby/declarations.rbs
+- sig/ast/ruby/helpers/constant_helper.rbs
+- sig/ast/ruby/helpers/location_helper.rbs
+- sig/ast/ruby/members.rbs
 - sig/buffer.rbs
 - sig/builtin_names.rbs
 - sig/cli.rbs
@@ -290,11 +328,15 @@ files:
 - sig/diff.rbs
 - sig/directives.rbs
 - sig/environment.rbs
+- sig/environment/class_entry.rbs
+- sig/environment/module_entry.rbs
 - sig/environment_loader.rbs
 - sig/environment_walker.rbs
 - sig/errors.rbs
 - sig/factory.rbs
 - sig/file_finder.rbs
+- sig/inline_parser.rbs
+- sig/inline_parser/comment_association.rbs
 - sig/location.rbs
 - sig/locator.rbs
 - sig/manifest.yaml
@@ -318,6 +360,7 @@ files:
 - sig/shims/enumerable.rbs
 - sig/shims/rubygems.rbs
 - sig/sorter.rbs
+- sig/source.rbs
 - sig/substitution.rbs
 - sig/subtractor.rbs
 - sig/test.rbs
@@ -341,9 +384,19 @@ files:
 - sig/version.rbs
 - sig/visitor.rbs
 - sig/writer.rbs
-- src/constants.c
-- src/ruby_objs.c
+- src/ast.c
+- src/lexer.c
+- src/lexer.re
+- src/lexstate.c
+- src/location.c
+- src/parser.c
+- src/string.c
+- src/util/rbs_allocator.c
+- src/util/rbs_assert.c
+- src/util/rbs_buffer.c
 - src/util/rbs_constant_pool.c
+- src/util/rbs_encoding.c
+- src/util/rbs_unescape.c
 - stdlib/abbrev/0/abbrev.rbs
 - stdlib/abbrev/0/array.rbs
 - stdlib/base64/0/base64.rbs
@@ -450,6 +503,7 @@ files:
 - stdlib/rdoc/0/comment.rbs
 - stdlib/rdoc/0/context.rbs
 - stdlib/rdoc/0/markup.rbs
+- stdlib/rdoc/0/options.rbs
 - stdlib/rdoc/0/parser.rbs
 - stdlib/rdoc/0/rdoc.rbs
 - stdlib/rdoc/0/ri.rbs