rbs 4.0.0.dev.1 → 4.0.0.dev.3

data/ext/rbs_extension/rbs_extension.h

@@ -1,8 +1,11 @@
 #include <stdbool.h>
+#include "compat.h"
 
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
 #include "ruby/re.h"
 #include "ruby/encoding.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 #include "class_constants.h"
 #include "rbs.h"

data/ext/rbs_extension/rbs_string_bridging.h

@@ -1,8 +1,12 @@
 #ifndef RBS__RBS_STRING_BRIDGING_H
 #define RBS__RBS_STRING_BRIDGING_H
 
+#include "compat.h"
+
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
 #include "ruby/encoding.h"
+SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 #include "rbs/string.h"
 

data/include/rbs/ast.h

@@ -91,7 +91,7 @@ typedef struct rbs_node {
     rbs_location_t *location;
 } rbs_node_t;
 
-const char* rbs_node_type_name(rbs_node_t *node);
+const char *rbs_node_type_name(rbs_node_t *node);
 
 /* rbs_node_list_node */
 
@@ -107,7 +107,7 @@ typedef struct rbs_node_list {
     size_t length;
 } rbs_node_list_t;
 
-rbs_node_list_t* rbs_node_list_new(rbs_allocator_t *);
+rbs_node_list_t *rbs_node_list_new(rbs_allocator_t *);
 
 void rbs_node_list_append(rbs_node_list_t *list, rbs_node_t *node);
 
@@ -126,13 +126,13 @@ typedef struct rbs_hash {
     size_t length;
 } rbs_hash_t;
 
-rbs_hash_t* rbs_hash_new(rbs_allocator_t *);
+rbs_hash_t *rbs_hash_new(rbs_allocator_t *);
 
 void rbs_hash_set(rbs_hash_t *hash, rbs_node_t *key, rbs_node_t *value);
 
-rbs_hash_node_t* rbs_hash_find(rbs_hash_t *hash, rbs_node_t *key);
+rbs_hash_node_t *rbs_hash_find(rbs_hash_t *hash, rbs_node_t *key);
 
-rbs_node_t* rbs_hash_get(rbs_hash_t *hash, rbs_node_t *key);
+rbs_node_t *rbs_hash_get(rbs_hash_t *hash, rbs_node_t *key);
 
 /* rbs_ast_node */
 
@@ -647,14 +647,13 @@ typedef struct rbs_types_variable {
     struct rbs_ast_symbol *name;
 } rbs_types_variable_t;
 
-
 typedef union rbs_ast_ruby_annotations {
-  rbs_node_t base;
-  rbs_ast_ruby_annotations_colon_method_type_annotation_t colon_method_type_annotation;
-  rbs_ast_ruby_annotations_method_types_annotation_t method_types_annotation;
-  rbs_ast_ruby_annotations_node_type_assertion_t node_type_assertion;
-  rbs_ast_ruby_annotations_return_type_annotation_t return_type_annotation;
-  rbs_ast_ruby_annotations_skip_annotation_t skip_annotation;
+    rbs_node_t base;
+    rbs_ast_ruby_annotations_colon_method_type_annotation_t colon_method_type_annotation;
+    rbs_ast_ruby_annotations_method_types_annotation_t method_types_annotation;
+    rbs_ast_ruby_annotations_node_type_assertion_t node_type_assertion;
+    rbs_ast_ruby_annotations_return_type_annotation_t return_type_annotation;
+    rbs_ast_ruby_annotations_skip_annotation_t skip_annotation;
 } rbs_ast_ruby_annotations_t;
 
 /// `rbs_keyword_t` models RBS keywords like "private", "instance", "covariant", etc.

data/include/rbs/defines.h

@@ -10,7 +10,6 @@
 #ifndef RBS_DEFINES_H
 #define RBS_DEFINES_H
 
-
 /***********************************************************************************************************************
  * Copied+modified subset of Prism's `include/prism/defines.h`                                                         *
  **********************************************************************************************************************/
@@ -22,15 +21,15 @@
  * compiler-agnostic way.
  */
 #if defined(__GNUC__)
