unparser 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 034e53fe83f3cb6b5d1c99e64f35b73d505812bf
-  data.tar.gz: 261ece646cfa726f17d70c2d82a44f837d6155b2
+  metadata.gz: e21010b4e759db5c1502593760f8480381ed63fd
+  data.tar.gz: c6549debc54796bf1151ee522d85caef6b6db7a2
 SHA512:
-  metadata.gz: ff483fa78c83e951ff869033f025238d75dbbba20a747952a32ce034c3a88ee346a0aeab555053fb27b94a440a38b4a9a18b036d672b7e64545fec4d0bec788b
-  data.tar.gz: db9c2c31f83b67d7bf70893c774a53b764a4e02ff7f096555fe42c88ba1ee504e962ff6e0e4e20be3febfa08ad09884a0b0e363bab05034127aef404af552064
+  metadata.gz: 342af109c4ede135af5f555073dcb2b10c1bdef9b1873598e5fc84dd5c57d517e8d6d5f51c4a856695f10fd0ead95ab68a19acd060c8acda82564bf95a5de2e0
+  data.tar.gz: 9abf7e144000af5631f23440abc8557210a67dbc935793ab3add786ba838ae77f19c5f5a428932f92c6a596c6892b68d7051c2dbd0a5afc32c07d4f1d91ff74c

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.1.11 2014-04-11
+
+* Fix performance on local variable scope inspection
+
 # v0.1.10 2014-04-06
 
 * Fix emit of inline rescues in combination with control flow keywords.

data/Gemfile

@@ -3,7 +3,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'morpher', git: 'https://github.com/mbj/morpher.git'
-
 gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
 eval_gemfile 'Gemfile.devtools'

data/Guardfile

@@ -1,10 +1,12 @@
 # encoding: utf-8
 
+ENV['GUARD'] = '1'
+
 guard :bundler do
   watch('Gemfile')
 end
 
-guard :rspec, :all_on_start => false, :all_after_pass => false, :cli => '--fail-fast --seed 1' do
+guard :rspec, :all_on_start => false, :all_after_pass => false, :cmd => 'bundle exec rspec --fail-fast --seed 1' do
   # run all specs if the spec_helper or supporting files files are modified
   watch('spec/spec_helper.rb')                      { 'spec/unit' }
   watch(%r{\Aspec/(?:lib|support|shared)/.+\.rb\z}) { 'spec/unit' }

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 720
+total_score: 718

data/lib/unparser/ast.rb

@@ -7,73 +7,46 @@ module Unparser
     FIRST_CHILD = ->(node) { node.children.first }.freeze
     TAUTOLOGY   = ->(node) { true }.freeze
 
-    # Test if local variable was first at given assignment
+    RESET_NODES   = [:module, :class, :sclass, :def, :defs].freeze
+    INHERIT_NODES = [:block].freeze
+    CLOSE_NODES   = (RESET_NODES + INHERIT_NODES).freeze
+
+    # Nodes that assign a local variable
+    #
+    # FIXME: Kwargs are missing.
+    #
+    ASSIGN_NODES = [:lvasgn, :arg, :optarg, :restarg].freeze
+
+    # Test for local variable inherited scope reset
     #
-    # @param [Parser::AST::Node] root
-    # @param [Parser::AST::Node] assignment
+    # @param [Parser::AST::Node] node
     #
     # @return [true]
-    #   if local variable was firstly introduced in body
+    #   if local variable scope must NOT be reset
     #
     # @return [false]
     #   otherwise
     #
     # @api private
     #
-    def self.first_assignment?(root, assignment)
-      name = assignment.children.first
-      AST::LocalVariableScope.each(root) do |node, current, before|
-        if node.equal?(assignment) && current.include?(name) && !before.include?(name)
-          return true
-        end
-      end
-
-      false
+    def self.not_close_scope?(node)
+      !CLOSE_NODES.include?(node.type)
     end
 
-    # Test if local variable is defined for given node
+    # Test for local variable scope reset
     #
-    # @param [Parser::AST::Node] root
     # @param [Parser::AST::Node] node
-    # @param [Symbol] name
     #
     # @return [true]
-    #   if local variable is defined
+    #   if local variable scope must NOT be reset
     #
     # @return [false]
     #   otherwise
     #
     # @api private
     #
