Update AST

Author: soutaro

config.yml

@@ -485,3 +485,15 @@ nodes:
         c_type: rbs_node
       - name: comment_location
         c_type: rbs_location
+  - name: RBS::AST::Ruby::Annotations::ParamTypeAnnotation
+    fields:
+      - name: prefix_location
+        c_type: rbs_location
+      - name: name_location
+        c_type: rbs_location
+      - name: colon_location
+        c_type: rbs_location
+      - name: param_type
+        c_type: rbs_node
+      - name: comment_location
+        c_type: rbs_location

ext/rbs_extension/ast_translation.c

@@ -651,6 +651,24 @@ VALUE rbs_struct_to_ruby_value(rbs_translation_context_t ctx, rbs_node_t *instan
                 &h
             );
         }
+        case RBS_AST_RUBY_ANNOTATIONS_PARAM_TYPE_ANNOTATION: {
+            rbs_ast_ruby_annotations_param_type_annotation_t *node = (rbs_ast_ruby_annotations_param_type_annotation_t *)instance;
+
+            VALUE h = rb_hash_new();
+            rb_hash_aset(h, ID2SYM(rb_intern("location")), rbs_loc_to_ruby_location(ctx, node->base.location));
+            rb_hash_aset(h, ID2SYM(rb_intern("prefix_location")), rbs_loc_to_ruby_location(ctx, node->prefix_location));
+            rb_hash_aset(h, ID2SYM(rb_intern("name_location")), rbs_loc_to_ruby_location(ctx, node->name_location));
+            rb_hash_aset(h, ID2SYM(rb_intern("colon_location")), rbs_loc_to_ruby_location(ctx, node->colon_location));
+            rb_hash_aset(h, ID2SYM(rb_intern("param_type")), rbs_struct_to_ruby_value(ctx, (rbs_node_t *) node->param_type)); // rbs_node
+            rb_hash_aset(h, ID2SYM(rb_intern("comment_location")), rbs_loc_to_ruby_location(ctx, node->comment_location));
+
+
+            return CLASS_NEW_INSTANCE(
+                RBS_AST_Ruby_Annotations_ParamTypeAnnotation,
+                1,
+                &h
+            );
+        }
         case RBS_AST_RUBY_ANNOTATIONS_RETURN_TYPE_ANNOTATION: {
             rbs_ast_ruby_annotations_return_type_annotation_t *node = (rbs_ast_ruby_annotations_return_type_annotation_t *)instance;
 

ext/rbs_extension/class_constants.c

@@ -52,6 +52,7 @@ 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_ParamTypeAnnotation;
 VALUE RBS_AST_Ruby_Annotations_ReturnTypeAnnotation;
 VALUE RBS_AST_Ruby_Annotations_SkipAnnotation;
 VALUE RBS_AST_TypeParam;
@@ -133,6 +134,7 @@ void rbs__init_constants(void) {
   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_ParamTypeAnnotation, RBS_AST_Ruby_Annotations, "ParamTypeAnnotation");
   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");

ext/rbs_extension/class_constants.h

@@ -54,6 +54,7 @@ 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_ParamTypeAnnotation;
 extern VALUE RBS_AST_Ruby_Annotations_ReturnTypeAnnotation;
 extern VALUE RBS_AST_Ruby_Annotations_SkipAnnotation;
 extern VALUE RBS_AST_TypeParam;

include/rbs/ast.h

@@ -48,40 +48,41 @@ enum rbs_node_type {
     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_AST_RUBY_ANNOTATIONS_PARAM_TYPE_ANNOTATION = 35,
+    RBS_AST_RUBY_ANNOTATIONS_RETURN_TYPE_ANNOTATION = 36,
+    RBS_AST_RUBY_ANNOTATIONS_SKIP_ANNOTATION = 37,
+    RBS_AST_STRING = 38,
+    RBS_AST_TYPE_PARAM = 39,
+    RBS_METHOD_TYPE = 40,
+    RBS_NAMESPACE = 41,
+    RBS_SIGNATURE = 42,
+    RBS_TYPE_NAME = 43,
+    RBS_TYPES_ALIAS = 44,
+    RBS_TYPES_BASES_ANY = 45,
+    RBS_TYPES_BASES_BOOL = 46,
+    RBS_TYPES_BASES_BOTTOM = 47,
+    RBS_TYPES_BASES_CLASS = 48,
+    RBS_TYPES_BASES_INSTANCE = 49,
+    RBS_TYPES_BASES_NIL = 50,
+    RBS_TYPES_BASES_SELF = 51,
+    RBS_TYPES_BASES_TOP = 52,
+    RBS_TYPES_BASES_VOID = 53,
+    RBS_TYPES_BLOCK = 54,
+    RBS_TYPES_CLASS_INSTANCE = 55,
+    RBS_TYPES_CLASS_SINGLETON = 56,
+    RBS_TYPES_FUNCTION = 57,
+    RBS_TYPES_FUNCTION_PARAM = 58,
+    RBS_TYPES_INTERFACE = 59,
+    RBS_TYPES_INTERSECTION = 60,
+    RBS_TYPES_LITERAL = 61,
+    RBS_TYPES_OPTIONAL = 62,
+    RBS_TYPES_PROC = 63,
+    RBS_TYPES_RECORD = 64,
+    RBS_TYPES_RECORD_FIELD_TYPE = 65,
+    RBS_TYPES_TUPLE = 66,
+    RBS_TYPES_UNION = 67,
+    RBS_TYPES_UNTYPED_FUNCTION = 68,
+    RBS_TYPES_VARIABLE = 69,
     RBS_KEYWORD,
     RBS_AST_SYMBOL,
 };
@@ -420,6 +421,16 @@ typedef struct rbs_ast_ruby_annotations_node_type_assertion {
     struct rbs_node *type;
 } rbs_ast_ruby_annotations_node_type_assertion_t;
 
+typedef struct rbs_ast_ruby_annotations_param_type_annotation {
+    rbs_node_t base;
+
+    struct rbs_location *prefix_location;
+    struct rbs_location *name_location;
+    struct rbs_location *colon_location;
+    struct rbs_node *param_type;
+    struct rbs_location *comment_location;
+} rbs_ast_ruby_annotations_param_type_annotation_t;
+
 typedef struct rbs_ast_ruby_annotations_return_type_annotation {
     rbs_node_t base;
 
@@ -655,6 +666,7 @@ typedef union rbs_ast_ruby_annotations {
   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_param_type_annotation_t param_type_annotation;
 } rbs_ast_ruby_annotations_t;
 
 /// `rbs_keyword_t` models RBS keywords like "private", "instance", "covariant", etc.
@@ -710,6 +722,7 @@ rbs_ast_members_public_t *rbs_ast_members_public_new(rbs_allocator_t *allocator,
 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_param_type_annotation_t *rbs_ast_ruby_annotations_param_type_annotation_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_location_t *prefix_location, rbs_location_t *name_location, rbs_location_t *colon_location, rbs_node_t *param_type, rbs_location_t *comment_location);
 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);

src/ast.c

@@ -47,6 +47,7 @@ const char* rbs_node_type_name(rbs_node_t *node) {
         case RBS_AST_RUBY_ANNOTATIONS_COLON_METHOD_TYPE_ANNOTATION: return "RBS::AST::Ruby::Annotations::ColonMethodTypeAnnotation";
         case RBS_AST_RUBY_ANNOTATIONS_METHOD_TYPES_ANNOTATION: return "RBS::AST::Ruby::Annotations::MethodTypesAnnotation";
         case RBS_AST_RUBY_ANNOTATIONS_NODE_TYPE_ASSERTION: return "RBS::AST::Ruby::Annotations::NodeTypeAssertion";
+        case RBS_AST_RUBY_ANNOTATIONS_PARAM_TYPE_ANNOTATION: return "RBS::AST::Ruby::Annotations::ParamTypeAnnotation";
         case RBS_AST_RUBY_ANNOTATIONS_RETURN_TYPE_ANNOTATION: return "RBS::AST::Ruby::Annotations::ReturnTypeAnnotation";
         case RBS_AST_RUBY_ANNOTATIONS_SKIP_ANNOTATION: return "RBS::AST::Ruby::Annotations::SkipAnnotation";
         case RBS_AST_STRING: return "RBS::AST::String";
@@ -811,6 +812,25 @@ rbs_ast_ruby_annotations_node_type_assertion_t *rbs_ast_ruby_annotations_node_ty
     return instance;
 }
 #line 153 "prism/templates/src/ast.c.erb"
+rbs_ast_ruby_annotations_param_type_annotation_t *rbs_ast_ruby_annotations_param_type_annotation_new(rbs_allocator_t *allocator, rbs_location_t *location, rbs_location_t *prefix_location, rbs_location_t *name_location, rbs_location_t *colon_location, rbs_node_t *param_type, rbs_location_t *comment_location) {
+    rbs_ast_ruby_annotations_param_type_annotation_t *instance = rbs_allocator_alloc(allocator, rbs_ast_ruby_annotations_param_type_annotation_t);
+
+
+    *instance = (rbs_ast_ruby_annotations_param_type_annotation_t) {
+        .base = (rbs_node_t) {
+            .type = RBS_AST_RUBY_ANNOTATIONS_PARAM_TYPE_ANNOTATION,
+            .location = location,
+        },
+        .prefix_location = prefix_location,
+        .name_location = name_location,
+        .colon_location = colon_location,
+        .param_type = param_type,
+        .comment_location = comment_location,
+    };
+
+    return instance;
+}
+#line 153 "prism/templates/src/ast.c.erb"
 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_return_type_annotation_t *instance = rbs_allocator_alloc(allocator, rbs_ast_ruby_annotations_return_type_annotation_t);
 

templates/include/rbs/ast.h.erb

@@ -82,6 +82,7 @@ typedef union rbs_ast_ruby_annotations {
   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_param_type_annotation_t param_type_annotation;
 } rbs_ast_ruby_annotations_t;
 
 /// `rbs_keyword_t` models RBS keywords like "private", "instance", "covariant", etc.