rbs 3.10.4 → 4.0.0

data/include/rbs/lexer.h

@@ -30,6 +30,7 @@ enum RBSTokenType {
     pBANG,     /* ! */
     pQUESTION, /* ? */
     pLT,       /* < */
+    pGT,       /* > */
     pEQ,       /* = */
 
     kALIAS,        /* alias */
@@ -39,6 +40,7 @@ enum RBSTokenType {
     kBOOL,         /* bool */
     kBOT,          /* bot */
     kCLASS,        /* class */
+    kCLASSALIAS,   /* class-alias */
     kDEF,          /* def */
     kEND,          /* end */
     kEXTEND,       /* extend */
@@ -48,6 +50,7 @@ enum RBSTokenType {
     kINSTANCE,     /* instance */
     kINTERFACE,    /* interface */
     kMODULE,       /* module */
+    kMODULEALIAS,  /* module-alias */
     kNIL,          /* nil */
     kOUT,          /* out */
     kPREPEND,      /* prepend */
@@ -64,6 +67,9 @@ enum RBSTokenType {
     kUSE,          /* use */
     kAS,           /* as */
     k__TODO__,     /* __todo__ */
+    kATRBS,        /* @rbs */
+    kSKIP,         /* skip */
+    kRETURN,       /* return */
 
     tLIDENT,    /* Identifiers starting with lower case */
     tUIDENT,    /* Identifiers starting with upper case */
@@ -78,8 +84,9 @@ enum RBSTokenType {
     pAREF_OPR,  /* [] */
     tOPERATOR,  /* Operator identifier */
 
-    tCOMMENT,     /* Comment */
-    tLINECOMMENT, /* Comment of all line */
+    tCOMMENT,       /* Comment */
+    tLINECOMMENT,   /* Comment of all line */
+    tINLINECOMMENT, /* Comment in inline decl starting with -- */
 
     tTRIVIA, /* Trivia tokens -- space and new line */
 
@@ -129,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,10 +126,28 @@ 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 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);
 
+/**
+ * Parse an inline leading annotation from a string.
+ *
+ * @param parser The parser to use
+ * @param annotation Pointer to store the resulting annotation
+ * @return true if parsing succeeded, false otherwise
+ */
+bool rbs_parse_inline_leading_annotation(rbs_parser_t *parser, rbs_ast_ruby_annotations_t **annotation);
+
+/**
+ * Parse an inline trailing annotation from a string.
+ *
+ * @param parser The parser to use
+ * @param annotation Pointer to store the resulting annotation
+ * @return true if parsing succeeded, false otherwise
+ */
+bool rbs_parse_inline_trailing_annotation(rbs_parser_t *parser, rbs_ast_ruby_annotations_t **annotation);
+
 #endif

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/annotation.rb

@@ -21,7 +21,7 @@ module RBS
         self.class.hash ^ string.hash
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { string: string, location: location }.to_json(state)
       end
     end

data/lib/rbs/ast/comment.rb

@@ -21,7 +21,7 @@ module RBS
         self.class.hash ^ string.hash
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { string: string, location: location }.to_json(state)
       end
     end

data/lib/rbs/ast/declarations.rb

@@ -74,7 +74,7 @@ module RBS
             self.class.hash ^ name.hash ^ args.hash
           end
 
-          def to_json(state = _ = nil)
+          def to_json(state = nil)
             {
               name: name,
               args: args,
@@ -130,7 +130,7 @@ module RBS
           self.class.hash ^ name.hash ^ type_params.hash ^ super_class.hash ^ members.hash
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             declaration: :class,
             name: name,
@@ -166,7 +166,7 @@ module RBS
             self.class.hash ^ name.hash ^ args.hash ^ location.hash
           end
 
-          def to_json(state = _ = nil)
+          def to_json(state = nil)
             {
               name: name,
               args: args,
@@ -231,7 +231,7 @@ module RBS
           self.class.hash ^ name.hash ^ type_params.hash ^ self_types.hash ^ members.hash
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             declaration: :module,
             name: name,
@@ -288,7 +288,7 @@ module RBS
           self.class.hash ^ type_params.hash ^ members.hash
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             declaration: :interface,
             name: name,
@@ -331,7 +331,7 @@ module RBS
           self.class.hash ^ name.hash ^ type_params.hash ^ type.hash
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             declaration: :alias,
             name: name,
@@ -371,7 +371,7 @@ module RBS
           self.class.hash ^ name.hash ^ type.hash
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             declaration: :constant,
             name: name,
@@ -409,7 +409,7 @@ module RBS
           self.class.hash ^ name.hash ^ type.hash
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             declaration: :global,
             name: name,
@@ -445,7 +445,7 @@ module RBS
       end
 
       class ClassAlias < AliasDecl
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             declaration: :class_alias,
             new_name: new_name,
@@ -457,7 +457,7 @@ module RBS
       end
 
       class ModuleAlias < AliasDecl
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             declaration: :module_alias,
             new_name: new_name,

data/lib/rbs/ast/members.rb

@@ -35,7 +35,7 @@ module RBS
             update(method_type: self.method_type.sub(subst))
           end
 
-          def to_json(state = _ = nil)
+          def to_json(state = nil)
             {
               annotations: annotations,
               method_type: method_type
@@ -103,7 +103,7 @@ module RBS
           )
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :method_definition,
             name: name,
@@ -145,7 +145,7 @@ module RBS
       class InstanceVariable < Base
         include Var
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :instance_variable,
             name: name,
@@ -159,7 +159,7 @@ module RBS
       class ClassInstanceVariable < Base
         include Var
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :class_instance_variable,
             name: name,
@@ -173,7 +173,7 @@ module RBS
       class ClassVariable < Base
         include Var
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :class_variable,
             name: name,
@@ -215,7 +215,7 @@ module RBS
       class Include < Base
         include Mixin
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :include,
             name: name,
@@ -230,7 +230,7 @@ module RBS
       class Extend < Base
         include Mixin
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :extend,
             name: name,
@@ -245,7 +245,7 @@ module RBS
       class Prepend < Base
         include Mixin
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :prepend,
             name: name,
@@ -311,7 +311,7 @@ module RBS
       class AttrReader < Base
         include Attribute
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :attr_reader,
             name: name,
@@ -329,7 +329,7 @@ module RBS
       class AttrAccessor < Base
         include Attribute
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :attr_accessor,
             name: name,
@@ -347,7 +347,7 @@ module RBS
       class AttrWriter < Base
         include Attribute
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :attr_writer,
             name: name,
@@ -383,7 +383,7 @@ module RBS
       class Public < Base
         include LocationOnly
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           { member: :public, location: location }.to_json(state)
         end
       end
@@ -391,7 +391,7 @@ module RBS
       class Private < Base
         include LocationOnly
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           { member: :private, location: location }.to_json(state)
         end
       end
@@ -426,7 +426,7 @@ module RBS
           new_name.hash ^ old_name.hash ^ kind.hash
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           {
             member: :alias,
             new_name: new_name,