typeprof 0.1.4 → 0.2.0

data/lib/typeprof/builtin.rb

@@ -147,7 +147,7 @@ module TypeProf
 
     def module_include(recv, mid, aargs, ep, env, scratch, &ctn)
       arg = aargs.lead_tys[0]
-      scratch.include_module(recv, arg)
+      scratch.include_module(recv, arg, ep.ctx.iseq.absolute_path)
       ctn[recv, ep, env]
     end
 
@@ -155,7 +155,7 @@ module TypeProf
       arg = aargs.lead_tys[0]
       arg.each_child do |arg|
         if arg.is_a?(Type::Class)
-          scratch.extend_module(recv, arg)
+          scratch.extend_module(recv, arg, ep.ctx.iseq.absolute_path)
         end
       end
       ctn[recv, ep, env]
@@ -180,7 +180,7 @@ module TypeProf
       aargs.lead_tys.each do |aarg|
         sym = get_sym("attr_accessor", aarg, ep, scratch) or next
         cref = ep.ctx.cref
-        scratch.add_attr_method(cref.klass, sym, :"@#{ sym }", :accessor)
+        scratch.add_attr_method(cref.klass, ep.ctx.iseq.absolute_path, sym, :"@#{ sym }", :accessor)
       end
       ctn[Type.nil, ep, env]
     end
@@ -189,7 +189,7 @@ module TypeProf
       aargs.lead_tys.each do |aarg|
         sym = get_sym("attr_reader", aarg, ep, scratch) or next
         cref = ep.ctx.cref
-        scratch.add_attr_method(cref.klass, sym, :"@#{ sym }", :reader)
+        scratch.add_attr_method(cref.klass, ep.ctx.iseq.absolute_path, sym, :"@#{ sym }", :reader)
       end
       ctn[Type.nil, ep, env]
     end
@@ -198,7 +198,7 @@ module TypeProf
       aargs.lead_tys.each do |aarg|
         sym = get_sym("attr_writer", aarg, ep, scratch) or next
         cref = ep.ctx.cref
-        scratch.add_attr_method(cref.klass, sym, :"@#{ sym }", :writer)
+        scratch.add_attr_method(cref.klass, ep.ctx.iseq.absolute_path, sym, :"@#{ sym }", :writer)
       end
       ctn[Type.nil, ep, env]
     end
@@ -283,8 +283,6 @@ module TypeProf
         return
       end
       idx = aargs.lead_tys.first
-      #idx = scratch.globalize_type(idx, env, ep)
-      # XXX: recv may be a union
       recv.each_child do |recv|
         if recv.is_a?(Type::LocalHash)
           ty = scratch.get_hash_elem_type(env, ep, recv.id, idx)
@@ -358,21 +356,21 @@ module TypeProf
       fields = aargs.lead_tys.map {|ty| get_sym("Struct.new", ty, ep, scratch) }.compact
       struct_klass = scratch.new_struct(ep)
 
-      scratch.add_singleton_custom_method(struct_klass, :new, Builtin.method(:struct_i_new))
-      scratch.add_singleton_custom_method(struct_klass, :[], Builtin.method(:struct_i_new))
+      scratch.set_singleton_custom_method(struct_klass, :new, Builtin.method(:struct_i_new))
+      scratch.set_singleton_custom_method(struct_klass, :[], Builtin.method(:struct_i_new))
       fields.each do |field|
-        scratch.add_attr_method(struct_klass, field, field, :accessor)
+        scratch.add_attr_method(struct_klass, ep.ctx.iseq.absolute_path, field, field, :accessor)
       end
       fields = fields.map {|field| Type::Symbol.new(field, Type::Instance.new(Type::Builtin[:sym])) }
       base_ty = Type::Instance.new(Type::Builtin[:ary])
       fields = Type::Array.new(Type::Array::Elements.new(fields), base_ty)
       scratch.set_instance_variable(Type::Instance.new(struct_klass), :_members, fields, ep, env)
-      #add_singleton_custom_method(struct_klass, :members, Builtin.method(:...))
+      #set_singleton_custom_method(struct_klass, :members, Builtin.method(:...))
 
       ctn[struct_klass, ep, env]
     end
 
-    def file_load(path, ep, env, scratch, &ctn)
+    def self.file_load(path, ep, env, scratch, &ctn)
       iseq = ISeq.compile(path)
       callee_ep, callee_env = CLI.starting_state(iseq)
       scratch.merge_env(callee_ep, callee_env)
@@ -383,51 +381,60 @@ module TypeProf
       end
     end
 
+    def self.file_require(feature, scratch)
+      return :done, :false if scratch.loaded_features[feature]
+      scratch.loaded_features[feature] = true
+
+      # XXX: dynamic RBS load is really needed??  Another idea:
+      #
+      # * RBS should be loaded in advance of analysis
+      # * require "some_gem/foo" should be ignored
+      # * require "app/foo" should always load .rb file (in this case, app/foo.rb)
+      return :done, :true if Import.import_library(scratch, feature)
+
+      # Try to analyze the source code of the gem
+      begin
+        gem feature
+      rescue Gem::MissingSpecError, Gem::LoadError
+      end
+
+      begin
+        filetype, path = $LOAD_PATH.resolve_feature_path(feature)
+        if filetype == :rb
+          return :do, path if File.readable?(path)
+
+          return :error, "failed to load: #{ path }"
+        else
+          return :error, "cannot load a .so file: #{ path }"
+        end
+      rescue LoadError
+        return :error, "failed to require: #{ feature }"
+      end
+    end
+
     def kernel_require(recv, mid, aargs, ep, env, scratch, &ctn)
       raise NotImplementedError if aargs.lead_tys.size != 1
       feature = aargs.lead_tys.first
       if feature.is_a?(Type::Literal)
         feature = feature.lit
 
-        begin
-          if scratch.loaded_features[feature]
-            result = Type::Instance.new(Type::Builtin[:false])
-            return ctn[result, ep, env]
-          end
-          scratch.loaded_features[feature] = true
-
-          # XXX: dynamic RBS load is really needed??  Another idea:
-          #
-          # * RBS should be loaded in advance of analysis
-          # * require "some_gem/foo" should be ignored
-          # * require "app/foo" should always load .rb file (in this case, app/foo.rb)
-          if RubySignatureImporter.import_library(scratch, feature)
-            result = Type::Instance.new(Type::Builtin[:true])
-            return ctn[result, ep, env]
-          end
-
-          begin
-            gem feature
-          rescue Gem::MissingSpecError, Gem::LoadError
-          end
-          filetype, path = $LOAD_PATH.resolve_feature_path(feature)
-          if filetype == :rb
-            # TODO: if there is RBS file for the library, do not read the source code
-            return file_load(path, ep, env, scratch, &ctn) if File.readable?(path)
-
-            scratch.warn(ep, "failed to load: #{ path }")
-          else
-            scratch.warn(ep, "cannot load a .so file: #{ path }")
-          end
-        rescue LoadError
-          scratch.warn(ep, "failed to require: #{ feature }")
+        action, arg = Builtin.file_require(feature, scratch)
+        case action
+        when :do
+          Builtin.file_load(arg, ep, env, scratch, &ctn)
+        when :done
+          result = Type::Instance.new(Type::Builtin[arg])
+          ctn[result, ep, env]
+        when :error
+          scratch.warn(ep, arg)
+          result = Type::Instance.new(Type.bool)
+          ctn[result, ep, env]
         end
       else
         scratch.warn(ep, "require target cannot be identified statically")
+        result = Type::Instance.new(Type.bool)
+        ctn[result, ep, env]
       end
-
-      result = Type::Instance.new(Type::Builtin[:true])
-      ctn[result, ep, env]
     end
 
     def kernel_require_relative(recv, mid, aargs, ep, env, scratch, &ctn)
@@ -443,7 +450,7 @@ module TypeProf
         scratch.loaded_features[feature] = true
 
         path = File.join(File.dirname(ep.ctx.iseq.path), feature) + ".rb" # XXX
-        return file_load(path, ep, env, scratch, &ctn) if File.readable?(path)
+        return Builtin.file_load(path, ep, env, scratch, &ctn) if File.readable?(path)
 
         scratch.warn(ep, "failed to load: #{ path }")
       else
@@ -473,20 +480,17 @@ module TypeProf
     end
 
     def self.setup_initial_global_env(scratch)
-      klass_obj = scratch.new_class(nil, :Object, [], :__root__) # cbase, name, superclass
+      klass_basic_obj = scratch.new_class(nil, :BasicObject, [], :__root__, nil) # cbase, name, superclass
+      klass_obj = scratch.new_class(nil, :Object, [], klass_basic_obj, nil)
       scratch.add_constant(klass_obj, "Object", klass_obj)
-      klass_true  = scratch.new_class(klass_obj, :TrueClass, [], klass_obj) # ???
-      klass_false = scratch.new_class(klass_obj, :FalseClass, [], klass_obj) # ???
-      klass_nil = scratch.new_class(klass_obj, :NilClass, [], klass_obj) # ???
+      scratch.add_constant(klass_obj, "BasicObject", klass_basic_obj)
 
+      Type::Builtin[:basic_obj] = klass_basic_obj
       Type::Builtin[:obj]   = klass_obj
-      Type::Builtin[:true]  = klass_true
-      Type::Builtin[:false] = klass_false
-      Type::Builtin[:nil]   = klass_nil
 
-      RubySignatureImporter.import_builtin(scratch)
+      Import.import_builtin(scratch)
 
-      Type::Builtin[:vmcore]    = scratch.new_class(klass_obj, :VMCore, [], klass_obj)
+      Type::Builtin[:vmcore]    = scratch.new_class(klass_obj, :VMCore, [], klass_obj, nil)
       Type::Builtin[:int]       = scratch.get_constant(klass_obj, :Integer)
       Type::Builtin[:float]     = scratch.get_constant(klass_obj, :Float)
       Type::Builtin[:rational]  = scratch.get_constant(klass_obj, :Rational)
@@ -511,41 +515,41 @@ module TypeProf
       klass_proc   = Type::Builtin[:proc]
       klass_module = Type::Builtin[:module]
 
-      scratch.add_custom_method(klass_vmcore, :"core#set_method_alias", Builtin.method(:vmcore_set_method_alias))
-      scratch.add_custom_method(klass_vmcore, :"core#undef_method", Builtin.method(:vmcore_undef_method))
-      scratch.add_custom_method(klass_vmcore, :"core#hash_merge_kwd", Builtin.method(:vmcore_hash_merge_kwd))
-      scratch.add_custom_method(klass_vmcore, :lambda, Builtin.method(:lambda))
-      scratch.add_singleton_custom_method(klass_obj, :"new", Builtin.method(:object_s_new))
-      scratch.add_singleton_custom_method(klass_obj, :"attr_accessor", Builtin.method(:module_attr_accessor))
-      scratch.add_singleton_custom_method(klass_obj, :"attr_reader", Builtin.method(:module_attr_reader))
-      scratch.add_singleton_custom_method(klass_obj, :"attr_writer", Builtin.method(:module_attr_writer))
-      scratch.add_custom_method(klass_obj, :p, Builtin.method(:kernel_p))
-      scratch.add_custom_method(klass_obj, :is_a?, Builtin.method(:object_is_a?))
-      scratch.add_custom_method(klass_obj, :respond_to?, Builtin.method(:object_respond_to?))
-      scratch.add_custom_method(klass_obj, :class, Builtin.method(:object_class))
-      scratch.add_custom_method(klass_obj, :send, Builtin.method(:object_send))
-      scratch.add_custom_method(klass_obj, :instance_eval, Builtin.method(:object_instance_eval))
-
-      scratch.add_custom_method(klass_module, :include, Builtin.method(:module_include))
-      scratch.add_custom_method(klass_module, :extend, Builtin.method(:module_extend))
-      scratch.add_custom_method(klass_module, :module_function, Builtin.method(:module_module_function))
-
-      scratch.add_custom_method(klass_proc, :[], Builtin.method(:proc_call))
-      scratch.add_custom_method(klass_proc, :call, Builtin.method(:proc_call))
-
-      scratch.add_custom_method(klass_ary, :[], Builtin.method(:array_aref))
-      scratch.add_custom_method(klass_ary, :[]=, Builtin.method(:array_aset))
-      scratch.add_custom_method(klass_ary, :pop, Builtin.method(:array_pop))
-
-      scratch.add_custom_method(klass_hash, :[], Builtin.method(:hash_aref))
-      scratch.add_custom_method(klass_hash, :[]=, Builtin.method(:hash_aset))
-
-      scratch.add_custom_method(klass_struct, :initialize, Builtin.method(:struct_initialize))
-      scratch.add_singleton_custom_method(klass_struct, :new, Builtin.method(:struct_s_new))
-
-      scratch.add_custom_method(klass_obj, :require, Builtin.method(:kernel_require))
-      scratch.add_custom_method(klass_obj, :require_relative, Builtin.method(:kernel_require_relative))
-      scratch.add_custom_method(klass_obj, :Array, Builtin.method(:kernel_Array))
+      scratch.set_custom_method(klass_vmcore, :"core#set_method_alias", Builtin.method(:vmcore_set_method_alias))
+      scratch.set_custom_method(klass_vmcore, :"core#undef_method", Builtin.method(:vmcore_undef_method))
+      scratch.set_custom_method(klass_vmcore, :"core#hash_merge_kwd", Builtin.method(:vmcore_hash_merge_kwd))
+      scratch.set_custom_method(klass_vmcore, :lambda, Builtin.method(:lambda))
+      scratch.set_singleton_custom_method(klass_obj, :"new", Builtin.method(:object_s_new))
+      scratch.set_singleton_custom_method(klass_obj, :"attr_accessor", Builtin.method(:module_attr_accessor))
+      scratch.set_singleton_custom_method(klass_obj, :"attr_reader", Builtin.method(:module_attr_reader))
+      scratch.set_singleton_custom_method(klass_obj, :"attr_writer", Builtin.method(:module_attr_writer))
+      scratch.set_custom_method(klass_obj, :p, Builtin.method(:kernel_p))
+      scratch.set_custom_method(klass_obj, :is_a?, Builtin.method(:object_is_a?))
+      scratch.set_custom_method(klass_obj, :respond_to?, Builtin.method(:object_respond_to?))
+      scratch.set_custom_method(klass_obj, :class, Builtin.method(:object_class))
+      scratch.set_custom_method(klass_obj, :send, Builtin.method(:object_send))
+      scratch.set_custom_method(klass_obj, :instance_eval, Builtin.method(:object_instance_eval))
+
+      scratch.set_custom_method(klass_module, :include, Builtin.method(:module_include))
+      scratch.set_custom_method(klass_module, :extend, Builtin.method(:module_extend))
+      scratch.set_custom_method(klass_module, :module_function, Builtin.method(:module_module_function))
+
+      scratch.set_custom_method(klass_proc, :[], Builtin.method(:proc_call))
+      scratch.set_custom_method(klass_proc, :call, Builtin.method(:proc_call))
+
+      scratch.set_custom_method(klass_ary, :[], Builtin.method(:array_aref))
+      scratch.set_custom_method(klass_ary, :[]=, Builtin.method(:array_aset))
+      scratch.set_custom_method(klass_ary, :pop, Builtin.method(:array_pop))
+
+      scratch.set_custom_method(klass_hash, :[], Builtin.method(:hash_aref))
+      scratch.set_custom_method(klass_hash, :[]=, Builtin.method(:hash_aset))
+
+      scratch.set_custom_method(klass_struct, :initialize, Builtin.method(:struct_initialize))
+      scratch.set_singleton_custom_method(klass_struct, :new, Builtin.method(:struct_s_new))
+
+      scratch.set_custom_method(klass_obj, :require, Builtin.method(:kernel_require))
+      scratch.set_custom_method(klass_obj, :require_relative, Builtin.method(:kernel_require_relative))
+      scratch.set_custom_method(klass_obj, :Array, Builtin.method(:kernel_Array))
 
       fargs, ret_ty = FormalArguments.new([], [], nil, [], nil, nil, Type.any), Type.any
       scratch.add_method(klass_obj, :initialize, false, TypedMethodDef.new([[fargs, ret_ty]], nil))

data/lib/typeprof/cli.rb

@@ -1,7 +1,15 @@
 require "optparse"
+require "rbconfig"
 
 module TypeProf
   class CLI
+    DEFAULT_DIR_FILTER = [
+      [:include],
+      [:exclude, RbConfig::CONFIG["prefix"]],
+      [:exclude, Gem.dir],
+      [:exclude, Gem.user_dir],
+    ]
+
     def initialize(argv)
       opt = OptionParser.new
 
@@ -18,10 +26,28 @@ module TypeProf
         pedantic_output: false,
         show_errors: false,
       }
+      @dir_filter = nil
+      @rbs_features_to_load = []
 
       opt.on("-o OUTFILE") {|v| @output = v }
-      opt.on("-q", "--quiet") {|v| @verbose = 0 }
-      opt.on("-v", "--verbose") {|v| @verbose = 2 }
+      opt.on("-q", "--quiet") { @verbose = 0 }
+      opt.on("-v", "--verbose") { @verbose = 2 }
+      opt.on("-I DIR") {|v| $LOAD_PATH << v }
+      opt.on("-r FEATURE") {|v| @rbs_features_to_load << v }
+
+      opt.on("--include-dir DIR") do |dir|
+        # When `--include-dir` option is specified as the first directory option,
+        # typeprof will exclude any files by default unless a file path matches the explicit option
+        @dir_filter ||= [[:exclude]]
+        @dir_filter << [:include, File.expand_path(dir)]
+      end
+      opt.on("--exclude-dir DIR") do |dir|
+        # When `--exclude-dir` option is specified as the first directory option,
+        # typeprof will include any files by default, except Ruby's install directory and Gem directories
+        @dir_filter ||= DEFAULT_DIR_FILTER
+        @dir_filter << [:exclude, File.expand_path(dir)]
+      end
+
       opt.on("-f OPTION") do |v|
         key, args = v.split("=", 2)
         case key
@@ -40,6 +66,7 @@ module TypeProf
 
       opt.parse!(argv)
 
+      @dir_filter ||= DEFAULT_DIR_FILTER
       @rb_files = []
       @rbs_files = []
       argv.each do |path|
@@ -59,13 +86,24 @@ module TypeProf
       exit
     end
 
-    attr_reader :verbose, :options, :files
+    attr_reader :verbose, :options, :dir_filter
     attr_accessor :output
 
+    def check_dir_filter(path)
+      @dir_filter.reverse_each do |cond, dir|
+        return cond unless dir
+        return cond if path.start_with?(dir)
+      end
+    end
+
     def run
       scratch = Scratch.new
       Builtin.setup_initial_global_env(scratch)
 
+      @rbs_features_to_load.each do |feature|
+        Import.import_library(scratch, feature)
+      end
+
       prologue_ctx = Context.new(nil, nil, nil)
       prologue_ep = ExecutionPoint.new(prologue_ctx, -1, nil)
       prologue_env = Env.new(StaticEnv.new(:top, Type.nil, false), [], [], Utils::HashWrapper.new({}))
@@ -82,7 +120,7 @@ module TypeProf
       end
 
       @rbs_files.each do |path|
-        RubySignatureImporter.import_rbs_file(scratch, path)
+        Import.import_rbs_file(scratch, path)
       end
 
       result = scratch.type_profile

data/lib/typeprof/export.rb

@@ -31,13 +31,13 @@ module TypeProf
 
       output.puts "# Errors"
       errors.each do |ep, msg|
-        if ENV["TYPE_PROFILER_DETAIL"]
+        if ENV["TP_DETAIL"]
           backtrace = filter_backtrace(generate_analysis_trace(ep, {}, backward_edge))
         else
           backtrace = [ep]
         end
         loc, *backtrace = backtrace.map do |ep|
-          ep.source_location
+          ep&.source_location
         end
         output.puts "#{ loc }: #{ msg }"
         backtrace.each do |loc|
@@ -57,13 +57,15 @@ module TypeProf
       output.puts
     end
 
-    def show_gvars(scratch, gvar_write, output)
+    def show_gvars(scratch, gvars, output)
       # A signature for global variables is not supported in RBS
-      return if gvar_write.empty?
+      return if gvars.dump.empty?
 
       output.puts "# Global variables"
-      gvar_write.each do |gvar_name, ty|
-        output.puts "#  #{ gvar_name } : #{ ty.screen_name(scratch) }"
+      gvars.dump.each do |gvar_name, entry|
+        next if entry.type == Type.bot
+        s = entry.rbs_declared ? "#" : ""
+        output.puts s + "#{ gvar_name } : #{ entry.type.screen_name(scratch) }"
       end
       output.puts
     end
@@ -88,14 +90,18 @@ module TypeProf
       stat_classes = {}
       stat_methods = {}
       first = true
+
       @class_defs.each_value do |class_def|
-        included_mods = class_def.modules[false].filter_map do |visible, mod_def|
-          mod_def.name if visible
+        included_mods = class_def.modules[false].filter_map do |mod_def, absolute_paths|
+          next if absolute_paths.all? {|path| !path || Config.check_dir_filter(path) == :exclude }
+          mod_def.name
         end
 
         explicit_methods = {}
         iseq_methods = {}
         attr_methods = {}
