katakata_irb 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882c0834b6d52916911b26b82083e1100491dd24cafdb1c948c4c1795fe03d7e
-  data.tar.gz: 2250eaec5d0b1cabc236f238249e132206b62e70ada1c16429567b680ace2093
+  metadata.gz: df817c7e7806e6ea21aa82e14a694130b0db5dd68c74ea84790b90ad3b895fb7
+  data.tar.gz: 9faa1d72b27f35bccc5b4d2dcc5c9f50b4dd9946ba5d63374d3083e933e62c38
 SHA512:
-  metadata.gz: 60f3c4de13636f2948e740b3a57b6091c1f193ae7fa259d665c69a404833ef413b90aca3da7360f97be2d7a669e9a0d5fc101ff172890c4f0714c9eb63db8dd4
-  data.tar.gz: eb496c54819de4f1e035e261a6afffcc13d2809b316428602567614dbc5671df5ead97fb4a0696afbb34a7ade9ce8a2b3e9579ebad4ddd006d9a32b120b3e05d
+  metadata.gz: 9bec77d0fd1f9484278541e48a964c683ef2546b8a5b107e731d7979b634c4c8fb9ce2b68261603fc5f4ad8eb83cfb3018e11881a2ecd4096d268e7be0e97405
+  data.tar.gz: b6520a88ad8644423f24e7c02e783bf1cb388b3a00d2c16151b97e08598f1fd80f55f8346562d00c9d2ec0e2b619d4f4db23eeba5834c39b9ebfc72ce765cbdb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    katakata_irb (0.1.5)
+    katakata_irb (0.1.6)
       irb (>= 1.4.0)
       rbs
 

data/lib/katakata_irb/scope.rb

@@ -87,7 +87,7 @@ module KatakataIrb
   end
 
   class Scope < BaseScope
-    attr_reader :parent, :jump_branches, :mergeable_changes, :level
+    attr_reader :parent, :jump_branches, :mergeable_changes, :level, :lvars
 
     def self.from_binding(binding) = new(BaseScope.new(binding, binding.eval('self')))
 
@@ -101,6 +101,7 @@ module KatakataIrb
       @passthrough = passthrough
       @terminated = false
       @jump_branches = []
+      @lvars = Set.new
       @mergeable_changes = @changes = table.transform_values { [level, _1] }
     end
 
@@ -156,6 +157,7 @@ module KatakataIrb
 
     def []=(name, value)
       variable_level = level_of(name) || level
+      @lvars << name if level == variable_level && BaseScope.type_by_name(name) == :lvar
       @changes[name] = [variable_level, value]
     end
 
@@ -197,12 +199,17 @@ module KatakataIrb
       update scope
     end
 
+    def touch_lvars(lvars)
+      lvars.each { self[_1] = self[_1] || KatakataIrb::Types::NIL }
+    end
+
     def run_branches(*blocks)
       results = []
       branches = []
       blocks.each do |block|
         scope = Scope.new self, passthrough: true
         result = block.call scope
+        touch_lvars scope.lvars if scope.level == level
         next if scope.terminated?
         results << result
         branches << scope.mergeable_changes
@@ -222,6 +229,7 @@ module KatakataIrb
 
     def update(child_scope)
       current_level = level
+      touch_lvars child_scope.lvars if child_scope.level == current_level
       child_scope.mergeable_changes.each do |name, (level, value)|
         self[name] = value if level <= current_level
       end

data/lib/katakata_irb/type_simulator.rb

@@ -70,7 +70,7 @@ class KatakataIrb::TypeSimulator
       else
         current_self_types = scope.self_type.types
         self_types = current_self_types.map do |type|
-          if (type in KatakataIrb::Types::SingletonType) && type.module_or_class.is_a?(Class)
+          if type.is_a?(KatakataIrb::Types::SingletonType) && type.module_or_class.is_a?(Class)
             KatakataIrb::Types::InstanceType.new type.module_or_class
           else
             type
@@ -129,10 +129,10 @@ class KatakataIrb::TypeSimulator
     in [:array, [:args_add_star,] => star]
       args, kwargs = retrieve_method_args star
       types = args.flat_map do |elem|
-        if elem in KatakataIrb::Types::Splat
+        if elem.is_a? KatakataIrb::Types::Splat
           splat = simulate_evaluate elem.item, scope
-          array_value = to_array splat, :to_a
-          array_value ? (array_value.params[:Elem] || []) : splat
+          array_elem, non_array = partition_to_array splat.nonnillable, :to_a
+          KatakataIrb::Types::UnionType[*array_elem, *non_array]
         else
           simulate_evaluate elem, scope
         end
@@ -173,10 +173,10 @@ class KatakataIrb::TypeSimulator
           values << simulate_evaluate(value, scope)
         in [:assoc_splat, value]
           hash = simulate_evaluate value, scope
-          unless (hash in KatakataIrb::Types::InstanceType) && hash.klass == Hash
+          unless hash.is_a?(KatakataIrb::Types::InstanceType) && hash.klass == Hash
             hash = simulate_call hash, :to_hash, [], nil, nil
           end
-          if (hash in KatakataIrb::Types::InstanceType) && hash.klass == Hash
+          if hash.is_a?(KatakataIrb::Types::InstanceType) && hash.klass == Hash
             keys << hash.params[:K] if hash.params[:K]
             values << hash.params[:V] if hash.params[:V]
           end
@@ -192,7 +192,7 @@ class KatakataIrb::TypeSimulator
       statements.map { simulate_evaluate _1, scope }.last
     in [:const_path_ref, receiver, [:@const, name,]]
       r = simulate_evaluate receiver, scope
-      (r in KatakataIrb::Types::SingletonType) ? KatakataIrb::BaseScope.type_of { r.module_or_class.const_get name } : KatakataIrb::Types::NIL
+      r.is_a?(KatakataIrb::Types::SingletonType) ? KatakataIrb::BaseScope.type_of { r.module_or_class.const_get name } : KatakataIrb::Types::NIL
     in [:__var_ref_or_call, [type, name, pos]]
       sexp = scope.has?(name) ? [:var_ref, [type, name, pos]] : [:vcall, [:@ident, name, pos]]
       simulate_evaluate sexp, scope
@@ -221,7 +221,7 @@ class KatakataIrb::TypeSimulator
       receiver_type = simulate_evaluate receiver, scope if receiver
       args, kwargs, _block = retrieve_method_args args
       args_type = args.map do |arg|
-        if arg in KatakataIrb::Types::Splat
+        if arg.is_a? KatakataIrb::Types::Splat
           simulate_evaluate arg.item, scope
           nil # TODO: splat
         else
@@ -242,7 +242,7 @@ class KatakataIrb::TypeSimulator
       receiver_type = receiver ? simulate_evaluate(receiver, scope) : scope.self_type
       evaluate_method = lambda do |scope|
         args_type = args.map do |arg|
-          if arg in KatakataIrb::Types::Splat
+          if arg.is_a? KatakataIrb::Types::Splat
             simulate_evaluate arg.item, scope
             nil # TODO: splat
           else
@@ -342,7 +342,7 @@ class KatakataIrb::TypeSimulator
       simulate_evaluate receiver, scope
       args, kwargs, _block = retrieve_method_args key
       args.each do |arg|
-        item = ((arg in KatakataIrb::Types::Splat) ? arg.item : arg)
+        item = arg.is_a?(KatakataIrb::Types::Splat) ? arg.item : arg
         simulate_evaluate item, scope
       end
       kwargs_type kwargs, scope
@@ -435,7 +435,7 @@ class KatakataIrb::TypeSimulator
     in [:super, args]
       args, kwargs, _block = retrieve_method_args args
       args.each do |arg|
-        item = ((arg in KatakataIrb::Types::Splat) ? arg.item : arg)
+        item = arg.is_a?(KatakataIrb::Types::Splat) ? arg.item : arg
         simulate_evaluate item, scope
       end
       kwargs_type kwargs, scope
@@ -460,7 +460,7 @@ class KatakataIrb::TypeSimulator
             error_class_stmts = [*stmts, stmt]
           end
           error_classes = (error_class_stmts || []).flat_map { simulate_evaluate _1, s }.uniq
-          error_types = error_classes.filter_map { KatakataIrb::Types::InstanceType.new _1.module_or_class if _1 in KatakataIrb::Types::SingletonType }
+          error_types = error_classes.filter_map { KatakataIrb::Types::InstanceType.new _1.module_or_class if _1.is_a?(KatakataIrb::Types::SingletonType) }
           error_types << KatakataIrb::Types::InstanceType.new(StandardError) if error_types.empty?
           s[error_var] = KatakataIrb::Types::UnionType[*error_types]
         end
@@ -486,7 +486,7 @@ class KatakataIrb::TypeSimulator
       result
     in [:sclass, klass_stmt, body_stmt]
       klass_types = simulate_evaluate(klass_stmt, scope).types.filter_map do |type|
-        KatakataIrb::Types::SingletonType.new type.klass if type in KatakataIrb::Types::InstanceType
+        KatakataIrb::Types::SingletonType.new type.klass if type.is_a? KatakataIrb::Types::InstanceType
       end
       klass_types = [KatakataIrb::Types::CLASS] if klass_types.empty?
       sclass_scope = KatakataIrb::Scope.new(scope, { KatakataIrb::Scope::SELF => KatakataIrb::Types::UnionType[*klass_types], KatakataIrb::Scope::BREAK_RESULT => nil, KatakataIrb::Scope::NEXT_RESULT => nil, KatakataIrb::Scope::RETURN_RESULT => nil }, trace_cvar: false, trace_ivar: false, trace_lvar: false)
@@ -497,7 +497,7 @@ class KatakataIrb::TypeSimulator
       klass_types = simulate_evaluate(klass_stmt, scope).types
       klass_types += simulate_evaluate(superclass_stmt, scope).types if superclass_stmt
       klass_types = klass_types.select do |type|
-        (type in KatakataIrb::Types::SingletonType) && type.module_or_class.is_a?(Class)
+        type.is_a?(KatakataIrb::Types::SingletonType) && type.module_or_class.is_a?(Class)
       end
       klass_types << KatakataIrb::Types::CLASS if klass_types.empty?
       klass_scope = KatakataIrb::Scope.new(scope, { KatakataIrb::Scope::SELF => KatakataIrb::Types::UnionType[*klass_types], KatakataIrb::Scope::BREAK_RESULT => nil, KatakataIrb::Scope::NEXT_RESULT => nil, KatakataIrb::Scope::RETURN_RESULT => nil }, trace_cvar: false, trace_ivar: false, trace_lvar: false)
@@ -571,6 +571,9 @@ class KatakataIrb::TypeSimulator
       simulate_evaluate a, scope
       simulate_evaluate b, scope
       KatakataIrb::Types::STRING
+    in [:defined, expression]
+      scope.conditional { simulate_evaluate expression, _1 }
+      KatakataIrb::Types::UnionType[KatakataIrb::Types::STRING, KatakataIrb::Types::NIL]
     else
       KatakataIrb.log_puts
       KatakataIrb.log_puts :NOMATCH
@@ -597,7 +600,7 @@ class KatakataIrb::TypeSimulator
     in [:binary, lpattern, :'=>', [:var_field, [:@ident, name,]] => rpattern]
       if lpattern in [:var_ref, [:@const, _const_name,]]
         const_value = simulate_evaluate lpattern, scope
-        if (const_value in KatakataIrb::Types::SingletonType) && const_value.module_or_class.is_a?(Class)
+        if const_value.is_a?(KatakataIrb::Types::SingletonType) && const_value.module_or_class.is_a?(Class)
           scope[name] = KatakataIrb::Types::InstanceType.new const_value.module_or_class
         else
           scope[name] = KatakataIrb::Types::OBJECT
@@ -609,7 +612,7 @@ class KatakataIrb::TypeSimulator
       end
     in [:aryptn, _unknown, items, splat, post_items]
       # TODO: deconstruct keys
-      array_types = types.select { (_1 in KatakataIrb::Types::InstanceType) && _1.klass == Array }
+      array_types = types.select { _1.is_a?(KatakataIrb::Types::InstanceType) && _1.klass == Array }
       elem = KatakataIrb::Types::UnionType[*array_types.filter_map { _1.params[:Elem] }]
       items&.each do |item|
         match_pattern elem, item, scope
@@ -623,7 +626,7 @@ class KatakataIrb::TypeSimulator
       end
     in [:hshptn, _unknown, items, splat]
       # TODO: deconstruct keys
-      hash_types = types.select { (_1 in KatakataIrb::Types::InstanceType) && _1.klass == Hash }
+      hash_types = types.select { _1.is_a?(KatakataIrb::Types::InstanceType) && _1.klass == Hash }
       key_type = KatakataIrb::Types::UnionType[*hash_types.filter_map { _1.params[:K] }]
       value_type = KatakataIrb::Types::UnionType[*hash_types.filter_map { _1.params[:V] }]
       items&.each do |key_pattern, value_pattern|
@@ -652,7 +655,7 @@ class KatakataIrb::TypeSimulator
   def evaluate_mrhs(sexp, scope)
     args, kwargs, = retrieve_method_args sexp
     values = args.filter_map do |t|
-      if t in KatakataIrb::Types::Splat
+      if t.is_a? KatakataIrb::Types::Splat
         simulate_evaluate t.item, scope
         # TODO
         nil
@@ -679,17 +682,31 @@ class KatakataIrb::TypeSimulator
     [values, kw]
   end
 
-  def to_array(value, method)
-    return value if (value in KatakataIrb::Types::InstanceType) && value.klass == Array
-    to_array_result = simulate_call value, method, [], nil, nil, name_match: false
-    return to_array_result if (to_array_result in KatakataIrb::Types::InstanceType) && to_array_result.klass == Array
+  def sized_splat(value, method, size)
+    array_elem, non_array = partition_to_array value, method
+    values = [KatakataIrb::Types::UnionType[*array_elem, *non_array]]
+    values += [array_elem] * (size - 1) if array_elem && size >= 1
+    values
   end
 
-  def evaluate_massign(sexp, values, scope)
-    unless values in Array
-      array_value = to_array values, :to_ary
-      values = array_value ? [array_value.params[:Elem] || KatakataIrb::Types::OBJECT] * sexp.size : [values]
+  def partition_to_array(value, method)
+    arrays, non_arrays = value.types.partition { _1.is_a?(KatakataIrb::Types::InstanceType) && _1.klass == Array }
+    non_arrays.select! do |type|
+      to_array_result = simulate_call type, method, [], nil, nil, name_match: false
+      if to_array_result.is_a?(KatakataIrb::Types::InstanceType) && to_array_result.klass == Array
+        arrays << to_array_result
+        false
+      else
+        true
+      end
     end
+    array_elem = arrays.empty? ? nil : KatakataIrb::Types::UnionType[*arrays.map { _1.params[:Elem] || KatakataIrb::Types::OBJECT }]
+    non_array = non_arrays.empty? ? nil : KatakataIrb::Types::UnionType[*non_arrays]
+    [array_elem, non_array]
+  end
+
+  def evaluate_massign(sexp, values, scope)
+    values = sized_splat values, :to_ary, sexp.size unless values.is_a? Array
 
     rest_index = sexp.find_index { _1 in [:rest_param, ]}
     if rest_index
@@ -729,12 +746,12 @@ class KatakataIrb::TypeSimulator
     keys = []
     values = []
     kwargs.each do |kv|
-      if kv in KatakataIrb::Types::Splat
+      if kv.is_a? KatakataIrb::Types::Splat
         hash = simulate_evaluate kv.item, scope
-        unless (hash in KatakataIrb::Types::InstanceType) && hash.klass == Hash
+        unless hash.is_a?(KatakataIrb::Types::InstanceType) && hash.klass == Hash
           hash = simulate_call hash, :to_hash, [], nil, nil
         end
-        if (hash in KatakataIrb::Types::InstanceType) && hash.klass == Hash
+        if hash.is_a?(KatakataIrb::Types::InstanceType) && hash.klass == Hash
           keys << hash.params[:K] if hash.params[:K]
           values << hash.params[:V] if hash.params[:V]
         end
@@ -822,6 +839,8 @@ class KatakataIrb::TypeSimulator
       [args, [], nil]
     in [:arg_paren, args]
       args ? retrieve_method_args(args) : [[], [], nil]
+    in [[:command | :command_call, ] => command_arg] # method(a b, c), method(a.b c, d)
+      [[command_arg], [], nil]
     else
       [[], [], nil]
     end
@@ -901,11 +920,7 @@ class KatakataIrb::TypeSimulator
     values = values.dup
     params => [:params, pre_required, optional, rest, post_required, _keywords, keyrest, block]
     size = (pre_required&.size || 0) + (optional&.size || 0) + (post_required&.size || 0) + (rest ? 1 : 0)
