kurangu 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de19d11be4850cfac46c8a8d9c338ac9b5d3d84c
-  data.tar.gz: 458809234d98ccb3733cb5ce51a05d484a16ab53
+  metadata.gz: d43dd760ec18c5c98d6d78531bbc57075eb7e748
+  data.tar.gz: 5e715a872a89d9d130b479f09cb6eb8d133947e1
 SHA512:
-  metadata.gz: fe1150d50de545a07d1606e068fda70d15566b952262b2f39fe7bb51044c20ed6e1090cdac0fc5ebae819c4b15e9e38489b0f7782b4a2134e0432bbe63a69c69
-  data.tar.gz: 41209ce3aab337bbd146c716ba4ef69de4d6b7ca077acf8c1e043164e1154c682715ea3cb16b3dbc8928bb8ee0bc97b9b637083d3414a451583443b4d32afb38
+  metadata.gz: 50cf6eb33524ad31b69fcb78592a939bf4d8ef76cbbb265f37392cd502840076c6214bffdfbc0e98231f06c270e390b8d2e47c565dde6608469708944fac35e7
+  data.tar.gz: 399b8baea12c636de0e64d01f969d529b12fa3651e8cb62b99d41287d778b8efb39503fde261155c3fa40c0488e04cc21f52ab41517d168a6d10b49814a6793f

data/lib/kurangu.rb

@@ -9,6 +9,7 @@ class Kurangu
     puts "\ngenerating annotations\n"
     Open3.popen2("#{ruby} -r #{trace_file} #{input_file}") {|stdin, stdout, wait_thr|
       stdin.puts(input_file)
+      puts stdout.read
     }
   end
 

data/lib/signature.rb

@@ -1,38 +1,112 @@
 class MethodSignature
-  def initialize(line, class_name, method_id, parameters)
+  def initialize(line, class_name, method_id, is_block, parameters, other_signatures)
     @line = line
     @class_name = class_name
     @method_id = method_id
+    @is_block = is_block
     @parameters = parameters
     # For each parameter signature (key), store a set of return types (value)
-    @signatures = Hash.new { | h, k | h[k] = Set.new }
+    @return_values = Hash.new { | h, k | h[k] = Set.new }
+    @parameter_values = Hash.new
+    @other_signatures = other_signatures
   end
- 
-  def generate_parameter_signature(parameter_types)
+
+  def signature_prefix
+    if !@is_block
+      "#{@class_name}, :#{@method_id}, "
+    else
+      ""
+    end
+  end
+
+  def expand_block(block)
+    if block.class.to_s != "Proc"
+      return
+    end
+    block_params = block.parameters
+    block_id = "#{block.source_location[0]} #{block.source_location[1]}"
+    if @other_signatures.key?(block_id)
+      @other_signatures[block_id].update_parameters(block_params)
+      block_signatures = @other_signatures[block_id].get_signatures
+      if block_signatures.size == 1
+        "{#{block_signatures[0]}}"
+      elsif block_signatures.size > 1
+        "{\n#{@other_signatures[block_id].get_signatures.join("\n")}\n}"
+      end
+    end
+  end
+
+  def generate_parameter_signature(parameter_values)
     signatures = @parameters.map do |parameter|
       prefix = ""
       if parameter[0] == :opt
         prefix = "?"
       end
