typeprof 0.33.0 → 0.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc7b580d84d82c2a49d4a2d24ddf32ddcafc938d4f9511fc4b6d4543f0b8e19
-  data.tar.gz: eed64be210440c2ea2627a7b21c95c7eedee374b760e9e6aa479dfa4c27df54f
+  metadata.gz: d5fa5ffcf2f4e98328b77be29d4e14574083acd097b9af8bac36c2f8e1113626
+  data.tar.gz: e4a075b8befec5fbf855d4c83cb17c66db0e0441d1e964249b82072a21b40f93
 SHA512:
-  metadata.gz: b314eccaecb06cac94df1af7ab96084b06d1d70710c9ece6934c98ca5379ca98e82ab93838322081357d13c0200681beb24d6108f699aac4a8904952333a7d83
-  data.tar.gz: 7ebcd55f8c8d91b1eac583c7d585723de31a83da5fa85c7485cda77e520e24d09f1652b1dde7657db62c8151166cbfdc71d3563647ccd60871bb31e74fc6055a
+  metadata.gz: 15d81769ed88b1f1ae097a913a8bc2f4912a36fb792900f86ef4071fe8e04edf1268fb84540e0a56bbc0c30ddeed12b7965aceb1e14fe5917557909146a936f5
+  data.tar.gz: a1ceade33cf5282b8d117dba231a0a59121a2d32865a8bdea17b5b44adb25f4eee53534a4c14b67a3442a1538557430408662b1802aa6769085a37a39a4c7db5

data/lib/typeprof/core/ast/sig_decl.rb

@@ -14,16 +14,20 @@ module TypeProf::Core
         @cpath = AST.resolve_rbs_name(raw_decl.name, lenv)
         # TODO: decl.type_params
         # TODO: decl.super_class.args
+        # TODO?: param.variance, param.unchecked, param.upper_bound
+        @params = raw_decl.type_params.map {|param| param.name }
+        sig_type_params = [@cpath, @params]
+        # The header (default types, self types, and superclass arguments) is
+        # resolved in the outer scope but may refer to the type parameters
+        @header_lenv = LocalEnv.new(@lenv.file_context, lenv.cref, {}, [], sig_type_params:)
         ncref = CRef.new(@cpath, :class, nil, lenv.cref)
-        nlenv = LocalEnv.new(@lenv.file_context, ncref, {}, [])
+        nlenv = LocalEnv.new(@lenv.file_context, ncref, {}, [], sig_type_params:)
         @members = raw_decl.members.map do |member|
           AST.create_rbs_member(member, nlenv)
         end.compact
-        # TODO?: param.variance, param.unchecked, param.upper_bound
-        @params = raw_decl.type_params.map {|param| param.name }
         @params_default_types = raw_decl.type_params.map do |param|
           ty = param.default_type
-          ty ? AST.create_rbs_type(ty, lenv) : nil
+          ty ? AST.create_rbs_type(ty, @header_lenv) : nil
         end
       end
 
@@ -81,7 +85,7 @@ module TypeProf::Core
           cpath = name.namespace.path + [self_type.name.name]
           toplevel = name.namespace.absolute?
           @self_types << [cpath, toplevel]
-          @self_type_args << self_type.args.map {|arg| AST.create_rbs_type(arg, lenv) }
+          @self_type_args << self_type.args.map {|arg| AST.create_rbs_type(arg, @header_lenv) }
         end
       end
 
@@ -138,7 +142,7 @@ module TypeProf::Core
           name = superclass.name
           @superclass_cpath = name.namespace.path + [name.name]
           @superclass_toplevel = name.namespace.absolute?
-          @superclass_args = superclass.args.map {|arg| AST.create_rbs_type(arg, lenv) }
+          @superclass_args = superclass.args.map {|arg| AST.create_rbs_type(arg, @header_lenv) }
         else
           @superclass_cpath = nil
           @superclass_toplevel = nil

data/lib/typeprof/core/ast/sig_type.rb

@@ -883,18 +883,32 @@ module TypeProf::Core
 
       def attrs = { var: }
 
+      # A reopened declaration may rename the type parameters (e.g., `Enumerable[E]`
+      # and `Enumerable[Elem]`), but the subst is keyed by the names of the module
+      # entity, so fall back to matching them by position
+      def resolve_var(genv, subst)
+        decl_cpath, decl_params = @lenv.sig_type_params
+        return subst[@var] unless decl_params
+        idx = decl_params.index(@var)
+        return subst[@var] unless idx
+        subst[genv.resolve_cpath(decl_cpath).type_params.keys[idx]]
+      end
+
       def covariant_vertex0(genv, changes, vtx, subst)
-        raise "unknown type variable: #{ @var }" unless subst[@var]
-        changes.add_edge(genv, subst[@var], vtx)
+        var_vtx = resolve_var(genv, subst)
+        raise "unknown type variable: #{ @var }" unless var_vtx
+        changes.add_edge(genv, var_vtx, vtx)
       end
 
       def contravariant_vertex0(genv, changes, vtx, subst)
-        raise "unknown type variable: #{ @var }" unless subst[@var]
-        changes.add_edge(genv, Source.new(Type::Var.new(genv, @var, subst[@var])), vtx)
+        var_vtx = resolve_var(genv, subst)
+        raise "unknown type variable: #{ @var }" unless var_vtx
+        changes.add_edge(genv, Source.new(Type::Var.new(genv, @var, var_vtx)), vtx)
       end
 
       def typecheck(genv, changes, vtx, subst)
-        changes.add_edge(genv, vtx.new_vertex(genv, self), subst[@var]) unless vtx == subst[@var]
+        var_vtx = resolve_var(genv, subst)
+        changes.add_edge(genv, vtx.new_vertex(genv, self), var_vtx) unless vtx == var_vtx
         true
       end
 

data/lib/typeprof/core/ast.rb

@@ -1,14 +1,24 @@
 module TypeProf::Core
   class AST
     def self.parse_rb(path, src, position_encoding)
-      result = Prism.parse(src)
+      build_rb(path, Prism.parse(src), position_encoding)
+    end
+
+    # This needs the comments and the Prism::Source, which a ParseResult has but a
+    # node does not.
+    def self.build_rb(path, result, position_encoding)
+      unless result.is_a?(Prism::ParseResult)
+        raise ArgumentError, "expected Prism::ParseResult, got #{ result.class }"
+      end
 
       return nil unless result.errors.empty?
 
       # comments, errors, magic_comments
       raw_scope = result.value
 
-      raise unless raw_scope.type == :program_node
+      unless raw_scope.is_a?(Prism::ProgramNode)
+        raise ArgumentError, "expected Prism::ProgramNode, got #{ raw_scope.class }"
+      end
 
       prism_source = result.source
       file_context = FileContext.new(path, position_encoding, prism_source, result.comments)

data/lib/typeprof/core/env.rb

@@ -283,17 +283,6 @@ module TypeProf::Core
       mod.get_type_alias(name)
     end
 
-    # Returns the type parameter names of the first generic declaration of cpath
-    def find_type_params(decls, cpath)
-      decls.each do |decl|
-        next unless decl.cpath == cpath
-        next unless decl.respond_to?(:params)
-        params = decl.params
-        return params if params && !params.empty?
-      end
-      nil
-    end
-
     def load_core_rbs(raw_decls, position_encoding)
       file_context = FileContext.new(nil, position_encoding)
       lenv = LocalEnv.new(file_context, CRef::Toplevel, {}, [])
@@ -301,11 +290,6 @@ module TypeProf::Core
         AST.create_rbs_decl(raw_decl, lenv)
       end.compact
 
-      # A module entity has one set of parameter names shared by all its declarations,
-      # so the shim must reuse the core's ones (Array's was `Elem`, and is `E` since RBS 4.1)
-      ary_elem, = find_type_params(decls, [:Array]) || [:Elem]
-      hash_key, hash_val = find_type_params(decls, [:Hash]) || [:K, :V]
-
       decls += AST.parse_rbs("typeprof-rbs-shim.rbs", <<-RBS, position_encoding)
         class Exception
           include _Exception
@@ -314,12 +298,12 @@ module TypeProf::Core
           include _ToS
           include _ToStr
         end
-        class Array[#{ ary_elem }]
-          include _ToAry[#{ ary_elem }]
-          include _Each[#{ ary_elem }]
+        class Array[Elem]
+          include _ToAry[Elem]
+          include _Each[Elem]
         end
-        class Hash[#{ hash_key }, #{ hash_val }]
-          include _Each[[#{ hash_key }, #{ hash_val }]]
+        class Hash[K, V]
+          include _Each[[K, V]]
         end
         class Object
           include Hash::_Key
@@ -380,7 +364,7 @@ module TypeProf::Core
   end
 
   class LocalEnv
-    def initialize(file_context, cref, locals, return_boxes, forward_args = nil)
+    def initialize(file_context, cref, locals, return_boxes, forward_args = nil, sig_type_params: nil)
       @file_context = file_context
       @cref = cref
       @locals = locals
@@ -390,9 +374,11 @@ module TypeProf::Core
       @ivar_narrowings = {}
       @strict_const_scope = false
       @forward_args = forward_args
+      # [cpath, names] of the type parameters of the enclosing RBS declaration
+      @sig_type_params = sig_type_params
     end
 
-    attr_reader :file_context, :cref, :locals, :return_boxes, :break_vtx, :next_boxes, :strict_const_scope
+    attr_reader :file_context, :cref, :locals, :return_boxes, :break_vtx, :next_boxes, :strict_const_scope, :sig_type_params
     attr_accessor :module_function, :forward_args
 
     def path = @file_context&.path

data/lib/typeprof/core/service.rb

@@ -55,10 +55,15 @@ module TypeProf::Core
     end
 
     def update_rb_file(path, code)
+      code = File.read(path) unless code
+      update_rb_ast(path, Prism.parse(code))
+    end
+
+    # path is used only as a key to find the previous analysis; the file is not read.
+    def update_rb_ast(path, parse_result)
       prev_node = @rb_text_nodes[path]
 
-      code = File.read(path) unless code
-      node = AST.parse_rb(path, code, @options[:position_encoding])
+      node = AST.build_rb(path, parse_result, @options[:position_encoding])
       return false unless node
 
       node.diff(@rb_text_nodes[path]) if prev_node

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.33.0"
+  VERSION = "0.33.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.33.1
 platform: ruby
 authors:
 - Yusuke Endoh