-    def self.local_variable_defined_for_node?(root, node, name)
-      AST::LocalVariableScope.each(root) do |child, current, before|
-        if child.equal?(node) && current.include?(name)
-          return true
-        end
-      end
-
-      false
-    end
-
-    # Test if local variables where first assigned in body and read by conditional
-    #
-    # @param [Parser::AST::Node] root
-    # @param [Parser::AST::Node] conditional
-    # @param [Parser::AST::Node] body
-    #
-    # @api private
-    #
-    def self.first_assignment_in_body_and_used_in_condition?(root, body, condition)
-      condition_reads = local_variables_read_in_scope(condition)
-
-      candidates = AST.local_variable_assignments_in_scope(body).select do |node|
-        name = node.children.first
-        condition_reads.include?(name)
-      end
-
-      candidates.any? do |node|
-        first_assignment?(root, node)
-      end
+    def self.not_reset_scope?(node)
+      !RESET_NODES.include?(node.type)
     end
 
     # Return local variables that get assigned in scope
@@ -84,11 +57,11 @@ module Unparser
     #
     # @api private
     #
-    def self.local_variable_assignments_in_scope(node)
+    def self.local_variable_assignments(node)
       Enumerator.new(
         node,
-        LocalVariableScope.method(:not_reset_scope?)
-      ).types(LocalVariableScope::ASSIGN_NODES)
+        method(:not_reset_scope?)
+      ).types(ASSIGN_NODES)
     end
 
     # Return local variables read
@@ -99,10 +72,10 @@ module Unparser
     #
     # @api private
     #
-    def self.local_variables_read_in_scope(node)
+    def self.local_variable_reads(node)
       Enumerator.new(
         node,
-        LocalVariableScope.method(:not_close_scope?)
+        method(:not_close_scope?)
       ).type(:lvar).map(&FIRST_CHILD).to_set
     end
 

data/lib/unparser/ast/local_variable_scope.rb

@@ -2,73 +2,137 @@
 
 module Unparser
   module AST
-    # Local variable scope enumerator
-    class LocalVariableScope
-      include Enumerable
 
-      RESET_NODES   = [:module, :class, :sclass, :def, :defs].freeze
-      INHERIT_NODES = [:block].freeze
-      CLOSE_NODES   = (RESET_NODES + INHERIT_NODES).freeze
-
-      # Nodes that assign a local variable
-      #
-      # FIXME: Kwargs are missing.
-      #
-      ASSIGN_NODES = [:lvasgn, :arg, :optarg, :restarg].freeze
+    # Calculated local variable scope for a given node
+    class LocalVariableScope
+      include Enumerable, Adamantium, Concord.new(:node)
 
       # Initialize object
       #
+      # @param [Parser::AST::Node] node
+      #
       # @return [undefined]
       #
       # @api private
       #
-      def initialize
-        @stack = [Set.new]
+      def initialize(node)
+        items = []
+        LocalVariableScopeEnumerator.each(node) do |*scope|
+          items << scope
+        end
+        @items = items
+        @node = node
       end
 
-      # Enumerate each node with its local variable scope
+      # Test if local variable was first at given assignment
       #
       # @param [Parser::AST::Node] node
       #
-      # @return [self]
+      # @return [true]
+      #   if local variable was firstly introduced in body
+      #
+      # @return [false]
+      #   otherwise
       #
       # @api private
       #
-      def self.each(node, &block)
-        new.each(node, &block)
-        self
+      def first_assignment?(node)
+        name = node.children.first
+        match(node) do |current, before|
+          current.include?(name) && !before.include?(name)
+        end
       end
 
-      # Test for local variable inherited scope reset
+      # Test if local variable is defined for given node
       #
       # @param [Parser::AST::Node] node
+      # @param [Symbol] name
       #
       # @return [true]
-      #   if local variable scope must NOT be reset
+      #   if local variable is defined
       #
       # @return [false]
       #   otherwise
       #
       # @api private
       #
-      def self.not_close_scope?(node)
-        !CLOSE_NODES.include?(node.type)
+      def local_variable_defined_for_node?(node, name)
+        match(node) do |current|
+          current.include?(name)
+        end
+      end
+
+      # Test if local variables where first assigned in body and read by conditional
+      #
+      # @param [Parser::AST::Node] conditional
+      # @param [Parser::AST::Node] body
+      #
+      # @api private
+      #
+      def first_assignment_in_body_and_used_in_condition?(body, condition)
+        condition_reads = AST.local_variable_reads(condition)
+
+        candidates = AST.local_variable_assignments(body).select do |node|
+          name = node.children.first
+          condition_reads.include?(name)
+        end
+
+        candidates.any? do |node|
+          first_assignment?(node)
+        end
       end
 
-      # Test for local variable scope reset
+    private
+
+      # Match node
       #
       # @param [Parser::AST::Node] node
+      #   if block given
       #
       # @return [true]
-      #   if local variable scope must NOT be reset
+      #   if found an matched
       #
       # @return [false]
       #   otherwise
       #
       # @api private
       #
-      def self.not_reset_scope?(node)
-        !RESET_NODES.include?(node.type)
+      def match(neddle)
+        @items.each do |node, current, before|
+          if node.equal?(neddle)
+            return yield(current, before)
+          end
+        end
+        false
+      end
+
+    end # LocalVariableScope
+
+    # Local variable scope enumerator
+    class LocalVariableScopeEnumerator
+      include Enumerable
+
+      # Initialize object
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def initialize
+        @stack = [Set.new]
+      end
+
+      # Enumerate each node with its local variable scope
+      #
+      # @param [Parser::AST::Node] node
+      #
+      # @return [self]
+      #
+      # @api private
+      #
+      def self.each(node, &block)
+        new.each(node, &block)
+        self
       end
 
       # Enumerate local variable scope scope
@@ -109,7 +173,7 @@ module Unparser
       def visit(node, &block)
         before = current.dup
         enter(node)
-        yield node, current, before
+        yield node, current.dup, before
         node.children.each do |child|
           if child.kind_of?(Parser::AST::Node)
             visit(child, &block)
@@ -193,6 +257,6 @@ module Unparser
         @stack.pop
       end
 
-    end # LocalVariableScope
+    end # LocalVariableScopeEnumerator
   end # AST
 end # Unparser

data/lib/unparser/emitter.rb

@@ -15,8 +15,14 @@ module Unparser
       #
       # @api private
       #
-      def local_variable_root
-        node
+      def local_variable_scope
+        AST::LocalVariableScope.new(node)
+      end
+
+      def self.included(descendant)
+        descendant.class_eval do
+          memoize :local_variable_scope
+        end
       end
 
     end
@@ -27,8 +33,8 @@ module Unparser
     #
     # @api private
     #
-    def local_variable_root
-      parent.local_variable_root
+    def local_variable_scope
+      parent.local_variable_scope
     end
 
     # Registry for node emitters

data/lib/unparser/emitter/if.rb

@@ -40,7 +40,7 @@ module Unparser
 
         body = if_branch || else_branch
 
-        AST.first_assignment_in_body_and_used_in_condition?(local_variable_root, body, condition)
+        local_variable_scope.first_assignment_in_body_and_used_in_condition?(body, condition)
       end
 
       # Emit in postcondition style

data/lib/unparser/emitter/repetition.rb

@@ -70,7 +70,7 @@ module Unparser
       #
       def postcontrol?
         return false unless body
-        AST.first_assignment_in_body_and_used_in_condition?(local_variable_root, body, condition)
+        local_variable_scope.first_assignment_in_body_and_used_in_condition?(body, condition)
       end
 
       # Emit keyword

data/lib/unparser/emitter/send.rb

@@ -229,7 +229,7 @@ module Unparser
       # @api private
       #
       def local_variable_clash?
-        AST.local_variable_defined_for_node?(local_variable_root, node, selector)
+        local_variable_scope.local_variable_defined_for_node?(node, selector)
       end
 
     end # Send

data/spec/integration/unparser/corpus_spec.rb

@@ -7,6 +7,9 @@ describe 'Unparser on ruby corpus' do
     if RUBY_VERSION == '1.9.3'
       pending 'Corpus test not active for 1.9.3 because of limitations in encoding singalling, see Readme'
     end
+    if ENV['GUARD']
+      pending 'Do not execute corpus spec under guard'
+    end
   end
   ROOT = Pathname.new(__FILE__).parent.parent.parent.parent
 

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name     = 'unparser'
-  gem.version  = '0.1.10'
+  gem.version  = '0.1.11'
 
   gem.authors  = ['Markus Schirp']
   gem.email    = 'mbj@schir-dso.com'
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version
 
-  gem.add_dependency('parser',        '~> 2.1.7')
+  gem.add_dependency('parser',        '~> 2.1')
   gem.add_dependency('procto',        '~> 0.0.2')
   gem.add_dependency('concord',       '~> 0.1.4')
   gem.add_dependency('adamantium',    '~> 0.2.0')

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Markus Schirp
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.7
-  requirement: !ruby/object:Gem::Requirement
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.7
-  prerelease: false
-  type: :runtime
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: procto
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: concord
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.4
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.4
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: adamantium
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: equalizer
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.9
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.9
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: abstract_type
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.7
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.7
-  prerelease: false
-  type: :runtime
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schir-dso.com
 executables:
@@ -209,7 +209,7 @@ homepage: http://github.com/mbj/unparser
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -224,9 +224,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.0.14
+signing_key: 
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
 test_files:
@@ -247,3 +247,4 @@ test_files:
 - spec/unit/unparser/comments/take_eol_comments_spec.rb
 - spec/unit/unparser/emitter/class_methods/handle_spec.rb
 - spec/unit/unparser_spec.rb
+has_rdoc: