unparser 0.1.7 → 0.1.8

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name     = 'unparser'
-  gem.version  = '0.1.7'
+  gem.version  = '0.1.8'
 
   gem.authors  = ['Markus Schirp']
   gem.email    = 'mbj@schir-dso.com'

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: procto
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: adamantium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: abstract_type
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
 description: Generate equivalent source for parser gem AST nodes
@@ -102,9 +102,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Gemfile.devtools
@@ -123,11 +124,12 @@ files:
 - config/rubocop.yml
 - config/yardstick.yml
 - lib/unparser.rb
+- lib/unparser/ast.rb
+- lib/unparser/ast/local_variable_scope.rb
 - lib/unparser/buffer.rb
 - lib/unparser/cli.rb
 - lib/unparser/cli/color.rb
 - lib/unparser/cli/differ.rb
-- lib/unparser/cli/preprocessor.rb
 - lib/unparser/cli/source.rb
 - lib/unparser/comments.rb
 - lib/unparser/constants.rb
@@ -138,7 +140,6 @@ files:
 - lib/unparser/emitter/begin.rb
 - lib/unparser/emitter/binary.rb
 - lib/unparser/emitter/block.rb
-- lib/unparser/emitter/break.rb
 - lib/unparser/emitter/case.rb
 - lib/unparser/emitter/cbase.rb
 - lib/unparser/emitter/class.rb
@@ -147,6 +148,7 @@ files:
 - lib/unparser/emitter/empty.rb
 - lib/unparser/emitter/ensure.rb
 - lib/unparser/emitter/flipflop.rb
+- lib/unparser/emitter/flow_modifier.rb
 - lib/unparser/emitter/for.rb
 - lib/unparser/emitter/hookexe.rb
 - lib/unparser/emitter/if.rb
@@ -162,14 +164,12 @@ files:
 - lib/unparser/emitter/literal/singleton.rb
 - lib/unparser/emitter/match.rb
 - lib/unparser/emitter/module.rb
-- lib/unparser/emitter/next.rb
 - lib/unparser/emitter/op_assign.rb
 - lib/unparser/emitter/redo.rb
 - lib/unparser/emitter/repetition.rb
 - lib/unparser/emitter/resbody.rb
 - lib/unparser/emitter/rescue.rb
 - lib/unparser/emitter/retry.rb
-- lib/unparser/emitter/return.rb
 - lib/unparser/emitter/root.rb
 - lib/unparser/emitter/send.rb
 - lib/unparser/emitter/send/arguments.rb
@@ -185,6 +185,9 @@ files:
 - lib/unparser/emitter/yield.rb
 - lib/unparser/finalize.rb
 - lib/unparser/node_helpers.rb
+- lib/unparser/preprocessor.rb
+- lib/unparser/strip_helper.rb
+- rubyspec.sh
 - spec/spec_helper.rb
 - spec/unit/unparser/buffer/append_spec.rb
 - spec/unit/unparser/buffer/append_without_prefix_spec.rb
@@ -211,17 +214,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes

data/lib/unparser/cli/preprocessor.rb

