ParseTree 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,25 @@
+=== 2.0.1 / 2007-08-21
+
+* 1 major enhancement:
+
+  * Rewrote parse_tree_show to use parse_tree_for_string.
+    * parse_tree_show adds -n=node filtering -u unifying, and -s structure-only.
+    * parse_tree_show no longer needs -f
+
+* 4 minor enhancements:
+
+  * Added context stack to SexpProcessor! YAY!!!
+  * Enforce type to be symbol in SexpProcessor... just makes life easier.
+  * Processing style change mode to UnifiedRuby. Prefer no rescues.
+  * Sexp#structure is no longer destructive.
+
+* 4 bug fixes:
+
+  * Added 1.8.4 compatibility fix.
+  * Added args lifting in :defs in UnifiedRuby.
+  * Fixed unifying argscat, splat, and a couple other oddities.
+  * Added process_call to UnifiedRuby *sigh* I'm a tard.
+
 === 2.0.0 / 2007-08-01
 
 * 2 major enhancements:

data/bin/parse_tree_show

@@ -3,47 +3,41 @@
 require 'pp'
 begin require 'rubygems' rescue LoadError end
 require 'parse_tree'
+require 'sexp'
 
-def discover_new_classes_from
-  old_classes = []
-  ObjectSpace.each_object(Module) do |klass|
-    old_classes << klass
-  end
+$u ||= false
+$n ||= false
+$s ||= false
+$n = $n.intern if $n
 
-  yield
+ARGV.push "-" if ARGV.empty?
 
-  new_classes = []
-  ObjectSpace.each_object(Module) do |klass|
-    new_classes << klass
-  end
+if $u then
+  require 'sexp_processor'
+  require 'unified_ruby'
 
-  new_classes -= old_classes
-  new_classes = [ eval($c) ] if defined? $c
-  new_classes
-end
-
-$f = false unless defined? $f
-
-new_classes = discover_new_classes_from do
-  ARGV.unshift "-" if ARGV.empty?
-  ARGV.each do |name|
-    if name == "-" then
-      code = $stdin.read
-      code = "class Example; def example; #{code}; end; end" if $f
-      eval code unless code.nil?
-    else
-      require name
-    end
+  class Unifier < SexpProcessor
+    include UnifiedRuby
   end
 end
 
-result = ParseTree.new.parse_tree(*new_classes)
+parse_tree = ParseTree.new
+unifier = Unifier.new if $u
 
-result = result[0][3][2][1][2..-1] if $f
+ARGV.each do |file|
+  ruby = file == "-" ? $stdin.read : File.read(file)
 
-unless defined? $q then
-  pp result
-else
-  p result
-end
+  sexp = Sexp.from_array parse_tree.parse_tree_for_string(ruby, file).first
+  sexp = unifier.process(sexp) if $u
+  sexp = sexp.structure if $s
 
+  if $n then
+    sexp.each_of_type $n do |node|
+      p node
+    end
+  elsif defined? $q then
+    p sexp
+  else
+    pp sexp
+  end
+end

data/lib/parse_tree.rb

@@ -41,7 +41,7 @@ end
 
 class ParseTree
 
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   ##
   # Front end translation method.
@@ -811,6 +811,9 @@ again_no_block:
         // nothing to do in this case, handled above
       } else if (arg_count == -2) {
         // nothing to do in this case, no name == no use
+#if RUBY_VERSION_CODE < 185
+        rb_ary_push(current, rb_str_intern(rb_str_new2("*")));
+#endif
       } else {
         rb_raise(rb_eArgError,
                  "not a clue what this arg value is: %ld", arg_count);

data/lib/sexp.rb

@@ -199,7 +199,7 @@ class Sexp < Array # ZenTest FULL
     if Array === self.first then
       result = self.first.structure
     else
-      result << self.shift
+      result << self.first
       self.grep(Array).each do |subexp|
         result << subexp.structure
       end

data/lib/sexp_processor.rb

@@ -74,17 +74,6 @@ class SexpTypeError < SexpProcessorError; end
 
 class SexpProcessor
 
-  ##
-  # A default method to call if a process_<type> method is not found
-  # for the Sexp type.
-
-  attr_accessor :default_method
-
-  ##
-  # Emit a warning when the method in #default_method is called.
-
-  attr_accessor :warn_on_default
-
   ##
   # Automatically shifts off the Sexp type before handing the
   # Sexp to process_<type>
@@ -92,16 +81,9 @@ class SexpProcessor
   attr_accessor :auto_shift_type
 
   ##
-  # An array that specifies node types that are unsupported by this
-  # processor. SexpProcessor will raise UnsupportedNodeError if you try
-  # to process one of those node types.
+  # Return a stack of contexts. Most recent node is first.
 
-  attr_accessor :unsupported
-
-  ##
-  # Raise an exception if no process_<type> method is found for a Sexp.
-
-  attr_accessor :strict
+  attr_reader :context
 
   ##
   # A Hash of Sexp types and Regexp.
@@ -111,6 +93,12 @@ class SexpProcessor
 
   attr_accessor :debug
 
+  ##
+  # A default method to call if a process_<type> method is not found
+  # for the Sexp type.
+
+  attr_accessor :default_method
+
   ##
   # Expected result class
 
@@ -121,6 +109,23 @@ class SexpProcessor
 
   attr_accessor :require_empty
 
+  ##
+  # Raise an exception if no process_<type> method is found for a Sexp.
+
+  attr_accessor :strict
+
+  ##
+  # An array that specifies node types that are unsupported by this
+  # processor. SexpProcessor will raise UnsupportedNodeError if you try
+  # to process one of those node types.
+
+  attr_accessor :unsupported
+
+  ##
+  # Emit a warning when the method in #default_method is called.
+
+  attr_accessor :warn_on_default
+
   ##
   # Creates a new SexpProcessor.  Use super to invoke this
   # initializer from SexpProcessor subclasses, then use the
@@ -144,6 +149,7 @@ class SexpProcessor
     # different processors.
     @processors = {}
     @rewriters  = {}
+    @context = []
 
     public_methods.each do |name|
       case name
@@ -198,6 +204,10 @@ class SexpProcessor
     result = self.expected.new
 
     type = exp.first
+    raise "type should be a Symbol, not: #{exp.first.inspect}" unless
+      Symbol === type
+
+    @context.unshift type
 
     if @debug.has_key? type then
       str = exp.inspect
@@ -268,6 +278,7 @@ class SexpProcessor
 
     @process_level -= 1
 
+    @context.shift
     result
   end
 

data/lib/unified_ruby.rb

@@ -1,5 +1,13 @@
 
+$TESTING ||= false
+
 module UnifiedRuby
+  def rewrite_argscat(exp)
+    raise "unknown type #{exp.inspect}" unless exp[1][0] == :array
+    exp[1][0] = :arglist
+    exp
+  end
+
   def rewrite_bmethod(exp)
     exp[0] = :scope
 
@@ -25,6 +33,28 @@ module UnifiedRuby
     exp
   end
 
+  def rewrite_call(exp)
+    args = exp.last
+    case args
+    when nil
+      exp.pop
+    when Array
+      case args.first
+      when :array, :arglist then
+        args[0] = :arglist
+      when :argscat, :splat then
+        # do nothing
+      else
+        raise "unknown type in call #{args.first.inspect}"
+      end
+      return exp
+    end
+
+    exp << s(:arglist)
+
+    exp
+  end
+
   ##
   # :defn is one of the most complex of all the ASTs in ruby. We do
   # one of 3 different translations:
@@ -74,6 +104,14 @@ module UnifiedRuby
     exp
   end
 
+  def rewrite_defs(exp)
+    # move args up
+    args = exp.scope.block.args(true) rescue nil
+    exp.insert 3, args if args
+
+    exp
+  end
+
   def rewrite_dmethod(exp)
     exp.shift # type
     exp.shift # dmethod name
@@ -89,16 +127,7 @@ module UnifiedRuby
     exp.insert 1, nil
     exp.push nil if exp.size <= 3
 
-    args = exp[-1]
-    if Array === args and args.first == :array then
-      args[0] = :arglist
-    elsif args.nil? then
-      exp[-1] = s(:arglist)
-    else
-      exp[-1] = s(:arglist, args) unless args.nil?
-    end
-
-    exp
+    rewrite_call(exp)
   end
 
   def rewrite_resbody(exp) # TODO: clean up and move to unified
@@ -108,8 +137,8 @@ module UnifiedRuby
     while exp and exp.first == :resbody do
       code << exp.shift
       list = exp.shift || s(:array)
-      body = exp.shift rescue nil
-      exp  = exp.shift rescue nil
+      body = exp.empty? ? nil : exp.shift
+      exp  = exp.empty? ? nil : exp.shift
 
       # code may be nil, :lasgn, or :block
       case body.first
@@ -133,9 +162,15 @@ module UnifiedRuby
       end
     end
 
-    raise unless result.first == :resbody
-    raise unless Sexp === result[1] and result[1].first == :array
-    raise unless result[2].nil? or (Sexp === result[2] and ! result[2].empty?)
+    if $DEBUG or $TESTING then
+      structure = result.structure
+      raise "result structure wrong: #{structure[0..1].inspect}" unless
+        structure.flatten[0] == :resbody
+      raise "result structure wrong: #{structure[0..1].inspect}" unless
+        s(:array, :splat, :argscat).include? structure.flatten[1]
+      raise "result body wrong: #{structure[2].inspect}" unless
+        structure[2].nil? or not structure[2].empty?
+    end
 
     result
   end

data/test/test_composite_sexp_processor.rb

@@ -16,6 +16,7 @@ class FakeProcessor1 < SexpProcessor # ZenTest SKIP
 
   def default_processor(exp)
     result = []
+    result << exp.shift
     until exp.empty? do
       result << exp.shift.to_s + " woot"
     end
@@ -36,18 +37,18 @@ class TestCompositeSexpProcessor < Test::Unit::TestCase
   end
 
   def test_process_fake1
-    data = [1, 2, 3]
+    data = [:x, 1, 2, 3]
     @p << FakeProcessor1.new
     result = @p.process(data.dup)
-    assert_equal(data.map {|x| "#{x} woot"}, result)
+    assert_equal [:x, "1 woot", "2 woot", "3 woot"], result
   end
 
   def test_process_fake1_twice
-    data = [1, 2, 3]
+    data = [:x, 1, 2, 3]
     @p << FakeProcessor1.new
     @p << FakeProcessor1.new
     result = @p.process(data.dup)
-    assert_equal(data.map {|x| "#{x} woot woot"}, result)
+    assert_equal [:x, "1 woot woot", "2 woot woot", "3 woot woot"], result
   end
 
   def test_processors

data/test/test_sexp.rb

@@ -263,9 +263,11 @@ class TestSexp < SexpTestCase # ZenTest FULL
 
   def test_structure
     @sexp    = s(:a, 1, 2, s(:b, 3, 4), 5, 6)
+    backup = @sexp.deep_clone
     expected = s(:a, s(:b))
 
     assert_equal(expected, @sexp.structure)
+    assert_equal(backup, @sexp)
   end
 
   def test_sub

data/test/test_unified_ruby.rb

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/local/bin/ruby -w
 
 $TESTING = true
 
@@ -31,6 +31,38 @@ class TestUnifiedRuby < Test::Unit::TestCase
     assert_equal @expect, @sp.process(@insert)
   end
 
+  def test_argscat
+    @insert = s(:argscat,
+                s(:array, s(:lvar, :container), s(:lvar, :point)),
+                s(:lvar, :args))
+    @expect = s(:argscat,
+                s(:arglist, s(:lvar, :container), s(:lvar, :point)),
+                s(:lvar, :args))
+
+    doit
+  end
+
+  def test_call_args
+    @insert = s(:call, s(:lit, 42), :y, s(:array, s(:lit, 24)))
+    @expect = s(:call, s(:lit, 42), :y, s(:arglist, s(:lit, 24)))
+
+    doit
+  end
+
+  def test_call_array_args
+    @insert = s(:call, s(:lit, 42), :y, s(:array))
+    @expect = s(:call, s(:lit, 42), :y, s(:arglist))
+
+    doit
+  end
+
+  def test_call_no_args
+    @insert = s(:call, s(:lit, 42), :y)
+    @expect = s(:call, s(:lit, 42), :y, s(:arglist))
+
+    doit
+  end
+
   def test_rewrite_bmethod
     @insert = s(:bmethod,
                 s(:dasgn_curr, :x),
@@ -38,7 +70,7 @@ class TestUnifiedRuby < Test::Unit::TestCase
     @expect = s(:scope,
                 s(:block,
                   s(:args, :x),
-                  s(:call, s(:lvar, :x), :+, s(:array, s(:lit, 1)))))
+                  s(:call, s(:lvar, :x), :+, s(:arglist, s(:lit, 1)))))
 
     doit
   end
@@ -51,7 +83,7 @@ class TestUnifiedRuby < Test::Unit::TestCase
                 s(:block,
                   s(:args),
                   s(:call, s(:call, nil, :x, s(:arglist)),
-                    :+, s(:array, s(:lit, 1)))))
+                    :+, s(:arglist, s(:lit, 1)))))
 
     doit
   end
@@ -98,7 +130,36 @@ class TestUnifiedRuby < Test::Unit::TestCase
                     s(:block_pass,
                       s(:lvar, :block),
                       s(:call, nil, :other,
-                        s(:arglist, s(:splat, s(:lvar, :args))))))))
+                        s(:splat, s(:lvar, :args)))))))
+
+    doit
+  end
+
+  def test_rewrite_defn_bmethod_alias
+    @insert = s(:defn, :group,
+                s(:fbody,
+                  s(:bmethod,
+                    s(:masgn, s(:dasgn_curr, :params)),
+                    s(:block,
+                      s(:lit, 42)))))
+    @expect = s(:defn, :group,
+                s(:args, :"*params"),
+                s(:scope,
+                  s(:block, s(:lit, 42))))
+
+    doit
+  end
+
+  def test_rewrite_defn_ivar
+    @insert = s(:defn, :reader, s(:ivar, :@reader))
+    @expect = s(:defn, :reader, s(:args), s(:ivar, :@reader))
+
+    doit
+  end
+
+  def test_rewrite_defs
+    @insert = s(:defs, s(:self), :meth, s(:scope, s(:block, s(:args), s(:true))))
+    @expect = s(:defs, s(:self), :meth, s(:args), s(:scope, s(:block, s(:true))))
 
     doit
   end
@@ -127,23 +188,28 @@ class TestUnifiedRuby < Test::Unit::TestCase
     @expect = s(:scope,
                 s(:block,
                   s(:args, :x),
-                  s(:call, s(:lvar, :x), :+, s(:array, s(:lit, 1)))))
+                  s(:call, s(:lvar, :x), :+, s(:arglist, s(:lit, 1)))))
 
     doit
   end
 
-  def test_rewrite_defn_bmethod_alias
-    @insert = s(:defn, :group,
-                s(:fbody,
-                  s(:bmethod,
-                    s(:masgn, s(:dasgn_curr, :params)),
-                    s(:block,
-                      s(:lit, 42)))))
-    @expect = s(:defn, :group,
-                s(:args, :"*params"),
-                s(:scope,
-                  s(:block, s(:lit, 42))))
+  def test_rewrite_fcall
+    @insert = s(:fcall,     :puts, s(:array, s(:lit, :blah)))
+    @expect = s(:call, nil, :puts, s(:arglist, s(:lit, :blah)))
+
+    doit
+  end
+
+  def test_rewrite_fcall_loop
+    @insert = s(:iter, s(:fcall, :loop), nil)
+    @expect = s(:iter, s(:call, nil, :loop, s(:arglist)), nil)
+
+    doit
+  end
 
+  def test_rewrite_fcall_splat
+    @insert = s(:fcall, :method, s(:splat, s(:vcall, :a)))
+    @expect = s(:call, nil, :method, s(:splat, s(:call, nil, :a, s(:arglist))))
     doit
   end
 
@@ -198,32 +264,10 @@ class TestUnifiedRuby < Test::Unit::TestCase
     doit
   end
 
-  def test_rewrite_defn_ivar
-    @insert = s(:defn, :reader, s(:ivar, :@reader))
-    @expect = s(:defn, :reader, s(:args), s(:ivar, :@reader))
-
-    doit
-  end
-
   def test_rewrite_vcall
     @insert = s(:vcall, :puts)
     @expect = s(:call, nil, :puts, s(:arglist))
 
     doit
   end
-
-  def test_rewrite_fcall
-    @insert = s(:fcall,     :puts, s(:array, s(:lit, :blah)))
-    @expect = s(:call, nil, :puts, s(:arglist, s(:lit, :blah)))
-
-    doit
-  end
-
-  def test_rewrite_fcall_loop
-    @insert = s(:iter, s(:fcall, :loop), nil)
-    @expect = s(:iter, s(:call, nil, :loop, s(:arglist)), nil)
-
-    doit
-  end
-
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ParseTree
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
-date: 2007-08-01 00:00:00 -07:00
+  version: 2.0.1
+date: 2007-08-21 00:00:00 -07:00
 summary: ParseTree is a C extension (using RubyInline) that extracts the parse tree for an entire class or a specific method and returns it as a s-expression (aka sexp) using ruby's arrays, strings, symbols, and integers.
 require_paths: 
 - lib
@@ -89,5 +89,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: