to_source 0.0.1 → 0.1.3

data/Readme.md

@@ -18,7 +18,14 @@ transform themselves into source code. It's the reverse of Rubinius' builtin
 
 to_source needs Rubinius 2.0 to run, in either 1.8 or 1.9 mode.
 
-Put this in your Gemfile:
+To install it as a gem:
+
+    $ gem install to_source
+
+And `require 'to_source'` from your code. Automatically, your AST nodes respond
+to the `#to_source` method.
+
+But if you're using Bundler, just put this in your Gemfile:
 
     gem 'to_source'
 

data/lib/to_source/core_ext/node.rb

@@ -9,8 +9,11 @@ module Rubinius
       #
       # Returns nothing.
       def lazy_visit(visitor, parent=nil, indent=false)
-        args = [self.node_name, self, parent]
-        args.push true if indent
+        name = node_name
+        name = "#{name}_def" if %w[ class module ].include?(name)
+
+        args = [name, self, parent]
+        args << true if indent
 
         visitor.__send__ *args
       end

data/lib/to_source/version.rb

@@ -1,3 +1,3 @@
 module ToSource
-  VERSION = "0.0.1"
+  VERSION = "0.1.3"
 end

data/lib/to_source/visitor.rb

@@ -17,6 +17,42 @@ module ToSource
       '  ' * @indentation
     end
 
+    def class_def(node, parent)
+      emit "class %s" % node.name.name
+
+      superclass = node.superclass
+      unless superclass.is_a?(Rubinius::AST::NilLiteral)
+        emit " < %s" % superclass.name
+      end
+
+      node.body.lazy_visit self, node, true
+
+      emit "\n"
+      emit "end"
+    end
+
+    def module_def(node, parent)
+      emit "module %s" % node.name.name
+
+      node.body.lazy_visit self, node, true
+
+      emit "\n"
+      emit "end"
+    end
+
+    def empty_body(*)
+      # do nothing
+    end
+
+    def class_scope(node, parent, indent)
+      emit "\n"
+      @indentation += 1 if indent
+      node.body.lazy_visit self, node, indent
+    ensure
+      @indentation -= 1 if indent
+    end
+    alias module_scope class_scope
+
     def local_variable_assignment(node, parent)
       emit "%s = " % node.name
       node.value.lazy_visit self, node
@@ -26,6 +62,15 @@ module ToSource
       emit node.name
     end
 
+    def instance_variable_assignment(node, parent)
+      emit "%s = " % node.name
+      node.value.lazy_visit self, node
+    end
+
+    def instance_variable_access(node, parent)
+      emit node.name
+    end
+
     def fixnum_literal(node, parent)
       emit node.value.to_s
     end
@@ -87,6 +132,12 @@ module ToSource
       node.finish.lazy_visit self, node
     end
 
+    def range_exclude(node, parent)
+      node.start.lazy_visit self, node
+      emit '...'
+      node.finish.lazy_visit self, node
+    end
+
     def regex_literal(node, parent)
       emit '/'
       emit node.source
@@ -207,6 +258,11 @@ module ToSource
       node.right.lazy_visit self, node
     end
 
+    def toplevel_constant(node, parent)
+      emit "::"
+      emit node.name
+    end
+
     def constant_access(node, parent)
       emit node.name
     end
@@ -217,6 +273,90 @@ module ToSource
       emit node.name
     end
 
+    def if(node, parent)
+      body, else_body = node.body, node.else
+      keyword = 'if'
+
+      if node.body.is_a?(Rubinius::AST::NilLiteral) && !node.else.is_a?(Rubinius::AST::NilLiteral)
+
+        body, else_body = else_body, body
+        keyword = 'unless'
+      end
+
+      emit keyword << ' '
+      node.condition.lazy_visit self, node
+      emit "\n"
+
+      @indentation += 1
+
+      if body.is_a?(Rubinius::AST::Block)
+        body.lazy_visit self, parent, true
+      else
+        emit current_indentation
+        body.lazy_visit self, parent
+      end
+
+      emit "\n"
+
+      if else_body.is_a?(Rubinius::AST::NilLiteral)
+        emit 'end'
+        return
+      end
+
+      emit "else\n"
+
+      if else_body.is_a?(Rubinius::AST::Block)
+        else_body.lazy_visit self, parent, true
+      else
+        emit current_indentation
+        else_body.lazy_visit self, parent
+      end
+
+      emit "\n"
+      emit 'end'
+    end
+
+    def while(node, parent)
+      emit 'while '
+      node.condition.lazy_visit self, node
+      emit "\n"
+
+      @indentation += 1
+
+      if node.body.is_a?(Rubinius::AST::Block)
+        node.body.lazy_visit self, parent, true
+      else
+        emit current_indentation
+        node.body.lazy_visit self, parent
+      end
+
+      emit "\n"
+      emit "end"
+    end
+
+    def until(node, parent)
+      emit 'until '
+      node.condition.lazy_visit self, node
+      emit "\n"
+
+      @indentation += 1
+
+      if node.body.is_a?(Rubinius::AST::Block)
+        node.body.lazy_visit self, parent, true
+      else
+        emit current_indentation
+        node.body.lazy_visit self, parent
+      end
+
+      emit "\n"
+      emit "end"
+    end
+
+    def return(node, parent)
+      emit 'return '
+      node.value.lazy_visit self, parent
+    end
+
     private
 
     def process_binary_operator(node, parent)

data/test/to_source/visitor_test.rb

@@ -15,14 +15,46 @@ module ToSource
       assert_equal expected, visit(code)
     end
 
+    def test_class
+      assert_source "class TestClass\nend"
+    end
+
+    def test_class_with_superclass
+      assert_source "class TestClass < Object\nend"
+    end
+
+    def test_class_with_body
+      assert_source "class TestClass\n  1\nend"
+    end
+
+    def test_module
+      assert_source "module TestModule\nend"
+    end
+
+    def test_module_with_body
+      assert_source "module TestModule\n  1\nend"
+    end
+
     def test_local_assignment
       assert_source "foo = 1"
     end
 
+    def test_ivar_assignment
+      assert_source "@foo = 1"
+    end
+
     def test_local_access
       assert_source "foo = 1\nfoo"
     end
 
+    def test_ivar_access
+      assert_source "@foo"
+    end
+
+    def test_toplevel_constant_access
+      assert_source "::Rubinius"
+    end
+
     def test_constant_access
       assert_source "Rubinius"
     end
@@ -71,6 +103,10 @@ module ToSource
       assert_source '20..34'
     end
 
+    def test_range_exclude
+      assert_source '20...34'
+    end
+
     def test_regex
       assert_source '/.*/'
     end
@@ -122,5 +158,45 @@ module ToSource
       assert_source "!1"
       assert_source "!!1"
     end
+
+    def test_if
+      assert_source "if 3\n  9\nend"
+    end
+
+    def test_if_with_multiple_blocks
+      assert_source "if 3\n  9\n  8\nend"
+    end
+
+    def test_else
+      assert_source "if 3\n  9\nelse\n  9\nend"
+    end
+
+    def test_else_with_multiple_blocks
+      assert_source "if 3\n  9\n  8\nelse\n  9\n  8\nend"
+    end
+
+    def test_unless
+      assert_source "unless 3\n  9\nend"
+    end
+
+    def test_while
+      assert_source "while false\n  3\nend"
+    end
+
+    def test_while_with_multiple_blocks
+      assert_source "while false\n  3\n  5\nend"
+    end
+
+    def test_until
+      assert_source "until false\n  3\nend"
+    end
+
+    def test_until_with_multiple_blocks
+      assert_source "while false\n  3\n  5\nend"
+    end
+
+    def test_return
+      assert_source "return 9"
+    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: to_source
 version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  version: 0.0.1
 platform: ruby
 authors:
 - Josep M. Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies: []
 description: Transform your Rubinius AST nodes back to source code. Reverse parsing!
 email:
@@ -37,17 +37,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12