rbs 3.9.3 → 4.0.0.dev.1

data/ext/rbs_extension/ast_translation.h

@@ -0,0 +1,30 @@
+/*----------------------------------------------------------------------------*/
+/* This file is generated by the templates/template.rb script and should not  */
+/* be modified manually.                                                      */
+/* To change the template see                                                 */
+/* templates/ext/rbs_extension/ast_translation.h.erb                          */
+/*----------------------------------------------------------------------------*/
+
+#ifndef RBS_EXTENSION_AST_TRANSLATION_H
+#define RBS_EXTENSION_AST_TRANSLATION_H
+
+#include "ruby.h"
+#include "ruby/encoding.h"
+
+#include "rbs/ast.h"
+#include "rbs/location.h"
+
+/// A bag of values needed when copying RBS C structs into Ruby objects.
+typedef struct rbs_translation_context {
+    rbs_constant_pool_t *constant_pool;
+    VALUE buffer;
+    rb_encoding *encoding;
+} rbs_translation_context_t;
+
+rbs_translation_context_t rbs_translation_context_create(rbs_constant_pool_t *, VALUE buffer_string, rb_encoding *ruby_encoding);
+
+VALUE rbs_node_list_to_ruby_array(rbs_translation_context_t, rbs_node_list_t *list);
+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);
+
+#endif

data/{src/constants.c → ext/rbs_extension/class_constants.c}

@@ -2,7 +2,7 @@
 /* This file is generated by the templates/template.rb script and should not  */
 /* be modified manually.                                                      */
 /* To change the template see                                                 */
-/* templates/src/constants.c.erb                                              */
+/* templates/ext/rbs_extension/class_constants.c.erb                          */
 /*----------------------------------------------------------------------------*/
 
 #include "rbs_extension.h"
@@ -14,6 +14,8 @@ VALUE RBS_AST;
 VALUE RBS_AST_Declarations;
 VALUE RBS_AST_Directives;
 VALUE RBS_AST_Members;
+VALUE RBS_AST_Ruby;
+VALUE RBS_AST_Ruby_Annotations;
 VALUE RBS_Parser;
 VALUE RBS_Types;
 VALUE RBS_Types_Bases;
@@ -47,6 +49,11 @@ 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_ColonMethodTypeAnnotation;
+VALUE RBS_AST_Ruby_Annotations_MethodTypesAnnotation;
+VALUE RBS_AST_Ruby_Annotations_NodeTypeAssertion;
+VALUE RBS_AST_Ruby_Annotations_ReturnTypeAnnotation;
+VALUE RBS_AST_Ruby_Annotations_SkipAnnotation;
 VALUE RBS_AST_TypeParam;
 VALUE RBS_MethodType;
 VALUE RBS_Namespace;
@@ -89,6 +96,8 @@ void rbs__init_constants(void) {
   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_AST_Ruby, RBS_AST, "Ruby");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations, RBS_AST_Ruby, "Annotations");
   IMPORT_CONSTANT(RBS_Types, RBS, "Types");
   IMPORT_CONSTANT(RBS_Types_Bases, RBS_Types, "Bases");
 
@@ -121,6 +130,11 @@ 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_ColonMethodTypeAnnotation, RBS_AST_Ruby_Annotations, "ColonMethodTypeAnnotation");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_MethodTypesAnnotation, RBS_AST_Ruby_Annotations, "MethodTypesAnnotation");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_NodeTypeAssertion, RBS_AST_Ruby_Annotations, "NodeTypeAssertion");
+  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_TypeParam, RBS_AST, "TypeParam");
   IMPORT_CONSTANT(RBS_MethodType, RBS, "MethodType");
   IMPORT_CONSTANT(RBS_Namespace, RBS, "Namespace");

data/{include/rbs/constants.h → ext/rbs_extension/class_constants.h}

@@ -2,18 +2,22 @@
 /* This file is generated by the templates/template.rb script and should not  */
 /* be modified manually.                                                      */
 /* To change the template see                                                 */
-/* templates/include/rbs/constants.h.erb                                      */
+/* templates/ext/rbs_extension/class_constants.h.erb                          */
 /*----------------------------------------------------------------------------*/
 
 #ifndef RBS__CONSTANTS_H
 #define RBS__CONSTANTS_H
 
+#include "ruby.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_AST_Ruby;
+extern VALUE RBS_AST_Ruby_Annotations;
 extern VALUE RBS_Types;
 extern VALUE RBS_Types_Bases;
 extern VALUE RBS_ParsingError;
@@ -47,6 +51,11 @@ 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_ColonMethodTypeAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_MethodTypesAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_NodeTypeAssertion;
+extern VALUE RBS_AST_Ruby_Annotations_ReturnTypeAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_SkipAnnotation;
 extern VALUE RBS_AST_TypeParam;
 extern VALUE RBS_MethodType;
 extern VALUE RBS_Namespace;

data/ext/rbs_extension/extconf.rb

@@ -11,5 +11,7 @@ root_dir = File.expand_path('../../../', __FILE__)
 $srcs = Dir.glob("#{root_dir}/src/**/*.c") +
         Dir.glob("#{root_dir}/ext/rbs_extension/*.c")
 
-append_cflags ['-std=gnu99']
+append_cflags ['-std=gnu99', '-Wimplicit-fallthrough', '-Wunused-result']
+append_cflags ['-O0', '-g'] if ENV['DEBUG']
+
 create_makefile 'rbs_extension'

data/ext/rbs_extension/{location.c → legacy_location.c}

@@ -1,3 +1,4 @@
+#include "legacy_location.h"
 #include "rbs_extension.h"
 
 #define RBS_LOC_REQUIRED_P(loc, i) ((loc)->children->required_p & (1 << (i)))
@@ -8,17 +9,15 @@
 rbs_loc_range RBS_LOC_NULL_RANGE = { -1, -1 };
 VALUE RBS_Location;
 
-position rbs_loc_position(int char_pos) {
-  position pos = { 0, char_pos, -1, -1 };
-  return pos;
+rbs_position_t rbs_loc_position(int char_pos) {
+  return (rbs_position_t) { 0, char_pos, -1, -1 };
 }
 
-position rbs_loc_position3(int char_pos, int line, int column) {
-  position pos = { 0, char_pos, line, column };
-  return pos;
+rbs_position_t rbs_loc_position3(int char_pos, int line, int column) {
+  return (rbs_position_t) { 0, char_pos, line, column };
 }
 
-rbs_loc_range rbs_new_loc_range(range rg) {
+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;
 }
@@ -30,7 +29,7 @@ static void check_children_max(unsigned short n) {
   }
 }
 
-void rbs_loc_alloc_children(rbs_loc *loc, unsigned short cap) {
+void rbs_loc_legacy_alloc_children(rbs_loc *loc, unsigned short cap) {
   check_children_max(cap);
 
   size_t s = RBS_LOC_CHILDREN_SIZE(cap);
@@ -46,7 +45,7 @@ void rbs_loc_alloc_children(rbs_loc *loc, unsigned short cap) {
 
 static void check_children_cap(rbs_loc *loc) {
   if (loc->children == NULL) {
-    rbs_loc_alloc_children(loc, 1);
+    rbs_loc_legacy_alloc_children(loc, 1);
   } else {
     if (loc->children->len == loc->children->cap) {
       check_children_max(loc->children->cap + 1);
@@ -56,14 +55,7 @@ static void check_children_cap(rbs_loc *loc) {
   }
 }
 
-void rbs_loc_add_required_child(rbs_loc *loc, rbs_constant_id_t name, range r) {
-  rbs_loc_add_optional_child(loc, name, r);
-
-  unsigned short last_index = loc->children->len - 1;
-  loc->children->required_p |= 1 << last_index;
-}
-
-void rbs_loc_add_optional_child(rbs_loc *loc, rbs_constant_id_t name, range r) {
+void rbs_loc_legacy_add_optional_child(rbs_loc *loc, rbs_constant_id_t name, rbs_range_t r) {
   check_children_cap(loc);
 
   unsigned short i = loc->children->len++;
@@ -73,6 +65,13 @@ void rbs_loc_add_optional_child(rbs_loc *loc, rbs_constant_id_t name, range r) {
   };
 }
 
+void rbs_loc_legacy_add_required_child(rbs_loc *loc, rbs_constant_id_t name, rbs_range_t r) {
+  rbs_loc_legacy_add_optional_child(loc, name, r);
+
+  unsigned short last_index = loc->children->len - 1;
+  loc->children->required_p |= 1 << last_index;
+}
+
 void rbs_loc_init(rbs_loc *loc, VALUE buffer, rbs_loc_range rg) {
   *loc = (rbs_loc) {
     .buffer = buffer,
@@ -146,7 +145,7 @@ static VALUE location_initialize_copy(VALUE self, VALUE other) {
   };
 
   if (other_loc->children != NULL) {
-    rbs_loc_alloc_children(self_loc, other_loc->children->cap);
+    rbs_loc_legacy_alloc_children(self_loc, other_loc->children->cap);
     memcpy(self_loc->children, other_loc->children, RBS_LOC_CHILDREN_SIZE(other_loc->children->cap));
   }
 
@@ -180,11 +179,11 @@ static rbs_constant_id_t rbs_constant_pool_insert_ruby_symbol(VALUE symbol) {
 static VALUE location_add_required_child(VALUE self, VALUE name, VALUE start, VALUE end) {
   rbs_loc *loc = rbs_check_location(self);
 
-  range rg;
+  rbs_range_t rg;
   rg.start = rbs_loc_position(FIX2INT(start));
   rg.end = rbs_loc_position(FIX2INT(end));
 
-  rbs_loc_add_required_child(loc, rbs_constant_pool_insert_ruby_symbol(name), rg);
+  rbs_loc_legacy_add_required_child(loc, rbs_constant_pool_insert_ruby_symbol(name), rg);
 
   return Qnil;
 }
@@ -192,11 +191,11 @@ 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);
 
-  range rg;
+  rbs_range_t rg;
   rg.start = rbs_loc_position(FIX2INT(start));
   rg.end = rbs_loc_position(FIX2INT(end));
 
-  rbs_loc_add_optional_child(loc, rbs_constant_pool_insert_ruby_symbol(name), rg);
+  rbs_loc_legacy_add_optional_child(loc, rbs_constant_pool_insert_ruby_symbol(name), rg);
 
   return Qnil;
 }
@@ -204,12 +203,12 @@ 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_add_optional_child(loc, rbs_constant_pool_insert_ruby_symbol(name), NULL_RANGE);
+  rbs_loc_legacy_add_optional_child(loc, rbs_constant_pool_insert_ruby_symbol(name), NULL_RANGE);
 
   return Qnil;
 }
 
-VALUE rbs_new_location(VALUE buffer, range rg) {
+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);
 
@@ -300,22 +299,14 @@ static VALUE location_required_keys(VALUE self) {
   return keys;
 }
 
-VALUE rbs_location_pp(VALUE buffer, const position *start_pos, const position *end_pos) {
-  range rg = { *start_pos, *end_pos };
-  rg.start = *start_pos;
-  rg.end = *end_pos;
-
-  return rbs_new_location(buffer, rg);
-}
-
 void rbs__init_location(void) {
   RBS_Location = rb_define_class_under(RBS, "Location", rb_cObject);
   rb_define_alloc_func(RBS_Location, location_s_allocate);
   rb_define_private_method(RBS_Location, "initialize", location_initialize, 3);
   rb_define_private_method(RBS_Location, "initialize_copy", location_initialize_copy, 1);
   rb_define_method(RBS_Location, "buffer", location_buffer, 0);
-  rb_define_method(RBS_Location, "start_pos", location_start_pos, 0);
-  rb_define_method(RBS_Location, "end_pos", location_end_pos, 0);
+  rb_define_method(RBS_Location, "_start_pos", location_start_pos, 0);
+  rb_define_method(RBS_Location, "_end_pos", location_end_pos, 0);
   rb_define_method(RBS_Location, "_add_required_child", location_add_required_child, 3);
   rb_define_method(RBS_Location, "_add_optional_child", location_add_optional_child, 3);
   rb_define_method(RBS_Location, "_add_optional_no_child", location_add_optional_no_child, 1);

data/ext/rbs_extension/legacy_location.h

@@ -0,0 +1,40 @@
+#ifndef RBS_LOCATION_H
+#define RBS_LOCATION_H
+
+#include "ruby.h"
+#include "rbs.h"
+
+/**
+ * RBS::Location class
+ * */
+extern VALUE RBS_Location;
+
+typedef struct {
+  VALUE buffer;
+  rbs_loc_range rg;
+  rbs_loc_children *children; // NULL when no children is allocated
+} rbs_loc;
+
+/**
+ * Returns new RBS::Location object, with given buffer and range.
+ * */
+VALUE rbs_new_location(VALUE buffer, rbs_range_t rg);
+
+/**
+ * Return rbs_loc associated with the RBS::Location object.
+ * */
+rbs_loc *rbs_check_location(VALUE location);
+
+/**
+ * Allocate memory for child locations.
+ *
+ * Do not call twice for the same location.
+ * */
+void rbs_loc_legacy_alloc_children(rbs_loc *loc, unsigned short cap);
+
+/**
+ * Define RBS::Location class.
+ * */
+void rbs__init_location();
+
+#endif