ParseTree 1.3.4 → 1.3.5

data/History.txt

@@ -1,3 +1,11 @@
+*** 1.3.5 / 2005-04-19
+
++ 2 minor enhancement
+	+ Added dynamic exception handling on a per node-type basis (BIG).
+	+ Added -c=classname to parse_tree_show to help w/ core classes.
++ 1 bug fix
+	+ Fixed dependency specification error in gemspec.
+
 *** 1.3.4 / 2005-02-09
 
 + 2 bug fixes

data/Manifest.txt

@@ -14,3 +14,4 @@ test/test_all.rb
 test/test_composite_sexp_processor.rb
 test/test_parse_tree.rb
 test/test_sexp_processor.rb
+validate.sh

data/bin/parse_tree_show

@@ -23,6 +23,7 @@ def discover_new_classes_from
   end
 
   new_classes - old_classes
+  new_classes = [ eval($c) ] if defined? $c
 end
 
 $f = false unless defined? $f

data/lib/composite_sexp_processor.rb

@@ -40,4 +40,10 @@ class CompositeSexpProcessor < SexpProcessor
     end
     exp
   end
+
+  def on(exception, &block)
+    @processors.each do |processor|
+      processor.on(exception, &block)
+    end
+  end
 end

data/lib/parse_tree.rb

@@ -28,7 +28,7 @@ end
 
 class ParseTree
 
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 
   ##
   # Initializes a ParseTree instance. Includes newline nodes if

data/lib/sexp_processor.rb

@@ -310,6 +310,7 @@ class SexpProcessor
     @expected = Sexp
     @require_empty = true
     @sexp_accessors = {}
+    @exceptions = {}
 
     # we do this on an instance basis so we can subclass it for
     # different processors.
@@ -334,7 +335,7 @@ class SexpProcessor
   def process(exp)
     return nil if exp.nil?
 
-    exp_orig = exp.deep_clone if $DEBUG
+    exp_orig = exp.deep_clone if $DEBUG or @exceptions.has_key?(exp.first)
     result = self.expected.new
 
     type = exp.first
@@ -355,9 +356,12 @@ class SexpProcessor
     raise UnsupportedNodeError, "'#{type}' is not a supported node type" if @unsupported.include? type
 
     # do a pass through the rewriter first, if any, reassign back to exp
+    # TODO: maybe the whole rewriting thing needs to be nuked
     meth = @rewriters[type]
     if meth then
-      new_exp = self.send(meth, exp)
+      new_exp = error_handler(type, exp_orig) do
+        self.send(meth, exp)
+      end
       # REFACTOR: duplicated from below
       if @require_empty and not exp.empty? then
         msg = "exp not empty after #{self.class}.#{meth} on #{exp.inspect}"
@@ -379,14 +383,15 @@ class SexpProcessor
 
       exp.shift if @auto_shift_type and meth != @default_method
 
-      result = self.send(meth, exp)
+      result = error_handler(type, exp_orig) do
+        self.send(meth, exp)
+      end
+
       raise TypeError, "Result must be a #{@expected}, was #{result.class}:#{result.inspect}" unless @expected === result
 
       if @require_empty and not exp.empty? then
         msg = "exp not empty after #{self.class}.#{meth} on #{exp.inspect}"
-        if $DEBUG then
-          msg += " from #{exp_orig.inspect}" 
-        end
+        msg += " from #{exp_orig.inspect}" if $DEBUG
         raise NotEmptyError, msg
       end
     else
@@ -395,7 +400,9 @@ class SexpProcessor
           sub_exp = exp.shift
           sub_result = nil
           if Array === sub_exp then
-            sub_result = process(sub_exp)
+            sub_result = error_handler(type, exp_orig) do
+              process(sub_exp)
+            end
             raise "Result is a bad type" unless Array === sub_exp
             raise "Result does not have a type in front: #{sub_exp.inspect}" unless Symbol === sub_exp.first unless sub_exp.empty?
           else
@@ -413,7 +420,9 @@ class SexpProcessor
           # nothing to do, on purpose
         end
       else
-        raise UnknownNodeError, "Bug! Unknown type #{type.inspect} to #{self.class}"
+        msg = "Bug! Unknown node-type #{type.inspect} to #{self.class}"
+        msg += " in #{exp_orig.inspect} from #{caller.inspect}" if $DEBUG
+        raise UnknownNodeError, msg
       end
     end
     result
