rbs 3.7.0.dev.1 → 3.7.0.pre.1

data/ext/rbs_extension/parser.c

@@ -143,7 +143,7 @@ void parser_advance_no_gap(parserstate *state) {
               | {(tUIDENT `::`)*} <tXIDENT>
               | {<tXIDENT>}
 */
-VALUE parse_type_name(parserstate *state, TypeNameKind kind, range *rg) {
+static VALUE parse_type_name(parserstate *state, TypeNameKind kind, range *rg) {
   VALUE absolute = Qfalse;
   VALUE path = EMPTY_ARRAY;
   VALUE namespace;
@@ -757,7 +757,7 @@ static void check_key_duplication(parserstate *state, VALUE fields, VALUE key) {
   record_attribute ::= {} keyword_token `:` <type>
                      | {} literal_type `=>` <type>
 */
-VALUE parse_record_attributes(parserstate *state) {
+static VALUE parse_record_attributes(parserstate *state) {
   VALUE fields = rb_hash_new();
 
   if (state->next_token.type == pRBRACE) {
@@ -963,25 +963,25 @@ static VALUE parse_simple(parserstate *state) {
     return type;
   }
   case kBOOL:
-    return rbs_base_type(RBS_Types_Bases_Bool, rbs_location_current_token(state));
+    return rbs_bases_bool(rbs_location_current_token(state));
   case kBOT:
-    return rbs_base_type(RBS_Types_Bases_Bottom, rbs_location_current_token(state));
+    return rbs_bases_bottom(rbs_location_current_token(state));
   case kCLASS:
-    return rbs_base_type(RBS_Types_Bases_Class, rbs_location_current_token(state));
+    return rbs_bases_class(rbs_location_current_token(state));
   case kINSTANCE:
-    return rbs_base_type(RBS_Types_Bases_Instance, rbs_location_current_token(state));
+    return rbs_bases_instance(rbs_location_current_token(state));
   case kNIL:
-    return rbs_base_type(RBS_Types_Bases_Nil, rbs_location_current_token(state));
+    return rbs_bases_nil(rbs_location_current_token(state));
   case kSELF:
-    return rbs_base_type(RBS_Types_Bases_Self, rbs_location_current_token(state));
+    return rbs_bases_self(rbs_location_current_token(state));
   case kTOP:
-    return rbs_base_type(RBS_Types_Bases_Top, rbs_location_current_token(state));
+    return rbs_bases_top(rbs_location_current_token(state));
   case kVOID:
-    return rbs_base_type(RBS_Types_Bases_Void, rbs_location_current_token(state));
+    return rbs_bases_void(rbs_location_current_token(state));
   case kUNTYPED:
-    return rbs_base_type(RBS_Types_Bases_Any, rbs_location_current_token(state));
+    return rbs_bases_any(rbs_location_current_token(state));
   case k__TODO__: {
-    VALUE type = rbs_base_type(RBS_Types_Bases_Any, rbs_location_current_token(state));
+    VALUE type = rbs_bases_any(rbs_location_current_token(state));
     rb_funcall(type, rb_intern("todo!"), 0);
     return type;
   }
@@ -1123,7 +1123,7 @@ VALUE parse_type(parserstate *state) {
 
   type_param ::= tUIDENT upper_bound? default_type?                           (module_type_params == false)
 */
-VALUE parse_type_params(parserstate *state, range *rg, bool module_type_params) {
+static VALUE parse_type_params(parserstate *state, range *rg, bool module_type_params) {
   VALUE params = EMPTY_ARRAY;
 
   bool required_param_allowed = true;
@@ -1219,7 +1219,12 @@ VALUE parse_type_params(parserstate *state, range *rg, bool module_type_params)
       rbs_loc_add_optional_child(loc, rb_intern("upper_bound"), upper_bound_range);
       rbs_loc_add_optional_child(loc, rb_intern("default"), default_type_range);
 
-      VALUE param = rbs_ast_type_param(name, variance, unchecked, upper_bound, default_type, location);
+      VALUE param = rbs_ast_type_param(name, variance, upper_bound, default_type, location);
+
+      if (unchecked) {
+        rb_funcall(param, rb_intern("unchecked!"), 0);
+      }
+
       melt_array(&params);
       rb_ary_push(params, param);
 
@@ -1290,7 +1295,7 @@ VALUE parse_method_type(parserstate *state) {
 /*
   global_decl ::= {tGIDENT} `:` <type>
 */
-VALUE parse_global_decl(parserstate *state) {
+static VALUE parse_global_decl(parserstate *state) {
   range decl_range;
   range name_range, colon_range;
 
@@ -1325,7 +1330,7 @@ VALUE parse_global_decl(parserstate *state) {
 /*
   const_decl ::= {const_name} `:` <type>
 */
-VALUE parse_const_decl(parserstate *state) {
+static VALUE parse_const_decl(parserstate *state) {
   range decl_range;
   range name_range, colon_range;
 
@@ -1359,7 +1364,7 @@ VALUE parse_const_decl(parserstate *state) {
 /*
   type_decl ::= {kTYPE} alias_name `=` <type>
 */
-VALUE parse_type_decl(parserstate *state, position comment_pos, VALUE annotations) {
+static VALUE parse_type_decl(parserstate *state, position comment_pos, VALUE annotations) {
   range decl_range;
   range keyword_range, name_range, params_range, eq_range;
 
@@ -1404,7 +1409,7 @@ VALUE parse_type_decl(parserstate *state, position comment_pos, VALUE annotation
 /*
   annotation ::= {<tANNOTATION>}
 */
-VALUE parse_annotation(parserstate *state) {
+static VALUE parse_annotation(parserstate *state) {
   VALUE content = rb_funcall(state->buffer, rb_intern("content"), 0);
   rb_encoding *enc = rb_enc_get(content);
 
@@ -1460,7 +1465,7 @@ VALUE parse_annotation(parserstate *state) {
   annotations ::= {} annotation ... <annotation>
                 | {<>}
 */
-void parse_annotations(parserstate *state, VALUE *annotations, position *annot_pos) {
+static void parse_annotations(parserstate *state, VALUE *annotations, position *annot_pos) {
   *annot_pos = NullPosition;
 
   while (true) {
@@ -1483,7 +1488,7 @@ void parse_annotations(parserstate *state, VALUE *annotations, position *annot_p
   method_name ::= {} <IDENT | keyword>
                 | {} (IDENT | keyword)~<`?`>
 */
-VALUE parse_method_name(parserstate *state, range *range) {
+static VALUE parse_method_name(parserstate *state, range *range) {
   parser_advance(state);
 
   switch (state->current_token.type)
@@ -1551,7 +1556,7 @@ typedef enum {
 
   @param allow_selfq `true` to accept `self?` kind.
 */
-InstanceSingletonKind parse_instance_singleton_kind(parserstate *state, bool allow_selfq, range *rg) {
+static InstanceSingletonKind parse_instance_singleton_kind(parserstate *state, bool allow_selfq, range *rg) {
   InstanceSingletonKind kind = INSTANCE_KIND;
 
   if (state->next_token.type == kSELF) {
@@ -1594,7 +1599,7 @@ InstanceSingletonKind parse_instance_singleton_kind(parserstate *state, bool all
  * @param instance_only `true` to reject singleton method definition.
  * @param accept_overload `true` to accept overloading (...) definition.
  * */
-VALUE parse_member_def(parserstate *state, bool instance_only, bool accept_overload, position comment_pos, VALUE annotations) {
+static VALUE parse_member_def(parserstate *state, bool instance_only, bool accept_overload, position comment_pos, VALUE annotations) {
   range member_range;
   range visibility_range;
   range keyword_range;
@@ -1774,31 +1779,29 @@ void class_instance_name(parserstate *state, TypeNameKind kind, VALUE *name, VAL
  *
  * @param from_interface `true` when the member is in an interface.
  * */
-VALUE parse_mixin_member(parserstate *state, bool from_interface, position comment_pos, VALUE annotations) {
+static VALUE parse_mixin_member(parserstate *state, bool from_interface, position comment_pos, VALUE annotations) {
   range member_range;
   range name_range;
   range keyword_range;
   range args_range = NULL_RANGE;
   bool reset_typevar_scope;
+  enum TokenType type;
 
   member_range.start = state->current_token.range.start;
   comment_pos = nonnull_pos_or(comment_pos, member_range.start);
 
+  type = state->current_token.type;
   keyword_range = state->current_token.range;
 
-  VALUE klass = Qnil;
-  switch (state->current_token.type)
+  switch (type)
   {
   case kINCLUDE:
-    klass = RBS_AST_Members_Include;
     reset_typevar_scope = false;
     break;
   case kEXTEND:
-    klass = RBS_AST_Members_Extend;
     reset_typevar_scope = true;
     break;
   case kPREPEND:
-    klass = RBS_AST_Members_Prepend;
     reset_typevar_scope = false;
     break;
   default:
@@ -1836,14 +1839,18 @@ VALUE parse_mixin_member(parserstate *state, bool from_interface, position comme
   rbs_loc_add_required_child(loc, rb_intern("keyword"), keyword_range);
   rbs_loc_add_optional_child(loc, rb_intern("args"), args_range);
 
-  return rbs_ast_members_mixin(
-    klass,
-    name,
-    args,
-    annotations,
-    location,
-    get_comment(state, comment_pos.line)
-  );
+  VALUE comment = get_comment(state, comment_pos.line);
+  switch (type)
+  {
+  case kINCLUDE:
+    return rbs_ast_members_include(name, args, annotations, location, comment);
+  case kEXTEND:
+    return rbs_ast_members_extend(name, args, annotations, location, comment);
+  case kPREPEND:
+    return rbs_ast_members_prepend(name, args, annotations, location, comment);
+  default:
+    rbs_abort();
+  }
 }
 
 /**
@@ -1854,7 +1861,7 @@ VALUE parse_mixin_member(parserstate *state, bool from_interface, position comme
  *
  * @param[in] instance_only `true` to reject `self.` alias.
  * */
-VALUE parse_alias_member(parserstate *state, bool instance_only, position comment_pos, VALUE annotations) {
+static VALUE parse_alias_member(parserstate *state, bool instance_only, position comment_pos, VALUE annotations) {
   range member_range;
   range keyword_range, new_name_range, old_name_range;
   range new_kind_range, old_kind_range;
@@ -1917,10 +1924,11 @@ VALUE parse_alias_member(parserstate *state, bool instance_only, position commen
                     | {kSELF} `.` tAIDENT `:` <type>
                     | {tA2IDENT} `:` <type>
 */
-VALUE parse_variable_member(parserstate *state, position comment_pos, VALUE annotations) {
+static VALUE parse_variable_member(parserstate *state, position comment_pos, VALUE annotations) {
   range member_range;
   range name_range, colon_range;
   range kind_range = NULL_RANGE;
+  rbs_loc *loc;
 
   if (rb_array_len(annotations) > 0) {
     raise_syntax_error(
@@ -1934,7 +1942,6 @@ VALUE parse_variable_member(parserstate *state, position comment_pos, VALUE anno
   comment_pos = nonnull_pos_or(comment_pos, member_range.start);
   VALUE comment = get_comment(state, comment_pos.line);
 
-  VALUE klass;
   VALUE location;
   VALUE name;
   VALUE type;
@@ -1942,8 +1949,6 @@ VALUE parse_variable_member(parserstate *state, position comment_pos, VALUE anno
   switch (state->current_token.type)
   {
   case tAIDENT:
-    klass = RBS_AST_Members_InstanceVariable;
-
     name_range = state->current_token.range;
     name = ID2SYM(INTERN_TOKEN(state, state->current_token));
 
@@ -1953,11 +1958,16 @@ VALUE parse_variable_member(parserstate *state, position comment_pos, VALUE anno
     type = parse_type(state);
     member_range.end = state->current_token.range.end;
 
-    break;
+    location = rbs_new_location(state->buffer, member_range);
+    loc = rbs_check_location(location);
+    rbs_loc_alloc_children(loc, 3);
+    rbs_loc_add_required_child(loc, rb_intern("name"), name_range);
+    rbs_loc_add_required_child(loc, rb_intern("colon"), colon_range);
+    rbs_loc_add_optional_child(loc, rb_intern("kind"), kind_range);
 
-  case tA2IDENT:
-    klass = RBS_AST_Members_ClassVariable;
+    return rbs_ast_members_instance_variable(name, type, location, comment);
 
+  case tA2IDENT:
     name_range = state->current_token.range;
     name = ID2SYM(INTERN_TOKEN(state, state->current_token));
 
@@ -1969,11 +1979,16 @@ VALUE parse_variable_member(parserstate *state, position comment_pos, VALUE anno
     parser_pop_typevar_table(state);
     member_range.end = state->current_token.range.end;
 
-    break;
+    location = rbs_new_location(state->buffer, member_range);
+    loc = rbs_check_location(location);
+    rbs_loc_alloc_children(loc, 3);
+    rbs_loc_add_required_child(loc, rb_intern("name"), name_range);
+    rbs_loc_add_required_child(loc, rb_intern("colon"), colon_range);
+    rbs_loc_add_optional_child(loc, rb_intern("kind"), kind_range);
 
-  case kSELF:
-    klass = RBS_AST_Members_ClassInstanceVariable;
+    return rbs_ast_members_class_variable(name, type, location, comment);
 
+  case kSELF:
     kind_range.start = state->current_token.range.start;
     kind_range.end = state->next_token.range.end;
 
@@ -1991,27 +2006,25 @@ VALUE parse_variable_member(parserstate *state, position comment_pos, VALUE anno
     parser_pop_typevar_table(state);
     member_range.end = state->current_token.range.end;
 
-    break;
+    location = rbs_new_location(state->buffer, member_range);
+    loc = rbs_check_location(location);
+    rbs_loc_alloc_children(loc, 3);
+    rbs_loc_add_required_child(loc, rb_intern("name"), name_range);
+    rbs_loc_add_required_child(loc, rb_intern("colon"), colon_range);
+    rbs_loc_add_optional_child(loc, rb_intern("kind"), kind_range);
+
+    return rbs_ast_members_class_instance_variable(name, type, location, comment);
 
   default:
     rbs_abort();
   }
-
-  location = rbs_new_location(state->buffer, member_range);
-  rbs_loc *loc = rbs_check_location(location);
-  rbs_loc_alloc_children(loc, 3);
-  rbs_loc_add_required_child(loc, rb_intern("name"), name_range);
-  rbs_loc_add_required_child(loc, rb_intern("colon"), colon_range);
-  rbs_loc_add_optional_child(loc, rb_intern("kind"), kind_range);
-
-  return rbs_ast_members_variable(klass, name, type, location, comment);
 }
 
 /*
   visibility_member ::= {<`public`>}
                       | {<`private`>}
 */
-VALUE parse_visibility_member(parserstate *state, VALUE annotations) {
+static VALUE parse_visibility_member(parserstate *state, VALUE annotations) {
   if (rb_array_len(annotations) > 0) {
     raise_syntax_error(
       state,
@@ -2020,24 +2033,17 @@ VALUE parse_visibility_member(parserstate *state, VALUE annotations) {
     );
   }
 
-  VALUE klass;
+  VALUE location = rbs_new_location(state->buffer, state->current_token.range);
 
   switch (state->current_token.type)
   {
   case kPUBLIC:
-    klass = RBS_AST_Members_Public;
-    break;
+    return rbs_ast_members_public(location);
   case kPRIVATE:
-    klass = RBS_AST_Members_Private;
-    break;
+    return rbs_ast_members_private(location);
   default:
     rbs_abort();
   }
-
-  return rbs_ast_members_visibility(
-    klass,
-    rbs_new_location(state->buffer, state->current_token.range)
-  );
 }
 
 /*
@@ -2054,13 +2060,12 @@ VALUE parse_visibility_member(parserstate *state, VALUE annotations) {
              | `(` tAIDENT `)`    # Ivar name
              | `(` `)`            # No variable
 */
-VALUE parse_attribute_member(parserstate *state, position comment_pos, VALUE annotations) {
+static VALUE parse_attribute_member(parserstate *state, position comment_pos, VALUE annotations) {
   range member_range;
   range keyword_range, name_range, colon_range;
   range kind_range = NULL_RANGE, ivar_range = NULL_RANGE, ivar_name_range = NULL_RANGE, visibility_range = NULL_RANGE;
 
   InstanceSingletonKind is_kind;
-  VALUE klass;
   VALUE kind;
   VALUE attr_name;
   VALUE ivar_name;
@@ -2069,6 +2074,7 @@ VALUE parse_attribute_member(parserstate *state, position comment_pos, VALUE ann
   VALUE location;
   VALUE visibility;
   rbs_loc *loc;
+  enum TokenType attr_type;
 
   member_range.start = state->current_token.range.start;
   comment_pos = nonnull_pos_or(comment_pos, member_range.start);
@@ -2092,21 +2098,8 @@ VALUE parse_attribute_member(parserstate *state, position comment_pos, VALUE ann
     break;
   }
 
+  attr_type = state->current_token.type;
   keyword_range = state->current_token.range;
-  switch (state->current_token.type)
-  {
-  case kATTRREADER:
-    klass = RBS_AST_Members_AttrReader;
-    break;
-  case kATTRWRITER:
-    klass = RBS_AST_Members_AttrWriter;
-    break;
-  case kATTRACCESSOR:
-    klass = RBS_AST_Members_AttrAccessor;
-    break;
-  default:
-    rbs_abort();
-  }
 
   is_kind = parse_instance_singleton_kind(state, false, &kind_range);
   if (is_kind == INSTANCE_KIND) {
@@ -2153,17 +2146,17 @@ VALUE parse_attribute_member(parserstate *state, position comment_pos, VALUE ann
   rbs_loc_add_optional_child(loc, rb_intern("ivar_name"), ivar_name_range);
   rbs_loc_add_optional_child(loc, rb_intern("visibility"), visibility_range);
 
-  return rbs_ast_members_attribute(
-    klass,
-    attr_name,
-    type,
-    ivar_name,
-    kind,
-    annotations,
-    location,
-    comment,
-    visibility
-  );
+  switch (attr_type)
+  {
+  case kATTRREADER:
+    return rbs_ast_members_attr_reader(attr_name, type, ivar_name, kind, annotations, location, comment, visibility);
+  case kATTRWRITER:
+    return rbs_ast_members_attr_writer(attr_name, type, ivar_name, kind, annotations, location, comment, visibility);
+  case kATTRACCESSOR:
+    return rbs_ast_members_attr_accessor(attr_name, type, ivar_name, kind, annotations, location, comment, visibility);
+  default:
+    rbs_abort();
+  }
 }
 
 /*
@@ -2173,7 +2166,7 @@ VALUE parse_attribute_member(parserstate *state, position comment_pos, VALUE ann
                      | mixin_member   (interface only)
                      | alias_member   (instance only)
 */
-VALUE parse_interface_members(parserstate *state) {
+static VALUE parse_interface_members(parserstate *state) {
   VALUE members = EMPTY_ARRAY;
 
   while (state->next_token.type != kEND) {
@@ -2218,7 +2211,7 @@ VALUE parse_interface_members(parserstate *state) {
 /*
   interface_decl ::= {`interface`} interface_name module_type_params interface_members <kEND>
 */
-VALUE parse_interface_decl(parserstate *state, position comment_pos, VALUE annotations) {
+static VALUE parse_interface_decl(parserstate *state, position comment_pos, VALUE annotations) {
   range member_range;
   range name_range, keyword_range, end_range;
   range type_params_range = NULL_RANGE;
@@ -2265,7 +2258,7 @@ VALUE parse_interface_decl(parserstate *state, position comment_pos, VALUE annot
   module_self_type ::= <module_name>
                      | module_name `[` type_list <`]`>
 */
-void parse_module_self_types(parserstate *state, VALUE *array) {
+static void parse_module_self_types(parserstate *state, VALUE *array) {
   while (true) {
     range self_range;
     range name_range;
@@ -2305,7 +2298,7 @@ void parse_module_self_types(parserstate *state, VALUE *array) {
   }
 }
 
-VALUE parse_nested_decl(parserstate *state, const char *nested_in, position annot_pos, VALUE annotations);
+static VALUE parse_nested_decl(parserstate *state, const char *nested_in, position annot_pos, VALUE annotations);
 
 /*
   module_members ::= {} ...<module_member> kEND
@@ -2318,7 +2311,7 @@ VALUE parse_nested_decl(parserstate *state, const char *nested_in, position anno
                   | `public`
                   | `private`
 */
-VALUE parse_module_members(parserstate *state) {
+static VALUE parse_module_members(parserstate *state) {
   VALUE members = EMPTY_ARRAY;
 
   while (state->next_token.type != kEND) {
@@ -2395,7 +2388,7 @@ VALUE parse_module_members(parserstate *state) {
   module_decl ::= {module_name} module_type_params module_members <kEND>
                 | {module_name} module_name module_type_params `:` module_self_types module_members <kEND>
 */
-VALUE parse_module_decl0(parserstate *state, range keyword_range, VALUE module_name, range name_range, VALUE comment, VALUE annotations) {
+static VALUE parse_module_decl0(parserstate *state, range keyword_range, VALUE module_name, range name_range, VALUE comment, VALUE annotations) {
   range decl_range;
   range end_range;
   range type_params_range;
@@ -2454,7 +2447,7 @@ VALUE parse_module_decl0(parserstate *state, range keyword_range, VALUE module_n
                 | {`module`} module_name module_decl0 <kEND>
 
 */
-VALUE parse_module_decl(parserstate *state, position comment_pos, VALUE annotations) {
+static VALUE parse_module_decl(parserstate *state, position comment_pos, VALUE annotations) {
   range keyword_range = state->current_token.range;
   range module_name_range;
 
@@ -2494,7 +2487,7 @@ VALUE parse_module_decl(parserstate *state, position comment_pos, VALUE annotati
   class_decl_super ::= {} `<` <class_instance_name>
                      | {<>}
 */
-VALUE parse_class_decl_super(parserstate *state, range *lt_range) {
+static VALUE parse_class_decl_super(parserstate *state, range *lt_range) {
   if (parser_advance_if(state, pLT)) {
     range super_range;
     range name_range;
@@ -2529,7 +2522,7 @@ VALUE parse_class_decl_super(parserstate *state, range *lt_range) {
 /*
   class_decl ::= {class_name} type_params class_decl_super class_members <`end`>
 */
-VALUE parse_class_decl0(parserstate *state, range keyword_range, VALUE name, range name_range, VALUE comment, VALUE annotations) {
+static VALUE parse_class_decl0(parserstate *state, range keyword_range, VALUE name, range name_range, VALUE comment, VALUE annotations) {
   range decl_range;
   range end_range;
   range type_params_range;
@@ -2580,7 +2573,7 @@ VALUE parse_class_decl0(parserstate *state, range keyword_range, VALUE name, ran
   class_decl ::= {`class`} class_name `=` <class_name>
                | {`class`} class_name <class_decl0>
 */
-VALUE parse_class_decl(parserstate *state, position comment_pos, VALUE annotations) {
+static VALUE parse_class_decl(parserstate *state, position comment_pos, VALUE annotations) {
   range keyword_range = state->current_token.range;
   range class_name_range;
 
@@ -2623,7 +2616,7 @@ VALUE parse_class_decl(parserstate *state, position comment_pos, VALUE annotatio
                 | {<module_decl>}
                 | {<class_decl>}
 */
-VALUE parse_nested_decl(parserstate *state, const char *nested_in, position annot_pos, VALUE annotations) {
+static VALUE parse_nested_decl(parserstate *state, const char *nested_in, position annot_pos, VALUE annotations) {
   VALUE decl;
 
   parser_push_typevar_table(state, true);
@@ -2661,7 +2654,7 @@ VALUE parse_nested_decl(parserstate *state, const char *nested_in, position anno
   return decl;
 }
 
-VALUE parse_decl(parserstate *state) {
+static VALUE parse_decl(parserstate *state) {
   VALUE annotations = EMPTY_ARRAY;
   position annot_pos = NullPosition;
 
@@ -2695,7 +2688,7 @@ VALUE parse_decl(parserstate *state) {
   namespace ::= {} (`::`)? (`tUIDENT` `::`)* `tUIDENT` <`::`>
               | {} <>                                            (empty -- returns empty namespace)
 */
-VALUE parse_namespace(parserstate *state, range *rg) {
+static VALUE parse_namespace(parserstate *state, range *rg) {
   bool is_absolute = false;
 
   if (state->next_token.type == pCOLON2) {
@@ -2733,7 +2726,7 @@ VALUE parse_namespace(parserstate *state, range *rg) {
                | {} namespace tUIDENT `as` <tUIDENT>
                | {} namespace <tSTAR>
 */
-void parse_use_clauses(parserstate *state, VALUE clauses) {
+static void parse_use_clauses(parserstate *state, VALUE clauses) {
   while (true) {
     range namespace_range = NULL_RANGE;
     VALUE namespace = parse_namespace(state, &namespace_range);
@@ -2826,7 +2819,7 @@ void parse_use_clauses(parserstate *state, VALUE clauses) {
 /*
   use_directive ::= {} `use` <clauses>
  */
-VALUE parse_use_directive(parserstate *state) {
+static VALUE parse_use_directive(parserstate *state) {
   if (state->next_token.type == kUSE) {
     parser_advance(state);
 

data/ext/rbs_extension/rbs_extension.h

@@ -4,10 +4,9 @@
 #include "ruby/re.h"
 #include "ruby/encoding.h"
 
+#include "rbs.h"
 #include "lexer.h"
 #include "parser.h"
-#include "constants.h"
-#include "ruby_objs.h"
 
 /**
  * Receives `parserstate` and `range`, which represents a string token or symbol token, and returns a string VALUE.

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

@@ -1,31 +1,38 @@
+/*----------------------------------------------------------------------------*/
+/* 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                                      */
+/*----------------------------------------------------------------------------*/
+
 #ifndef RBS__CONSTANTS_H
 #define RBS__CONSTANTS_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_Types;
+extern VALUE RBS_Types_Bases;
+extern VALUE RBS_ParsingError;
+
 extern VALUE RBS_AST_Annotation;
 extern VALUE RBS_AST_Comment;
-extern VALUE RBS_AST_TypeParam;
-
-extern VALUE RBS_AST_Declarations;
-extern VALUE RBS_AST_Declarations_TypeAlias;
-extern VALUE RBS_AST_Declarations_Class_Super;
 extern VALUE RBS_AST_Declarations_Class;
+extern VALUE RBS_AST_Declarations_Class_Super;
+extern VALUE RBS_AST_Declarations_ClassAlias;
 extern VALUE RBS_AST_Declarations_Constant;
 extern VALUE RBS_AST_Declarations_Global;
 extern VALUE RBS_AST_Declarations_Interface;
-extern VALUE RBS_AST_Declarations_Module_Self;
 extern VALUE RBS_AST_Declarations_Module;
+extern VALUE RBS_AST_Declarations_Module_Self;
 extern VALUE RBS_AST_Declarations_ModuleAlias;
-extern VALUE RBS_AST_Declarations_ClassAlias;
-
-extern VALUE RBS_AST_Directives;
+extern VALUE RBS_AST_Declarations_TypeAlias;
 extern VALUE RBS_AST_Directives_Use;
 extern VALUE RBS_AST_Directives_Use_SingleClause;
 extern VALUE RBS_AST_Directives_Use_WildcardClause;
-
-extern VALUE RBS_AST_Members;
 extern VALUE RBS_AST_Members_Alias;
 extern VALUE RBS_AST_Members_AttrAccessor;
 extern VALUE RBS_AST_Members_AttrReader;
@@ -40,16 +47,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_TypeParam;
 extern VALUE RBS_MethodType;
 extern VALUE RBS_Namespace;
-
-extern VALUE RBS_ParsingError;
 extern VALUE RBS_TypeName;
-
-extern VALUE RBS_Types;
 extern VALUE RBS_Types_Alias;
-extern VALUE RBS_Types_Bases;
 extern VALUE RBS_Types_Bases_Any;
 extern VALUE RBS_Types_Bases_Bool;
 extern VALUE RBS_Types_Bases_Bottom;
@@ -62,9 +64,8 @@ extern VALUE RBS_Types_Bases_Void;
 extern VALUE RBS_Types_Block;
 extern VALUE RBS_Types_ClassInstance;
 extern VALUE RBS_Types_ClassSingleton;
-extern VALUE RBS_Types_Function_Param;
 extern VALUE RBS_Types_Function;
-extern VALUE RBS_Types_UntypedFunction;
+extern VALUE RBS_Types_Function_Param;
 extern VALUE RBS_Types_Interface;
 extern VALUE RBS_Types_Intersection;
 extern VALUE RBS_Types_Literal;
@@ -73,6 +74,7 @@ extern VALUE RBS_Types_Proc;
 extern VALUE RBS_Types_Record;
 extern VALUE RBS_Types_Tuple;
 extern VALUE RBS_Types_Union;
+extern VALUE RBS_Types_UntypedFunction;
 extern VALUE RBS_Types_Variable;
 
 void rbs__init_constants();