sexp_processor 3.1.0 → 3.2.0

data/lib/sexp_processor.rb

@@ -34,7 +34,7 @@ require 'sexp'
 
 class SexpProcessor
 
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 
   ##
   # Automatically shifts off the Sexp type before handing the
@@ -139,6 +139,11 @@ class SexpProcessor
   def rewrite(exp)
     type = exp.first
 
+    if @debug.has_key? type then
+      str = exp.inspect
+      puts "// DEBUG (original ): #{str}" if str =~ @debug[type]
+    end
+
     in_context type do
       exp.map! { |sub| Array === sub ? rewrite(sub) : sub }
     end
@@ -147,6 +152,12 @@ class SexpProcessor
       meth = @rewriters[type]
       exp  = self.send(meth, exp) if meth
       break unless Sexp === exp
+
+      if @debug.has_key? type then
+        str = exp.inspect
+        puts "// DEBUG (rewritten): #{str}" if str =~ @debug[type]
+      end
+
       old_type, type = type, exp.first
     end until old_type == type
 
@@ -160,7 +171,11 @@ class SexpProcessor
 
   def process(exp)
     return nil if exp.nil?
-    exp = self.rewrite(exp) if self.context.empty?
+    if self.context.empty? then
+      p :rewriting unless debug.empty?
+      exp = self.rewrite(exp)
+      p :done_rewriting unless debug.empty?
+    end
 
     unless @unsupported_checked then
       m = public_methods.grep(/^process_/) { |o| o.to_s.sub(/^process_/, '').to_sym }
@@ -180,7 +195,7 @@ class SexpProcessor
     in_context type do
       if @debug.has_key? type then
         str = exp.inspect
-        puts "// DEBUG: #{str}" if str =~ @debug[type]
+        puts "// DEBUG:(original ): #{str}" if str =~ @debug[type]
       end
 
       exp_orig = nil
@@ -190,11 +205,6 @@ class SexpProcessor
       raise UnsupportedNodeError, "'#{type}' is not a supported node type" if
         @unsupported.include? type
 
-      if @debug.has_key? type then
-        str = exp.inspect
-        puts "// DEBUG (rewritten): #{str}" if str =~ @debug[type]
-      end
-
       # now do a pass with the real processor (or generic)
       meth = @processors[type] || @default_method
       if meth then
@@ -209,6 +219,11 @@ class SexpProcessor
           self.send(meth, exp)
         end
 
+        if @debug.has_key? type then
+          str = exp.inspect
+          puts "// DEBUG (processed): #{str}" if str =~ @debug[type]
+        end
+
         raise SexpTypeError, "Result must be a #{@expected}, was #{result.class}:#{result.inspect}" unless @expected === result
 
         self.assert_empty(meth, exp, exp_orig) if @require_empty

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sexp_processor
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: 
   segments: 
   - 3
-  - 1
+  - 2
   - 0
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-03-01 00:00:00 Z
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -46,11 +46,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 27
         segments: 
         - 2
-        - 11
-        version: "2.11"
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 7
         segments: 
-        - 2
-        - 15
-        version: "2.15"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id003
 description: |-
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: parsetree
-rubygems_version: 1.8.12
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: sexp_processor branches from ParseTree bringing all the generic sexp processing tools with it