rbs 4.0.0.dev.5 → 4.0.1.dev.1

data/include/rbs/lexer.h

@@ -136,8 +136,8 @@ typedef struct {
  * */
 typedef struct {
     rbs_string_t string;
-    int start_pos;          /* The character position that defines the start of the input */
-    int end_pos;            /* The character position that defines the end of the input */
+    int start_pos;          /* The byte position that defines the start of the input */
+    int end_pos;            /* The byte position that defines the end of the input */
     rbs_position_t current; /* The current position: just before the current_character */
     rbs_position_t start;   /* The start position of the current token */
 

data/include/rbs/location.h

@@ -1,59 +1,40 @@
 #ifndef RBS__RBS_LOCATION_H
 #define RBS__RBS_LOCATION_H
 
-#include "lexer.h"
-
-#include "rbs/util/rbs_constant_pool.h"
 #include "rbs/util/rbs_allocator.h"
 
-typedef struct {
-    int start;
-    int end;
-} rbs_loc_range;
+#define RBS_LOCATION_NULL_RANGE ((rbs_location_range) { -1, -1, -1, -1 })
+#define RBS_LOCATION_NULL_RANGE_P(rg) ((rg).start_char == -1)
+
+/**
+ * Converts a lexer range (rbs_range_t) to an AST location range (rbs_location_range) by extracting character and byte positions.
+ */
+#define RBS_RANGE_LEX2AST(rg) ((rbs_location_range) { .start_char = (rg).start.char_pos, .start_byte = (rg).start.byte_pos, .end_char = (rg).end.char_pos, .end_byte = (rg).end.byte_pos })
 
 typedef struct {
-    rbs_constant_id_t name;
-    rbs_loc_range rg;
-} rbs_loc_entry;
+    int start_char;
+    int start_byte;
 
-typedef unsigned int rbs_loc_entry_bitmap;
+    int end_char;
+    int end_byte;
+} rbs_location_range;
 
-// 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 rbs_location {
-    rbs_range_t rg;
-    rbs_loc_children *children;
-} rbs_location_t;
-
-typedef struct rbs_location_list_node {
-    rbs_location_t *loc;
-    struct rbs_location_list_node *next;
-} rbs_location_list_node_t;
-
-typedef struct rbs_location_list {
+typedef struct rbs_location_range_list_node {
+    rbs_location_range range;
+    struct rbs_location_range_list_node *next;
+} rbs_location_range_list_node_t;
+
+typedef struct rbs_location_range_list {
     rbs_allocator_t *allocator;
-    rbs_location_list_node_t *head;
-    rbs_location_list_node_t *tail;
+    struct rbs_location_range_list_node *head;
+    struct rbs_location_range_list_node *tail;
     size_t length;
-} rbs_location_list_t;
-
-void rbs_loc_alloc_children(rbs_allocator_t *, rbs_location_t *loc, size_t capacity);
-void rbs_loc_add_required_child(rbs_location_t *loc, rbs_constant_id_t name, rbs_range_t r);
-void rbs_loc_add_optional_child(rbs_location_t *loc, rbs_constant_id_t name, rbs_range_t r);
+} rbs_location_range_list_t;
 
 /**
- * Allocate new rbs_location_t object through the given allocator.
- * */
-rbs_location_t *rbs_location_new(rbs_allocator_t *, rbs_range_t rg);
-
-rbs_location_list_t *rbs_location_list_new(rbs_allocator_t *allocator);
-void rbs_location_list_append(rbs_location_list_t *list, rbs_location_t *loc);
+ * Allocate new rbs_location_range_list_t object through the given allocator.
+ */
+rbs_location_range_list_t *rbs_location_range_list_new(rbs_allocator_t *allocator);
+void rbs_location_range_list_append(rbs_location_range_list_t *list, rbs_location_range range);
 
 #endif

data/include/rbs/parser.h

