ParseTree 1.3.3 → 1.3.4

data/History.txt

@@ -1,3 +1,9 @@
+*** 1.3.4 / 2005-02-09
+
++ 2 bug fixes
+	+ bug:1459: Cleaned up and corrected superclass naming code.
+	+ bug:1458: Fixed while to support post-conditional while/until nodes.
+
 *** 1.3.3 / 2005-02-01
 
 + 3 minor enhancement

data/Makefile

@@ -1,10 +1,11 @@
 RUBY?=ruby
+RUBY_DEBUG?=
 RUBY_FLAGS?=-w -Ilib -Ibin
 RUBY_LIB?=$(shell $(RUBY) -rrbconfig -e 'include Config; print CONFIG["sitelibdir"]')
 PREFIX?=/usr/local
 
 all test: FORCE
-	GEM_SKIP=ParseTree $(RUBY) $(RUBY_FLAGS) test/test_all.rb
+	GEM_SKIP=ParseTree $(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.
@@ -32,7 +33,7 @@ clean:
 	-rm -fr diff diff.txt *.gem doc $$HOME/.ruby_inline
 
 demo:
-	echo 1+1 | $(RUBY) $(RUBY_FLAGS) ./bin/parse_tree_show -f
+	echo 1+1 | GEM_SKIP=ParseTree $(RUBY) $(RUBY_FLAGS) ./bin/parse_tree_show -f
 
 gem:
 	gem ParseTree.gemspec

data/lib/parse_tree.rb

@@ -28,7 +28,7 @@ end
 
 class ParseTree
 
-  VERSION = '1.3.3'
+  VERSION = '1.3.4'
 
   ##
   # Initializes a ParseTree instance. Includes newline nodes if
@@ -63,10 +63,9 @@ class ParseTree
       klassname = klassname.to_sym
 
       code = if Class === klass then
-               superclass = klass.superclass.name
-               superclass = "nil" if superclass.empty?
-               superclass = superclass.to_sym
-               [:class, klassname, superclass]
+               sc = klass.superclass
+               sc_name = ((sc.nil? or sc.name.empty?) ? "nil" : sc.name).intern
+               [:class, klassname, sc_name]
              else
                [:module, klassname]
              end
@@ -315,6 +314,7 @@ again_no_block:
   case NODE_UNTIL:
     add_to_parse_tree(current,  node->nd_cond, newlines, locals);
     add_to_parse_tree(current,  node->nd_body, newlines, locals); 
+    rb_ary_push(current, node->nd_3rd == 0 ? Qfalse : Qtrue);
     break;
 
   case NODE_BLOCK_PASS:

data/test/something.rb

@@ -179,6 +179,15 @@ class Something
     end
   end
 
+  def whiles
+    while false do
+      puts "false"
+    end
+    begin
+      puts "true"
+    end while false
+  end
+
   def self.bmethod_maker
     define_method(:bmethod_added) do |x|
       x + 1

data/test/test_parse_tree.rb

@@ -291,6 +291,14 @@ class TestParseTree < Test::Unit::TestCase
           :type=, 
           [:array, [:call, [:vcall, :other], :type]]]]]]
   
+  @@whiles = [:defn,
+    :whiles,
+    [:scope,
+      [:block,
+        [:args],
+        [:while, [:false], [:fcall, :puts, [:array, [:str, "false"]]], true],
+        [:while, [:false], [:fcall, :puts, [:array, [:str, "true"]]], false]]]]
+
   @@__all = [:class, :Something, :Object]
   
   def setup

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: ParseTree
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
-date: 2005-02-01
+  version: 1.3.4
+date: 2005-02-09
 summary: Extract and enumerate ruby parse trees.
 require_paths: 
   - lib