kurangu 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1edac603765e16e67954a8413fb896f5eb29f3c1
-  data.tar.gz: 08ed42aa75aca7d75d52888bab152a1e4824dbba
+  metadata.gz: 7752f5414ccab463481b345ff7200e814fb5859a
+  data.tar.gz: b47108ea9f4cd426311d641d6807a6cf48bd2ac5
 SHA512:
-  metadata.gz: b9b0bb828692c4f30dfbd53569c97e6f441716e4bc49c89fa028da82e243b4383f87bc7203945632c06f1fcf47d064a951c6ed170ec714f49c1d91d9a0fb6f2a
-  data.tar.gz: 82c27311d8eb3ce022052d5ce04e07f0df6adf9c06efdb961716db9b8dd689bd128df7bfdf01468590e45ccc05722ae82d43dbed2d7fd148e33074d1b212cf7a
+  metadata.gz: a07563548226e345a01eda0373b3ab2becf85f9bfa43be17882a7ddaa4c91e46179c02f2486a841dbb6f16f1a9701be5267abb8dc2efacb163e6fcdd09fb5c42
+  data.tar.gz: c0fee84605fa788d50f1a59e7e4d5e1a30b965b31aa213dfa262dbdcd789a6a9af5169e6a1d5d14528b7cc6671c9700246cc925d5b52b634bf877666b116a9bb

data/lib/kurangu.rb

@@ -18,11 +18,8 @@ class Kurangu
       f.each_line do |annotation_file|
         puts annotation_file
         File.open(annotation_file, "r") do |f|
-          f.each_line.with_index do |line, index|
-            if index > 2
-              puts line
-            end
-          end
+          contents = f.read
+          puts contents
         end
       end
     end
@@ -34,12 +31,12 @@ class Kurangu
         original_path = annotation_path.chomp('.annotations')
         annotated_path = "#{original_path}.annotated"
         puts "\ngenerating annotated file #{annotated_path}\n"
-        annotations = Hash.new
+        annotations = Hash.new { |h, k| h[k] = [] }
         File.open(annotation_path, "r") do |f|
           f.each_line do |line|
             split = line.split(" ", 2)
             index = split[0].to_i
-            annotations[index] = "#{split[1]}\n"
+            annotations[index].push split[1]
           end
         end
         lines = []
@@ -47,14 +44,20 @@ class Kurangu
         File.open(original_path, "r") do |f|
           f.each_line.with_index do |line, index|
             whitespace = line.chomp(line.lstrip)
-            if annotations.key?(index + 1)
+            if annotations[index + 1].size > 0
               if lines.last and lines.last.start_with?('type')
                 has_types = true
-                lines.last = "#{whitespace}#{annotations[index + 1]}"
+                lines.last = "#{whitespace}#{annotations[index + 1][0]}"
+                annotations[index + 1].drop(1).each do |annotation|
+                  lines << "#{whitespace}#{annotation}"
+                end
               else
                 lines << "#{whitespace}extend RDL::Annotate\n"
-                lines << "#{whitespace}#{annotations[index + 1]}"
+                annotations[index + 1].each do |annotation|
+                  lines << "#{whitespace}#{annotation}"
+                end
               end
+              lines << "\n"
             end
             lines << line
           end

data/lib/trace.rb

@@ -2,16 +2,14 @@ require 'set'
 
 INPUT_FILE = $stdin.readline.chomp
 
-stack = Hash.new Array.new
-parameter_types = Hash.new Hash.new Set.new
-return_types = Hash.new Set.new
-parameter_list = Hash.new Array.new
-signatures = Hash.new
+stack = Hash.new { |h, k| h[k] = [] }
+parameter_list = Hash.new { |h, k| h[k] = [] }
+signatures = Array.new
 paths = Set.new
 
-def generate_signature(line, parameters, parameter_types, return_types)
-  joined_parameters = parameters.map { |arg| parameter_types[arg].to_a.join(" or ") }
-  "#{line} type '(#{joined_parameters.join(", ")}) -> #{return_types.to_a.join(" or ")}'"
+def generate_signature(line, parameters, parameter_types, return_type)
+  joined_parameters = parameters.map { |arg| parameter_types[arg] }
+  "#{line} type '(#{joined_parameters.join(", ")}) -> #{return_type}'"
 end
 
 def write_annotations_paths(dir, paths)
@@ -20,7 +18,7 @@ def write_annotations_paths(dir, paths)
 end
 
 def write_annotations(path, signatures)
-  IO.write(path, signatures.values.join("\n"))
+  IO.write(path, signatures.join("\n"))
 end
 
 trace_return = TracePoint.new(:return) do |t|
@@ -28,13 +26,9 @@ trace_return = TracePoint.new(:return) do |t|
     s = "#{t.defined_class}, :#{t.method_id}"
     args = stack[s].pop
     if args
-      args.each do |arg, type|
-        parameter_types[s][arg].add(type)
-      end
-      return_types[s].add(t.return_value.class)
-      parameter_list[s] = t.self.method(t.method_id).parameters.map { |a | a[1] }
+      parameter_list = t.self.method(t.method_id).parameters.map { |a | a[1] }
       line = t.self.method(t.method_id).source_location[1]
-      signatures[s] = generate_signature(line, parameter_list[s], parameter_types[s], return_types[s])
+      signatures.push generate_signature(line, parameter_list, args, t.return_value.class)
       path = "#{t.path}.annotations"
       dir = File.dirname(t.path)
       write_annotations_paths(dir, paths.add(path))

metadata

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