laerad 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4aba5b10777aeac869643bacc35c67a718111bbf3fba0f9565adaf9ae7feda
-  data.tar.gz: 07f3e5a2e2bc0ce751b983ced23cd3f800e1b5b5faed771ab89eaf8cb1fd8f41
+  metadata.gz: b261cc9887d95310e55ec298d704b10d897c33efab020de4911093abaf2ec867
+  data.tar.gz: '0681f30617fd4d7f319f7677c1e9545ebf747a57bede300d09209d569561425c'
 SHA512:
-  metadata.gz: 37fbe81640c7637723514412ba77b4a1e5179f33f8e632ff2d137c98177a7793731d8e4b7b4da629f2e1579e7a75c922cf417d40493c5cff5709af17a18b174c
-  data.tar.gz: b39c39ef6759a111cc777a649341cce2c30ab61d59aae267c310a08be76b3f055b96ff95ebb230acd0a8cc51f1387e3c699591c75f8f406b5541b2024be69c45
+  metadata.gz: 314e0f6970ed63ad8a8522e83428cc1752084d3aebff81a95f6bc196cabf03ccd5e8cb39c1e54bd43238b9d4594c3a4e1efb01236c7b37ae1777fb1358abc123
+  data.tar.gz: c8ddb6b2bc18348cd53b88cea53b22b6ea4d453a6b1fec8239bb2c50fa5c5f13953ce40b9587cba8c29681a33f744c59306d78d1ccd809a49894e50b576e9fad

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,22 @@ 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)
+        name = extract_var_name(node.target)
+        if name && (defining_scope = find_defining_scope(name))
+          defining_scope.register_variable_ref(name)
+        else
+          visit(node.target)
+        end
         visit(node.value)
 
       when SyntaxTree::DefNode

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.4"
 end

metadata

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