@@ -1,197 +0,0 @@
-# encoding: utf-8
-
-module Unparser
-  class CLI
-
-    # CLI Specific preprocessor used for equivalency testing
-    class Preprocessor
-      include Adamantium::Flat, NodeHelpers, AbstractType, Concord.new(:node), Procto.call(:result)
-
-      # Return preprocessor result
-      #
-      # @return [Parser::AST::Node]
-      #
-      # @api private
-      #
-      abstract_method :result
-
-      # Run preprocessor for node
-      #
-      # @param [Parser::AST::Node, nil] node
-      #
-      # @return [Parser::AST::Node, nil]
-      #
-      # @api private
-      #
-      def self.run(node)
-        return if node.nil?
-        REGISTRY.fetch(node.type, Noop).new(node).result
-      end
-
-      REGISTRY = {}
-
-      # Register preprocessor
-      #
-      # @param [Symbol] type
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def self.register(type)
-        REGISTRY[type] = self
-      end
-      private_class_method :register
-
-    private
-
-      # Visit node
-      #
-      # @param [Parser::AST::Node]
-      #
-      # @api private
-      #
-      def visit(node)
-        self.class.run(node)
-      end
-
-      # Return children
-      #
-      # @return [Array<Parser::AST::Node>]
-      #
-      # @api private
-      #
-      def children
-        node.children
-      end
-
-      # Return mapped children
-      #
-      # @return [Array<Parser::Ast::Node>]
-      #
-      # @api private
-      #
-      def mapped_children
-        children.map do |node|
-          if node.kind_of?(Parser::AST::Node)
-            visit(node)
-          else
-            node
-          end
-        end
-      end
-
-      # Noop preprocessor that just passes through noode.
-      class Noop < self
-
-        # Return preprocessor result
-        #
-        # @return [Parser::AST::Node]
-        #
-        # @api private
-        #
-        def result
-          s(node.type, mapped_children)
-        end
-
-      end # Noop
-
-      # Preprocessor for dynamic string nodes. Collapses adjacent string segments into one.
-      class Dstr < self
-
-        register :dstr
-
-        # Return preprocessor result
-        #
-        # @return [Parser::AST::Node]
-        #
-        # @api private
-        #
-        def result
-          if collapsed_children.all? { |node| node.type == :str }
-            s(:str, [collapsed_children.map { |node| node.children.first }.join])
-          else
-            node.updated(nil, collapsed_children)
-          end
-        end
-
-      private
-
-        # Return collapsed children
-        #
-        # @return [Array<Parser::AST::Node>]
-        #
-        # @api private
-        #
-        def collapsed_children
-          chunked_children.each_with_object([]) do |(type, nodes), aggregate|
-            if type == :str
-              aggregate << s(:str, [nodes.map { |node| node.children.first }.join])
-            else
-              aggregate.concat(nodes)
-            end
-          end
-        end
-        memoize :collapsed_children
-
-        # Return chunked children
-        #
-        # @return [Array<Parser::AST::Node>]
-        #
-        # @api private
-        #
-        def chunked_children
-          mapped_children.chunk do |item|
-            item.type
-          end
-        end
-
-      end # Begin
-
-      # Preprocessor for regexp nodes. Normalizes quoting.
-      class Regexp < self
-
-        register :regexp
-
-        # Return preprocesso result
-        #
-        # @return [Parser::AST::Node]
-        #
-        # @api private
-        #
-        def result
-          location = node.location
-          if location && location.begin.source.start_with?('%r')
-            Parser::CurrentRuby.parse(Unparser.unparse(node))
-          else
-            node
-          end
-        end
-      end
-
-      # Preprocessor for begin nodes. Removes begin nodes with one child.
-      #
-      # These superflownosely currently get generated by unparser.
-      #
-      class Begin < self
-
-        register :begin
-
-        # Return preprocessor result
-        #
-        # @return [Parser::AST::Node]
-        #
-        # @api private
-        #
-        def result
-          if children.one?
-            visit(children.first)
-          else
-            Noop.call(node)
-          end
-        end
-
-      end # Begin
-    end # Preprocessor
-  end # CLI
-end # Unparser

data/lib/unparser/emitter/break.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-
-module Unparser
-  class Emitter
-    # Emitter for break nodes
-    class Break < Return
-
-      handle :break
-
-    private
-
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def dispatch
-        conditional_parentheses(parent_type == :or || parent_type == :and) do
-          write(K_BREAK)
-          emit_break_return_arguments
-        end
-      end
-
-    end # Break
-  end # Emitter
-end # Unparser

data/lib/unparser/emitter/next.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-
-module Unparser
-  class Emitter
-    # Emitter for next nodes
-    class Next < self
-
-      handle :next
-
-    private
-
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def dispatch
-        conditional_parentheses(parent_type == :or || parent_type == :and) do
-          write(K_NEXT)
-          return if children.empty?
-          visit_parentheses(children.first)
-        end
-      end
-
-    end # Next
-  end # Emitter
-end # Unparser