to_source 0.2.16 → 0.2.17

data/.rspec

@@ -1 +1,2 @@
 --color
+--fail-fast

data/Changelog.md

@@ -1,11 +1,44 @@
-# v0.2.15 2013-01-25
+# v0.2.17 2013-01-26
+
+* [fixed] Fix op assign 1 operators with implicit index array[] ||= etc
+* [fixed] Fix op assign 1 operators with explicit index array[foo] ||= etc
+* [fixed] Add support regexp in if statements with implicit haystack (Rubinius::AST::Match)
+* [fixed] Add support for Rubionius::AST::Flip{2,3} (flip flops)
+* [fixed] Add support for Rubionius::AST::VAlias
+* [fixed] Fix multiple edge cases with array literals and splats
+* [fixed] Add support for mixed splat arguments 
+* [fixed] Add support for __ENCODING__
+* [fixed] Fix emit of splat arguments to binary method operators
+* [fixed] Fix multiple assigments when assigning to element with splat index
+* [fixed] Add support for retry
+* [fixed] Add support for redo
+* [fixed] Add support rubinius specific type constant
+* [fixed] Add support for dynamic once literal
+* [fixed] Emit regexp options for single and dynamic literals
+* [fixed] Add support for undef keyword
+* [fixed] Add support toplevel module name
+* [fixed] Fix regexp emitter for edge cases
+* [fixed] Fix element reference with splat arguments
+* [fixed] Add support for construct
+* [fixed] Add support splat assigmnent in multiple assignment
+* [fixed] Add support for /s/ =~ foo (Rubinius::AST::Match2)
+* [fixed] Add support for $` (Rubinius::AST::BackRef)
+* [fixed] Support multiple assignments also for attribute and element assignments
+
+[Compare v0.2.16..v0.2.17](https://github.com/mbj/to_source/compare/v0.2.16...v0.2.17)
+
+# v0.2.16 2013-01-25
 
 * [fixed] Handle Rubinius::AST::Case
 
+[Compare v0.2.15..v0.2.16](https://github.com/mbj/to_source/compare/v0.2.15...v0.2.16)
+
 # v0.2.15 2013-01-24
 
 * [fixed] Emit dynamic regexp literals with split groups correctly
 
+[Compare v0.2.14..v0.2.15](https://github.com/mbj/to_source/compare/v0.2.14...v0.2.15)
+
 # v0.2.14 2013-01-09
 
 * [fixed] Emit send with arguments and body correctly

data/bin/to_source

@@ -3,15 +3,9 @@
 require 'to_source'
 
 ARGV.each do |path|
+  $stderr.puts(path)
   source = File.read(path)
   ast = source.to_ast
   next if ast.nil? # When file only has comments
-  $stderr.puts(path)
-  begin 
-    $stdout.puts(ToSource.to_source(ast))
-  rescue
-    ast.ascii_graph
-    $stderr.puts("Error in: #{path}")
-    raise
-  end
+  $stderr.puts(ToSource.to_source(ast))
 end

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 40
-total_score: 719
+total_score: 882

data/config/site.reek

@@ -42,6 +42,11 @@ IrresponsibleModule:
   enabled: false
 UncommunicativeModuleName:
   accept: 
+  - ToSource::Emitter::Match2
+  - ToSource::Emitter::Iter19
+  - ToSource::Emitter::Flip::Flip2
+  - ToSource::Emitter::Flip::Flip3
+  - ToSource::Emitter::For19
   - ToSource::Emitter::Match3
   - ToSource::Emitter::OpAssign1
   - ToSource::Emitter::OpAssign2

data/lib/to_source.rb

@@ -8,12 +8,20 @@ require 'to_source/state'
 require 'to_source/emitter'
 require 'to_source/emitter/literal'
 require 'to_source/emitter/literal/dynamic'
+require 'to_source/emitter/literal/dynamic/regexp'
+require 'to_source/emitter/literal/regexp'
+require 'to_source/emitter/literal/regexp/options'
 require 'to_source/emitter/access'
 require 'to_source/emitter/formal_arguments'
 require 'to_source/emitter/actual_arguments'
 require 'to_source/emitter/scope'
 require 'to_source/emitter/define'
 require 'to_source/emitter/assignment'
+require 'to_source/emitter/assignment/element'
+require 'to_source/emitter/assignment/variable'
+require 'to_source/emitter/assignment/attribute'
+require 'to_source/emitter/assignment/constant'
+require 'to_source/emitter/assignment_operator'
 require 'to_source/emitter/static'
 require 'to_source/emitter/block'
 require 'to_source/emitter/toplevel'
@@ -32,6 +40,7 @@ require 'to_source/emitter/send_with_arguments'
 require 'to_source/emitter/block_pass'
 require 'to_source/emitter/block_argument'
 require 'to_source/emitter/iter'
+require 'to_source/emitter/for'
 require 'to_source/emitter/pattern_arguments'
 require 'to_source/emitter/unary_operator_method'
 require 'to_source/emitter/binary_operator_method'
@@ -40,15 +49,19 @@ require 'to_source/emitter/element_reference'
 require 'to_source/emitter/to_array'
 require 'to_source/emitter/to_string'
 require 'to_source/emitter/defined'
-require 'to_source/emitter/attribute_assignment'
-require 'to_source/emitter/element_assignment'
+require 'to_source/emitter/undef'
 require 'to_source/emitter/if'
+require 'to_source/emitter/back_ref'
 require 'to_source/emitter/loop'
 require 'to_source/emitter/ensure'
 require 'to_source/emitter/case'
 require 'to_source/emitter/when'
+require 'to_source/emitter/splat'
+require 'to_source/emitter/push_args'
 require 'to_source/emitter/splat_when'
+require 'to_source/emitter/collect_splat'
 require 'to_source/emitter/unless'
+require 'to_source/emitter/flip'
 require 'to_source/emitter/class'
 require 'to_source/emitter/module'
 require 'to_source/emitter/op_assign2'
@@ -58,10 +71,11 @@ require 'to_source/emitter/default_arguments'
 require 'to_source/emitter/multiple_assignment'
 require 'to_source/emitter/concat_arguments'
 require 'to_source/emitter/super'
+require 'to_source/emitter/match'
+require 'to_source/emitter/match2'
 require 'to_source/emitter/match3'
 require 'to_source/emitter/yield'
 require 'to_source/emitter/alias'
-require 'to_source/emitter/splat'
 require 'to_source/emitter/begin'
 require 'to_source/emitter/util'
 

data/lib/to_source/emitter.rb

@@ -16,7 +16,11 @@ module ToSource
     # @api private
     #
     def self.build(node, buffer = [])
-      REGISTRY.fetch(node.class).new(node, buffer)
+      klass = node.class
+      emitter = REGISTRY.fetch(klass) do
+        raise RuntimeError, "No emmitter for: #{klass} at line: #{node.line}"
+      end
+      emitter.new(node, buffer)
     end
 
     # Run emitter for node

data/lib/to_source/emitter/alias.rb

@@ -1,5 +1,28 @@
 module ToSource
   class Emitter
+    class VAlias < self
+
+      handle(Rubinius::AST::VAlias)
+
+    private
+
+      delegate(:to, :from)
+
+      # Perform dispatch
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def dispatch
+        emit('alias ')
+        emit(to)
+        space
+        emit(from)
+      end
+
+    end
+
     # Emiter for alias node
     class Alias < self
 

data/lib/to_source/emitter/assignment.rb

@@ -2,10 +2,23 @@ module ToSource
   class Emitter
     # Base class for various assignment nodes
     class Assignment < self
+      include AbstractType
 
     private
 
-      delegate :value
+      predicate(:value)
+
+      # Return value to assign
+      #
+      # @return [Rubinius::AST::Node]
+      #   if present
+      #
+      # @return [nil]
+      #   otherwise
+      #
+      # @api private
+      #
+      abstract_method :value
 
       # Perform dispatch
       #
@@ -15,105 +28,31 @@ module ToSource
       #
       def dispatch
         emit_target
-        val = value
-
-        if val
-          emit(' = ')
-          visit(val)
-        end
-      end
-
-      # Emitter for constant assignments
-      class Constant < self
-
-        handle(Rubinius::AST::ConstantAssignment)
-
-      private
-
-        # Emit name
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def emit_target
-          visit(node.constant)
+        if value?
+          emit_operator
+          emit_value
         end
-
       end
 
-      # Emitter for various variabe assignments
-      class Variable < self
-
-        handle(Rubinius::AST::LocalVariableAssignment)
-        handle(Rubinius::AST::InstanceVariableAssignment)
-        handle(Rubinius::AST::GlobalVariableAssignment)
-        handle(Rubinius::AST::ClassVariableAssignment)
-
-      private
-
-        # Emit target
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def emit_target
-          emit(node.name)
-        end
-
-      end
-    end
-
-    # Base class for assignment operators
-    class AssignmentOperator < self
-
-    private
-
-      delegate(:left, :right)
-
-      # Perform dispatch
+      # Emit value
       #
       # @return [undefined]
       #
       # @api private
       #
-      def dispatch
-        parantheses do
-          visit(left)
-          emit(" #{self.class::SYMBOL} ")
-          emit_right
-        end
+      def emit_value
+        visit(value)
       end
 
-      # Emit right
+      # Emit operator
       #
       # @return [undefined]
       #
       # @api private
       #
-      def emit_right
-        parantheses do
-          visit(right.value)
-        end
+      def emit_operator
+        emit(' = ')
       end
-
-      # Emitter for or assigmnent operator
-      class Or < self
-
-        handle(Rubinius::AST::OpAssignOr19)
-        SYMBOL = :'||='
-
-      end
-
-      # Emitter for and assigmnent operator
-      class And < self
-
-        handle(Rubinius::AST::OpAssignAnd)
-        SYMBOL = :'&&='
-
-      end
-
     end
   end
 end

data/lib/to_source/emitter/assignment/attribute.rb

@@ -0,0 +1,52 @@
+module ToSource
+  class Emitter
+    class Assignment
+      # Emitter for attribute assignments
+      class Attribute < self
+
+        handle(Rubinius::AST::AttributeAssignment)
+
+      private
+
+        delegate(:receiver)
+
+        # Return name
+        #
+        # @return [Symbol]
+        #
+        # @api private
+        #
+        def name
+          node.name.to_s.gsub(/=\z/,'').to_sym
+        end
+
+        # Emit target
+        #
+        # @return [self]
+        #
+        # @api private
+        #
+        def emit_target
+          visit(receiver)
+          emit('.')
+          emit(name)
+        end
+
+        # Return value
+        #
+        # @return [Rubinius::AST::Node]
+        #   if value is present
+        #
+        # @return [nil]
+        #   otherwise
+        #
+        # @api private
+        #
+        def value
+          node.arguments.array.first
+        end
+
+      end
+    end
+  end
+end

data/lib/to_source/emitter/assignment/constant.rb

@@ -0,0 +1,26 @@
+module ToSource
+  class Emitter
+    class Assignment
+      # Emitter for constant assignments
+      class Constant < self
+
+        handle(Rubinius::AST::ConstantAssignment)
+
+      private
+
+        delegate(:value)
+
+        # Emit name
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_target
+          visit(node.constant)
+        end
+
+      end
+    end
+  end
+end

data/lib/to_source/emitter/assignment/element.rb

@@ -0,0 +1,124 @@
+module ToSource
+  class Emitter
+    class Assignment
+
+      class ElementDispatcher < Emitter
+
+        handle(Rubinius::AST::ElementAssignment)
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          case node.arguments
+          when Rubinius::AST::ActualArguments
+            run(Element::Argument)
+          when Rubinius::AST::PushActualArguments
+            run(Element::Push)
+          end
+        end
+
+      end
+
+      # Emitter for element assignments
+      class Element < self
+
+      private
+
+        delegate(:receiver, :arguments)
+
+        # Emit target
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_target
+          visit(receiver)
+          emit('[')
+          emit_index
+          emit(']')
+        end
+
+        class Argument < self
+
+        private
+
+          # Return arguments array
+          #
+          # @return [Array]
+          #
+          # @api private
+          #
+          def array
+            arguments.array
+          end
+
+          # Emit index
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def emit_index
+            splat = arguments.splat
+            if splat
+              visit(splat)
+            else
+              visit(array[0])
+            end
+          end
+
+          # Return value
+          #
+          # @return [Rubinius::AST::Node]
+          #   if value is present
+          #
+          # @return [nil]
+          #   otherwise
+          #
+          def value
+            array[1]
+          end
+
+        end
+
+        class Push < self
+
+          # Emit index
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def emit_index
+            # FIXME: Add reader
+            visit(arguments.instance_variable_get(:@arguments))
+          end
+
+          # Return value
+          #
+          # @return [Rubinius::AST::Node]
+          #   if value is present
+          #
+          # @return [nil]
+          #   otherwise
+          #
+          # @api private
+          #
+          def value
+            # FIXME: Add reader
+            arguments.instance_variable_get(:@value)
+          end
+
+        end
+
+      end
+    end
+  end
+end