ParseTree 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,13 @@
+*** 1.3.3 / 2005-02-01
+
++ 3 minor enhancement
+	+ Cleaned up parse_tree_abc output
+	+ Patched up null class names (delegate classes are weird!)
+	+ Added UnknownNodeError and switched SyntaxError over to it.
++ 2 bug fixes
+	+ Fixed BEGIN node handling to recurse instead of going flat.
+	+ FINALLY fixed the weird compiler errors seen on some versions of gcc 3.4.x related to type punned pointers.
+
 *** 1.3.2 / 2005-01-04
 
 + 1 minor enhancement

data/Makefile

@@ -29,9 +29,7 @@ audit:
 
 clean:
 	-find . -name \*~ | xargs rm
-	-rm -f diff diff.txt
-	-rm -r $$HOME/.ruby_inline
-	-rm -r doc
+	-rm -fr diff diff.txt *.gem doc $$HOME/.ruby_inline
 
 demo:
 	echo 1+1 | $(RUBY) $(RUBY_FLAGS) ./bin/parse_tree_show -f

data/bin/parse_tree_abc

@@ -6,6 +6,8 @@
 #
 # A simple way to measure the complexity of a function or method.
 
+PARSE_TREE_ABC=true
+
 begin
   require 'rubygems'
   require_gem 'ParseTree'
@@ -21,7 +23,11 @@ ObjectSpace.each_object(Module) do |klass|
 end
 
 ARGV.each do |name|
-  require name
+  begin
+    require name
+  rescue NameError => err
+    $stderr.puts "ERROR requiring #{name}. Perhaps you need to add some -I's?\n\n#{err}"
+  end
 end
 
 new_classes = []
@@ -60,12 +66,12 @@ klasses.each do |klass|
       end
     end
     key = ["#{klassname}.#{methodname}", a, b, c]
-    val = a+b+c
+    val = Math.sqrt(a*a+b*b+c*c)
     score[key] = val
   end
 end
 
-puts "Method = assignments + branches + calls = total"
+puts "|ABC| = Math.sqrt(assignments^2 + branches^2 + calls^2)"
 puts
 count = 1
 ta = tb = tc = tval = 0
@@ -75,7 +81,7 @@ score.sort_by { |k,v| v }.reverse.each do |key,val|
   tb += b
   tc += c
   tval += val
-  printf "%3d) %-50s = %2d + %2d + %2d = %3d\n", count, name, a, b, c, val
+  printf "%3d) %-50s = %2d + %2d + %2d = %6.2f\n", count, name, a, b, c, val
   count += 1
 end
-printf "%3d) %-50s = %2d + %2d + %2d = %3d\n", count, "Total", ta, tb, tc, tval
+printf "%3d) %-50s = %2d + %2d + %2d = %6.2f\n", count, "Total", ta, tb, tc, tval

data/lib/parse_tree.rb

@@ -18,16 +18,17 @@ end
 #   end
 #
 #   ParseTree.new.parse_tree(Example)
-#   =>  [[:defn,
-#         "blah",
-#         [:scope,
-#          [:block,
-#           [:args],
-#            [:return, [:call, [:lit, 1], "+", [:array, [:lit, 1]]]]]]]]
+#   => [[:class, :Example, :Object,
+#          [:defn,
+#            "blah",
+#            [:scope,
+#              [:block,
+#                [:args],
+#                [:return, [:call, [:lit, 1], "+", [:array, [:lit, 1]]]]]]]]]
 
 class ParseTree
 
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 
   ##
   # Initializes a ParseTree instance. Includes newline nodes if
@@ -53,8 +54,11 @@ class ParseTree
   def parse_tree(*klasses)
     result = []
     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
+      klassname = klass.name || '' # HACK klass.name should never be nil
+                                   # Tempfile's DelegateClass(File) seems to
+                                   # cause this
       klassname = "UnnamedClass_#{klass.object_id}" if klassname.empty?
       klassname = klassname.to_sym
 
@@ -87,6 +91,10 @@ class ParseTree
     parse_tree_for_meth(klass, method.to_sym, @include_newlines)
   end
 
+  ############################################################
+  # END of rdoc methods
+  ############################################################
+
   inline do |builder|
     builder.add_type_converter("VALUE", '', '')
     builder.add_type_converter("ID *", '', '')
@@ -102,6 +110,12 @@ class ParseTree
     builder.add_compile_flags "-Wcast-align"
     builder.add_compile_flags "-Wwrite-strings"
     builder.add_compile_flags "-Wmissing-noreturn"
+    # NOTE: If you get weird compiler errors like:
+    #    dereferencing type-punned pointer will break strict-aliasing rules
+    # PLEASE do one of the following:
+    # 1) Get me a login on your box so I can repro this and get it fixed.
+    # 2) Fix it and send me the patch
+    # 3) (quick, but dirty and bad), comment out the following line:
     builder.add_compile_flags "-Werror"
     # NOTE: this flag doesn't work w/ gcc 2.95.x - the FreeBSD default
     # builder.add_compile_flags "-Wno-strict-aliasing"
@@ -110,7 +124,7 @@ class ParseTree
     # builder.add_compile_flags "-Wconversion"
     # builder.add_compile_flags "-Wstrict-prototypes"
     # builder.add_compile_flags "-Wmissing-prototypes"
