rbs 4.0.0.dev.4 → 4.1.0.pre.2

data/ext/rbs_extension/ast_translation.h

@@ -23,6 +23,10 @@ typedef struct rbs_translation_context {
     rbs_constant_pool_t *constant_pool;
     VALUE buffer;
     rb_encoding *encoding;
+
+    /// A reusable Hash used for calling `rb_class_new_instance_kw()` without allocating a new Hash each time.
+    /// It's vital that the various Nodes' `#initialize` methods take the kwarg values, but don't retain this reusable Hash.
+    VALUE reusable_kwargs_hash;
 } rbs_translation_context_t;
 
 rbs_translation_context_t rbs_translation_context_create(rbs_constant_pool_t *, VALUE buffer_string, rb_encoding *ruby_encoding);
@@ -31,4 +35,7 @@ VALUE rbs_node_list_to_ruby_array(rbs_translation_context_t, rbs_node_list_t *li
 VALUE rbs_hash_to_ruby_hash(rbs_translation_context_t, rbs_hash_t *hash);
 VALUE rbs_struct_to_ruby_value(rbs_translation_context_t, rbs_node_t *instance);
 
+extern VALUE EMPTY_ARRAY;
+extern VALUE EMPTY_HASH;
+
 #endif

data/ext/rbs_extension/class_constants.c

@@ -7,8 +7,6 @@
 
 #include "rbs_extension.h"
 
-VALUE RBS_Parser;
-
 VALUE RBS;
 VALUE RBS_AST;
 VALUE RBS_AST_Declarations;
@@ -49,11 +47,20 @@ VALUE RBS_AST_Members_MethodDefinition_Overload;
 VALUE RBS_AST_Members_Prepend;
 VALUE RBS_AST_Members_Private;
 VALUE RBS_AST_Members_Public;
+VALUE RBS_AST_Ruby_Annotations_BlockParamTypeAnnotation;
+VALUE RBS_AST_Ruby_Annotations_ClassAliasAnnotation;
 VALUE RBS_AST_Ruby_Annotations_ColonMethodTypeAnnotation;
+VALUE RBS_AST_Ruby_Annotations_DoubleSplatParamTypeAnnotation;
+VALUE RBS_AST_Ruby_Annotations_InstanceVariableAnnotation;
 VALUE RBS_AST_Ruby_Annotations_MethodTypesAnnotation;
+VALUE RBS_AST_Ruby_Annotations_ModuleAliasAnnotation;
+VALUE RBS_AST_Ruby_Annotations_ModuleSelfAnnotation;
 VALUE RBS_AST_Ruby_Annotations_NodeTypeAssertion;
+VALUE RBS_AST_Ruby_Annotations_ParamTypeAnnotation;
 VALUE RBS_AST_Ruby_Annotations_ReturnTypeAnnotation;
 VALUE RBS_AST_Ruby_Annotations_SkipAnnotation;
+VALUE RBS_AST_Ruby_Annotations_SplatParamTypeAnnotation;
+VALUE RBS_AST_Ruby_Annotations_TypeApplicationAnnotation;
 VALUE RBS_AST_TypeParam;
 VALUE RBS_MethodType;
 VALUE RBS_Namespace;
@@ -134,11 +141,20 @@ void rbs__init_constants(void) {
     IMPORT_CONSTANT(RBS_AST_Members_Prepend, RBS_AST_Members, "Prepend");
     IMPORT_CONSTANT(RBS_AST_Members_Private, RBS_AST_Members, "Private");
     IMPORT_CONSTANT(RBS_AST_Members_Public, RBS_AST_Members, "Public");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_BlockParamTypeAnnotation, RBS_AST_Ruby_Annotations, "BlockParamTypeAnnotation");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_ClassAliasAnnotation, RBS_AST_Ruby_Annotations, "ClassAliasAnnotation");
     IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_ColonMethodTypeAnnotation, RBS_AST_Ruby_Annotations, "ColonMethodTypeAnnotation");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_DoubleSplatParamTypeAnnotation, RBS_AST_Ruby_Annotations, "DoubleSplatParamTypeAnnotation");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_InstanceVariableAnnotation, RBS_AST_Ruby_Annotations, "InstanceVariableAnnotation");
     IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_MethodTypesAnnotation, RBS_AST_Ruby_Annotations, "MethodTypesAnnotation");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_ModuleAliasAnnotation, RBS_AST_Ruby_Annotations, "ModuleAliasAnnotation");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_ModuleSelfAnnotation, RBS_AST_Ruby_Annotations, "ModuleSelfAnnotation");
     IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_NodeTypeAssertion, RBS_AST_Ruby_Annotations, "NodeTypeAssertion");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_ParamTypeAnnotation, RBS_AST_Ruby_Annotations, "ParamTypeAnnotation");
     IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_ReturnTypeAnnotation, RBS_AST_Ruby_Annotations, "ReturnTypeAnnotation");
     IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_SkipAnnotation, RBS_AST_Ruby_Annotations, "SkipAnnotation");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_SplatParamTypeAnnotation, RBS_AST_Ruby_Annotations, "SplatParamTypeAnnotation");