-#   if defined(__MINGW_PRINTF_FORMAT)
-#       define RBS_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((format(__MINGW_PRINTF_FORMAT, string_index, argument_index)))
-#   else
-#       define RBS_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((format(printf, string_index, argument_index)))
-#   endif
+#if defined(__MINGW_PRINTF_FORMAT)
+#define RBS_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((format(__MINGW_PRINTF_FORMAT, string_index, argument_index)))
+#else
+#define RBS_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((format(printf, string_index, argument_index)))
+#endif
 #elif defined(__clang__)
-#   define RBS_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((__format__(__printf__, string_index, argument_index)))
+#define RBS_ATTRIBUTE_FORMAT(string_index, argument_index) __attribute__((__format__(__printf__, string_index, argument_index)))
 #else
-#   define RBS_ATTRIBUTE_FORMAT(string_index, argument_index)
+#define RBS_ATTRIBUTE_FORMAT(string_index, argument_index)
 #endif
 
 /**
@@ -38,13 +37,13 @@
  * Use RBS_FALLTHROUGH to explicitly annotate cases where the fallthrough is intentional.
  */
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L // C23 or later
-    #define RBS_FALLTHROUGH [[fallthrough]];
+#define RBS_FALLTHROUGH [[fallthrough]];
 #elif defined(__GNUC__) || defined(__clang__)
-    #define RBS_FALLTHROUGH __attribute__((fallthrough));
+#define RBS_FALLTHROUGH __attribute__((fallthrough));
 #elif defined(_MSC_VER)
-    #define RBS_FALLTHROUGH __fallthrough;
+#define RBS_FALLTHROUGH __fallthrough;
 #else
