sexp_processor 3.0.4 → 3.0.5

data/History.txt

@@ -1,3 +1,10 @@
+=== 3.0.5 / 2010-09-01
+
+* 2 minor enhancements:
+
+  * Added in_context to clean up code.
+  * optimize inspect to avoid needlessly caching @line
+
 === 3.0.4 / 2010-03-27
 
 * 1 minor enhancement:

data/lib/sexp.rb

@@ -134,7 +134,7 @@ class Sexp < Array # ZenTest FULL
 
   def inspect # :nodoc:
     sexp_str = self.map {|x|x.inspect}.join(', ')
-    if line && ENV['VERBOSE'] then
+    if ENV['VERBOSE'] && line then
       "s(#{sexp_str}).line(#{line})"
     else
       "s(#{sexp_str})"

data/lib/sexp_processor.rb

@@ -34,7 +34,7 @@ require 'sexp'
 
 class SexpProcessor
 
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 
   ##
   # Automatically shifts off the Sexp type before handing the
@@ -121,9 +121,9 @@ class SexpProcessor
     public_methods.each do |name|
       case name
       when /^process_(.*)/ then
-        @processors[$1.intern] = name.intern
+        @processors[$1.to_sym] = name.to_sym
       when /^rewrite_(.*)/ then
-        @rewriters[$1.intern]  = name.intern
+        @rewriters[$1.to_sym]  = name.to_sym
       end
     end
   end
@@ -139,11 +139,9 @@ class SexpProcessor
   def rewrite(exp)
     type = exp.first
 
-    self.context.unshift type
-
-    exp.map! { |sub| Array === sub ? rewrite(sub) : sub }
-
-    self.context.shift
+    in_context type do
+      exp.map! { |sub| Array === sub ? rewrite(sub) : sub }
+    end
 
     begin
       meth = @rewriters[type]
@@ -165,7 +163,7 @@ class SexpProcessor
     exp = self.rewrite(exp) if self.context.empty?
 
     unless @unsupported_checked then
-      m = public_methods.grep(/^process_/) { |o| o.to_s.sub(/^process_/, '').intern }
+      m = public_methods.grep(/^process_/) { |o| o.to_s.sub(/^process_/, '').to_sym }
       supported = m - (m - @unsupported)
 
       raise UnsupportedNodeError, "#{supported.inspect} shouldn't be in @unsupported" unless supported.empty?
@@ -179,75 +177,74 @@ class SexpProcessor
     raise "type should be a Symbol, not: #{exp.first.inspect}" unless
       Symbol === type
 
-    self.context.unshift type
+    in_context type do
+      if @debug.has_key? type then
+        str = exp.inspect
+        puts "// DEBUG: #{str}" if str =~ @debug[type]
+      end
 
-    if @debug.has_key? type then
-      str = exp.inspect
-      puts "// DEBUG: #{str}" if str =~ @debug[type]
-    end
+      exp_orig = nil
+      exp_orig = exp.deep_clone if $DEBUG or
+        @debug.has_key? type or @exceptions.has_key?(type)
 
-    exp_orig = nil
-    exp_orig = exp.deep_clone if $DEBUG or
-      @debug.has_key? type or @exceptions.has_key?(type)
+      raise UnsupportedNodeError, "'#{type}' is not a supported node type" if
+        @unsupported.include? type
 
-    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
 
-    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
 
-    # now do a pass with the real processor (or generic)
-    meth = @processors[type] || @default_method
-    if meth then
+        if @warn_on_default and meth == @default_method then
+          warn "WARNING: Using default method #{meth} for #{type}"
+        end
 
-      if @warn_on_default and meth == @default_method then
-        warn "WARNING: Using default method #{meth} for #{type}"
-      end
+        exp.shift if @auto_shift_type and meth != @default_method
 
-      exp.shift if @auto_shift_type and meth != @default_method
+        result = error_handler(type, exp_orig) do
+          self.send(meth, exp)
+        end
 
-      result = error_handler(type, exp_orig) do
-        self.send(meth, exp)
-      end
+        raise SexpTypeError, "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
-
-      self.assert_empty(meth, exp, exp_orig) if @require_empty
-    else
-      unless @strict then
-        until exp.empty? do
-          sub_exp = exp.shift
-          sub_result = nil
-          if Array === sub_exp then
-            sub_result = error_handler(type, exp_orig) do
-              process(sub_exp)
+        self.assert_empty(meth, exp, exp_orig) if @require_empty
+      else
+        unless @strict then
+          until exp.empty? do
+            sub_exp = exp.shift
+            sub_result = nil
+            if Array === sub_exp then
+              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
+              sub_result = 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
-            sub_result = sub_exp
+            result << sub_result
           end
-          result << sub_result
-        end
 
-        # NOTE: this is costly, but we are in the generic processor
-        # so we shouldn't hit it too much with RubyToC stuff at least.
-        #if Sexp === exp and not exp.sexp_type.nil? then
-        begin
-          result.sexp_type = exp.sexp_type
-        rescue Exception
-          # nothing to do, on purpose
+          # NOTE: this is costly, but we are in the generic processor
+          # so we shouldn't hit it too much with RubyToC stuff at least.
+          #if Sexp === exp and not exp.sexp_type.nil? then
+          begin
+            result.sexp_type = exp.sexp_type
+          rescue Exception
+            # nothing to do, on purpose
+          end
+        else
+          msg = "Bug! Unknown node-type #{type.inspect} to #{self.class}"
+          msg += " in #{exp_orig.inspect} from #{caller.inspect}" if $DEBUG
+          raise UnknownNodeError, msg
         end
-      else
-        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
 
-    self.context.shift
     result
   end
 
@@ -323,6 +320,14 @@ class SexpProcessor
     env.scope(&block)
   end
 
+  def in_context type
+    self.context.unshift type
+
+    yield
+
+    self.context.shift
+  end
+
   ##
   # I really hate this here, but I hate subdirs in my lib dir more...
   # I guess it is kinda like shaving... I'll split this out when it

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Ryan Davis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 2
         - 0
-        - 3
-        version: 2.0.3
+        - 4
+        version: 2.0.4
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 5
+        - 6
         - 0
-        version: 1.5.0
+        version: 1.6.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -54,9 +54,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 5
+        - 6
         - 0
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   version_requirements: *id003
 description: |-