Skip to content

Commit 970b651

Browse files
amomchilovamomchilov
committed
Remove previous order from code-genned files
1 parent 081154f commit 970b651

File tree

8 files changed

+403
-721
lines changed

8 files changed

+403
-721
lines changed

‎include/rbs/constants.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ extern VALUE RBS_ParsingError;
2020

2121
extern VALUE RBS_AST_Annotation;
2222
extern VALUE RBS_AST_Comment;
23-
extern VALUE RBS_AST_TypeParam;
24-
extern VALUE RBS_AST_Declarations_TypeAlias;
25-
extern VALUE RBS_AST_Declarations_Class_Super;
2623
extern VALUE RBS_AST_Declarations_Class;
24+
extern VALUE RBS_AST_Declarations_Class_Super;
25+
extern VALUE RBS_AST_Declarations_ClassAlias;
2726
extern VALUE RBS_AST_Declarations_Constant;
2827
extern VALUE RBS_AST_Declarations_Global;
2928
extern VALUE RBS_AST_Declarations_Interface;
30-
extern VALUE RBS_AST_Declarations_Module_Self;
3129
extern VALUE RBS_AST_Declarations_Module;
30+
extern VALUE RBS_AST_Declarations_Module_Self;
3231
extern VALUE RBS_AST_Declarations_ModuleAlias;
33-
extern VALUE RBS_AST_Declarations_ClassAlias;
32+
extern VALUE RBS_AST_Declarations_TypeAlias;
3433
extern VALUE RBS_AST_Directives_Use;
3534
extern VALUE RBS_AST_Directives_Use_SingleClause;
3635
extern VALUE RBS_AST_Directives_Use_WildcardClause;
@@ -48,6 +47,7 @@ extern VALUE RBS_AST_Members_MethodDefinition_Overload;
4847
extern VALUE RBS_AST_Members_Prepend;
4948
extern VALUE RBS_AST_Members_Private;
5049
extern VALUE RBS_AST_Members_Public;
50+
extern VALUE RBS_AST_TypeParam;
5151
extern VALUE RBS_MethodType;
5252
extern VALUE RBS_Namespace;
5353
extern VALUE RBS_TypeName;
@@ -64,9 +64,8 @@ extern VALUE RBS_Types_Bases_Void;
6464
extern VALUE RBS_Types_Block;
6565
extern VALUE RBS_Types_ClassInstance;
6666
extern VALUE RBS_Types_ClassSingleton;
67-
extern VALUE RBS_Types_Function_Param;
6867
extern VALUE RBS_Types_Function;
69-
extern VALUE RBS_Types_UntypedFunction;
68+
extern VALUE RBS_Types_Function_Param;
7069
extern VALUE RBS_Types_Interface;
7170
extern VALUE RBS_Types_Intersection;
7271
extern VALUE RBS_Types_Literal;
@@ -75,6 +74,7 @@ extern VALUE RBS_Types_Proc;
7574
extern VALUE RBS_Types_Record;
7675
extern VALUE RBS_Types_Tuple;
7776
extern VALUE RBS_Types_Union;
77+
extern VALUE RBS_Types_UntypedFunction;
7878
extern VALUE RBS_Types_Variable;
7979

8080
void rbs__init_constants();

‎include/rbs/ruby_objs.h‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,63 @@
1010

1111
#include "ruby.h"
1212

13-
VALUE rbs_alias(VALUE typename, VALUE args, VALUE location);
1413
VALUE rbs_ast_annotation(VALUE string, VALUE location);
1514
VALUE rbs_ast_comment(VALUE string, VALUE location);
16-
VALUE rbs_ast_type_param(VALUE name, VALUE variance, VALUE upper_bound, VALUE default_type, VALUE location);
17-
VALUE rbs_ast_decl_type_alias(VALUE name, VALUE type_params, VALUE type, VALUE annotations, VALUE location, VALUE comment);
18-
VALUE rbs_ast_decl_class_super(VALUE name, VALUE args, VALUE location);
1915
VALUE rbs_ast_decl_class(VALUE name, VALUE type_params, VALUE super_class, VALUE members, VALUE annotations, VALUE location, VALUE comment);
16+
VALUE rbs_ast_decl_class_super(VALUE name, VALUE args, VALUE location);
17+
VALUE rbs_ast_decl_class_alias(VALUE new_name, VALUE old_name, VALUE location, VALUE comment);
2018
VALUE rbs_ast_decl_constant(VALUE name, VALUE type, VALUE location, VALUE comment);
2119
VALUE rbs_ast_decl_global(VALUE name, VALUE type, VALUE location, VALUE comment);
2220
VALUE rbs_ast_decl_interface(VALUE name, VALUE type_params, VALUE members, VALUE annotations, VALUE location, VALUE comment);
23-
VALUE rbs_ast_decl_module_self(VALUE name, VALUE args, VALUE location);
2421
VALUE rbs_ast_decl_module(VALUE name, VALUE type_params, VALUE self_types, VALUE members, VALUE annotations, VALUE location, VALUE comment);
22+
VALUE rbs_ast_decl_module_self(VALUE name, VALUE args, VALUE location);
2523
VALUE rbs_ast_decl_module_alias(VALUE new_name, VALUE old_name, VALUE location, VALUE comment);
26-
VALUE rbs_ast_decl_class_alias(VALUE new_name, VALUE old_name, VALUE location, VALUE comment);
24+
VALUE rbs_ast_decl_type_alias(VALUE name, VALUE type_params, VALUE type, VALUE annotations, VALUE location, VALUE comment);
25+
VALUE rbs_ast_directives_use(VALUE clauses, VALUE location);
26+
VALUE rbs_ast_directives_use_single_clause(VALUE type_name, VALUE new_name, VALUE location);
27+
VALUE rbs_ast_directives_use_wildcard_clause(VALUE namespace, VALUE location);
2728
VALUE rbs_ast_members_alias(VALUE new_name, VALUE old_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment);
29+
VALUE rbs_ast_members_attr_accessor(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
30+
VALUE rbs_ast_members_attr_reader(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
31+
VALUE rbs_ast_members_attr_writer(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
32+
VALUE rbs_ast_members_class_instance_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
33+
VALUE rbs_ast_members_class_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
34+
VALUE rbs_ast_members_extend(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
35+
VALUE rbs_ast_members_include(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
36+
VALUE rbs_ast_members_instance_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
2837
VALUE rbs_ast_members_method_definition(VALUE name, VALUE kind, VALUE overloads, VALUE annotations, VALUE location, VALUE comment, VALUE overloading, VALUE visibility);
2938
VALUE rbs_ast_members_method_definition_overload(VALUE annotations, VALUE method_type);
39+
VALUE rbs_ast_members_prepend(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
40+
VALUE rbs_ast_members_private(VALUE location);
41+
VALUE rbs_ast_members_public(VALUE location);
42+
VALUE rbs_ast_type_param(VALUE name, VALUE variance, VALUE upper_bound, VALUE default_type, VALUE location);
43+
VALUE rbs_method_type(VALUE type_params, VALUE type, VALUE block, VALUE location);
44+
VALUE rbs_namespace(VALUE path, VALUE absolute);
45+
VALUE rbs_type_name(VALUE namespace, VALUE name);
46+
VALUE rbs_alias(VALUE typename, VALUE args, VALUE location);
47+
VALUE rbs_bases_any(VALUE location);
48+
VALUE rbs_bases_bool(VALUE location);
49+
VALUE rbs_bases_bottom(VALUE location);
50+
VALUE rbs_bases_class(VALUE location);
51+
VALUE rbs_bases_instance(VALUE location);
52+
VALUE rbs_bases_nil(VALUE location);
53+
VALUE rbs_bases_self(VALUE location);
54+
VALUE rbs_bases_top(VALUE location);
55+
VALUE rbs_bases_void(VALUE location);
3056
VALUE rbs_block(VALUE type, VALUE required, VALUE self_type);
3157
VALUE rbs_class_instance(VALUE typename, VALUE type_args, VALUE location);
3258
VALUE rbs_class_singleton(VALUE typename, VALUE location);
33-
VALUE rbs_function_param(VALUE type, VALUE name, VALUE location);
3459
VALUE rbs_function(VALUE required_positional_params, VALUE optional_positional_params, VALUE rest_positional_params, VALUE trailing_positional_params, VALUE required_keywords, VALUE optional_keywords, VALUE rest_keywords, VALUE return_type);
35-
VALUE rbs_untyped_function(VALUE return_type);
60+
VALUE rbs_function_param(VALUE type, VALUE name, VALUE location);
3661
VALUE rbs_interface(VALUE typename, VALUE type_args, VALUE location);
3762
VALUE rbs_intersection(VALUE types, VALUE location);
3863
VALUE rbs_literal(VALUE literal, VALUE location);
39-
VALUE rbs_method_type(VALUE type_params, VALUE type, VALUE block, VALUE location);
40-
VALUE rbs_namespace(VALUE path, VALUE absolute);
4164
VALUE rbs_optional(VALUE type, VALUE location);
4265
VALUE rbs_proc(VALUE function, VALUE block, VALUE location, VALUE self_type);
4366
VALUE rbs_record(VALUE fields, VALUE location);
4467
VALUE rbs_tuple(VALUE types, VALUE location);
45-
VALUE rbs_type_name(VALUE namespace, VALUE name);
4668
VALUE rbs_union(VALUE types, VALUE location);
69+
VALUE rbs_untyped_function(VALUE return_type);
4770
VALUE rbs_variable(VALUE name, VALUE location);
48-
VALUE rbs_ast_directives_use(VALUE clauses, VALUE location);
49-
VALUE rbs_ast_directives_use_single_clause(VALUE type_name, VALUE new_name, VALUE location);
50-
VALUE rbs_ast_directives_use_wildcard_clause(VALUE namespace, VALUE location);
51-
VALUE rbs_ast_members_attr_accessor(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
52-
VALUE rbs_ast_members_attr_reader(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
53-
VALUE rbs_ast_members_attr_writer(VALUE name, VALUE type, VALUE ivar_name, VALUE kind, VALUE annotations, VALUE location, VALUE comment, VALUE visibility);
54-
VALUE rbs_ast_members_class_instance_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
55-
VALUE rbs_ast_members_class_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
56-
VALUE rbs_ast_members_extend(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
57-
VALUE rbs_bases_void(VALUE location);
58-
VALUE rbs_bases_top(VALUE location);
59-
VALUE rbs_bases_self(VALUE location);
60-
VALUE rbs_bases_nil(VALUE location);
61-
VALUE rbs_bases_instance(VALUE location);
62-
VALUE rbs_bases_class(VALUE location);
63-
VALUE rbs_bases_bottom(VALUE location);
64-
VALUE rbs_bases_bool(VALUE location);
65-
VALUE rbs_bases_any(VALUE location);
66-
VALUE rbs_ast_members_include(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
67-
VALUE rbs_ast_members_instance_variable(VALUE name, VALUE type, VALUE location, VALUE comment);
68-
VALUE rbs_ast_members_prepend(VALUE name, VALUE args, VALUE annotations, VALUE location, VALUE comment);
69-
VALUE rbs_ast_members_private(VALUE location);
70-
VALUE rbs_ast_members_public(VALUE location);
7171

7272
#endif

‎src/constants.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ VALUE RBS_Parser;
1818
VALUE RBS_Types;
1919
VALUE RBS_Types_Bases;
2020

21-
2221
VALUE RBS_AST_Annotation;
2322
VALUE RBS_AST_Comment;
2423
VALUE RBS_AST_Declarations_Class;
@@ -35,6 +34,7 @@ VALUE RBS_AST_Directives_Use;
3534
VALUE RBS_AST_Directives_Use_SingleClause;
3635
VALUE RBS_AST_Directives_Use_WildcardClause;
3736
VALUE RBS_AST_Members_Alias;
37+
VALUE RBS_AST_Members_AttrAccessor;
3838
VALUE RBS_AST_Members_AttrReader;
3939
VALUE RBS_AST_Members_AttrWriter;
4040
VALUE RBS_AST_Members_ClassInstanceVariable;
@@ -76,7 +76,6 @@ VALUE RBS_Types_Tuple;
7676
VALUE RBS_Types_Union;
7777
VALUE RBS_Types_UntypedFunction;
7878
VALUE RBS_Types_Variable;
79-
VALUE RBS_AST_Members_AttrAccessor;
8079

8180
VALUE RBS_ParsingError;
8281

@@ -93,7 +92,6 @@ void rbs__init_constants(void) {
9392
IMPORT_CONSTANT(RBS_Types, RBS, "Types");
9493
IMPORT_CONSTANT(RBS_Types_Bases, RBS_Types, "Bases");
9594

96-
9795
IMPORT_CONSTANT(RBS_AST_Annotation, RBS_AST, "Annotation");
9896
IMPORT_CONSTANT(RBS_AST_Comment, RBS_AST, "Comment");
9997
IMPORT_CONSTANT(RBS_AST_Declarations_Class, RBS_AST_Declarations, "Class");
@@ -110,6 +108,7 @@ void rbs__init_constants(void) {
110108
IMPORT_CONSTANT(RBS_AST_Directives_Use_SingleClause, RBS_AST_Directives_Use, "SingleClause");
111109
IMPORT_CONSTANT(RBS_AST_Directives_Use_WildcardClause, RBS_AST_Directives_Use, "WildcardClause");
112110
IMPORT_CONSTANT(RBS_AST_Members_Alias, RBS_AST_Members, "Alias");
111+
IMPORT_CONSTANT(RBS_AST_Members_AttrAccessor, RBS_AST_Members, "AttrAccessor");
113112
IMPORT_CONSTANT(RBS_AST_Members_AttrReader, RBS_AST_Members, "AttrReader");
114113
IMPORT_CONSTANT(RBS_AST_Members_AttrWriter, RBS_AST_Members, "AttrWriter");
115114
IMPORT_CONSTANT(RBS_AST_Members_ClassInstanceVariable, RBS_AST_Members, "ClassInstanceVariable");
@@ -151,5 +150,4 @@ void rbs__init_constants(void) {
151150
IMPORT_CONSTANT(RBS_Types_Union, RBS_Types, "Union");
152151
IMPORT_CONSTANT(RBS_Types_UntypedFunction, RBS_Types, "UntypedFunction");
153152
IMPORT_CONSTANT(RBS_Types_Variable, RBS_Types, "Variable");
154-
IMPORT_CONSTANT(RBS_AST_Members_AttrAccessor, RBS_AST_Members, "AttrAccessor");
155153
}

0 commit comments

Comments
 (0)