-    if values.size == 1 && size >= 2
-      value = values.first
-      array_value = to_array value, :to_ary if value
-      values = [array_value.params[:Elem] || KatakataIrb::Types::OBJECT] * size if array_value
-    end
+    values = sized_splat values.first, :to_ary, size if values.size == 1 && size >= 2
     pre_values = values.shift pre_required.size if pre_required
     post_values = values.pop post_required.size if post_required
     opt_values = values.shift optional.size if optional
@@ -955,7 +970,7 @@ class KatakataIrb::TypeSimulator
       name.match?(/\A_[1-9]\z/) ? name[1..].to_i : 0
     else
       sexp.filter_map do |s|
-        max_numbered_params s if s in Array
+        max_numbered_params s if s.is_a? Array
       end.max || 0
     end
   end

data/lib/katakata_irb/types.rb

@@ -4,9 +4,16 @@ require 'rbs/cli'
 module KatakataIrb; end
 module KatakataIrb::Types
   def self.rbs_builder
-    @rbs_builder ||= RBS::DefinitionBuilder.new(
-      env: RBS::Environment.from_loader(RBS::CLI::LibraryOptions.new.loader).resolve_type_names
-    )
+    @rbs_builder ||= load_rbs_builder
+  end
+
+  def self.load_rbs_builder
+    loader = RBS::CLI::LibraryOptions.new.loader
+    loader.add path: Pathname('sig')
+    RBS::DefinitionBuilder.new env: RBS::Environment.from_loader(loader).resolve_type_names
+  rescue => e
+    puts "\nKatakataIRB failed to initialize RBS::DefinitionBuild\n#{e}"
+    Object.new
   end
 
   Splat = Struct.new :item
@@ -24,7 +31,7 @@ module KatakataIrb::Types
       next unless name
       type_name = RBS::TypeName(name).absolute!
       definition = (singleton ? rbs_builder.build_singleton(type_name) : rbs_builder.build_instance(type_name)) rescue nil
-      method = definition&.methods&.[](method_name)
+      method = definition.methods[method_name] if definition
       return method if method
     end
     nil
@@ -170,6 +177,9 @@ module KatakataIrb::Types
     def types() = [self]
     def nillable?() = false
     def nonnillable() = self
+    def inspect
+      "#{module_or_class}.itself"
+    end
   end
 
   class InstanceType
@@ -185,6 +195,19 @@ module KatakataIrb::Types
     def types() = [self]
     def nillable?() = (@klass == NilClass)
     def nonnillable() = self
+    def inspect
+      case klass
+      when NilClass
+        'nil'
+      when TrueClass
+        'true'
+      when FalseClass
+        'false'
+      else
+        params_string = "[#{params.map { "#{_1}: #{_2.inspect}" }.join(', ')}]" unless params.empty?
+        "#{klass.name}#{params_string}"
+      end
+    end
   end
 
   class ProcType
@@ -201,6 +224,7 @@ module KatakataIrb::Types
     def types() = [self]
     def nillable?() = (@klass == NilClass)
     def nonnillable() = self
+    def inspect() = 'Proc'
   end
 
   NIL = InstanceType.new NilClass
@@ -276,6 +300,7 @@ module KatakataIrb::Types
     def methods() = @types.flat_map(&:methods).uniq
     def all_methods() = @types.flat_map(&:all_methods).uniq
     def constants() = @types.flat_map(&:constants).uniq
+    def inspect() = @types.map(&:inspect).join(' | ')
   end
 
   BOOLEAN = UnionType[TRUE, FALSE]
@@ -284,9 +309,9 @@ module KatakataIrb::Types
     case return_type
     when RBS::Types::Bases::Self
       self_type
-    when RBS::Types::Bases::Void, RBS::Types::Bases::Bottom, RBS::Types::Bases::Nil
+    when RBS::Types::Bases::Bottom, RBS::Types::Bases::Nil
       NIL
-    when RBS::Types::Bases::Any
+    when RBS::Types::Bases::Any, RBS::Types::Bases::Void
       OBJECT
     when RBS::Types::Bases::Class
       self_type.transform do |type|

data/lib/katakata_irb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KatakataIrb
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/sig/katakata_irb.rbs

@@ -1,4 +1,7 @@
 module KatakataIrb
   VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+  module Completor
+    def self.analyze: (code: String, binding?: Binding) -> Array[Symbol | Object | String | true | false]?
+    def self.setup: () -> void
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katakata_irb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb