typeprof 0.2.0 → 0.3.0

data/lib/typeprof/utils.rb

@@ -6,25 +6,11 @@ module TypeProf
     end
 
     module StructuralEquality
-      def hash
-        @_hash ||=
-          begin
-            h = 0
-            instance_variables.each do |v|
-              h ^= instance_variable_get(v).hash if v != :@_hash
-            end
-            h
-          end
-      end
-
-      TABLE = {}
-
       def self.included(klass)
-        def klass.new(*args)
-          (TABLE[self] ||= {})[args] ||= super
-        end
-        class << klass
-          ruby2_keywords :new
+        klass.instance_eval do
+          def new(*args)
+            (@table ||= {})[[self] + args] ||= super
+          end
         end
       end
     end

data/lib/typeprof/version.rb

@@ -0,0 +1,3 @@
+module TypeProf
+  VERSION = "0.3.0"
+end

data/smoke/arguments2.rb

@@ -0,0 +1,55 @@
+def f1
+end
+f1
+
+def f2(x, y, z)
+end
+f2(:x, :y, :z)
+
+def f3(x = "str", y = "str")
+end
+f3
+
+def f4(*r)
+end
+f4(:a, :b, :c)
+
+def f5(x, y = "str", z)
+end
+f5(:x, :z)
+
+def f6(k:)
+end
+f6(k: :kk)
+
+def f7(k: 42)
+end
+f7
+
+def f8(k: "str")
+end
+f8
+
+def f9(**kw)
+end
+f9(k: :kk)
+
+def f10(&blk)
+  blk.call(1)
+end
+f10 {}
+
+__END__
+# Classes
+class Object
+  def f1 : -> nil
+  def f2 : (:x, :y, :z) -> nil
+  def f3 : (?String, ?String) -> nil
+  def f4 : (*:a | :b | :c) -> nil
+  def f5 : (:x, ?String, :z) -> nil
+  def f6 : (k: :kk) -> nil
+  def f7 : (?k: Integer) -> nil
+  def f8 : (?k: String) -> nil
+  def f9 : (**{:k=>:kk}) -> nil
+  def f10 : { (Integer) -> nil } -> nil
+end

data/smoke/hash4.rb

@@ -6,5 +6,5 @@ foo
 __END__
 # Classes
 class Object
-  def foo : -> Hash
+  def foo : -> Hash[bot, bot]
 end

data/smoke/keyword3.rb

@@ -1,4 +1,3 @@
-# TODO: foo should accept "s: String | [Integer]"?
 def foo(n: 42, s: [n])
   [n, s]
 end
@@ -8,5 +7,5 @@ foo(n: 42, s: "str")
 __END__
 # Classes
 class Object
-  def foo : (?n: Integer, ?s: String) -> ([Integer, String | [Integer]])
+  def foo : (?n: Integer, ?s: String | [Integer]) -> ([Integer, String | [Integer]])
 end

data/smoke/keyword4.rb

@@ -7,5 +7,5 @@ foo(n: 42, s: "str")
 __END__
 # Classes
 class Object
-  def foo : (**{:n=>Integer, :s=>String}) -> nil
+  def foo : (**{:n=>Integer, :s=>String}) -> {:n=>Integer, :s=>String}
 end

data/smoke/module4.rb

@@ -25,8 +25,10 @@ module M2
 end
 
 module M1
+  extend M2
   def foo : -> :m1_foo
 end
 
 class C
+  extend M1
 end

data/smoke/optional1.rb

@@ -9,5 +9,5 @@ foo("A", "B", "C", "Z")
 __END__
 # Classes
 class Object
-  def foo : (String, ?String, ?String, String) -> ([String, Integer | String, Integer | String, String])
+  def foo : (String, ?Integer | String, ?Integer | String, String) -> ([String, Integer | String, Integer | String, String])
 end

data/smoke/optional2.rb

@@ -11,5 +11,5 @@ foo("A", "B", "C", "D", "E", "Z")
 __END__
 # Classes
 class Object
-  def foo : (String, ?String, ?String, *String, String) -> ([String, Integer | String, Integer | String, Array[String], String])
+  def foo : (String, ?Integer | String, ?Integer | String, *String, String) -> ([String, Integer | String, Integer | String, Array[String], String])
 end

data/smoke/rbs-extend.rb

@@ -0,0 +1,9 @@
+def log
+  C.foo
+end
+
+__END__
+# Classes
+class Object
+  def log : -> Integer
+end

data/smoke/rbs-extend.rbs

@@ -0,0 +1,7 @@
+module M
+  def foo: -> Integer
+end
+
+class C
+  extend M
+end

data/smoke/rbs-interface.rb

@@ -0,0 +1,24 @@
+def get_module
+  C.new.get_module
+end
+
+def get_module_foo
+  C.new.get_module.foo
+end
+
+def get_interface
+  C.new.get_interface
+end
+
+def get_interface_foo
+  C.new.get_interface.foo
+end
+
+__END__
+# Classes
+class Object
+  def get_module : -> M
+  def get_module_foo : -> Integer
+  def get_interface : -> _I
+  def get_interface_foo : -> Integer
+end

data/smoke/rbs-interface.rbs

@@ -0,0 +1,12 @@
+module M
+  def foo: -> Integer
+end
+
+interface _I
+  def foo: -> Integer
+end
+
+class C
+  def get_module : -> M
+  def get_interface : -> _I
+end

data/smoke/rbs-tyvar.rb

@@ -0,0 +1,18 @@
+def foo
+  cell = Cell.new("str")
+  cell.set_elem(42) if rand < 0.5
+  cell
+end
+
+def bar
+  foo.get_elem
+end
+
+bar
+
+__END__
+# Classes
+class Object
+  def foo : -> (Cell[Integer | String])
+  def bar : -> (Integer | String)
+end

data/smoke/rbs-tyvar.rbs

@@ -0,0 +1,5 @@
+class Cell[T]
+  def initialize : (T) -> void
+  def set_elem : (T) -> void
+  def get_elem : -> T
+end

data/smoke/rbs-tyvar2.rb

@@ -0,0 +1,20 @@
+def foo
+  cell = Cell.new(:a1, :b1, :c1)
+  cell.set_a(:a2)
+  cell.set_b(:b2)
+  cell.set_c(:c2)
+  cell
+end
+
+def bar
+  foo.get_b
+end
+
+bar
+
+__END__
+# Classes
+class Object
+  def foo : -> (Cell[:a1 | :a2, :b1 | :b2, :c1 | :c2])
+  def bar : -> (:b1 | :b2)
+end

data/smoke/rbs-tyvar2.rbs

@@ -0,0 +1,9 @@
+class Cell[A, B, C]
+  def initialize : (A, B, C) -> void
+  def set_a : (A) -> void
+  def set_b : (B) -> void
+  def set_c : (C) -> void
+  def get_a : -> A
+  def get_b : -> B
+  def get_c : -> C
+end

data/smoke/rest1.rb

@@ -21,5 +21,5 @@ __END__
 # Classes
 class Object
   def foo : (:a | Integer | String, *Integer | String, :z | Integer | String) -> (Array[Integer | String])
-  def bar : (String, ?String, *String, String) -> Array[String]
+  def bar : (String, ?Integer | String, *String, String) -> Array[String]
 end

data/smoke/rest3.rb

@@ -32,5 +32,5 @@ class Object
   def baz : (String, *String) -> nil
   def qux : (Integer, *String) -> nil
   def corge : (*Integer | String, Integer | String) -> nil
-  def grault : (String, ?String, *String, String) -> nil
+  def grault : (String, ?Integer | String, *String, String) -> nil
 end

data/smoke/rest6.rb

@@ -7,5 +7,5 @@ foo("x", "x")
 __END__
 # Classes
 class Object
-  def foo : (?String, *String) -> [Array[String]]
+  def foo : (?Integer | String, *String) -> [Array[String]]
 end

data/smoke/retry1.rb

@@ -16,5 +16,5 @@ __END__
 # Classes
 class Object
   def bar : (Integer | String) -> (Integer | String)
-  def foo : (Integer) -> (Integer | String)
+  def foo : (Integer | String) -> (Integer | String)
 end

data/smoke/step.rb

@@ -12,6 +12,6 @@ __END__
 # Classes
 class Object
   def log1 : (Integer | Numeric) -> nil
-  def log2 : (untyped) -> nil
+  def log2 : (void) -> nil
   def log3 : (Enumerator[Integer | Numeric]) -> nil
 end

data/smoke/user-demo.rb

@@ -0,0 +1,15 @@
+class User
+  def foo(name: "str", age: 0)
+    @name, @age = name, age
+  end
+
+  attr_reader :name, :age
+end
+
+__END__
+# Classes
+class User
+  attr_reader name : String | untyped
+  attr_reader age : Integer | untyped
+  def foo : (?name: String | untyped, ?age: Integer | untyped) -> ([String | untyped, Integer | untyped])
+end

data/smoke/wrong-extend.rb

@@ -21,5 +21,6 @@ module Bar
 end
 
 module Foo
+  extend Bar
   def foo : -> :foo
 end

data/typeprof.gemspec

@@ -1,6 +1,8 @@
+require_relative 'lib/typeprof/version'
+
 Gem::Specification.new do |spec|
   spec.name          = "typeprof" # temporal
-  spec.version       = "0.2.0"
+  spec.version       = TypeProf::VERSION
   spec.authors       = ["Yusuke Endoh"]
   spec.email         = ["mame@ruby-lang.org"]
 
@@ -28,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rbs", ">= 0.14.0"
+  spec.add_runtime_dependency "rbs", ">= 0.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yusuke Endoh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.13.1
 description: |
   TypeProf performs a type analysis of non-annotated Ruby code.
 
@@ -41,6 +41,7 @@ files:
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - doc/doc.ja.md
@@ -51,6 +52,7 @@ files:
 - lib/typeprof/analyzer.rb
 - lib/typeprof/builtin.rb
 - lib/typeprof/cli.rb
+- lib/typeprof/config.rb
 - lib/typeprof/container-type.rb
 - lib/typeprof/export.rb
 - lib/typeprof/import.rb
@@ -59,13 +61,14 @@ files:
 - lib/typeprof/method.rb
 - lib/typeprof/type.rb
 - lib/typeprof/utils.rb
-- run.sh
+- lib/typeprof/version.rb
 - smoke/alias.rb
 - smoke/alias2.rb
 - smoke/any-cbase.rb
 - smoke/any1.rb
 - smoke/any2.rb
 - smoke/arguments.rb
+- smoke/arguments2.rb
 - smoke/array-each.rb
 - smoke/array-each2.rb
 - smoke/array-each3.rb
@@ -220,6 +223,14 @@ files:
 - smoke/rbs-alias.rbs
 - smoke/rbs-attr.rb
 - smoke/rbs-attr.rbs
+- smoke/rbs-extend.rb
+- smoke/rbs-extend.rbs
+- smoke/rbs-interface.rb
+- smoke/rbs-interface.rbs
+- smoke/rbs-tyvar.rb
+- smoke/rbs-tyvar.rbs
+- smoke/rbs-tyvar2.rb
+- smoke/rbs-tyvar2.rbs
 - smoke/rbs-vars.rb
 - smoke/rbs-vars.rbs
 - smoke/redo1.rb
@@ -254,6 +265,7 @@ files:
 - smoke/type_var.rb
 - smoke/typed_method.rb
 - smoke/union-recv.rb
+- smoke/user-demo.rb
 - smoke/variadic1.rb.notyet
 - smoke/wrong-extend.rb
 - smoke/wrong-include.rb

data/run.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-bundle exe ruby exe/typeprof $@