rbs 3.10.0 → 4.0.0.dev.1

data/ext/rbs_extension/rbs_string_bridging.h

@@ -1,12 +1,8 @@
 #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

@@ -45,38 +45,43 @@ enum rbs_node_type {
     RBS_AST_MEMBERS_PREPEND = 29,
     RBS_AST_MEMBERS_PRIVATE = 30,
     RBS_AST_MEMBERS_PUBLIC = 31,
-    RBS_AST_STRING = 32,
-    RBS_AST_TYPE_PARAM = 33,
-    RBS_METHOD_TYPE = 34,
-    RBS_NAMESPACE = 35,
-    RBS_SIGNATURE = 36,
-    RBS_TYPE_NAME = 37,
-    RBS_TYPES_ALIAS = 38,
-    RBS_TYPES_BASES_ANY = 39,
-    RBS_TYPES_BASES_BOOL = 40,
-    RBS_TYPES_BASES_BOTTOM = 41,
-    RBS_TYPES_BASES_CLASS = 42,
-    RBS_TYPES_BASES_INSTANCE = 43,
-    RBS_TYPES_BASES_NIL = 44,
-    RBS_TYPES_BASES_SELF = 45,
-    RBS_TYPES_BASES_TOP = 46,
-    RBS_TYPES_BASES_VOID = 47,
-    RBS_TYPES_BLOCK = 48,
-    RBS_TYPES_CLASS_INSTANCE = 49,
-    RBS_TYPES_CLASS_SINGLETON = 50,
-    RBS_TYPES_FUNCTION = 51,
-    RBS_TYPES_FUNCTION_PARAM = 52,
-    RBS_TYPES_INTERFACE = 53,
-    RBS_TYPES_INTERSECTION = 54,
-    RBS_TYPES_LITERAL = 55,
-    RBS_TYPES_OPTIONAL = 56,
-    RBS_TYPES_PROC = 57,
-    RBS_TYPES_RECORD = 58,
-    RBS_TYPES_RECORD_FIELD_TYPE = 59,
-    RBS_TYPES_TUPLE = 60,
-    RBS_TYPES_UNION = 61,
-    RBS_TYPES_UNTYPED_FUNCTION = 62,
-    RBS_TYPES_VARIABLE = 63,
+    RBS_AST_RUBY_ANNOTATIONS_COLON_METHOD_TYPE_ANNOTATION = 32,
+    RBS_AST_RUBY_ANNOTATIONS_METHOD_TYPES_ANNOTATION = 33,
+    RBS_AST_RUBY_ANNOTATIONS_NODE_TYPE_ASSERTION = 34,
+    RBS_AST_RUBY_ANNOTATIONS_RETURN_TYPE_ANNOTATION = 35,
+    RBS_AST_RUBY_ANNOTATIONS_SKIP_ANNOTATION = 36,
+    RBS_AST_STRING = 37,
+    RBS_AST_TYPE_PARAM = 38,
+    RBS_METHOD_TYPE = 39,
+    RBS_NAMESPACE = 40,
+    RBS_SIGNATURE = 41,
+    RBS_TYPE_NAME = 42,
+    RBS_TYPES_ALIAS = 43,
+    RBS_TYPES_BASES_ANY = 44,
+    RBS_TYPES_BASES_BOOL = 45,
+    RBS_TYPES_BASES_BOTTOM = 46,
+    RBS_TYPES_BASES_CLASS = 47,
+    RBS_TYPES_BASES_INSTANCE = 48,
+    RBS_TYPES_BASES_NIL = 49,
+    RBS_TYPES_BASES_SELF = 50,
+    RBS_TYPES_BASES_TOP = 51,
+    RBS_TYPES_BASES_VOID = 52,
+    RBS_TYPES_BLOCK = 53,
+    RBS_TYPES_CLASS_INSTANCE = 54,
+    RBS_TYPES_CLASS_SINGLETON = 55,
+    RBS_TYPES_FUNCTION = 56,
+    RBS_TYPES_FUNCTION_PARAM = 57,
+    RBS_TYPES_INTERFACE = 58,
+    RBS_TYPES_INTERSECTION = 59,
+    RBS_TYPES_LITERAL = 60,
+    RBS_TYPES_OPTIONAL = 61,
+    RBS_TYPES_PROC = 62,
+    RBS_TYPES_RECORD = 63,
+    RBS_TYPES_RECORD_FIELD_TYPE = 64,
+    RBS_TYPES_TUPLE = 65,
+    RBS_TYPES_UNION = 66,
+    RBS_TYPES_UNTYPED_FUNCTION = 67,
+    RBS_TYPES_VARIABLE = 68,
     RBS_KEYWORD,
     RBS_AST_SYMBOL,
 };
@@ -86,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 */
 
@@ -102,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);
 
@@ -121,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 */
 
@@ -392,6 +397,47 @@ typedef struct rbs_ast_members_public {
 
 } rbs_ast_members_public_t;
 
+typedef struct rbs_ast_ruby_annotations_colon_method_type_annotation {
+    rbs_node_t base;
+
+    struct rbs_location *prefix_location;
+    struct rbs_node_list *annotations;
+    struct rbs_node *method_type;
+} rbs_ast_ruby_annotations_colon_method_type_annotation_t;
+
+typedef struct rbs_ast_ruby_annotations_method_types_annotation {
+    rbs_node_t base;
+
+    struct rbs_location *prefix_location;
+    struct rbs_node_list *overloads;
+    struct rbs_location_list *vertical_bar_locations;
+} rbs_ast_ruby_annotations_method_types_annotation_t;
+
+typedef struct rbs_ast_ruby_annotations_node_type_assertion {
+    rbs_node_t base;
+
+    struct rbs_location *prefix_location;
+    struct rbs_node *type;
+} rbs_ast_ruby_annotations_node_type_assertion_t;
+
+typedef struct rbs_ast_ruby_annotations_return_type_annotation {
+    rbs_node_t base;
+
+    struct rbs_location *prefix_location;
+    struct rbs_location *return_location;
+    struct rbs_location *colon_location;
+    struct rbs_node *return_type;
+    struct rbs_location *comment_location;
+} rbs_ast_ruby_annotations_return_type_annotation_t;
+
+typedef struct rbs_ast_ruby_annotations_skip_annotation {
+    rbs_node_t base;
+
+    struct rbs_location *prefix_location;
+    struct rbs_location *skip_location;
+    struct rbs_location *comment_location;
+} rbs_ast_ruby_annotations_skip_annotation_t;
+
 typedef struct rbs_ast_string {
     rbs_node_t base;
 
@@ -601,6 +647,16 @@ 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_ast_ruby_annotations_t;
+
 /// `rbs_keyword_t` models RBS keywords like "private", "instance", "covariant", etc.
 /// These are stored in the global constant pool, and get surfaced to Ruby as `Symbol`s,
 /// just like `rbs_ast_symbol_t`s.
@@ -651,6 +707,11 @@ rbs_ast_members_method_definition_overload_t *rbs_ast_members_method_definition_
 rbs_ast_members_prepend_t *rbs_ast_members_prepend_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_type_name_t *name, rbs_node_list_t *args, rbs_node_list_t *annotations, rbs_ast_comment_t *comment);
 rbs_ast_members_private_t *rbs_ast_members_private_new(rbs_allocator_t *allocator, rbs_location_t *location);
 rbs_ast_members_public_t *rbs_ast_members_public_new(rbs_allocator_t *allocator, rbs_location_t *location);
+rbs_ast_ruby_annotations_colon_method_type_annotation_t *rbs_ast_ruby_annotations_colon_method_type_annotation_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_location_t *prefix_location, rbs_node_list_t *annotations, rbs_node_t *method_type);
+rbs_ast_ruby_annotations_method_types_annotation_t *rbs_ast_ruby_annotations_method_types_annotation_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_location_t *prefix_location, rbs_node_list_t *overloads, rbs_location_list_t *vertical_bar_locations);
+rbs_ast_ruby_annotations_node_type_assertion_t *rbs_ast_ruby_annotations_node_type_assertion_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_location_t *prefix_location, rbs_node_t *type);
+rbs_ast_ruby_annotations_return_type_annotation_t *rbs_ast_ruby_annotations_return_type_annotation_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_location_t *prefix_location, rbs_location_t *return_location, rbs_location_t *colon_location, rbs_node_t *return_type, rbs_location_t *comment_location);
+rbs_ast_ruby_annotations_skip_annotation_t *rbs_ast_ruby_annotations_skip_annotation_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_location_t *prefix_location, rbs_location_t *skip_location, rbs_location_t *comment_location);
 rbs_ast_string_t *rbs_ast_string_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_string_t string);
 rbs_ast_type_param_t *rbs_ast_type_param_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_ast_symbol_t *name, rbs_keyword_t *variance, rbs_node_t *upper_bound, rbs_node_t *default_type, bool unchecked);
 rbs_method_type_t *rbs_method_type_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_node_list_t *type_params, rbs_node_t *type, rbs_types_block_t *block);

data/include/rbs/defines.h

@@ -10,6 +10,7 @@
 #ifndef RBS_DEFINES_H
 #define RBS_DEFINES_H
 
+
 /***********************************************************************************************************************
  * Copied+modified subset of Prism's `include/prism/defines.h`                                                         *
  **********************************************************************************************************************/
@@ -21,33 +22,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)
-#endif
-
-/**
- * Support RBS_LIKELY and RBS_UNLIKELY to help the compiler optimize its
- * branch predication.
- */
-#if defined(__GNUC__) || defined(__clang__)
-/** The compiler should predicate that this branch will be taken. */
-#define RBS_LIKELY(x) __builtin_expect(!!(x), 1)
-
-/** The compiler should predicate that this branch will not be taken. */
-#define RBS_UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-/** Void because this platform does not support branch prediction hints. */
-#define RBS_LIKELY(x) (x)
-
-/** Void because this platform does not support branch prediction hints. */
-#define RBS_UNLIKELY(x) (x)
+#   define RBS_ATTRIBUTE_FORMAT(string_index, argument_index)
 #endif
 
 /**
@@ -55,13 +38,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
 
 /***********************************************************************************************************************
@@ -74,13 +57,4 @@
 #define NODISCARD __attribute__((warn_unused_result))
 #endif
 
-/**
- * Mark a function or variable as potentially unused to suppress compiler warnings.
- */
-#if defined(__GNUC__) || defined(__clang__)
-#define RBS_ATTRIBUTE_UNUSED __attribute__((unused))
-#else
-#define RBS_ATTRIBUTE_UNUSED
-#endif
-
 #endif

data/include/rbs/lexer.h

@@ -5,91 +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__ */
-
-    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 */
-
-    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 */
 };
 
 /**
@@ -99,52 +103,46 @@ 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;
 
 /**
  * The lexer state is the curren token.
  *
  * ```
- #.   0.1.2.3.4.5.6.7.8.9.0.1.2.3.4.5.6
- * ... " a   s t r i n g   t o k e n "
- *    ^                                   start position (0)
- *                ^                       current position (6)
- *                 ^                      current character ('i', bytes = 1)
- *     ~~~~~~~~~~~                        Token => "a str
+ * ... "a string token"
+ *    ^                      start position
+ *          ^                current position
+ *     ~~~~~~                Token => "a str
  * ```
  * */
 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: just before the current_character */
-    rbs_position_t start;   /* The start position of the current token */
-
-    unsigned int current_code_point; /* Current character code point */
-    size_t current_character_bytes;  /* Current character byte length (0 or 1~4) */
-
-    bool first_token_of_line; /* This flag is used for tLINECOMMENT */
-
-    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 const rbs_token_t NullToken;
-extern const rbs_position_t NullPosition;
-extern const rbs_range_t NULL_RANGE;
+extern rbs_token_t NullToken;
+extern rbs_position_t NullPosition;
+extern 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);
@@ -158,23 +156,15 @@ int rbs_token_bytes(rbs_token_t tok);
 const char *rbs_token_type_str(enum RBSTokenType type);
 
 /**
- * Returns the next character.
+ * Read next character.
  * */
 unsigned int rbs_peek(rbs_lexer_t *lexer);
 
 /**
- * Advances the current position by one character.
+ * Skip one character.
  * */
 void rbs_skip(rbs_lexer_t *lexer);
 
-/**
- * Read next character and store the codepoint and byte length to the given pointers.
- * 
- * This doesn't update the lexer state.
- * Returns `true` if succeeded, or `false` if reached to EOF.
- * */
-bool rbs_next_char(rbs_lexer_t *lexer, unsigned int *codepoint, size_t *bytes);
-
 /**
  * Skip n characters.
  * */
@@ -194,6 +184,4 @@ rbs_token_t rbs_lexer_next_token(rbs_lexer_t *lexer);
 
 void rbs_print_token(rbs_token_t tok);
 
-void rbs_print_lexer(rbs_lexer_t *lexer);
-
 #endif

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);