-    #define RBS_FALLTHROUGH
+#define RBS_FALLTHROUGH
 #endif
 
 /***********************************************************************************************************************

data/include/rbs/lexer.h

@@ -5,95 +5,95 @@
 #include "util/rbs_encoding.h"
 
 enum RBSTokenType {
-  NullType,         /* (Nothing) */
-  pEOF,             /* EOF */
-  ErrorToken,       /* Error */
-
-  pLPAREN,          /* ( */
-  pRPAREN,          /* ) */
-  pCOLON,           /* : */
-  pCOLON2,          /* :: */
-  pLBRACKET,        /* [ */
-  pRBRACKET,        /* ] */
-  pLBRACE,          /* { */
-  pRBRACE,          /* } */
-  pHAT,             /* ^ */
-  pARROW,           /* -> */
-  pFATARROW,        /* => */
-  pCOMMA,           /* , */
-  pBAR,             /* | */
-  pAMP,             /* & */
-  pSTAR,            /* * */
-  pSTAR2,           /* ** */
-  pDOT,             /* . */
-  pDOT3,            /* ... */
-  pBANG,            /* ! */
-  pQUESTION,        /* ? */
-  pLT,              /* < */
-  pEQ,              /* = */
-
-  kALIAS,           /* alias */
-  kATTRACCESSOR,    /* attr_accessor */
-  kATTRREADER,      /* attr_reader */
-  kATTRWRITER,      /* attr_writer */
-  kBOOL,            /* bool */
-  kBOT,             /* bot */
-  kCLASS,           /* class */
-  kDEF,             /* def */
-  kEND,             /* end */
-  kEXTEND,          /* extend */
-  kFALSE,           /* false */
-  kIN,              /* in */
-  kINCLUDE,         /* include */
-  kINSTANCE,        /* instance */
-  kINTERFACE,       /* interface */
-  kMODULE,          /* module */
-  kNIL,             /* nil */
-  kOUT,             /* out */
-  kPREPEND,         /* prepend */
-  kPRIVATE,         /* private */
-  kPUBLIC,          /* public */
-  kSELF,            /* self */
-  kSINGLETON,       /* singleton */
-  kTOP,             /* top */
-  kTRUE,            /* true */
-  kTYPE,            /* type */
-  kUNCHECKED,       /* unchecked */
-  kUNTYPED,         /* untyped */
-  kVOID,            /* void */
-  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 */
-  tULIDENT,         /* Identifiers starting with `_` followed by upper case */
-  tULLIDENT,        /* Identifiers starting with `_` followed by lower case */
-  tGIDENT,          /* Identifiers starting with `$` */
-  tAIDENT,          /* Identifiers starting with `@` */
-  tA2IDENT,         /* Identifiers starting with `@@` */
-  tBANGIDENT,       /* Identifiers ending with `!` */
-  tEQIDENT,         /* Identifiers ending with `=` */
-  tQIDENT,          /* Quoted identifier */
-  pAREF_OPR,        /* [] */
-  tOPERATOR,        /* Operator identifier */
-
-  tCOMMENT,         /* Comment */
-  tLINECOMMENT,     /* Comment of all line */
-  tINLINECOMMENT,   /* Comment in inline decl starting with -- */
-
-  tTRIVIA,          /* Trivia tokens -- space and new line */
-
-  tDQSTRING,        /* Double quoted string */
-  tSQSTRING,        /* Single quoted string */
-  tINTEGER,         /* Integer */
-  tSYMBOL,          /* Symbol */
-  tDQSYMBOL,        /* Double quoted symbol */
-  tSQSYMBOL,        /* Single quoted symbol */
-  tANNOTATION,      /* Annotation */
+    NullType,   /* (Nothing) */
+    pEOF,       /* EOF */
+    ErrorToken, /* Error */
+
+    pLPAREN,   /* ( */
+    pRPAREN,   /* ) */
+    pCOLON,    /* : */
+    pCOLON2,   /* :: */
+    pLBRACKET, /* [ */
+    pRBRACKET, /* ] */
+    pLBRACE,   /* { */
+    pRBRACE,   /* } */
+    pHAT,      /* ^ */
+    pARROW,    /* -> */
+    pFATARROW, /* => */
+    pCOMMA,    /* , */
+    pBAR,      /* | */
+    pAMP,      /* & */
+    pSTAR,     /* * */
+    pSTAR2,    /* ** */
+    pDOT,      /* . */
+    pDOT3,     /* ... */
+    pBANG,     /* ! */
+    pQUESTION, /* ? */
+    pLT,       /* < */
+    pEQ,       /* = */
+
+    kALIAS,        /* alias */
+    kATTRACCESSOR, /* attr_accessor */
+    kATTRREADER,   /* attr_reader */
+    kATTRWRITER,   /* attr_writer */
+    kBOOL,         /* bool */
+    kBOT,          /* bot */
+    kCLASS,        /* class */
+    kDEF,          /* def */
+    kEND,          /* end */
+    kEXTEND,       /* extend */
+    kFALSE,        /* false */
+    kIN,           /* in */
+    kINCLUDE,      /* include */
+    kINSTANCE,     /* instance */
+    kINTERFACE,    /* interface */
+    kMODULE,       /* module */
+    kNIL,          /* nil */
+    kOUT,          /* out */
+    kPREPEND,      /* prepend */
+    kPRIVATE,      /* private */
+    kPUBLIC,       /* public */
+    kSELF,         /* self */
+    kSINGLETON,    /* singleton */
+    kTOP,          /* top */
+    kTRUE,         /* true */
+    kTYPE,         /* type */
+    kUNCHECKED,    /* unchecked */
+    kUNTYPED,      /* untyped */
+    kVOID,         /* void */
+    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 */
+    tULIDENT,   /* Identifiers starting with `_` followed by upper case */
+    tULLIDENT,  /* Identifiers starting with `_` followed by lower case */
+    tGIDENT,    /* Identifiers starting with `$` */
+    tAIDENT,    /* Identifiers starting with `@` */
+    tA2IDENT,   /* Identifiers starting with `@@` */
+    tBANGIDENT, /* Identifiers ending with `!` */
+    tEQIDENT,   /* Identifiers ending with `=` */
+    tQIDENT,    /* Quoted identifier */
+    pAREF_OPR,  /* [] */
+    tOPERATOR,  /* Operator identifier */
+
+    tCOMMENT,       /* Comment */
+    tLINECOMMENT,   /* Comment of all line */
+    tINLINECOMMENT, /* Comment in inline decl starting with -- */
+
+    tTRIVIA, /* Trivia tokens -- space and new line */
+
+    tDQSTRING,   /* Double quoted string */
+    tSQSTRING,   /* Single quoted string */
+    tINTEGER,    /* Integer */
+    tSYMBOL,     /* Symbol */
+    tDQSYMBOL,   /* Double quoted symbol */
+    tSQSYMBOL,   /* Single quoted symbol */
+    tANNOTATION, /* Annotation */
 };
 
 /**
@@ -103,20 +103,20 @@ enum RBSTokenType {
  * They can be computed from `byte_pos` (or `char_pos`), but it needs full scan from the beginning of the string (depending on the encoding).
  * */
 typedef struct {
-  int byte_pos;
-  int char_pos;
-  int line;
-  int column;
+    int byte_pos;
+    int char_pos;
+    int line;
+    int column;
 } rbs_position_t;
 
 typedef struct {
-  rbs_position_t start;
-  rbs_position_t end;
+    rbs_position_t start;
+    rbs_position_t end;
 } rbs_range_t;
 
 typedef struct {
-  enum RBSTokenType type;
-  rbs_range_t range;
+    enum RBSTokenType type;
+    rbs_range_t range;
 } rbs_token_t;
 
 /**
@@ -130,19 +130,19 @@ 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 */
-  rbs_position_t current;               /* The current position */
-  rbs_position_t start;                 /* The start position of the current token */
-  bool first_token_of_line;       /* This flag is used for tLINECOMMENT */
-  unsigned int last_char;         /* Last peeked character */
-  const rbs_encoding_t *encoding;
+    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 */
+    rbs_position_t current;   /* The current position */
+    rbs_position_t start;     /* The start position of the current token */
+    bool first_token_of_line; /* This flag is used for tLINECOMMENT */
+    unsigned int last_char;   /* Last peeked character */
+    const rbs_encoding_t *encoding;
 } rbs_lexer_t;
 
-extern rbs_token_t NullToken;
-extern rbs_position_t NullPosition;
-extern rbs_range_t NULL_RANGE;
+extern const rbs_token_t NullToken;
+extern const rbs_position_t NullPosition;
+extern const rbs_range_t NULL_RANGE;
 
 char *rbs_peek_token(rbs_lexer_t *lexer, rbs_token_t tok);
 int rbs_token_chars(rbs_token_t tok);

data/include/rbs/location.h

@@ -7,13 +7,13 @@
 #include "rbs/util/rbs_allocator.h"
 
 typedef struct {
-  int start;
-  int end;
+    int start;
+    int end;
 } rbs_loc_range;
 
 typedef struct {
-  rbs_constant_id_t name;
-  rbs_loc_range rg;
+    rbs_constant_id_t name;
+    rbs_loc_range rg;
 } rbs_loc_entry;
 
 typedef unsigned int rbs_loc_entry_bitmap;
@@ -21,10 +21,10 @@ 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];
+    unsigned short len;
+    unsigned short cap;
+    rbs_loc_entry_bitmap required_p;
+    rbs_loc_entry entries[1];
 } rbs_loc_children;
 
 typedef struct rbs_location {
@@ -33,15 +33,15 @@ typedef struct rbs_location {
 } rbs_location_t;
 
 typedef struct rbs_location_list_node {
-  rbs_location_t *loc;
-  struct rbs_location_list_node *next;
+    rbs_location_t *loc;
+    struct rbs_location_list_node *next;
 } rbs_location_list_node_t;
 
 typedef struct rbs_location_list {
-  rbs_allocator_t *allocator;
-  rbs_location_list_node_t *head;
-  rbs_location_list_node_t *tail;
-  size_t length;
+    rbs_allocator_t *allocator;
+    rbs_location_list_node_t *head;
+    rbs_location_list_node_t *tail;
+    size_t length;
 } rbs_location_list_t;
 
 void rbs_loc_alloc_children(rbs_allocator_t *, rbs_location_t *loc, size_t capacity);

data/include/rbs/parser.h

@@ -24,39 +24,39 @@
  * A comment object represents the six lines of comments.
  * */
 typedef struct rbs_comment_t {
-  rbs_position_t start;
-  rbs_position_t end;
+    rbs_position_t start;
+    rbs_position_t end;
 
-  size_t line_size;
-  size_t line_count;
-  rbs_token_t *tokens;
+    size_t line_size;
+    size_t line_count;
+    rbs_token_t *tokens;
 
-  struct rbs_comment_t *next_comment;
+    struct rbs_comment_t *next_comment;
 } rbs_comment_t;
 
 typedef struct rbs_error_t {
-  char *message;
-  rbs_token_t token;
-  bool syntax_error;
+    char *message;
+    rbs_token_t token;
+    bool syntax_error;
 } rbs_error_t;
 
 /**
  * An RBS parser is a LL(3) parser.
  * */
 typedef struct {
-  rbs_lexer_t *rbs_lexer_t;
+    rbs_lexer_t *rbs_lexer_t;
 
-  rbs_token_t current_token;
-  rbs_token_t next_token;       /* The first lookahead token */
-  rbs_token_t next_token2;      /* The second lookahead token */
-  rbs_token_t next_token3;      /* The third lookahead token */
+    rbs_token_t current_token;
+    rbs_token_t next_token;  /* The first lookahead token */
+    rbs_token_t next_token2; /* The second lookahead token */
+    rbs_token_t next_token3; /* The third lookahead token */
 
-  struct id_table *vars;  /* Known type variables */
-  rbs_comment_t *last_comment;  /* Last read comment */
+    struct id_table *vars;       /* Known type variables */
+    rbs_comment_t *last_comment; /* Last read comment */
 
-  rbs_constant_pool_t constant_pool;
-  rbs_allocator_t *allocator;
-  rbs_error_t *error;
+    rbs_constant_pool_t constant_pool;
+    rbs_allocator_t *allocator;
+    rbs_error_t *error;
 } rbs_parser_t;
 
 /**
@@ -130,6 +130,8 @@ 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 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.
  *

data/include/rbs/string.h

@@ -6,14 +6,14 @@
 #include "rbs/util/rbs_allocator.h"
 
 typedef struct {
-  const char *start;
-  const char *end;
+    const char *start;
+    const char *end;
 } rbs_string_t;
 
 #define RBS_STRING_NULL ((rbs_string_t) { \
     .start = NULL,                        \
     .end = NULL,                          \
-  })
+})
 
 /**
  * Returns a new `rbs_string_t` struct

data/include/rbs/util/rbs_allocator.h

@@ -4,14 +4,14 @@
 #include <stddef.h>
 
 #ifndef alignof
-    #if defined(__GNUC__) || defined(__clang__)
-        #define alignof(type) __alignof__(type)
-    #elif defined(_MSC_VER)
-        #define alignof(type) __alignof(type)
-    #else
-        // Fallback using offset trick
-        #define alignof(type) offsetof(struct { char c; type member; }, member)
-    #endif
+#if defined(__GNUC__) || defined(__clang__)
+#define alignof(type) __alignof__(type)
+#elif defined(_MSC_VER)
+#define alignof(type) __alignof(type)
+#else
+// Fallback using offset trick
+#define alignof(type) offsetof(struct { char c; type member; }, member)
+#endif
 #endif
 
 struct rbs_allocator;
@@ -19,20 +19,20 @@ typedef struct rbs_allocator rbs_allocator_t;
 
 rbs_allocator_t *rbs_allocator_init(void);
 void rbs_allocator_free(rbs_allocator_t *);
-void *rbs_allocator_malloc_impl      (rbs_allocator_t *, /*    1    */ size_t size, size_t alignment);
-void *rbs_allocator_malloc_many_impl (rbs_allocator_t *, size_t count, size_t size, size_t alignment);
-void *rbs_allocator_calloc_impl      (rbs_allocator_t *, size_t count, size_t size, size_t alignment);
+void *rbs_allocator_malloc_impl(rbs_allocator_t *, /*    1    */ size_t size, size_t alignment);
+void *rbs_allocator_malloc_many_impl(rbs_allocator_t *, size_t count, size_t size, size_t alignment);
+void *rbs_allocator_calloc_impl(rbs_allocator_t *, size_t count, size_t size, size_t alignment);
 
