Merge pull request #2249 from Shopify/at-remove-todo-call

Remove call to `Any#todo!` from C parser
ruby · Jan 28, 2025 · d70b6ee · d70b6ee
2 parents 5b64e6c + 8b80ea8
commit d70b6ee
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/config.yml b/config.yml
@@ -214,6 +214,7 @@ nodes:
       - name: location
   - name: RBS::Types::Bases::Any
     fields:
+      - name: todo
       - name: location
   - name: RBS::Types::Bases::Bool
     fields:

diff --git a/ext/rbs_extension/parser.c b/ext/rbs_extension/parser.c
@@ -993,12 +993,10 @@ static VALUE parse_simple(parserstate *state) {
     return rbs_bases_void(rbs_location_current_token(state));
   }
   case kUNTYPED: {
-    return rbs_bases_any(rbs_location_current_token(state));
+    return rbs_bases_any(false, rbs_location_current_token(state));
   }
   case k__TODO__: {
-    VALUE type = rbs_bases_any(rbs_location_current_token(state));
-    rb_funcall(type, rb_intern("todo!"), 0);
-    return type;
+    return rbs_bases_any(true, rbs_location_current_token(state));
   }
   case tINTEGER: {
     VALUE literal = rb_funcall(

diff --git a/include/rbs/ruby_objs.h b/include/rbs/ruby_objs.h
@@ -44,7 +44,7 @@ VALUE rbs_method_type(VALUE type_params, VALUE type, VALUE block, VALUE location
 VALUE rbs_namespace(VALUE path, VALUE absolute);
 VALUE rbs_type_name(VALUE namespace, VALUE name);
 VALUE rbs_alias(VALUE name, VALUE args, VALUE location);
-VALUE rbs_bases_any(VALUE location);
+VALUE rbs_bases_any(VALUE todo, VALUE location);
 VALUE rbs_bases_bool(VALUE location);
 VALUE rbs_bases_bottom(VALUE location);
 VALUE rbs_bases_class(VALUE location);

diff --git a/lib/rbs/types.rb b/lib/rbs/types.rb
@@ -107,10 +107,16 @@ def with_nonreturn_void?
       class Bool < Base; end
       class Void < Base; end
       class Any < Base
+        def initialize(location:, todo: false)
+          super(location: location)
+          todo! if todo
+        end
+
         def to_s(level=0)
           @string || "untyped"
         end
 
+        # @deprecated: this method is now called from the constructor, do not call it from outside
         def todo!
           @string = '__todo__'
           self

diff --git a/sig/types.rbs b/sig/types.rbs
@@ -113,6 +113,9 @@ module RBS
       class Any < Base
         @string: String?
 
+        def initialize: (location: Location[bot, bot]?, ?todo: bool) -> void
+
+        %a{steep:deprecated}
         def todo!: () -> self
       end
 

diff --git a/src/ruby_objs.c b/src/ruby_objs.c
@@ -502,8 +502,9 @@ VALUE rbs_alias(VALUE name, VALUE args, VALUE location) {
   );
 }
 
-VALUE rbs_bases_any(VALUE location) {
+VALUE rbs_bases_any(VALUE todo, VALUE location) {
   VALUE _init_kwargs = rb_hash_new();
+  rb_hash_aset(_init_kwargs, ID2SYM(rb_intern("todo")), todo);
   rb_hash_aset(_init_kwargs, ID2SYM(rb_intern("location")), location);
 
   return CLASS_NEW_INSTANCE(