-      "#{prefix}#{parameter_types[parameter[1]]} #{parameter[1]}"
+      name = parameter[1]
+      value = parameter_values[name]
+      type = value.class
+      if type.to_s == "Proc"
+        expanded = expand_block(value)
+        if expanded
+          type = expanded
+        end
+      end
+      "#{prefix}#{type} #{name}"
+    end
+    method_block_signature = ""
+    if @parameters[-1][0] == :block
+      expanded = expand_block(parameter_values[@parameters[-1][1]])
+      if expanded
+        signatures.pop
+        method_block_signature = " #{expanded}"
+      end
+    end
+    "(#{signatures.join(", ")})#{method_block_signature}"
+  end
+
+  def generate_return_signature(return_values)
+    types = return_values.to_a.map do |return_value|
+      if return_value == "self"
+        return_value
+      else
+        expanded = expand_block(return_value)
+        if !expanded
+          return_value.class
+        else
+          expanded
+        end
+      end
+    end
+    types.join(" or ")
+  end
+
+  def update_parameters(parameters)
+    @parameters = parameters
+  end
+
+  def get_signatures
+    @return_values.to_a.map do |a|
+      parameter_values = @parameter_values[a[0]]
+      parameter_signature = generate_parameter_signature(parameter_values)
+      return_signature = generate_return_signature(a[1])
+      "#{parameter_signature} -> #{return_signature}"
     end
-    signatures.join(", ")
   end
 
   def to_s
-    signatures = @signatures.to_a.map { |a|
-      prefix = "#{@class_name}, :#{@method_id}"
-      "#{@line} type #{prefix}, '(#{a[0]}) -> #{a[1].to_a.join(" or ")}'"
-    }
+    signatures = get_signatures.map do |signature|
+      "#{@line} type #{signature_prefix}'#{signature}'"
+    end
     signatures.join("\n")
   end
 
-  def add(parameter_types, return_type, owner)
-    parameter_signature = generate_parameter_signature(parameter_types)
-    if return_type.to_s == owner.class.name or @method_id == :initialize
-      return_type = "self"
+  def add(parameter_values, return_value, owner)
+    if return_value.class.to_s == owner.class.name or @method_id == :initialize
+      return_value = "self"
     end
-    @signatures[parameter_signature].add(return_type)
+    parameter_sig = generate_parameter_signature(parameter_values)
+    @return_values[parameter_sig].add(return_value)
+    @parameter_values[parameter_sig] = parameter_values
   end
 
 end

data/lib/trace.rb

@@ -16,17 +16,28 @@ def write_annotations(path, signatures)
   IO.write(path, signatures.values.join("\n"))
 end
 
-trace_return = TracePoint.new(:return) do |t|
+def is_block(t)
+  t.event == :b_return or t.event == :b_call
+end
+
+def tracepoint_line(t)
+  if is_block(t)
+    t.lineno
+  else
+    t.self.method(t.method_id).source_location[1]
+  end
+end
+
+trace_return = TracePoint.new(:return, :b_return) do |t|
   if File.dirname(t.path) == File.dirname(INPUT_FILE)
-    s = "#{t.defined_class}, :#{t.method_id}"
+    s = "#{t.path} #{tracepoint_line(t)}"
     args = stack[s].pop
     if args
-      line = t.self.method(t.method_id).source_location[1]
       if !signatures.key?(s)
         parameters = t.self.method(t.method_id).parameters
-        signatures[s] = MethodSignature.new(line, t.defined_class, t.method_id, parameters)
+        signatures[s] = MethodSignature.new(tracepoint_line(t), t.defined_class, t.method_id, is_block(t), parameters, signatures)
       end
-      signatures[s].add(args, t.return_value.class, t.self)
+      signatures[s].add(args, t.return_value, t.self)
       path = "#{t.path}.annotations"
       dir = File.dirname(t.path)
       write_annotations_paths(dir, paths.add(path))
@@ -35,12 +46,12 @@ trace_return = TracePoint.new(:return) do |t|
   end
 end
 
-trace_call = TracePoint.new(:call) do |t|
+trace_call = TracePoint.new(:call, :b_call) do |t|
   if File.dirname(t.path) == File.dirname(INPUT_FILE)
-    s = "#{t.defined_class}, :#{t.method_id}"
+    s = "#{t.path} #{tracepoint_line(t)}"
     args = t.binding.eval("local_variables").inject({}) do |vars, name|
       value = t.binding.eval name.to_s
-      vars[name] = value.class
+      vars[name] = value
       vars
     end
     stack[s] << args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurangu
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Arpith Siromoney