+        ivars = class_def.ivars.dump
+        cvars = class_def.cvars.dump
         class_def.methods.each do |(singleton, mid), mdefs|
           mdefs.each do |mdef|
             case mdef
@@ -105,6 +111,7 @@ module TypeProf
 
               ctxs.each do |ctx|
                 next if mid != ctx.mid
+                next if Config.check_dir_filter(ctx.iseq.absolute_path) == :exclude
 
                 method_name = ctx.mid
                 method_name = "self.#{ method_name }" if singleton
@@ -116,6 +123,7 @@ module TypeProf
                 iseq_methods[method_name] << @scratch.show_signature(fargs, @yields[ctx], ret_tys)
               end
             when AttrMethodDef
+              next if Config.check_dir_filter(mdef.absolute_path) == :exclude
               mid = mid.to_s[0..-2].to_sym if mid.to_s.end_with?("=")
               method_name = mid
               method_name = "self.#{ mid }" if singleton
@@ -125,7 +133,8 @@ module TypeProf
                   attr_methods[method_name][0] = :accessor
                 end
               else
-                ty = class_def.ivars.write[[singleton, mdef.ivar]] || Type.any
+                entry = ivars[[singleton, mdef.ivar]]
+                ty = entry ? entry.type : Type.any
                 attr_methods[method_name] = [mdef.kind, ty.screen_name(@scratch)]
               end
             when TypedMethodDef
@@ -137,36 +146,43 @@ module TypeProf
           end
         end
 
-        ivars = class_def.ivars.write.map do |(singleton, var), ty|
+        ivars = ivars.map do |(singleton, var), entry|
+          next if entry.absolute_paths.all? {|path| Config.check_dir_filter(path) == :exclude }
+          ty = entry.type
           next unless var.to_s.start_with?("@")
           var = "self.#{ var }" if singleton
           next if attr_methods[[singleton ? "self.#{ var.to_s[1..] }" : var.to_s[1..].to_sym, false]]
-          [var, ty.screen_name(@scratch)]
+          [var, ty.screen_name(@scratch), entry.rbs_declared]
         end.compact
 
-        cvars = class_def.cvars.write.map do |var, ty|
-          [var, ty.screen_name(@scratch)]
+        cvars = cvars.map do |var, entry|
+          next if entry.absolute_paths.all? {|path| Config.check_dir_filter(path) == :exclude }
+          [var, entry.type.screen_name(@scratch), entry.rbs_declared]
         end
 
-        next if included_mods.empty? && ivars.empty? && cvars.empty? && iseq_methods.empty? && attr_methods.empty?
+        if !class_def.absolute_path || Config.check_dir_filter(class_def.absolute_path) == :exclude
+          next if included_mods.empty? && ivars.empty? && cvars.empty? && iseq_methods.empty? && attr_methods.empty?
+        end
 
         output.puts unless first
         first = false
 
         if class_def.superclass
-          object = @class_defs[class_def.superclass].klass_obj == Type::Builtin[:obj]
-          superclass = object ? "" : " < #{ @class_defs[class_def.superclass].name }"
+          omit = @class_defs[class_def.superclass].klass_obj == Type::Builtin[:obj] || class_def.klass_obj == Type::Builtin[:obj]
+          superclass = omit ? "" : " < #{ @class_defs[class_def.superclass].name }"
         end
 
         output.puts "#{ class_def.kind } #{ class_def.name }#{ superclass }"
         included_mods.sort.each do |ty|
           output.puts "  include #{ ty }"
         end
-        ivars.each do |var, ty|
-          output.puts "  #{ var } : #{ ty }" unless var.start_with?("_")
+        ivars.each do |var, ty, rbs_declared|
+          s = rbs_declared ? "# " : "  "
+          output.puts s + "#{ var } : #{ ty }" unless var.start_with?("_")
         end
-        cvars.each do |var, ty|
-          output.puts "  #{ var } : #{ ty }"
+        cvars.each do |var, ty, rbs_declared|
+          s = rbs_declared ? "# " : "  "
+          output.puts s + "#{ var } : #{ ty }"
         end
         attr_methods.each do |(method_name, hidden), (kind, ty)|
           output.puts "  attr_#{ kind } #{ method_name }#{ hidden ? "()" : "" } : #{ ty }"