live_ast_ruby_parser 0.5.2 → 0.6.0

data/CHANGES.rdoc

@@ -1,6 +1,12 @@
 
 = live_ast_ruby_parser ChangeLog
 
+== Version 0.6.0
+
+* added new testing API methods
+* fixed a recursion issue
+* optimized
+
 == Version 0.5.2
 
 * doc fixes

data/MANIFEST

@@ -1,8 +1,10 @@
 CHANGES.rdoc
 MANIFEST
+MANIFEST
 README.rdoc
 Rakefile
 devel/jumpstart.rb
 lib/live_ast_ruby_parser.rb
-lib/live_ast_ruby_parser/test_forms.rb
-lib/live_ast_ruby_parser/unparser.rb
+lib/live_ast_ruby_parser/test.rb
+lib/live_ast_ruby_parser/unparser.rb
+lib/live_ast_ruby_parser/version.rb

data/Rakefile

@@ -1,18 +1,21 @@
 require_relative 'devel/jumpstart'
 
 Jumpstart.new "live_ast_ruby_parser" do |s|
+  s.camel_name = "LiveASTRubyParser"
   s.developers << ["James M. Lawrence", "quixoticsycophant@gmail.com"]
   s.github_user = "quix"
-  s.version = "0.5.2"
   s.description = s.summary
-
-  # my code compensates for a ruby_parser bug; make this equal for now
-  s.dependencies << ["ruby_parser", "= 2.0.6"]
-
-  s.dependencies << ["ruby2ruby"]
+  s.dependencies = [
+    #
+    # my code compensates for a ruby_parser bug; make this equal for now
+    #
+    ["ruby_parser", "= 2.0.6"],
+    ["ruby2ruby", ">= 0"],
+  ]
 end
 
-# testing done inside live_ast
 task :test do
+  puts "Testing is done with the LiveAST test suite."
 end
 
+task :default => :test

data/lib/live_ast_ruby_parser.rb

@@ -1,18 +1,14 @@
 require 'ruby_parser'
-require 'sexp_processor'
 require 'live_ast/base'
 
-class LiveASTRubyParser < SexpProcessor
-  #
-  # Whether this is Ryan Davis' unified sexp format.
-  #
-  def self.unified?
-    true
-  end
+class LiveASTRubyParser
+  VERSION = "0.6.0"
 
   #
-  # Returns a line --> sexp hash where sexp corresponds to the
-  # method or block defined at the given line.
+  # Returns a line-to-sexp hash where sexp corresponds to the method
+  # or block defined at the given line.
+  #
+  # This method is the only requirement of a LiveAST parser plugin.
   #
   def parse(source)
     @defs = {}
@@ -20,36 +16,23 @@ class LiveASTRubyParser < SexpProcessor
     @defs
   end
 
-  def process_defn(sexp)
-    result = Sexp.new
-    result << sexp.shift
-    result << sexp.shift
-    result << process(sexp.shift)
-    result << process(sexp.shift)
-
-    store_sexp(result, sexp.line)
-    s()
-  end
-
-  def process_iter(sexp)
-    line = sexp[1].line
-
-    result = Sexp.new
-    result << sexp.shift
-    result << process(sexp.shift)
-    result << process(sexp.shift)
-    result << process(sexp.shift)
-
-    #
-    # ruby_parser bug: a method without args attached to a
-    # multi-line block reports the wrong line. workaround.
-    #
-    if result[1][3].size == 1
-      line = sexp.line
+  def process(sexp)
+    case sexp.first
+    when :defn
+      store_sexp(sexp, sexp.line)
+    when :iter
+      #
+      # ruby_parser bug: a method without args attached to a
+      # multi-line block reports the wrong line. workaround.
+      #
+      # http://rubyforge.org/tracker/index.php?func=detail&aid=28940&group_id=439&atid=1778
+      #
+      store_sexp(sexp, sexp[1][3].size == 1 ? sexp.line : sexp[1].line)
     end
 
-    store_sexp(result, line)
-    s()
+    sexp.each do |elem|
+      process(elem) if elem.is_a? Sexp
+    end
   end
 
   def store_sexp(sexp, line)
@@ -57,7 +40,7 @@ class LiveASTRubyParser < SexpProcessor
   end
 end
 
-LiveASTRubyParser.autoload :Unparser,  'live_ast_ruby_parser/unparser'
-LiveASTRubyParser.autoload :TestForms, 'live_ast_ruby_parser/test_forms'
+LiveASTRubyParser.autoload :Unparser, 'live_ast_ruby_parser/unparser'
+LiveASTRubyParser.autoload :Test, 'live_ast_ruby_parser/test'
 
 LiveAST.parser = LiveASTRubyParser

data/lib/live_ast_ruby_parser/{test_forms.rb → test.rb}

@@ -1,6 +1,24 @@
 
-# For testing with LiveAST.
-module LiveASTRubyParser::TestForms
+#
+# Used by the LiveAST test suite.
+#
+module LiveASTRubyParser::Test
+  class << self
+    #
+    # Whether this is Ryan Davis's unified sexp format.
+    #
+    def unified_sexp?
+      true
+    end
+
+    #
+    # Whether the unparser output matches that of ruby2ruby.
+    #
+    def unparser_matches_ruby2ruby?
+      true
+    end
+  end
+
   #
   # no_arg_def(:f, "A#f") returns the ast of
   #
@@ -115,4 +133,42 @@ module LiveASTRubyParser::TestForms
       s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))),
       s(:call, s(:lvar, :x), op, s(:arglist, s(:lvar, :y))))
   end
+
+  #
+  # nested_lambdas("foo") returns the ast of
+  #
+  #   lambda {
+  #     lambda {
+  #       "foo"
+  #     }
+  #   }
+  #  
+  def nested_lambdas(str)
+    s(:iter,
+      s(:call, nil, :lambda, s(:arglist)),
+      nil,
+      s(:iter, s(:call, nil, :lambda, s(:arglist)), nil, s(:str, str)))
+  end
+
+  # nested_defs(:f, :g, "foo") returns the ast of
+  #
+  #   def f
+  #     Class.new do
+  #       def g
+  #         "foo"
+  #       end
+  #     end
+  #   end
+  #   
+  def nested_defs(u, v, str)
+    s(:defn,
+      u,
+      s(:args),
+      s(:scope,
+        s(:block,
+          s(:iter,
+            s(:call, s(:const, :Class), :new, s(:arglist)),
+            nil,
+            s(:defn, v, s(:args), s(:scope, s(:block, s(:str, str))))))))
+  end
 end

data/lib/live_ast_ruby_parser/unparser.rb

@@ -4,15 +4,10 @@ require 'ruby2ruby'
 # Used by +to_ruby+ in LiveAST.
 #
 module LiveASTRubyParser::Unparser
-  class << self
-    # Whether the unparsed code matches ruby2ruby output.
-    def ruby2ruby?
-      true
-    end
-    
-    # Return a ruby source string which reflects the given AST.
-    def unparse(sexp)
-      Ruby2Ruby.new.process(sexp)
-    end
+  #
+  # Return a ruby source string which reflects the given AST.
+  #
+  def self.unparse(sexp)
+    Ruby2Ruby.new.process(sexp)
   end
 end

data/lib/live_ast_ruby_parser/version.rb

@@ -0,0 +1,3 @@
+class LiveASTRubyParser
+  VERSION = "0.6.0"
+end

metadata

@@ -2,7 +2,7 @@
 name: live_ast_ruby_parser
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -05:00
+date: 2011-02-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,13 +46,14 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - CHANGES.rdoc
+- MANIFEST
 - README.rdoc
 - Rakefile
 - devel/jumpstart.rb
 - lib/live_ast_ruby_parser.rb
-- lib/live_ast_ruby_parser/test_forms.rb
+- lib/live_ast_ruby_parser/test.rb
 - lib/live_ast_ruby_parser/unparser.rb
-- MANIFEST
+- lib/live_ast_ruby_parser/version.rb
 has_rdoc: true
 homepage: http://quix.github.com/live_ast_ruby_parser
 licenses: []