typeprof 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '080db9120b2b069f8a1385e3696851212a2271652f73b8627d5337d2d26d8f2b'
-  data.tar.gz: 969e38b2a1b64ec3fbe90551b440418901c8af028c7126b1f56acaca3818d2b1
+  metadata.gz: 3dedfe8da717afcf508820efe445a790336ab877156d5b2de3683ab5043c18ab
+  data.tar.gz: 345fa1163af50a1b01fef26a83a835bfd7813453c6132ebb1036fe8178dd9757
 SHA512:
-  metadata.gz: 322bff1d2a49e9a2729012064e393138cb9e4b81472e1c75b14a2d55a4fe3616ef3efc5ecf5df3a156a418ff6ad0281c24c2c585c61a733db0c6e4d05ceb6595
-  data.tar.gz: 78de3b56104b239c272938a9877bfdd49ccf20df8dbd360bf5fe7ef3c342e1d746c2adbf957fd511c03156258effe630c440941e600d58b7e7cd914ff11ca4d5
+  metadata.gz: 48972d2ab935ff782a0651eda48afa301531d5c5fff4f1a9ba17d29c54323b127fc3013c29863c21b26d77e81230c2e0318d58d3cde680c57b611c5a77a1214b
+  data.tar.gz: dc29d8282f165f9ddaabecf97f4eb81aaaa43c5defe1d63d083ef1147c2c0e6d2def961fa07f339587902d8524ee66940da742a5b30cd48dcccdcd94262883a8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.6.0)
+    typeprof (0.6.1)
       rbs (>= 0.17.0)
 
 GEM

data/lib/typeprof/import.rb

@@ -62,6 +62,7 @@ module TypeProf
   class RBS2JSON
     def initialize(all_env, cur_env)
       @all_env, @cur_env = all_env, cur_env
+      @env_walker = RBS::EnvironmentWalker.new(env: @cur_env) # Currently, only each_type_name is used
     end
 
     def dump_json
@@ -237,7 +238,7 @@ module TypeProf
             @all_env.class_decls[name].decls.each do |decl|
               decl = decl.decl
               next if decl.is_a?(RBS::AST::Declarations::Module)
-              each_ancestor(decl) {|name| queue << [:visit, name] }
+              each_reference(decl) {|name| queue << [:visit, name] }
             end
             queue << [:visit, name.namespace.to_type_name] if !name.namespace.empty?
           end
@@ -252,13 +253,23 @@ module TypeProf
       end
     end
 
-    def each_ancestor(decl, &blk)
+    def each_reference(decl, &blk)
       yield decl.name
-      super_class = decl.super_class || RBS::BuiltinNames::Object
+      if decl.super_class
+        name = decl.super_class.name
+        args = decl.super_class.args
+        if args
+          args.each do |ty|
+            @env_walker.each_type_name(ty, &blk)
+          end
+        end
+      else
+        name = RBS::BuiltinNames::Object.name
+      end
       return if decl.name == RBS::BuiltinNames::BasicObject.name
-      return if decl.name == super_class.name
-      @all_env.class_decls[super_class.name].decls.each do |decl|
-        each_ancestor(decl.decl, &blk)
+      return if decl.name == name
+      @all_env.class_decls[name].decls.each do |decl|
+        each_reference(decl.decl, &blk)
       end
     end
 

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Yusuke Endoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs