unparser 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: d4a7819ea2d8ce95d148c52ee34b15ebe1ff90b2
-  data.tar.gz: 0e9816a2e5d51a4e69f3a08e85ecfde8ae481a9f
-SHA512: 
-  metadata.gz: b06c3a9e8f10304d8acfb49504f4830400817506faaaa01e60a22c5b4da509f004ae5c5034604cb72568c1df6861ed0eaa495796988b839ce94fb217fd61b5d1
-  data.tar.gz: 4c1e6bb60efa42743788669d69aae5c67d47f278d2b97f357bd40eda44642da6daaa5e5fc58a90cc28e99214df03b76587d5593bc5e6b497caea116e2e9227b4
+---
+SHA1:
+  metadata.gz: 6fbc42b2270dfea79002ff8d2bf543618237f65e
+  data.tar.gz: 992ce6239c5de55bf3cb5f3b182a2e6d8368ae06
+SHA512:
+  metadata.gz: 90e80a39138d2cf49d9be5e303f9255be55ff8200ddb1dcb5181951ddce109816749e8cd72388a5a935b966ab6d67a23175eb714fa5038dde99cb846a547a6f4
+  data.tar.gz: f51ab9def69f2641e819f1c57741d808f61f25cfc2738257ea846daff6a1a4562683e9972d8fde4f58b023fdc0e1edf1a03fe996157c89bc9efe5a2aa940f75f

data/.travis.yml

@@ -4,10 +4,13 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
-  - jruby-19mode
-  - jruby-20mode
   - rbx-2
 matrix:
+  include:
+    - rvm: jruby
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug --1.9"  # for simplecov
+    - rvm: jruby
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug --2.0"  # for simplecov
   allow_failures:
     - rvm: rbx-2
 notifications:

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.1.14 2014-06-15
+
+* Fix emitter to correctly unparse foo[] = 1
+
 # v0.1.13 2014-06-08
 
 * Add support for rubinius.

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 728
+total_score: 701

data/config/flog.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 20.7
+threshold: 21.3

data/config/reek.yml

@@ -17,7 +17,7 @@ TooManyInstanceVariables:
 TooManyMethods:
   exclude:
   - Unparser::Emitter # TODO: 13 methods, mostly helpers for deduplicate sublcasses
-  - Unparser::Buffer  # TODO: 11 methods, mostly helpers for deduplicate sublcasses
+  - Unparser::Buffer  # 11 methods
   - Unparser::CLI::Source # 11 methods
   enabled: true
   max_methods: 10

data/lib/unparser.rb

@@ -39,6 +39,7 @@ require 'unparser/node_helpers'
 require 'unparser/preprocessor'
 require 'unparser/comments'
 require 'unparser/constants'
+require 'unparser/dsl'
 require 'unparser/ast'
 require 'unparser/ast/local_variable_scope'
 require 'unparser/emitter'

data/lib/unparser/dsl.rb

@@ -0,0 +1,71 @@
+module Unparser
+  # DSL to help defining emitters
+  module DSL
+
+  private
+
+    # Define remaining children
+    #
+    # @param [Enumerable<Symbol>] names
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def define_remaining_children(names)
+      range = names.length .. -1
+      define_method(:remaining_children) do
+        children[range]
+      end
+      private :remaining_children
+    end
+
+    # Define named child
+    #
+    # @param [Symbol] name
+    # @param [Fixnum] index
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def define_child(name, index)
+      define_method(name) do
+        children.at(index)
+      end
+      private name
+    end
+
+    # Define a group of children
+    #
+    # @param [Symbol] name
+    # @param [Range] range
+    #
+    # @return [undefined]
+    #
+    # @pai private
+    #
+    def define_group(name, range)
+      define_method(name) do
+        children[range]
+      end
+      private(name)
+      memoize(name)
+    end
+
+    # Create name helpers
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def children(*names)
+      define_remaining_children(names)
+
+      names.each_with_index do |name, index|
+        define_child(name, index)
+      end
+    end
+
+  end # DSL
+end # Unparser

data/lib/unparser/emitter.rb