+    IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_TypeApplicationAnnotation, RBS_AST_Ruby_Annotations, "TypeApplicationAnnotation");
     IMPORT_CONSTANT(RBS_AST_TypeParam, RBS_AST, "TypeParam");
     IMPORT_CONSTANT(RBS_MethodType, RBS, "MethodType");
     IMPORT_CONSTANT(RBS_Namespace, RBS, "Namespace");

data/ext/rbs_extension/class_constants.h

@@ -55,11 +55,20 @@ extern VALUE RBS_AST_Members_MethodDefinition_Overload;
 extern VALUE RBS_AST_Members_Prepend;
 extern VALUE RBS_AST_Members_Private;
 extern VALUE RBS_AST_Members_Public;
+extern VALUE RBS_AST_Ruby_Annotations_BlockParamTypeAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_ClassAliasAnnotation;
 extern VALUE RBS_AST_Ruby_Annotations_ColonMethodTypeAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_DoubleSplatParamTypeAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_InstanceVariableAnnotation;
 extern VALUE RBS_AST_Ruby_Annotations_MethodTypesAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_ModuleAliasAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_ModuleSelfAnnotation;
 extern VALUE RBS_AST_Ruby_Annotations_NodeTypeAssertion;
+extern VALUE RBS_AST_Ruby_Annotations_ParamTypeAnnotation;
 extern VALUE RBS_AST_Ruby_Annotations_ReturnTypeAnnotation;
 extern VALUE RBS_AST_Ruby_Annotations_SkipAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_SplatParamTypeAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_TypeApplicationAnnotation;
 extern VALUE RBS_AST_TypeParam;
 extern VALUE RBS_MethodType;
 extern VALUE RBS_Namespace;

data/ext/rbs_extension/extconf.rb

@@ -16,9 +16,14 @@ append_cflags [
   '-Wimplicit-fallthrough',
   '-Wunused-result',
   '-Wc++-compat',
+  '-Wnullable-to-nonnull-conversion',
 ]
 
-append_cflags ['-O0', '-g'] if ENV['DEBUG']
+if ENV['DEBUG']
+  append_cflags ['-O0', '-pg']
+else
+  append_cflags ['-DNDEBUG']
+end
 if ENV["TEST_NO_C23"]
   puts "Adding -Wc2x-extensions to CFLAGS"
   $CFLAGS << " -Werror -Wc2x-extensions"

data/ext/rbs_extension/legacy_location.c

@@ -1,5 +1,6 @@
 #include "legacy_location.h"
 #include "rbs_extension.h"
+#include "ruby/internal/symbol.h"
 
 #define RBS_LOC_REQUIRED_P(loc, i) ((loc)->children->required_p & (1 << (i)))
 #define RBS_LOC_OPTIONAL_P(loc, i) (!RBS_LOC_REQUIRED_P((loc), (i)))
@@ -9,19 +10,6 @@
 rbs_loc_range RBS_LOC_NULL_RANGE = { -1, -1 };
 VALUE RBS_Location;
 
-rbs_position_t rbs_loc_position(int char_pos) {
-    return (rbs_position_t) { 0, char_pos, -1, -1 };
-}
-
-rbs_position_t rbs_loc_position3(int char_pos, int line, int column) {
-    return (rbs_position_t) { 0, char_pos, line, column };
-}
-
-static rbs_loc_range rbs_new_loc_range(rbs_range_t rg) {
-    rbs_loc_range r = { rg.start.char_pos, rg.end.char_pos };
-    return r;
-}
-
 static void check_children_max(unsigned short n) {
     size_t max = sizeof(rbs_loc_entry_bitmap) * 8;
     if (n > max) {
@@ -33,8 +21,7 @@ void rbs_loc_legacy_alloc_children(rbs_loc *loc, unsigned short cap) {
     check_children_max(cap);
 
     size_t s = RBS_LOC_CHILDREN_SIZE(cap);
-    loc->children = malloc(s);
-
+    loc->children = (rbs_loc_children *) malloc(s);
     *loc->children = (rbs_loc_children) {
         .len = 0,
         .required_p = 0,
@@ -50,22 +37,22 @@ static void check_children_cap(rbs_loc *loc) {
         if (loc->children->len == loc->children->cap) {
             check_children_max(loc->children->cap + 1);
             size_t s = RBS_LOC_CHILDREN_SIZE(++loc->children->cap);
-            loc->children = realloc(loc->children, s);
+            loc->children = (rbs_loc_children *) realloc(loc->children, s);
         }
     }
 }
 
-void rbs_loc_legacy_add_optional_child(rbs_loc *loc, rbs_constant_id_t name, rbs_range_t r) {
+void rbs_loc_legacy_add_optional_child(rbs_loc *loc, ID name, rbs_loc_range r) {
     check_children_cap(loc);
 
     unsigned short i = loc->children->len++;
     loc->children->entries[i] = (rbs_loc_entry) {
         .name = name,
-        .rg = rbs_new_loc_range(r),
+        .rg = r,
     };
 }
 
-void rbs_loc_legacy_add_required_child(rbs_loc *loc, rbs_constant_id_t name, rbs_range_t r) {
+void rbs_loc_legacy_add_required_child(rbs_loc *loc, ID name, rbs_loc_range r) {
     rbs_loc_legacy_add_optional_child(loc, name, r);
 
     unsigned short last_index = loc->children->len - 1;
@@ -86,12 +73,12 @@ void rbs_loc_free(rbs_loc *loc) {
 }
 
 static void rbs_loc_mark(void *ptr) {
-    rbs_loc *loc = ptr;
+    rbs_loc *loc = (rbs_loc *) ptr;
     rb_gc_mark(loc->buffer);
 }
 
 static size_t rbs_loc_memsize(const void *ptr) {
-    const rbs_loc *loc = ptr;
+    const rbs_loc *loc = (const rbs_loc *) ptr;
     if (loc->children == NULL) {
         return sizeof(rbs_loc);
     } else {
@@ -117,7 +104,7 @@ static VALUE location_s_allocate(VALUE klass) {
 }
 
 rbs_loc *rbs_check_location(VALUE obj) {
-    return rb_check_typeddata(obj, &location_type);
+    return (rbs_loc *) rb_check_typeddata(obj, &location_type);
 }
 
 static VALUE location_initialize(VALUE self, VALUE buffer, VALUE start_pos, VALUE end_pos) {
@@ -168,23 +155,15 @@ static VALUE location_end_pos(VALUE self) {
     return INT2FIX(loc->rg.end);
 }
 
-static rbs_constant_id_t rbs_constant_pool_insert_ruby_symbol(VALUE symbol) {
-    VALUE name = rb_sym2str(symbol);
-
-    // Constants inserted here will never be freed, but that's acceptable because:
-    // 1. Most symbols passed into here will be the ones already inserted into the constant pool by `parser.c`.
-    // 2. Methods like `add_required_child` and `add_optional_child` will usually only get called with a few different symbols.
-    return rbs_constant_pool_insert_constant(RBS_GLOBAL_CONSTANT_POOL, (const uint8_t *) RSTRING_PTR(name), RSTRING_LEN(name));
-}
-
 static VALUE location_add_required_child(VALUE self, VALUE name, VALUE start, VALUE end) {
     rbs_loc *loc = rbs_check_location(self);
 
-    rbs_range_t rg;
-    rg.start = rbs_loc_position(FIX2INT(start));
-    rg.end = rbs_loc_position(FIX2INT(end));
+    rbs_loc_range rg = {
+        .start = FIX2INT(start),
+        .end = FIX2INT(end),
+    };
 
-    rbs_loc_legacy_add_required_child(loc, rbs_constant_pool_insert_ruby_symbol(name), rg);
+    rbs_loc_legacy_add_required_child(loc, rb_sym2id(name), rg);
 
     return Qnil;
 }
@@ -192,11 +171,12 @@ static VALUE location_add_required_child(VALUE self, VALUE name, VALUE start, VA
 static VALUE location_add_optional_child(VALUE self, VALUE name, VALUE start, VALUE end) {
     rbs_loc *loc = rbs_check_location(self);
 
-    rbs_range_t rg;
-    rg.start = rbs_loc_position(FIX2INT(start));
-    rg.end = rbs_loc_position(FIX2INT(end));
+    rbs_loc_range rg = {
+        .start = FIX2INT(start),
+        .end = FIX2INT(end),
+    };
 
-    rbs_loc_legacy_add_optional_child(loc, rbs_constant_pool_insert_ruby_symbol(name), rg);
+    rbs_loc_legacy_add_optional_child(loc, rb_sym2id(name), rg);
 
     return Qnil;
 }
@@ -204,7 +184,7 @@ static VALUE location_add_optional_child(VALUE self, VALUE name, VALUE start, VA
 static VALUE location_add_optional_no_child(VALUE self, VALUE name) {
     rbs_loc *loc = rbs_check_location(self);
 
-    rbs_loc_legacy_add_optional_child(loc, rbs_constant_pool_insert_ruby_symbol(name), NULL_RANGE);
+    rbs_loc_legacy_add_optional_child(loc, rb_sym2id(name), RBS_LOC_NULL_RANGE);
 
     return Qnil;
 }
@@ -213,32 +193,35 @@ VALUE rbs_new_location(VALUE buffer, rbs_range_t rg) {
     rbs_loc *loc;
     VALUE obj = TypedData_Make_Struct(RBS_Location, rbs_loc, &location_type, loc);
 
-    rbs_loc_init(loc, buffer, rbs_new_loc_range(rg));
+    rbs_loc_init(loc, buffer, (rbs_loc_range) { rg.start.char_pos, rg.end.char_pos });
 
     return obj;
 }
 
-static VALUE rbs_new_location_from_loc_range(VALUE buffer, rbs_loc_range rg) {
+VALUE rbs_new_location2(VALUE buffer, int start_char, int end_char) {
     rbs_loc *loc;
     VALUE obj = TypedData_Make_Struct(RBS_Location, rbs_loc, &location_type, loc);
 
-    rbs_loc_init(loc, buffer, rg);
+    rbs_loc_init(loc, buffer, (rbs_loc_range) { .start = start_char, .end = end_char });
 
     return obj;
 }
 
-static rbs_constant_id_t rbs_constant_pool_find_ruby_symbol(VALUE symbol) {
-    VALUE name = rb_sym2str(symbol);
+static VALUE rbs_new_location_from_loc_range(VALUE buffer, rbs_loc_range rg) {
+    rbs_loc *loc;
+    VALUE obj = TypedData_Make_Struct(RBS_Location, rbs_loc, &location_type, loc);
 
-    return rbs_constant_pool_find(RBS_GLOBAL_CONSTANT_POOL, (const uint8_t *) RSTRING_PTR(name), RSTRING_LEN(name));
+    rbs_loc_init(loc, buffer, rg);
+
+    return obj;
 }
 
 static VALUE location_aref(VALUE self, VALUE name) {
     rbs_loc *loc = rbs_check_location(self);
 
-    rbs_constant_id_t id = rbs_constant_pool_find_ruby_symbol(name);
+    ID id = rb_sym2id(name);
 
-    if (loc->children != NULL && id != RBS_CONSTANT_ID_UNSET) {
+    if (loc->children != NULL) {
         for (unsigned short i = 0; i < loc->children->len; i++) {
             if (loc->children->entries[i].name == id) {
                 rbs_loc_range result = loc->children->entries[i].rg;
@@ -256,10 +239,6 @@ static VALUE location_aref(VALUE self, VALUE name) {
     rb_raise(rb_eRuntimeError, "Unknown child name given: %s", RSTRING_PTR(string));
 }
 
-static VALUE rbs_constant_to_ruby_symbol(rbs_constant_t *constant) {
-    return ID2SYM(rb_intern2((const char *) constant->start, constant->length));
-}
-
 static VALUE location_optional_keys(VALUE self) {
     VALUE keys = rb_ary_new();
 
@@ -271,8 +250,7 @@ static VALUE location_optional_keys(VALUE self) {
 
     for (unsigned short i = 0; i < children->len; i++) {
         if (RBS_LOC_OPTIONAL_P(loc, i)) {
-            rbs_constant_t *key_id = rbs_constant_pool_id_to_constant(RBS_GLOBAL_CONSTANT_POOL, children->entries[i].name);
-            VALUE key_sym = rbs_constant_to_ruby_symbol(key_id);
+            VALUE key_sym = rb_id2sym(children->entries[i].name);
             rb_ary_push(keys, key_sym);
         }
     }
@@ -291,8 +269,7 @@ static VALUE location_required_keys(VALUE self) {
 
     for (unsigned short i = 0; i < children->len; i++) {
         if (RBS_LOC_REQUIRED_P(loc, i)) {
-            rbs_constant_t *key_id = rbs_constant_pool_id_to_constant(RBS_GLOBAL_CONSTANT_POOL, children->entries[i].name);
-            VALUE key_sym = rbs_constant_to_ruby_symbol(key_id);
+            VALUE key_sym = rb_id2sym(children->entries[i].name);
             rb_ary_push(keys, key_sym);
         }
     }

data/ext/rbs_extension/legacy_location.h

@@ -9,11 +9,43 @@ SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 #include "rbs.h"
 
+/**
+ * Data structures for implementing RBS::Location class in Ruby.
+ *
+ * These structs support hierarchical locations, allowing sub-locations (children)
+ * to be stored under a main location. Each sub-location is identified by its
+ * name (Ruby Symbol ID).
+ */
+
 /**
  * RBS::Location class
  * */
 extern VALUE RBS_Location;
 
+/**
+ * Range of character index for `rbs_loc` locations.
+ */
+typedef struct {
+    int start;
+    int end;
+} rbs_loc_range;
+
+typedef struct {
+    ID name; /* Ruby ID for the name of the entry */
+    rbs_loc_range rg;
+} rbs_loc_entry;
+
+typedef unsigned int rbs_loc_entry_bitmap;
+
+// The flexible array always allocates, but it's okay.
+// This struct is not allocated when the `rbs_loc` doesn't have children.
+typedef struct {
+    unsigned short len;
+    unsigned short cap;
+    rbs_loc_entry_bitmap required_p;
+    rbs_loc_entry entries[1];
+} rbs_loc_children;
+
 typedef struct {
     VALUE buffer;
     rbs_loc_range rg;
@@ -25,6 +57,8 @@ typedef struct {
  * */
 VALUE rbs_new_location(VALUE buffer, rbs_range_t rg);
 
+VALUE rbs_new_location2(VALUE buffer, int start_char, int end_char);
+
 /**
  * Return rbs_loc associated with the RBS::Location object.
  * */
@@ -37,6 +71,9 @@ rbs_loc *rbs_check_location(VALUE location);
  * */
 void rbs_loc_legacy_alloc_children(rbs_loc *loc, unsigned short cap);
 
+void rbs_loc_legacy_add_optional_child(rbs_loc *loc, ID name, rbs_loc_range r);
+void rbs_loc_legacy_add_required_child(rbs_loc *loc, ID name, rbs_loc_range r);
+
 /**
  * Define RBS::Location class.
  * */