rbs 3.10.0 → 4.0.0.dev.1

data/ext/rbs_extension/ast_translation.h

@@ -8,12 +8,8 @@
 #ifndef RBS_EXTENSION_AST_TRANSLATION_H
 #define RBS_EXTENSION_AST_TRANSLATION_H
 
-#include "compat.h"
-
-SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
 #include "ruby/encoding.h"
-SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 #include "rbs/ast.h"
 #include "rbs/location.h"
@@ -31,7 +27,4 @@ VALUE rbs_node_list_to_ruby_array(rbs_translation_context_t, rbs_node_list_t *li
 VALUE rbs_hash_to_ruby_hash(rbs_translation_context_t, rbs_hash_t *hash);
 VALUE rbs_struct_to_ruby_value(rbs_translation_context_t, rbs_node_t *instance);
 
-extern VALUE EMPTY_ARRAY;
-extern VALUE EMPTY_HASH;
-
 #endif

data/ext/rbs_extension/class_constants.c

@@ -7,11 +7,15 @@
 
 #include "rbs_extension.h"
 
+VALUE RBS_Parser;
+
 VALUE RBS;
 VALUE RBS_AST;
 VALUE RBS_AST_Declarations;
 VALUE RBS_AST_Directives;
 VALUE RBS_AST_Members;
+VALUE RBS_AST_Ruby;
+VALUE RBS_AST_Ruby_Annotations;
 VALUE RBS_Parser;
 VALUE RBS_Types;
 VALUE RBS_Types_Bases;
@@ -45,6 +49,11 @@ VALUE RBS_AST_Members_MethodDefinition_Overload;
 VALUE RBS_AST_Members_Prepend;
 VALUE RBS_AST_Members_Private;
 VALUE RBS_AST_Members_Public;
+VALUE RBS_AST_Ruby_Annotations_ColonMethodTypeAnnotation;
+VALUE RBS_AST_Ruby_Annotations_MethodTypesAnnotation;
+VALUE RBS_AST_Ruby_Annotations_NodeTypeAssertion;
+VALUE RBS_AST_Ruby_Annotations_ReturnTypeAnnotation;
+VALUE RBS_AST_Ruby_Annotations_SkipAnnotation;
 VALUE RBS_AST_TypeParam;
 VALUE RBS_MethodType;
 VALUE RBS_Namespace;
@@ -77,79 +86,82 @@ VALUE RBS_Types_Variable;
 
 VALUE RBS_ParsingError;
 
-#define IMPORT_CONSTANT(var, parent, name)           \
-    {                                                \
-        var = rb_const_get(parent, rb_intern(name)); \
-        rb_gc_register_mark_object(var);             \
-    }
+#define IMPORT_CONSTANT(var, parent, name) { var = rb_const_get(parent, rb_intern(name)); rb_gc_register_mark_object(var); }
 
 void rbs__init_constants(void) {
-    IMPORT_CONSTANT(RBS, rb_cObject, "RBS");
-    IMPORT_CONSTANT(RBS_ParsingError, RBS, "ParsingError");
+  IMPORT_CONSTANT(RBS, rb_cObject, "RBS");
+  IMPORT_CONSTANT(RBS_ParsingError, RBS, "ParsingError");
 
-    IMPORT_CONSTANT(RBS_AST, RBS, "AST");
-    IMPORT_CONSTANT(RBS_AST_Declarations, RBS_AST, "Declarations");
-    IMPORT_CONSTANT(RBS_AST_Directives, RBS_AST, "Directives");
-    IMPORT_CONSTANT(RBS_AST_Members, RBS_AST, "Members");
-    IMPORT_CONSTANT(RBS_Types, RBS, "Types");
-    IMPORT_CONSTANT(RBS_Types_Bases, RBS_Types, "Bases");
+  IMPORT_CONSTANT(RBS_AST, RBS, "AST");
+  IMPORT_CONSTANT(RBS_AST_Declarations, RBS_AST, "Declarations");
+  IMPORT_CONSTANT(RBS_AST_Directives, RBS_AST, "Directives");
+  IMPORT_CONSTANT(RBS_AST_Members, RBS_AST, "Members");
+  IMPORT_CONSTANT(RBS_AST_Ruby, RBS_AST, "Ruby");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations, RBS_AST_Ruby, "Annotations");
+  IMPORT_CONSTANT(RBS_Types, RBS, "Types");
+  IMPORT_CONSTANT(RBS_Types_Bases, RBS_Types, "Bases");
 
-    IMPORT_CONSTANT(RBS_AST_Annotation, RBS_AST, "Annotation");
-    IMPORT_CONSTANT(RBS_AST_Comment, RBS_AST, "Comment");
-    IMPORT_CONSTANT(RBS_AST_Declarations_Class, RBS_AST_Declarations, "Class");
-    IMPORT_CONSTANT(RBS_AST_Declarations_Class_Super, RBS_AST_Declarations_Class, "Super");
-    IMPORT_CONSTANT(RBS_AST_Declarations_ClassAlias, RBS_AST_Declarations, "ClassAlias");
-    IMPORT_CONSTANT(RBS_AST_Declarations_Constant, RBS_AST_Declarations, "Constant");
-    IMPORT_CONSTANT(RBS_AST_Declarations_Global, RBS_AST_Declarations, "Global");
-    IMPORT_CONSTANT(RBS_AST_Declarations_Interface, RBS_AST_Declarations, "Interface");
-    IMPORT_CONSTANT(RBS_AST_Declarations_Module, RBS_AST_Declarations, "Module");
-    IMPORT_CONSTANT(RBS_AST_Declarations_Module_Self, RBS_AST_Declarations_Module, "Self");
-    IMPORT_CONSTANT(RBS_AST_Declarations_ModuleAlias, RBS_AST_Declarations, "ModuleAlias");
-    IMPORT_CONSTANT(RBS_AST_Declarations_TypeAlias, RBS_AST_Declarations, "TypeAlias");
-    IMPORT_CONSTANT(RBS_AST_Directives_Use, RBS_AST_Directives, "Use");
-    IMPORT_CONSTANT(RBS_AST_Directives_Use_SingleClause, RBS_AST_Directives_Use, "SingleClause");
-    IMPORT_CONSTANT(RBS_AST_Directives_Use_WildcardClause, RBS_AST_Directives_Use, "WildcardClause");
-    IMPORT_CONSTANT(RBS_AST_Members_Alias, RBS_AST_Members, "Alias");
-    IMPORT_CONSTANT(RBS_AST_Members_AttrAccessor, RBS_AST_Members, "AttrAccessor");
-    IMPORT_CONSTANT(RBS_AST_Members_AttrReader, RBS_AST_Members, "AttrReader");
-    IMPORT_CONSTANT(RBS_AST_Members_AttrWriter, RBS_AST_Members, "AttrWriter");
-    IMPORT_CONSTANT(RBS_AST_Members_ClassInstanceVariable, RBS_AST_Members, "ClassInstanceVariable");
-    IMPORT_CONSTANT(RBS_AST_Members_ClassVariable, RBS_AST_Members, "ClassVariable");
-    IMPORT_CONSTANT(RBS_AST_Members_Extend, RBS_AST_Members, "Extend");
-    IMPORT_CONSTANT(RBS_AST_Members_Include, RBS_AST_Members, "Include");
-    IMPORT_CONSTANT(RBS_AST_Members_InstanceVariable, RBS_AST_Members, "InstanceVariable");
-    IMPORT_CONSTANT(RBS_AST_Members_MethodDefinition, RBS_AST_Members, "MethodDefinition");
-    IMPORT_CONSTANT(RBS_AST_Members_MethodDefinition_Overload, RBS_AST_Members_MethodDefinition, "Overload");
-    IMPORT_CONSTANT(RBS_AST_Members_Prepend, RBS_AST_Members, "Prepend");
-    IMPORT_CONSTANT(RBS_AST_Members_Private, RBS_AST_Members, "Private");
-    IMPORT_CONSTANT(RBS_AST_Members_Public, RBS_AST_Members, "Public");
-    IMPORT_CONSTANT(RBS_AST_TypeParam, RBS_AST, "TypeParam");
-    IMPORT_CONSTANT(RBS_MethodType, RBS, "MethodType");
-    IMPORT_CONSTANT(RBS_Namespace, RBS, "Namespace");
-    IMPORT_CONSTANT(RBS_TypeName, RBS, "TypeName");
-    IMPORT_CONSTANT(RBS_Types_Alias, RBS_Types, "Alias");
-    IMPORT_CONSTANT(RBS_Types_Bases_Any, RBS_Types_Bases, "Any");
-    IMPORT_CONSTANT(RBS_Types_Bases_Bool, RBS_Types_Bases, "Bool");
-    IMPORT_CONSTANT(RBS_Types_Bases_Bottom, RBS_Types_Bases, "Bottom");
-    IMPORT_CONSTANT(RBS_Types_Bases_Class, RBS_Types_Bases, "Class");
-    IMPORT_CONSTANT(RBS_Types_Bases_Instance, RBS_Types_Bases, "Instance");
-    IMPORT_CONSTANT(RBS_Types_Bases_Nil, RBS_Types_Bases, "Nil");
-    IMPORT_CONSTANT(RBS_Types_Bases_Self, RBS_Types_Bases, "Self");
-    IMPORT_CONSTANT(RBS_Types_Bases_Top, RBS_Types_Bases, "Top");
-    IMPORT_CONSTANT(RBS_Types_Bases_Void, RBS_Types_Bases, "Void");
-    IMPORT_CONSTANT(RBS_Types_Block, RBS_Types, "Block");
-    IMPORT_CONSTANT(RBS_Types_ClassInstance, RBS_Types, "ClassInstance");
-    IMPORT_CONSTANT(RBS_Types_ClassSingleton, RBS_Types, "ClassSingleton");
-    IMPORT_CONSTANT(RBS_Types_Function, RBS_Types, "Function");
-    IMPORT_CONSTANT(RBS_Types_Function_Param, RBS_Types_Function, "Param");
-    IMPORT_CONSTANT(RBS_Types_Interface, RBS_Types, "Interface");
-    IMPORT_CONSTANT(RBS_Types_Intersection, RBS_Types, "Intersection");
-    IMPORT_CONSTANT(RBS_Types_Literal, RBS_Types, "Literal");
-    IMPORT_CONSTANT(RBS_Types_Optional, RBS_Types, "Optional");
-    IMPORT_CONSTANT(RBS_Types_Proc, RBS_Types, "Proc");
-    IMPORT_CONSTANT(RBS_Types_Record, RBS_Types, "Record");
-    IMPORT_CONSTANT(RBS_Types_Tuple, RBS_Types, "Tuple");
-    IMPORT_CONSTANT(RBS_Types_Union, RBS_Types, "Union");
-    IMPORT_CONSTANT(RBS_Types_UntypedFunction, RBS_Types, "UntypedFunction");
-    IMPORT_CONSTANT(RBS_Types_Variable, RBS_Types, "Variable");
+  IMPORT_CONSTANT(RBS_AST_Annotation, RBS_AST, "Annotation");
+  IMPORT_CONSTANT(RBS_AST_Comment, RBS_AST, "Comment");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Class, RBS_AST_Declarations, "Class");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Class_Super, RBS_AST_Declarations_Class, "Super");
+  IMPORT_CONSTANT(RBS_AST_Declarations_ClassAlias, RBS_AST_Declarations, "ClassAlias");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Constant, RBS_AST_Declarations, "Constant");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Global, RBS_AST_Declarations, "Global");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Interface, RBS_AST_Declarations, "Interface");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Module, RBS_AST_Declarations, "Module");
+  IMPORT_CONSTANT(RBS_AST_Declarations_Module_Self, RBS_AST_Declarations_Module, "Self");
+  IMPORT_CONSTANT(RBS_AST_Declarations_ModuleAlias, RBS_AST_Declarations, "ModuleAlias");
+  IMPORT_CONSTANT(RBS_AST_Declarations_TypeAlias, RBS_AST_Declarations, "TypeAlias");
+  IMPORT_CONSTANT(RBS_AST_Directives_Use, RBS_AST_Directives, "Use");
+  IMPORT_CONSTANT(RBS_AST_Directives_Use_SingleClause, RBS_AST_Directives_Use, "SingleClause");
+  IMPORT_CONSTANT(RBS_AST_Directives_Use_WildcardClause, RBS_AST_Directives_Use, "WildcardClause");
+  IMPORT_CONSTANT(RBS_AST_Members_Alias, RBS_AST_Members, "Alias");
+  IMPORT_CONSTANT(RBS_AST_Members_AttrAccessor, RBS_AST_Members, "AttrAccessor");
+  IMPORT_CONSTANT(RBS_AST_Members_AttrReader, RBS_AST_Members, "AttrReader");
+  IMPORT_CONSTANT(RBS_AST_Members_AttrWriter, RBS_AST_Members, "AttrWriter");
+  IMPORT_CONSTANT(RBS_AST_Members_ClassInstanceVariable, RBS_AST_Members, "ClassInstanceVariable");
+  IMPORT_CONSTANT(RBS_AST_Members_ClassVariable, RBS_AST_Members, "ClassVariable");
+  IMPORT_CONSTANT(RBS_AST_Members_Extend, RBS_AST_Members, "Extend");
+  IMPORT_CONSTANT(RBS_AST_Members_Include, RBS_AST_Members, "Include");
+  IMPORT_CONSTANT(RBS_AST_Members_InstanceVariable, RBS_AST_Members, "InstanceVariable");
+  IMPORT_CONSTANT(RBS_AST_Members_MethodDefinition, RBS_AST_Members, "MethodDefinition");
+  IMPORT_CONSTANT(RBS_AST_Members_MethodDefinition_Overload, RBS_AST_Members_MethodDefinition, "Overload");
+  IMPORT_CONSTANT(RBS_AST_Members_Prepend, RBS_AST_Members, "Prepend");
+  IMPORT_CONSTANT(RBS_AST_Members_Private, RBS_AST_Members, "Private");
+  IMPORT_CONSTANT(RBS_AST_Members_Public, RBS_AST_Members, "Public");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_ColonMethodTypeAnnotation, RBS_AST_Ruby_Annotations, "ColonMethodTypeAnnotation");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_MethodTypesAnnotation, RBS_AST_Ruby_Annotations, "MethodTypesAnnotation");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_NodeTypeAssertion, RBS_AST_Ruby_Annotations, "NodeTypeAssertion");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_ReturnTypeAnnotation, RBS_AST_Ruby_Annotations, "ReturnTypeAnnotation");
+  IMPORT_CONSTANT(RBS_AST_Ruby_Annotations_SkipAnnotation, RBS_AST_Ruby_Annotations, "SkipAnnotation");
+  IMPORT_CONSTANT(RBS_AST_TypeParam, RBS_AST, "TypeParam");
+  IMPORT_CONSTANT(RBS_MethodType, RBS, "MethodType");
+  IMPORT_CONSTANT(RBS_Namespace, RBS, "Namespace");
+  IMPORT_CONSTANT(RBS_TypeName, RBS, "TypeName");
+  IMPORT_CONSTANT(RBS_Types_Alias, RBS_Types, "Alias");
+  IMPORT_CONSTANT(RBS_Types_Bases_Any, RBS_Types_Bases, "Any");
+  IMPORT_CONSTANT(RBS_Types_Bases_Bool, RBS_Types_Bases, "Bool");
+  IMPORT_CONSTANT(RBS_Types_Bases_Bottom, RBS_Types_Bases, "Bottom");
+  IMPORT_CONSTANT(RBS_Types_Bases_Class, RBS_Types_Bases, "Class");
+  IMPORT_CONSTANT(RBS_Types_Bases_Instance, RBS_Types_Bases, "Instance");
+  IMPORT_CONSTANT(RBS_Types_Bases_Nil, RBS_Types_Bases, "Nil");
+  IMPORT_CONSTANT(RBS_Types_Bases_Self, RBS_Types_Bases, "Self");
+  IMPORT_CONSTANT(RBS_Types_Bases_Top, RBS_Types_Bases, "Top");
+  IMPORT_CONSTANT(RBS_Types_Bases_Void, RBS_Types_Bases, "Void");
+  IMPORT_CONSTANT(RBS_Types_Block, RBS_Types, "Block");
+  IMPORT_CONSTANT(RBS_Types_ClassInstance, RBS_Types, "ClassInstance");
+  IMPORT_CONSTANT(RBS_Types_ClassSingleton, RBS_Types, "ClassSingleton");
+  IMPORT_CONSTANT(RBS_Types_Function, RBS_Types, "Function");
+  IMPORT_CONSTANT(RBS_Types_Function_Param, RBS_Types_Function, "Param");
+  IMPORT_CONSTANT(RBS_Types_Interface, RBS_Types, "Interface");
+  IMPORT_CONSTANT(RBS_Types_Intersection, RBS_Types, "Intersection");
+  IMPORT_CONSTANT(RBS_Types_Literal, RBS_Types, "Literal");
+  IMPORT_CONSTANT(RBS_Types_Optional, RBS_Types, "Optional");
+  IMPORT_CONSTANT(RBS_Types_Proc, RBS_Types, "Proc");
+  IMPORT_CONSTANT(RBS_Types_Record, RBS_Types, "Record");
+  IMPORT_CONSTANT(RBS_Types_Tuple, RBS_Types, "Tuple");
+  IMPORT_CONSTANT(RBS_Types_Union, RBS_Types, "Union");
+  IMPORT_CONSTANT(RBS_Types_UntypedFunction, RBS_Types, "UntypedFunction");
+  IMPORT_CONSTANT(RBS_Types_Variable, RBS_Types, "Variable");
 }