@@ -6,6 +6,16 @@ module Unparser
   class Emitter
     include Adamantium::Flat, AbstractType, Constants, NodeHelpers
     include Concord.new(:node, :parent)
+    extend DSL
+
+    # Registry for node emitters
+    REGISTRY = {}
+
+    NOINDENT = [:rescue, :ensure].to_set.freeze
+
+    DEFAULT_DELIMITER = ', '.freeze
+
+    CURLY_BRACKETS = IceNine.deep_freeze(%w({ }))
 
     module LocalVariableRoot
 
@@ -25,7 +35,7 @@ module Unparser
         end
       end
 
-    end
+    end # LocalVariableRoot
 
     # Return local variable root
     #
@@ -37,15 +47,6 @@ module Unparser
       parent.local_variable_scope
     end
 
-    # Registry for node emitters
-    REGISTRY = {}
-
-    NOINDENT = [:rescue, :ensure].to_set.freeze
-
-    DEFAULT_DELIMITER = ', '.freeze
-
-    CURLY_BRACKETS = IceNine.deep_freeze(%w({ }))
-
     # Return assigned lvars
     #
     # @return [Array<Symbol>]
@@ -64,54 +65,6 @@ module Unparser
       node.type
     end
 
-    # Define remaining children
-    #
-    # @param [Enumerable<Symbol>] names
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def self.define_remaining_children(names)
-      define_method(:remaining_children) do
-        children[names.length..-1]
-      end
-      private :remaining_children
-    end
-    private_class_method :define_remaining_children
-
-    # Define named child
-    #
-    # @param [Symbol] name
-    # @param [Fixnum] index
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def self.define_child(name, index)
-      define_method(name) do
-        children.at(index)
-      end
-      protected name
-    end
-    private_class_method :define_child
-
-    # Create name helpers
-    #
-    # @return [undefined]
-    #
-    # @api private
-    #
-    def self.children(*names)
-      define_remaining_children(names)
-
-      names.each_with_index do |name, index|
-        define_child(name, index)
-      end
-    end
-    private_class_method :children
-
     # Register emitter for type
     #
     # @param [Symbol] type
@@ -176,10 +129,7 @@ module Unparser
 
     # Test if node is emitted as terminated expression
     #
-    # @return [false]
-    #   if emitted node is unambigous
-    #
-    # @return [true]
+    # @return [Boolean]
     #
     # @api private
     #

data/lib/unparser/emitter/case.rb

@@ -8,6 +8,7 @@ module Unparser
       handle :case
 
       children :condition
+      define_group :whens, 1..-2
 
     private
 
@@ -46,9 +47,7 @@ module Unparser
       #
       def emit_whens
         nl
-        children[1..-2].each do |child|
-          visit(child)
-        end
+        whens.each(&method(:visit))
       end
 
       # Emit condition
@@ -70,6 +69,8 @@ module Unparser
 
       handle :when
 
+      define_group :captures, 0 .. -2
+
     private
 
       # Perform dispatch
@@ -92,9 +93,9 @@ module Unparser
       # @api private
       #
       def emit_captures
-        delimited(children[0..-2])
+        delimited(captures)
       end
 
-    end
+    end # When
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/literal/dynamic_body.rb

@@ -42,9 +42,7 @@ module Unparser
         # @api private
         #
         def dispatch
-          children.each do |node|
-            emit_segment(node)
-          end
+          children.each(&method(:emit_segment))
         end
 
         # Emit segment

data/lib/unparser/emitter/literal/regexp.rb

@@ -21,9 +21,7 @@ module Unparser
         #
         def dispatch
           parentheses(DELIMITER, DELIMITER) do
-            body.each do |child|
-              write_body(child)
-            end
+            body.each(&method(:write_body))
           end
           visit(children.last)
         end

data/lib/unparser/emitter/rescue.rb

@@ -9,7 +9,7 @@ module Unparser
 
       children :body, :rescue_body
 
-      RESCUE_BODIES_RANGE = (1..-2).freeze
+      define_group :rescue_bodies, 1..-2
 
       EMBEDDED_TYPES = [:def, :defs, :kwbegin, :ensure].to_set.freeze
 
@@ -83,16 +83,6 @@ module Unparser
         emit_else
       end
 
-      # Return rescue bodies
-      #
-      # @return [Enumerable<Parser::AST::Node>]
-      #
-      # @api private
-      #
-      def rescue_bodies
-        children[RESCUE_BODIES_RANGE]
-      end
-
       # Emit else
       #
       # @return [undefined]

data/lib/unparser/emitter/root.rb

@@ -6,7 +6,6 @@ module Unparser
     class Root < self
       include Concord::Public.new(:node, :buffer, :comments)
       include LocalVariableRoot
-
     end # Root
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/send.rb

@@ -14,17 +14,11 @@ module Unparser
       INDEX_ASSIGN    = :'[]='
       ASSIGN_SUFFIX   = '='.freeze
 
-      AMBIGOUS = [:irange, :erange].to_set.freeze
-
       children :receiver, :selector
 
       # Test for terminated expression
       #
-      # @return [true]
-      #   if send is terminated
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
@@ -44,7 +38,7 @@ module Unparser
       # @api private
       #
       def dispatch
-        run(effective_emitter)
+        effective_emitter.new(node, parent).write_to_buffer
       end
 
       # Return effective emitter
@@ -96,11 +90,7 @@ module Unparser
 
       # Test for unary operator implemented as method
       #
-      # @return [true]
-      #   if node is a unary operator
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
@@ -110,11 +100,7 @@ module Unparser
 
       # Test for binary operator implemented as method
       #
-      # @return [true]
-      #   if node is a binary operator
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
@@ -138,27 +124,19 @@ module Unparser
 
       # Test for mlhs
       #
-      # @return [true]
-      #   if node is within an mlhs
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #
       def mlhs?
-        assignment? && !arguments?
+        parent_type.equal?(:mlhs)
       end
 
       # Test for assignment
       #
       # FIXME: This also returns true for <= operator!
       #
-      # @return [true]
-      #   if node represents attribute / element assignment
-      #
-      # @return [false]
-      #   otherwise
+      # @return [Boolean]
       #
       # @api private
       #

data/lib/unparser/emitter/send/index.rb

@@ -16,7 +16,7 @@ module Unparser
         #
         def dispatch
           emit_receiver
-          emit_arguments
+          emit_operation
         end
 
         # Emit receiver
@@ -40,7 +40,7 @@ module Unparser
           #
           # @api private
           #
-          def emit_arguments
+          def emit_operation
             parentheses(*INDEX_PARENS) do
               delimited(arguments)
             end
@@ -50,20 +50,24 @@ module Unparser
         # Emitter for assign to index nodes
         class Assign < self
 
+          define_group(:indices, 2..-2)
+          define_child(:value, -1)
+
           # Emit arguments
           #
           # @return [undefined]
           #
           # @api private
           #
-          def emit_arguments
-            case arguments.length
-            when 0
+          def emit_operation
+            if arguments.empty?
               emit_regular_with_empty_args
-            when 1
-              emit_mlhs_arguments
             else
-              emit_normal_arguments
+              if mlhs?
+                emit_mlhs_operation
+              else
+                emit_normal_operation
+              end
             end
           end
 
@@ -73,7 +77,7 @@ module Unparser
           #
           # @api private
           #
-          def emit_mlhs_arguments
+          def emit_mlhs_operation
             parentheses(*INDEX_PARENS) do
               delimited(arguments)
             end
@@ -85,12 +89,7 @@ module Unparser
           #
           # @api private
           #
-          def emit_normal_arguments
-            # Workaround bug in RBX causes to crash here on
-            # *indices, value = arguments
-            #
-            # https://github.com/rubinius/rubinius/issues/3037
-            indices, value = arguments[0..-2], arguments.last
+          def emit_normal_operation
             parentheses(*INDEX_PARENS) do
               delimited(indices)
             end

data/spec/integration/unparser/corpus_spec.rb

@@ -5,10 +5,13 @@ require 'spec_helper'
 describe 'Unparser on ruby corpus' do
   before do
     if RUBY_VERSION == '1.9.3'
-      pending 'Corpus test not active for 1.9.3 because of limitations in encoding singalling, see Readme'
+      skip 'Corpus test not active for 1.9.3 because of limitations in encoding signalling, see Readme'
+    end
+    if RUBY_ENGINE == 'jruby'
+      skip 'Corpus test exhausts jruby heap space on travis'
     end
     if ENV['GUARD']
-      pending 'Do not execute corpus spec under guard'
+      skip 'Do not execute corpus spec under guard'
     end
   end
   ROOT = Pathname.new(__FILE__).parent.parent.parent.parent

data/spec/unit/unparser_spec.rb

@@ -392,6 +392,7 @@ describe Unparser do
       assert_source 'self.foo'
       assert_source 'a.foo'
       assert_source 'A.foo'
+      assert_source 'foo[]'
       assert_source 'foo[1]'
       assert_source 'foo[*baz]'
       assert_source 'foo(1)'
@@ -515,9 +516,9 @@ describe Unparser do
       assert_source 'yield.foo'
       assert_source 'Foo::Bar.foo'
       assert_source '::BAZ.foo'
-      assert_source 'array[i].foo'
-      assert_source '(array[i] = 1).foo'
-      assert_source 'array[1..2].foo'
+      assert_source 'foo[i].foo'
+      assert_source '(foo[i] = 1).foo'
+      assert_source 'foo[1..2].foo'
       assert_source '(a.attribute ||= foo).bar'
       assert_source 'foo.bar = baz[1]'
       assert_source 'foo.bar = (baz || foo)'
@@ -1304,15 +1305,16 @@ describe Unparser do
       end
 
       context 'element assignment' do
-        assert_source 'array[index] = value'
-        assert_source 'array[*index] = value'
-        assert_source 'array[a, b] = value'
-        assert_source 'array.[]=()'
+        assert_source 'foo[index] = value'
+        assert_source 'foo[*index] = value'
+        assert_source 'foo[a, b] = value'
+        assert_source 'foo.[]=()'
+        assert_source 'foo[] = 1'
 
         %w(+ - * / % & | || &&).each do |operator|
           context "with #{operator}" do
-            assert_source "array[index] #{operator}= 2"
-            assert_source "array[] #{operator}= 2"
+            assert_source "foo[index] #{operator}= 2"
+            assert_source "foo[] #{operator}= 2"
           end
         end
       end

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name     = 'unparser'
-  gem.version  = '0.1.13'
+  gem.version  = '0.1.14'
 
   gem.authors  = ['Markus Schirp']
   gem.email    = 'mbj@schir-dso.com'
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = %w(README.md)
   gem.executables      = [ 'unparser' ]
 
-  gem.required_ruby_version
+  gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency('parser',        '~> 2.1')
   gem.add_dependency('procto',        '~> 0.0.2')

metadata

@@ -1,89 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: unparser
-version: !ruby/object:Gem::Version 
-  version: 0.1.13
+version: !ruby/object:Gem::Version
+  version: 0.1.14
 platform: ruby
-authors: 
+authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-06-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-06-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: parser
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.1"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: procto
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: procto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: concord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  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.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: adamantium
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: adamantium
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: equalizer
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: equalizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: abstract_type
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+- !ruby/object:Gem::Dependency
+  name: abstract_type
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
-  version_requirements: *id006
+  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
 email: mbj@schir-dso.com
-executables: 
+executables:
 - unparser
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Gemfile.devtools
@@ -111,6 +133,7 @@ files:
 - lib/unparser/cli/source.rb
 - lib/unparser/comments.rb
 - lib/unparser/constants.rb
+- lib/unparser/dsl.rb
 - lib/unparser/emitter.rb
 - lib/unparser/emitter/alias.rb
 - lib/unparser/emitter/argument.rb
@@ -184,32 +207,30 @@ files:
 - spec/unit/unparser_spec.rb
 - unparser.gemspec
 homepage: http://github.com/mbj/unparser
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id007 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 1.9.3
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
-test_files: 
+test_files:
 - spec/integration/unparser/corpus_spec.rb
 - spec/integrations.yml
 - spec/spec_helper.rb