-    # builder.add_compile_flags "-Wsign-compare", 
+    # builder.add_compile_flags "-Wsign-compare"
 
     builder.prefix %q{
         #define nd_3rd   u3.node
@@ -246,17 +260,15 @@ again_no_block:
       rb_ary_push(current, ID2SYM(node->nd_mid));
       break;
 
-    case NODE_BEGIN:
-      node = node->nd_body;
-      goto again;
-
     case NODE_MATCH2:
     case NODE_MATCH3:
       add_to_parse_tree(current, node->nd_recv, newlines, locals);
       add_to_parse_tree(current, node->nd_value, newlines, locals);
       break;
 
+    case NODE_BEGIN:
     case NODE_OPT_N:
+    case NODE_NOT:
       add_to_parse_tree(current, node->nd_body, newlines, locals);
       break;
 
@@ -333,9 +345,15 @@ again_no_block:
   case NODE_RESCUE:
       add_to_parse_tree(current, node->nd_1st, newlines, locals);
       add_to_parse_tree(current, node->nd_2nd, newlines, locals);
+      add_to_parse_tree(current, node->nd_3rd, newlines, locals);
     break;
 
-  case NODE_RESBODY:            // stmt rescue stmt | a = b rescue c - no repro
+  // rescue body:
+  // begin stmt rescue exception => var; stmt; [rescue e2 => v2; s2;]* end 
+  // stmt rescue stmt
+  // a = b rescue c
+
+  case NODE_RESBODY:
       add_to_parse_tree(current, node->nd_3rd, newlines, locals);
       add_to_parse_tree(current, node->nd_2nd, newlines, locals);
       add_to_parse_tree(current, node->nd_1st, newlines, locals);
@@ -354,10 +372,6 @@ again_no_block:
     add_to_parse_tree(current, node->nd_2nd, newlines, locals);
     break;
 
-  case NODE_NOT:
-    add_to_parse_tree(current, node->nd_body, newlines, locals);
-    break;
-
   case NODE_DOT2:
   case NODE_DOT3:
   case NODE_FLIP2:
@@ -706,6 +720,7 @@ again_no_block:
 
     builder.c %q{
 static VALUE parse_tree_for_meth(VALUE klass, VALUE method, VALUE newlines) {
+  VALUE n;
   NODE *node = NULL;
   ID id;
   VALUE result = rb_ary_new();
@@ -714,7 +729,8 @@ static VALUE parse_tree_for_meth(VALUE klass, VALUE method, VALUE newlines) {
   (void) argc; // quell warnings
 
   id = rb_to_id(method);
-  if (st_lookup(RCLASS(klass)->m_tbl, id, (st_data_t *) &node)) {
+  if (st_lookup(RCLASS(klass)->m_tbl, id, &n)) {
+    node = (NODE*)n;
     rb_ary_push(result, ID2SYM(rb_intern("defn")));
     rb_ary_push(result, ID2SYM(id));
     add_to_parse_tree(result, node->nd_body, newlines, NULL);

data/lib/sexp_processor.rb

@@ -198,6 +198,12 @@ end
 
 class UnsupportedNodeError < SyntaxError; 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
+
 ##
 # Raised by SexpProcessor if a processor did not process every node in
 # a sexp and @require_empty is true.
@@ -346,7 +352,7 @@ class SexpProcessor
       end
     end
     
-    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
 
     # do a pass through the rewriter first, if any, reassign back to exp
     meth = @rewriters[type]
@@ -407,7 +413,7 @@ class SexpProcessor
           # nothing to do, on purpose
         end
       else
-        raise SyntaxError, "Bug! Unknown type #{type.inspect} to #{self.class}"
+        raise UnknownNodeError, "Bug! Unknown type #{type.inspect} to #{self.class}"
       end
     end
     result
@@ -432,8 +438,9 @@ class SexpProcessor
   #
   # Bogus Example:
   #
-  # def process_something(exp)
-  #   return s(:dummy, process(exp), s(:extra, 42))
+  #   def process_something(exp)
+  #     return s(:dummy, process(exp), s(:extra, 42))
+  #   end
 
   def process_dummy(exp)
     result = @expected.new(:dummy)

data/test/something.rb

@@ -164,6 +164,21 @@ class Something
     self.type = other.type
   end
 
+  # TODO: sort list
+  def bbegin
+    begin
+      1
+    rescue SyntaxError => e1
+      2
+    rescue Exception => e2
+      3
+    else
+      4
+    ensure
+      5
+    end
+  end
+
   def self.bmethod_maker
     define_method(:bmethod_added) do |x|
       x + 1

data/test/test_parse_tree.rb

@@ -234,6 +234,22 @@ class TestParseTree < Test::Unit::TestCase
       [:block,
         [:args, :arg1, :arg2],
         [:return, [:lvar, :arg1]]]]]
+  @@bbegin = [:defn, :bbegin,
+    [:scope,
+      [:block,
+        [:args],
+        [:begin,
+          [:ensure,
+            [:rescue,
+              [:lit, 1],
+              [:resbody,
+                [:array, [:const, :SyntaxError]],
+                [:block, [:lasgn, :e1, [:gvar, :$!]], [:lit, 2]],
+                [:resbody,
+                  [:array, [:const, :Exception]],
+                  [:block, [:lasgn, :e2, [:gvar, :$!]], [:lit, 3]]]],
+              [:lit, 4]],
+            [:lit, 5]]]]]]
   @@determine_args = [:defn, :determine_args,
     [:scope,
       [:block,

data/test/test_sexp_processor.rb

@@ -297,7 +297,7 @@ class TestSexpProcessor < Test::Unit::TestCase
 
   def test_strict
     @processor.strict = true
-    assert_raise(SyntaxError) do
+    assert_raise(UnknownNodeError) do
       @processor.process([:blah, 1, 2, 3])
     end
   end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.4
 specification_version: 1
 name: ParseTree
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
-date: 2005-01-04
+  version: 1.3.3
+date: 2005-02-01
 summary: Extract and enumerate ruby parse trees.
 require_paths: 
   - lib
   - test
-author: Ryan Davis
 email: ryand-ruby@zenspider.com
 homepage: http://www.zenspider.com/ZSS/Products/ParseTree/
 rubyforge_project: parsetree
@@ -28,6 +27,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: 
+  - Ryan Davis
 files: 
   - History.txt
   - Makefile