@@ -431,6 +440,26 @@ class SexpProcessor
       list.first != typ
   end
 
+  def error_handler(type, exp=nil) # :nodoc:
+    if @exceptions.has_key? type then
+      begin
+        return yield
+      rescue Exception => err
+        return @exceptions[type].call(self, exp, err)
+      end
+    else
+      return yield
+    end
+  end
+  private :error_handler
+
+  ##
+  # Registers an error handler for +node+
+
+  def on(node, &block)
+    @exceptions[node] = block
+  end
+
   ##
   # A fairly generic processor for a dummy node. Dummy nodes are used
   # when your processor is doing a complicated rewrite that replaces

data/validate.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# set -xv
+
+trap "exit 1" 1 2 3 15
+
+DIRS="-I../../metaruby/dev/tests/builtin -I../../metaruby/dev/tests -Ilib"
+for d in $(ls -d ../../*/dev); do
+    DIRS="-I$d $DIRS"
+done
+
+if [ -f rb.bad.txt ]; then
+    mv rb.bad.txt rb.files.txt
+else
+    find ../../*/dev /usr/local/lib/ruby/1.8/ -name \*.rb > rb.files.txt
+fi
+
+total_count=$(wc -l rb.files.txt | awk '{print $1}')
+curr_count=0
+for f in $(cat rb.files.txt); do
+    curr_count=$(($curr_count + 1))
+    if GEM_SKIP=ParseTree ruby $DIRS ./bin/parse_tree_show -q $f > /dev/null 2> rb.err.txt < /dev/null; then
+	echo $f >> rb.good.txt
+	status=pass
+    else
+	echo $f >> rb.bad.txt	
+	status=fail
+    fi
+    fname=`basename $f`
+    printf "%4d/%4d: %s %s\n" $curr_count $total_count $status $fname
+done

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.10
 specification_version: 1
 name: ParseTree
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
-date: 2005-02-09
+  version: 1.3.5
+date: 2005-04-19
 summary: Extract and enumerate ruby parse trees.
 require_paths: 
   - lib
@@ -34,7 +34,6 @@ files:
   - Makefile
   - Manifest.txt
   - README.txt
-  - ParseTree.gemspec
   - bin/parse_tree_abc
   - bin/parse_tree_deps
   - bin/parse_tree_show
@@ -46,6 +45,7 @@ files:
   - test/test_composite_sexp_processor.rb
   - test/test_parse_tree.rb
   - test/test_sexp_processor.rb
+  - validate.sh
 test_files: 
   - test/test_all.rb
 rdoc_options: []
@@ -55,6 +55,15 @@ executables:
   - parse_tree_deps
   - parse_tree_show
 extensions: []
-requirements: 
-  - RubyInline.
-dependencies: []
+requirements: []
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: RubyInline
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.2.0
+      version: 

data/ParseTree.gemspec

@@ -1,39 +0,0 @@
-# -*- ruby -*-
-
-require 'rubygems'
-$: << "./lib"
-require 'parse_tree'
-
-spec = Gem::Specification.new do |s|
-
-  s.name = 'ParseTree'
-  s.version = ParseTree::VERSION
-  s.summary = "Extract and enumerate ruby parse trees."
-
-  paragraphs = File.read("README.txt").split(/\n\n+/)
-  s.description = paragraphs[2]
-  puts "Description = #{s.description}"
-
-  s.requirements << "RubyInline."
-  s.files = IO.readlines("Manifest.txt").map {|f| f.chomp }
-
-  s.require_paths = ['lib', 'test']
-  s.autorequire = 'parse_tree'
-
-  s.bindir = "bin"
-  s.executables = s.files.grep(Regexp.new(s.bindir)) { |f| File.basename(f) }
-  puts "Executables = #{s.executables.join(", ")}"
-
-  s.has_rdoc = true
-  s.test_suite_file = "test/test_all.rb"
-
-  s.author = "Ryan Davis"
-  s.email = "ryand-ruby@zenspider.com"
-  s.homepage = "http://www.zenspider.com/ZSS/Products/ParseTree/"
-  s.rubyforge_project = "parsetree"
-end
-
-if $0 == __FILE__
-  Gem.manage_gems
-  Gem::Builder.new(spec).build
-end