data/ext/rbs_extension/class_constants.h

@@ -8,11 +8,7 @@
 #ifndef RBS__CONSTANTS_H
 #define RBS__CONSTANTS_H
 
-#include "compat.h"
-
-SUPPRESS_RUBY_HEADER_DIAGNOSTICS_BEGIN
 #include "ruby.h"
-SUPPRESS_RUBY_HEADER_DIAGNOSTICS_END
 
 extern VALUE RBS;
 
@@ -20,6 +16,8 @@ extern VALUE RBS_AST;
 extern VALUE RBS_AST_Declarations;
 extern VALUE RBS_AST_Directives;
 extern VALUE RBS_AST_Members;
+extern VALUE RBS_AST_Ruby;
+extern VALUE RBS_AST_Ruby_Annotations;
 extern VALUE RBS_Types;
 extern VALUE RBS_Types_Bases;
 extern VALUE RBS_ParsingError;
@@ -53,6 +51,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_Ruby_Annotations_ColonMethodTypeAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_MethodTypesAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_NodeTypeAssertion;
+extern VALUE RBS_AST_Ruby_Annotations_ReturnTypeAnnotation;
+extern VALUE RBS_AST_Ruby_Annotations_SkipAnnotation;
 extern VALUE RBS_AST_TypeParam;
 extern VALUE RBS_MethodType;
 extern VALUE RBS_Namespace;

data/ext/rbs_extension/extconf.rb

@@ -11,29 +11,7 @@ root_dir = File.expand_path('../../../', __FILE__)
 $srcs = Dir.glob("#{root_dir}/src/**/*.c") +
         Dir.glob("#{root_dir}/ext/rbs_extension/*.c")
 
-append_cflags [
-  '-std=gnu99',
-  '-Wimplicit-fallthrough',
-  '-Wunused-result',
-  '-Wc++-compat',
-]
-
-if ENV['DEBUG']
-  append_cflags ['-O0', '-pg']
-else
-  append_cflags ['-DNDEBUG']
-end
-if ENV["TEST_NO_C23"]
-  puts "Adding -Wc2x-extensions to CFLAGS"
-  $CFLAGS << " -Werror -Wc2x-extensions"
-end
+append_cflags ['-std=gnu99', '-Wimplicit-fallthrough', '-Wunused-result']
+append_cflags ['-O0', '-g'] if ENV['DEBUG']
 
 create_makefile 'rbs_extension'
-
-# Only generate compile_commands.json when compiling through Rake tasks
-# This is to avoid adding extconf_compile_commands_json as a runtime dependency
-if ENV["COMPILE_COMMANDS_JSON"]
-  require 'extconf_compile_commands_json'
-  ExtconfCompileCommandsJson.generate!
-  ExtconfCompileCommandsJson.symlink!
-end