laerad 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35856e816ed1ba8b9ae913335e1e28b9b5a5181d4714064e0529d04c4ddbe98c
-  data.tar.gz: 2396959e613c2f8261f8519c47aa7743d0be291f51fb2134d83f5f037928a43b
+  metadata.gz: 3a6b8326480701c196940c855f32155f82063550c1f649d4bc6a91ce3f94c41d
+  data.tar.gz: c79f6083de445395ad1f95d12209bfe565d85e8217a4ead2de67ddc27ada0249
 SHA512:
-  metadata.gz: 5ef2b09e75348487b63511d4eca7b00400a00ae20dac624cb1eb224d45e641f4af9d647d7c740f7f892b679ec32aa2c09f6ab650014be8f190cb2dba9cb50531
-  data.tar.gz: ad16630f69bd3504cce35015bd529886164d83173c32fa3ba854377212ab518bc4571c5c3e73741c5c52a1a4153e0afec1398d39c0840a0dbf0de2d394295035
+  metadata.gz: b4c50c7971ba93555f6155deb1da2b9e953348f86695e6d9484c72d3af1526d128e5637f5f0ce01bc7df1aa8387fcfd253fd749da079849e5786f7bf1b5e500d
+  data.tar.gz: 076e550586df6a84ff3ded07576731537da61e77cd630937080346efe88cf3488e5ac1c503c11c66ef555e49f34be7183a9269df209e4b613f8aa8d7dcab95d1

data/lib/laerad/file_analyzer.rb

@@ -47,6 +47,9 @@ module Laerad
 
     def finalize_scope(scope)
       scope.single_use_variables.each do |name|
+        next if name.start_with?("_")
+        next if scope.exempt_variables.include?(name)
+
         line = scope.variable_definition_line(name)
         @result.add_variable_violation(
           name: name,
@@ -80,6 +83,12 @@ module Laerad
           scope.register_variable_ref(name)
         end
 
+      when SyntaxTree::VCall
+        name = extract_var_name(node)
+        if name && (scope = find_defining_scope(name))
+          scope.register_variable_ref(name)
+        end
+
       when SyntaxTree::Assign
         visit(node.target)
         visit(node.value)
@@ -101,6 +110,12 @@ module Laerad
         push_scope
         visit_params(node.params)
         visit(node.bodystmt)
+        if (block_name = extract_block_param_name(node.params)) && contains_yield?(node.bodystmt)
+          current_scope.exempt_variables.add(block_name)
+        end
+        if contains_zsuper?(node.bodystmt)
+          current_scope.param_names.each { |name| current_scope.exempt_variables.add(name) }
+        end
         pop_scope
 
       when SyntaxTree::BodyStmt
@@ -224,6 +239,9 @@ module Laerad
       when SyntaxTree::Args
         node.parts.each { |part| visit(part) }
 
+      when SyntaxTree::ArgBlock
+        visit(node.value)
+
       when SyntaxTree::ArgParen
         visit(node.arguments)
 
@@ -347,6 +365,8 @@ module Laerad
       name = case param
       when SyntaxTree::Ident
         param.value
+      when SyntaxTree::Label
+        param.value.chomp(":")
       when SyntaxTree::RestParam
         param.name&.value
       when SyntaxTree::KwRestParam
@@ -359,6 +379,7 @@ module Laerad
 
       if name
         current_scope.register_variable_def(name, param.location.start_line)
+        current_scope.param_names.add(name)
       end
     end
 
@@ -371,5 +392,27 @@ module Laerad
     def extract_var_name(node)
       node.value.value if node.value.is_a?(SyntaxTree::Ident)
     end
+
+    def extract_block_param_name(params)
+      params = params.contents if params.is_a?(SyntaxTree::Paren)
+      return unless params.is_a?(SyntaxTree::Params)
+      params.block&.name&.value
+    end
+
+    def contains_yield?(node)
+      tree_contains?(node, SyntaxTree::YieldNode)
+    end
+
+    def contains_zsuper?(node)
+      tree_contains?(node, SyntaxTree::ZSuper)
+    end
+
+    def tree_contains?(node, target_class)
+      if node.is_a?(target_class)
+        true
+      elsif node && !node.is_a?(SyntaxTree::DefNode) && node.respond_to?(:child_nodes)
+        node.child_nodes.any? { |child| tree_contains?(child, target_class) }
+      end
+    end
   end
 end

data/lib/laerad/scope.rb

@@ -2,11 +2,13 @@
 
 module Laerad
   class Scope
-    attr_reader :variables, :variable_def_lines
+    attr_reader :variables, :variable_def_lines, :exempt_variables, :param_names
 
     def initialize
       @variables = Hash.new(0)
       @variable_def_lines = Hash.new { |h, k| h[k] = [] }
+      @exempt_variables = Set.new
+      @param_names = Set.new
     end
 
     def register_variable_def(name, line)

data/lib/laerad/version.rb

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

metadata

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