ParseTree 1.3.6 → 1.3.7

data/History.txt

@@ -1,3 +1,10 @@
+*** 1.3.7 / 2005-07-13
+
++ 3 bug fixes:
+	+ Fixed rubygem requires for non-gem systems.
+	+ Renamed on to on_error_in to make more clear.
+	+ Moved exceptions to their own tree to make catching cleaner.
+
 *** 1.3.6 / 2005-05-19
 
 + 2 minor enhancements:

data/Makefile

@@ -5,7 +5,7 @@ RUBY_LIB?=$(shell $(RUBY) -rrbconfig -e 'include Config; print CONFIG["sitelibdi
 PREFIX?=/usr/local
 
 all test: FORCE
-	GEM_SKIP=RubyInline:ParseTree $(RUBY) $(RUBY_DEBUG) $(RUBY_FLAGS) test/test_all.rb
+	$(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=RubyInline:ParseTree $(RUBY) $(RUBY_FLAGS) ./bin/parse_tree_show -f
+	echo 1+1 | $(RUBY) $(RUBY_FLAGS) ./bin/parse_tree_show -f
 
 gem:
 	gem ParseTree.gemspec

data/bin/parse_tree_abc

@@ -8,14 +8,9 @@
 
 PARSE_TREE_ABC=true
 
-begin
-  require 'rubygems'
-  require_gem 'ParseTree'
-rescue LoadError
-  require 'parse_tree'
-end
-
-  require 'sexp_processor'
+begin require 'rubygems' rescue LoadError end
+require 'parse_tree'
+require 'sexp_processor'
 
 old_classes = []
 ObjectSpace.each_object(Module) do |klass|

data/bin/parse_tree_deps

@@ -6,13 +6,8 @@ ObjectSpace.each_object(Module) { |klass| old_classes << klass } if defined? $a
 
 require 'pp'
 
-begin
-  require 'rubygems'
-  require_gem 'ParseTree'
-rescue LoadError
-  require 'parse_tree'
-end
-
+begin require 'rubygems' rescue LoadError end
+require 'parse_tree'
 require 'sexp_processor'
 
 ObjectSpace.each_object(Module) { |klass| old_classes << klass } unless defined? $a

data/bin/parse_tree_show

@@ -1,13 +1,8 @@
 #!/usr/local/bin/ruby -ws
 
 require 'pp'
-
-begin
-  require 'rubygems'
-  require_gem 'ParseTree'
-rescue LoadError
-  require 'parse_tree'
-end
+begin require 'rubygems' rescue LoadError end
+require 'parse_tree'
 
 def discover_new_classes_from
   old_classes = []

data/lib/composite_sexp_processor.rb

@@ -41,9 +41,9 @@ class CompositeSexpProcessor < SexpProcessor
     exp
   end
 
-  def on(exception, &block)
+  def on_error_in(node_type, &block)
     @processors.each do |processor|
-      processor.on(exception, &block)
+      processor.on_error_in(node_type, &block)
     end
   end
 end

data/lib/parse_tree.rb

@@ -1,11 +1,7 @@
 #!/usr/local/bin/ruby -w
 
-begin
-  require 'rubygems'
-  require_gem 'RubyInline'
-rescue LoadError
-  require "inline"
-end
+begin require 'rubygems' rescue LoadError end
+require 'inline'
 
 ##
 # ParseTree is a RubyInline-style extension that accesses and
@@ -28,7 +24,7 @@ end
 
 class ParseTree
 
-  VERSION = '1.3.6'
+  VERSION = '1.3.7'
 
   ##
   # Initializes a ParseTree instance. Includes newline nodes if

data/lib/sexp_processor.rb

@@ -192,23 +192,33 @@ def s(*args)
   Sexp.new(*args)
 end
 
+##
+# SexpProcessor base exception class.
+
+class SexpProcessorError < StandardError; end
+
 ##
 # Raised by SexpProcessor if it sees a node type listed in its
 # unsupported list.
 
-class UnsupportedNodeError < SyntaxError; end
+class UnsupportedNodeError < SexpProcessorError; end
 
 ##
 # Raised by SexpProcessor if it is in strict mode and sees a node for
 # which there is no processor available.
 
-class UnknownNodeError < SyntaxError; end
+class UnknownNodeError < SexpProcessorError; end
 
 ##
 # Raised by SexpProcessor if a processor did not process every node in
 # a sexp and @require_empty is true.
 
-class NotEmptyError < SyntaxError; end
+class NotEmptyError < SexpProcessorError; end
+
+##
+# Raised if assert_type encounters an unexpected sexp type.
+
+class SexpTypeError < SexpProcessorError; end
 
 ##
 # SexpProcessor provides a uniform interface to process Sexps.
@@ -260,7 +270,7 @@ class SexpProcessor
 
   ##
   # An array that specifies node types that are unsupported by this
-  # processor. SexpProcesor will raise UnsupportedNodeError if you try
+  # processor. SexpProcessor will raise UnsupportedNodeError if you try
   # to process one of those node types.
 
   attr_accessor :unsupported
@@ -389,7 +399,7 @@ class SexpProcessor
         self.send(meth, exp)
       end
 
-      raise TypeError, "Result must be a #{@expected}, was #{result.class}:#{result.inspect}" unless @expected === result
+      raise SexpTypeError, "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}"
@@ -431,25 +441,25 @@ class SexpProcessor
   end
 
   def generate # :nodoc:
-    raise "not implemented yet"
+    raise NotImplementedError, "not implemented yet"
   end
 
   ##
   # Raises unless the Sexp type for +list+ matches +typ+
 
   def assert_type(list, typ)
-    raise TypeError, "Expected type #{typ.inspect} in #{list.inspect}" if
+    raise SexpTypeError, "Expected type #{typ.inspect} in #{list.inspect}" if
       list.first != typ
   end
 
   def error_handler(type, exp=nil) # :nodoc:
     begin
       return yield
-    rescue Exception => err
+    rescue StandardError => 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
+        $stderr.puts "#{err.class} Exception thrown while processing #{type} for sexp #{exp.inspect} #{caller.inspect}" if $DEBUG
         raise
       end
     end
@@ -459,8 +469,8 @@ class SexpProcessor
   ##
   # Registers an error handler for +node+
 
-  def on(node, &block)
-    @exceptions[node] = block
+  def on_error_in(node_type, &block)
+    @exceptions[node_type] = block
   end
 
   ##

data/test/test_sexp_processor.rb

@@ -282,7 +282,7 @@ class TestSexpProcessor < Test::Unit::TestCase
     @processor = TestProcessor.new
     @processor.warn_on_default = false
 
-    assert_raises(TypeError) do
+    assert_raises(SexpTypeError) do
       @processor.process([:broken, 1, 2, 3])
     end
   end
@@ -342,7 +342,7 @@ class TestSexpProcessor < Test::Unit::TestCase
   end
 
   def test_assert_type_miss
-    assert_raise(TypeError) do
+    assert_raise(SexpTypeError) do
       @processor.assert_type([:thingy, 1, 2, 3], :blah)
     end
   end
@@ -369,7 +369,7 @@ class TestSexpProcessor < Test::Unit::TestCase
 
   def test_expected
     assert_equal Sexp, @processor.expected
-    assert_raises(TypeError) do
+    assert_raises(SexpTypeError) do
       @processor.process([:expected])           # should raise
     end
 
@@ -379,7 +379,7 @@ class TestSexpProcessor < Test::Unit::TestCase
     assert_equal Hash, @processor.expected
     assert !(Hash === s()), "Hash === s() should not be true"
 
-    assert_raises(TypeError) do
+    assert_raises(SexpTypeError) do
       @processor.process(s(:string, "string"))     # should raise
     end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.10.1
 specification_version: 1
 name: ParseTree
 version: !ruby/object:Gem::Version 
-  version: 1.3.6
-date: 2005-05-19
+  version: 1.3.7
+date: 2005-07-13
 summary: Extract and enumerate ruby parse trees.
 require_paths: 
   - lib