ParseTree 1.3.5 → 1.3.6

data/History.txt

@@ -1,3 +1,13 @@
+*** 1.3.6 / 2005-05-19
+
++ 2 minor enhancements:
+	+ Improved debugging capability when $DEBUG.
+	+ Allowed for selective debugging output by node type.
++ 3 bug fixes:
+	+ Minor fixes to Makefile and parse_tree_show.
+	+ Improved error messages in parse_tree when newlines are included.
+	+ Improved method coverage for parse_tree.
+
 *** 1.3.5 / 2005-04-19
 
 + 2 minor enhancement

data/Makefile

@@ -1,11 +1,11 @@
 RUBY?=ruby
 RUBY_DEBUG?=
-RUBY_FLAGS?=-w -Ilib -Ibin
+RUBY_FLAGS?=-w -Ilib:bin:../../RubyInline/dev
 RUBY_LIB?=$(shell $(RUBY) -rrbconfig -e 'include Config; print CONFIG["sitelibdir"]')
 PREFIX?=/usr/local
 
 all test: FORCE
-	GEM_SKIP=ParseTree $(RUBY) $(RUBY_DEBUG) $(RUBY_FLAGS) test/test_all.rb
+	GEM_SKIP=RubyInline:ParseTree $(RUBY) $(RUBY_DEBUG) $(RUBY_FLAGS) test/test_all.rb
 
 # we only install test_sexp_processor.rb to help make ruby_to_c's
 # subclass tests work.
@@ -33,7 +33,7 @@ clean:
 	-rm -fr diff diff.txt *.gem doc $$HOME/.ruby_inline
 
 demo:
-	echo 1+1 | GEM_SKIP=ParseTree $(RUBY) $(RUBY_FLAGS) ./bin/parse_tree_show -f
+	echo 1+1 | GEM_SKIP=RubyInline:ParseTree $(RUBY) $(RUBY_FLAGS) ./bin/parse_tree_show -f
 
 gem:
 	gem ParseTree.gemspec

data/bin/parse_tree_show

@@ -22,8 +22,9 @@ def discover_new_classes_from
     new_classes << klass
   end
 
-  new_classes - old_classes
+  new_classes -= old_classes
   new_classes = [ eval($c) ] if defined? $c
+  new_classes
 end
 
 $f = false unless defined? $f

data/lib/parse_tree.rb

@@ -28,13 +28,16 @@ end
 
 class ParseTree
 
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 
   ##
   # Initializes a ParseTree instance. Includes newline nodes if
   # +include_newlines+ which defaults to +$DEBUG+.
 
   def initialize(include_newlines=$DEBUG)
+    if include_newlines then
+      warn "WARNING: include_newlines=true from #{caller[0..9].join(', ')}"
+    end
     @include_newlines = include_newlines
   end
 
@@ -56,7 +59,7 @@ class ParseTree
     klasses.each do |klass|
       # TODO: remove this on v 1.1
       raise "You should call parse_tree_for_method(#{klasses.first}, #{klass}) instead of parse_tree" if Symbol === klass or String === klass
-      klassname = klass.name || '' # HACK klass.name should never be nil
+      klassname = klass.name rescue '' # HACK klass.name should never be nil
                                    # Tempfile's DelegateClass(File) seems to
                                    # cause this
       klassname = "UnnamedClass_#{klass.object_id}" if klassname.empty?
@@ -70,7 +73,12 @@ class ParseTree
                [:module, klassname]
              end
 
-      klass.instance_methods(false).sort.each do |m|
+      method_names = []
+      method_names += klass.instance_methods false
+      method_names += klass.private_instance_methods false
+      # protected methods are included in instance_methods, go figure!
+
+      method_names.sort.each do |m|
         $stderr.puts "parse_tree_for_method(#{klass}, #{m}):" if $DEBUG
         code << parse_tree_for_method(klass, m.to_sym)
       end

data/lib/sexp_processor.rb

@@ -335,16 +335,18 @@ class SexpProcessor
   def process(exp)
     return nil if exp.nil?
 
-    exp_orig = exp.deep_clone if $DEBUG or @exceptions.has_key?(exp.first)
     result = self.expected.new
 
     type = exp.first
 
-    if @debug.include? type then
+    if @debug.has_key? type then
       str = exp.inspect
       puts "// DEBUG: #{str}" if str =~ @debug[type]
     end
 
+    exp_orig = exp.deep_clone if $DEBUG or
+      @debug.has_key? type or @exceptions.has_key?(type)
+
     if Sexp === exp then
       if @sexp_accessors.include? type then
         exp.accessors = @sexp_accessors[type]
@@ -441,14 +443,15 @@ class SexpProcessor
   end
 
   def error_handler(type, exp=nil) # :nodoc:
-    if @exceptions.has_key? type then
-      begin
-        return yield
-      rescue Exception => err
+    begin
+      return yield
+    rescue Exception => err
+      if @exceptions.has_key? type then
         return @exceptions[type].call(self, exp, err)
+      else
+        puts "#{err.class} Exception thrown while processing #{type} for sexp #{exp.inspect} #{caller.inspect}" if $DEBUG
+        raise
       end
-    else
-      return yield
     end
   end
   private :error_handler

data/test/test_parse_tree.rb

@@ -4,8 +4,23 @@ require 'test/unit'
 require 'parse_tree'
 require 'test/something'
 
+class SomethingWithInitialize
+  def initialize; end # this method is private
+  protected
+  def protected_meth; end
+end
+
 class TestParseTree < Test::Unit::TestCase
 
+  def test_class_initialize
+    expected = [[:class, :SomethingWithInitialize, :Object,
+      [:defn, :initialize, [:scope, [:block, [:args], [:nil]]]],
+      [:defn, :protected_meth, [:scope, [:block, [:args], [:nil]]]],
+    ]]
+    tree = @thing.parse_tree SomethingWithInitialize
+    assert_equal expected, tree
+  end
+
   # TODO: need a test of interpolated strings
 
   @@missing = [nil]

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: ParseTree
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
-date: 2005-04-19
+  version: 1.3.6
+date: 2005-05-19
 summary: Extract and enumerate ruby parse trees.
 require_paths: 
   - lib