laerad 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4aba5b10777aeac869643bacc35c67a718111bbf3fba0f9565adaf9ae7feda
-  data.tar.gz: 07f3e5a2e2bc0ce751b983ced23cd3f800e1b5b5faed771ab89eaf8cb1fd8f41
+  metadata.gz: 35856e816ed1ba8b9ae913335e1e28b9b5a5181d4714064e0529d04c4ddbe98c
+  data.tar.gz: 2396959e613c2f8261f8519c47aa7743d0be291f51fb2134d83f5f037928a43b
 SHA512:
-  metadata.gz: 37fbe81640c7637723514412ba77b4a1e5179f33f8e632ff2d137c98177a7793731d8e4b7b4da629f2e1579e7a75c922cf417d40493c5cff5709af17a18b174c
-  data.tar.gz: b39c39ef6759a111cc777a649341cce2c30ab61d59aae267c310a08be76b3f055b96ff95ebb230acd0a8cc51f1387e3c699591c75f8f406b5541b2024be69c45
+  metadata.gz: 5ef2b09e75348487b63511d4eca7b00400a00ae20dac624cb1eb224d45e641f4af9d647d7c740f7f892b679ec32aa2c09f6ab650014be8f190cb2dba9cb50531
+  data.tar.gz: ad16630f69bd3504cce35015bd529886164d83173c32fa3ba854377212ab518bc4571c5c3e73741c5c52a1a4153e0afec1398d39c0840a0dbf0de2d394295035

data/lib/laerad/file_analyzer.rb

@@ -41,6 +41,10 @@ module Laerad
       scope
     end
 
+    def find_defining_scope(name)
+      @scope_stack.reverse.find { |s| s.variable_defined?(name) }
+    end
+
     def finalize_scope(scope)
       scope.single_use_variables.each do |name|
         line = scope.variable_definition_line(name)
@@ -71,14 +75,26 @@ module Laerad
 
       when SyntaxTree::VarRef
         name = extract_var_name(node)
-        current_scope.register_variable_ref(name) if name
+        if name
+          scope = find_defining_scope(name) || current_scope
+          scope.register_variable_ref(name)
+        end
 
       when SyntaxTree::Assign
         visit(node.target)
         visit(node.value)
 
       when SyntaxTree::OpAssign
-        visit(node.target)
+        if node.target.is_a?(SyntaxTree::VarField) && node.target.value.is_a?(SyntaxTree::Ident)
+          name = node.target.value.value
+          if (defining_scope = find_defining_scope(name))
+            defining_scope.register_variable_ref(name)
+          else
+            visit(node.target)
+          end
+        else
+          visit(node.target)
+        end
         visit(node.value)
 
       when SyntaxTree::DefNode
@@ -333,7 +349,7 @@ module Laerad
         param.value
       when SyntaxTree::RestParam
         param.name&.value
-      when SyntaxTree::KeywordRestParam
+      when SyntaxTree::KwRestParam
         param.name&.value
       when SyntaxTree::BlockArg
         param.name&.value
@@ -353,10 +369,7 @@ module Laerad
     end
 
     def extract_var_name(node)
-      case node.value
-      when SyntaxTree::Ident
-        node.value.value
-      end
+      node.value.value if node.value.is_a?(SyntaxTree::Ident)
     end
   end
 end

data/lib/laerad/result.rb

@@ -46,7 +46,7 @@ module Laerad
         end
 
         table = Terminal::Table.new(
-          headings: ["File", "Line", "Variable", "Uses"],
+          headings: ["File", "Line", "Variable", "Appearances"],
           rows: rows
         )
 

data/lib/laerad/scope.rb

@@ -29,5 +29,9 @@ module Laerad
     def variable_count(name)
       @variables[name]
     end
+
+    def variable_defined?(name)
+      @variable_def_lines.key?(name)
+    end
   end
 end

data/lib/laerad/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: laerad
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Giles Bowkett