-void *rbs_allocator_realloc_impl     (rbs_allocator_t *, void *ptr, size_t old_size, size_t new_size, size_t alignment);
+void *rbs_allocator_realloc_impl(rbs_allocator_t *, void *ptr, size_t old_size, size_t new_size, size_t alignment);
 
 // Use this when allocating memory for a single instance of a type.
-#define rbs_allocator_alloc(allocator, type)             ((type *) rbs_allocator_malloc_impl((allocator), sizeof(type), alignof(type)))
+#define rbs_allocator_alloc(allocator, type) ((type *) rbs_allocator_malloc_impl((allocator), sizeof(type), alignof(type)))
 // Use this when allocating memory that will be immediately written to in full.
 // Such as allocating strings
 #define rbs_allocator_alloc_many(allocator, count, type) ((type *) rbs_allocator_malloc_many_impl((allocator), (count), sizeof(type), alignof(type)))
 // Use this when allocating memory that will NOT be immediately written to in full.
 // Such as allocating buffers
-#define rbs_allocator_calloc(allocator, count, type)     ((type *) rbs_allocator_calloc_impl((allocator), (count), sizeof(type), alignof(type)))
+#define rbs_allocator_calloc(allocator, count, type) ((type *) rbs_allocator_calloc_impl((allocator), (count), sizeof(type), alignof(type)))
 #define rbs_allocator_realloc(allocator, ptr, old_size, new_size, type) ((type *) rbs_allocator_realloc_impl((allocator), (ptr), (old_size), (new_size), alignof(type)))
 
 #endif

data/include/rbs/util/rbs_constant_pool.h

@@ -48,10 +48,10 @@ static const rbs_constant_pool_bucket_type_t RBS_CONSTANT_POOL_BUCKET_CONSTANT =
 /** A bucket in the hash map. */
 typedef struct {
     /** The incremental ID used for indexing back into the pool. */
-    unsigned int id: 30;
+    unsigned int id : 30;
 
     /** The type of the bucket, which determines how to free it. */
-    rbs_constant_pool_bucket_type_t type: 2;
+    rbs_constant_pool_bucket_type_t type : 2;
 
     /** The hash of the bucket. */
     uint32_t hash;
@@ -100,7 +100,7 @@ bool rbs_constant_pool_init(rbs_constant_pool_t *pool, uint32_t capacity);
  * @param constant_id The id of the constant to get.
  * @return A pointer to the constant.
  */
-rbs_constant_t * rbs_constant_pool_id_to_constant(const rbs_constant_pool_t *pool, rbs_constant_id_t constant_id);
+rbs_constant_t *rbs_constant_pool_id_to_constant(const rbs_constant_pool_t *pool, rbs_constant_id_t constant_id);
 
 /**
  * Find a constant in a constant pool. Returns the id of the constant, or 0 if

data/include/rbs/util/rbs_encoding.h

@@ -275,6 +275,6 @@ extern const rbs_encoding_t rbs_encodings[RBS_ENCODING_MAXIMUM];
  * @param end A pointer to the last byte of the name.
  * @returns A pointer to the encoding struct if one is found, otherwise NULL.
  */
-const rbs_encoding_t * rbs_encoding_find(const uint8_t *start, const uint8_t *end);
+const rbs_encoding_t *rbs_encoding_find(const uint8_t *start, const uint8_t *end);
 
 #endif

data/lib/rbs/environment.rb

@@ -11,6 +11,10 @@ module RBS
 
     attr_reader :sources
 
+    def declarations
+      sources.flat_map(&:declarations)
+    end
+
     class SingleEntry
       attr_reader :name
       attr_reader :context

data/lib/rbs/namespace.rb

@@ -116,10 +116,3 @@ module RBS
     end
   end
 end
-
-module Kernel
-  def Namespace(name)
-    warn "Kernel#Namespace() is deprecated. Use RBS::Namespace.parse instead.", category: :deprecated
-    RBS::Namespace.parse(name)
-  end
-end

data/lib/rbs/parser_aux.rb

@@ -35,6 +35,11 @@ module RBS
       [buf, dirs, decls]
     end
 
+    def self.parse_type_params(source, module_type_params: true)
+      buf = buffer(source)
+      _parse_type_params(buf, 0, buf.last_position, module_type_params)
+    end
+
     def self.magic_comment(buf)
       start_pos = 0
 

data/lib/rbs/type_name.rb

@@ -100,10 +100,3 @@ module RBS
     end
   end
 end
-
-module Kernel
-  def TypeName(string)
-    warn "Kernel#TypeName() is deprecated. Use RBS::TypeName.parse instead.", category: :deprecated
-    RBS::TypeName.parse(string)
-  end
-end