@@ -126,8 +126,8 @@ rbs_ast_comment_t *rbs_parser_get_comment(rbs_parser_t *parser, int subject_line
 
 void rbs_parser_set_error(rbs_parser_t *parser, rbs_token_t tok, bool syntax_error, const char *fmt, ...) RBS_ATTRIBUTE_FORMAT(4, 5);
 
-bool rbs_parse_type(rbs_parser_t *parser, rbs_node_t **type, bool void_allowed, bool self_allowed);
-bool rbs_parse_method_type(rbs_parser_t *parser, rbs_method_type_t **method_type, bool require_eof);
+bool rbs_parse_type(rbs_parser_t *parser, rbs_node_t **type, bool void_allowed, bool self_allowed, bool classish_allowed);
+bool rbs_parse_method_type(rbs_parser_t *parser, rbs_method_type_t **method_type, bool require_eof, bool classish_allowed);
 bool rbs_parse_signature(rbs_parser_t *parser, rbs_signature_t **signature);
 
 bool rbs_parse_type_params(rbs_parser_t *parser, bool module_type_params, rbs_node_list_t **params);

data/include/rbs/util/rbs_constant_pool.h

@@ -81,9 +81,6 @@ typedef struct {
     uint32_t capacity;
 } rbs_constant_pool_t;
 
-// A global constant pool for storing permenant keywords, such as the names of location children in `parser.c`.
-extern rbs_constant_pool_t *RBS_GLOBAL_CONSTANT_POOL;
-
 /**
  * Initialize a new constant pool with a given capacity.
  *

data/include/rbs.h

@@ -1,6 +1,14 @@
 #ifndef RBS_H
 #define RBS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "rbs/parser.h"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

data/lib/rbs/ast/ruby/annotations.rb

@@ -109,12 +109,13 @@ module RBS
         class MethodTypesAnnotation < Base
           Overload = AST::Members::MethodDefinition::Overload
 
-          attr_reader :overloads, :vertical_bar_locations
+          attr_reader :overloads, :vertical_bar_locations, :dot3_location
 
-          def initialize(location:, prefix_location:, overloads:, vertical_bar_locations:)
+          def initialize(location:, prefix_location:, overloads:, vertical_bar_locations:, dot3_location:)
             super(location, prefix_location)
             @overloads = overloads
             @vertical_bar_locations = vertical_bar_locations
+            @dot3_location = dot3_location
           end
 
           def map_type_name(&block)
@@ -125,13 +126,14 @@ module RBS
               )
             end
 
-            self.class.new(location:, prefix_location:, overloads: ovs, vertical_bar_locations:) #: self
+            self.class.new(location:, prefix_location:, overloads: ovs, vertical_bar_locations:, dot3_location:) #: self
           end
 
           def type_fingerprint
             [
               "annots/method_types",
-              overloads.map { |o| [o.annotations.map(&:to_s), o.method_type.to_s] }
+              overloads.map { |o| [o.annotations.map(&:to_s), o.method_type.to_s] },
+              overloading: dot3_location ? true : false
             ]
           end
         end
@@ -250,6 +252,157 @@ module RBS
             ]
           end
         end
+
+        class ParamTypeAnnotation < Base
+          attr_reader :name_location, :colon_location, :param_type, :comment_location
+
+          def initialize(location:, prefix_location:, name_location:, colon_location:, param_type:, comment_location:)
+            super(location, prefix_location)
+            @name_location = name_location
+            @colon_location = colon_location
+            @param_type = param_type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              name_location: name_location,
+              colon_location: colon_location,
+              param_type: param_type.map_type_name { yield _1 },
+              comment_location: comment_location
+            ) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/param_type",
+              name_location.source,
+              param_type.to_s,
+              comment_location&.source
+            ]
+          end
+        end
+
+        class SplatParamTypeAnnotation < Base
+          attr_reader :star_location, :name_location, :colon_location, :param_type, :comment_location
+
+          def initialize(location:, prefix_location:, star_location:, name_location:, colon_location:, param_type:, comment_location:)
+            super(location, prefix_location)
+            @star_location = star_location
+            @name_location = name_location
+            @colon_location = colon_location
+            @param_type = param_type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              star_location: star_location,
+              name_location: name_location,
+              colon_location: colon_location,
+              param_type: param_type.map_type_name { yield _1 },
+              comment_location: comment_location
+            ) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/splat_param_type",
+              name_location&.source,
+              param_type.to_s,
+              comment_location&.source
+            ]
+          end
+        end
+
+        class DoubleSplatParamTypeAnnotation < Base
+          attr_reader :star2_location, :name_location, :colon_location, :param_type, :comment_location
+
+          def initialize(location:, prefix_location:, star2_location:, name_location:, colon_location:, param_type:, comment_location:)
+            super(location, prefix_location)
+            @star2_location = star2_location
+            @name_location = name_location
+            @colon_location = colon_location
+            @param_type = param_type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              star2_location: star2_location,
+              name_location: name_location,
+              colon_location: colon_location,
+              param_type: param_type.map_type_name { yield _1 },
+              comment_location: comment_location
+            ) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/double_splat_param_type",
+              name_location&.source,
+              param_type.to_s,
+              comment_location&.source
+            ]
+          end
+        end
+
+        class BlockParamTypeAnnotation < Base
+          attr_reader :ampersand_location, :name_location, :colon_location, :question_location, :type_location, :type, :comment_location
+
+          def initialize(location:, prefix_location:, ampersand_location:, name_location:, colon_location:, question_location:, type_location:, type:, comment_location:)
+            super(location, prefix_location)
+            @ampersand_location = ampersand_location
+            @name_location = name_location
+            @colon_location = colon_location
+            @question_location = question_location
+            @type_location = type_location
+            @type = type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              ampersand_location: ampersand_location,
+              name_location: name_location,
+              colon_location: colon_location,
+              question_location: question_location,
+              type_location: type_location,
+              type: type.map_type_name { yield _1 },
+              comment_location: comment_location
+            ) #: self
+          end
+
+          def name
+            name_location&.source&.to_sym
+          end
+
+          def optional?
+            question_location ? true : false
+          end
+
+          def required?
+            !optional?
+          end
+
+          def type_fingerprint
+            [
+              "annots/block_param_type",
+              name_location&.source,
+              type.to_s,
+              optional? ? "optional" : "required",
+              comment_location&.source
+            ]
+          end
+        end
       end
     end
   end