parsetree19 0.2 → 0.3

data/ChangeLog

@@ -1,3 +1,24 @@
+2011-06-08  r <rocky@gnu.org>
+
+	* ext/add_to_parse_tree.inc: Add NODE_BLOCK and NODE_BLOCK_ARG.
+
+2011-06-08  r <rocky@gnu.org>
+
+	* ext/parse_tree.c: Guard against dereferencing NULL iseq pointer.
+
+2010-12-28  r <rocky@gnu.org>
+
+	* .gemspec, Rakefile, ext/parse_tree.c: Add .gemspec. bump version
+	number.
+
+2010-12-25  rocky <rockyb@rubyforge.org>
+
+	* README.md: Update README.md
+
+2010-12-25  rocky <rockyb@rubyforge.org>
+
+	* ChangeLog: See above.
+
 2010-12-25  rocky <rockyb@rubyforge.org>
 
 	* ChangeLog: Update README.md to include usage.

data/NEWS

@@ -1,2 +1,7 @@
+June 12, 2011 (0.3)
+ Add NODE_BLOCK and NODE_BLOCK_ARG 
+ Guard against dereferening a NULL iseq pointer
+ Remove some gcc warnings
+
 December 25, 2010 (0.2)
  First public release

data/README.md

@@ -5,4 +5,37 @@ A C extension to support ParseTree in Ruby 1.9
 ## Requirements
 
 A patched version of Ruby 1.9.2 is needed. In fact the same patched version
-as needed by rb-threadframe (and thus rbdbgr).
+as needed by rb-threadframe (and thus trepanning).
+
+Usage:
+
+    require 'parse_tree'
+    processor = ParseTree19.new(false)
+    processor.parse_tree_for_str('x=1; y=2', '(string'), 1)
+      => [:scope, [:block, [:lasgn, :x, [:lit, 1]], [:block, [:lasgn, :y, [:lit, 2]]]]]
+    def five; 5 end
+    processor.parse_tree_for_method(method(:five), true)
+      => [:scope, [:args, 0, [:args_aux]], [:lit, 5]]
+    puts processor.parse_tree_for_method(method(:five, false)
+      => nil
+    ###########################################################
+    ## Do NOT use this node dump for any purpose other than  ##
+    ## debug and research.  Compatibility is not guaranteed. ##
+    ###########################################################
+    
+    # @ NODE_SCOPE (line: 6)
+    # +- nd_tbl: (empty)
+    # +- nd_args:
+    # |   @ NODE_ARGS (line: 6)
+    # |   +- nd_frml: 0
+    # |   +- nd_next:
+    # |   |   @ NODE_ARGS_AUX (line: 6)
+    # |   |   +- nd_rest: (null)
+    # |   |   +- nd_body: (null)
+    # |   |   +- nd_next:
+    # |   |       (null node)
+    # |   +- nd_opt:
+    # |       (null node)
+    # +- nd_body:
+    #     @ NODE_LIT (line: 6)
+    #     +- nd_lit: 5

data/Rakefile

@@ -1,30 +1,34 @@
 #!/usr/bin/env rake
 # -*- Ruby -*-
 require 'rubygems'
+
+ROOT_DIR = File.dirname(__FILE__)
+def gemspec
+  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
+end
+
 require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
+desc "Build the gem"
+task :package=>:gem
+task :gem=>:gemspec do
+  Dir.chdir(ROOT_DIR) do
+    sh "gem build .gemspec"
+    FileUtils.mkdir_p 'pkg'
+    FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
+  end
+end
 
-rake_dir = File.dirname(__FILE__)
+desc "Install the gem locally"
+task :install => :gem do
+  Dir.chdir(ROOT_DIR) do
+    sh %{gem install --local pkg/#{gemspec.name}-#{gemspec.version}}
+  end
+end
 
 require 'rbconfig'
 RUBY_PATH = File.join(Config::CONFIG['bindir'],  
                       Config::CONFIG['RUBY_INSTALL_NAME'])
 
-SO_NAME = 'parsetree19.so'
-
-PACKAGE_VERSION = open("ext/parse_tree.c") do |f| 
-  f.grep(/^#define PARSETREE19_VERSION/).first[/"(.+)"/,1]
-end
-
-EXT_FILES     = FileList[%w(ext/*.c ext/*.h ext/*.inc)]
-INCLUDE_FILES = FileList['include/*.h']
-LIB_FILES     = FileList['lib/*.rb']
-TEST_FILES    = FileList['test/*/*.rb']
-COMMON_FILES  = FileList[%w(README.md Rakefile NEWS ChangeLog)]
-ALL_FILES     = COMMON_FILES + INCLUDE_FILES + LIB_FILES + EXT_FILES + 
-  TEST_FILES
-
 desc 'Create the core thread-frame shared library extension'
 task :ext do
   Dir.chdir('ext') do
@@ -54,13 +58,12 @@ def run_standalone_ruby_file(directory)
   end
 end
 
-desc "Create a GNU-style ChangeLog via git2cl"
+desc 'Create a GNU-style ChangeLog via git2cl'
 task :ChangeLog do
-  system("git log --pretty --numstat --summary | git2cl > ChangeLog")
+  system('git log --pretty --numstat --summary | git2cl > ChangeLog')
 end
 
-task :default => [:test]
-
+require 'rake/testtask'
 desc 'Test units - the smaller tests'
 Rake::TestTask.new(:'test:unit') do |t|
   t.libs << './ext'
@@ -70,89 +73,35 @@ Rake::TestTask.new(:'test:unit') do |t|
 end
 task :'test:unit' => [:ext]
 
-desc 'Test everything - unit tests for now.'
-task :test do
-  exceptions = ['test:unit'].collect do |task|
-    begin
-      Rake::Task[task].invoke
-      nil
-    rescue => e
-      e
-    end
-  end.compact
-  
-  exceptions.each {|e| puts e;puts e.backtrace }
-  raise "Test failures" unless exceptions.empty?
-end
-
 desc "Test everything - same as test."
 
 task :'check' do
-  run_standalone_ruby_file(File.join(%W(#{rake_dir} test unit)))
+  run_standalone_ruby_file(File.join(%W(#{ROOT_DIR} test unit)))
 end
 
+task :default => [:test]
+task :test => [:'test:unit']
+
+desc "Generate the gemspec"
+task :generate do
+  puts gemspec.to_ruby
+end
+
+desc "Validate the gemspec"
+task :gemspec do
+  gemspec.validate
+end
+
+
 # ---------  RDoc Documentation ------
+require 'rake/rdoctask'
 desc 'Generate rdoc documentation'
 Rake::RDocTask.new('rdoc') do |rdoc|
-  rdoc.rdoc_dir = 'doc/rdoc'
-  rdoc.title    = 'parsetree19'
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title    = "ParseTree Documentation"
   # Show source inline with line numbers
   rdoc.options << '--inline-source' << '--line-numbers'
   # Make the readme file the start page for the generated html
   rdoc.options << '--main' << 'README.md'
-  rdoc.rdoc_files.include('ext/**/*.c',
-                          'README.md')
-end
-
-# Base GEM Specification
-spec = Gem::Specification.new do |spec|
-  spec.name = "parsetree19"
-  
-  spec.homepage = "http://github.com/rocky/rb-parsetree19/tree/master"
-  spec.summary = "Frame introspection"
-  spec.description = <<-EOF
-
-rb-parsetree is the C extension part of ParseTree for Ruby 1.9.
-EOF
-
-  spec.version = PACKAGE_VERSION
-  spec.require_path = 'lib'
-  spec.extensions = ["ext/extconf.rb"]
-
-  spec.author = "R. Bernstein"
-  spec.email  = "rockyb@rubyforge.org"
-  spec.platform = Gem::Platform::RUBY
-  spec.files = ALL_FILES.to_a  
-
-  spec.required_ruby_version = '~> 1.9.2frame'
-  spec.date = Time.now
-  # spec.rubyforge_project = 'rocky-hacks'
-  
-  # rdoc
-  spec.has_rdoc = true
-  spec.extra_rdoc_files = ['README.md'] + FileList['ext/*.c']
-end
-
-# Rake task to build the default package
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-end
-
-def install(spec, *opts)
-  args = ['gem', 'install', "pkg/#{spec.name}-#{spec.version}.gem"] + opts
-  system(*args)
+  rdoc.rdoc_files.include(%w(ext/**/*.c README.md))
 end
-
-desc 'Install locally'
-task :install => :package do
-  Dir.chdir(File::dirname(__FILE__)) do
-    # ri and rdoc take lots of time
-    install(spec, '--no-ri', '--no-rdoc')
-  end
-end    
-
-task :install_full => :package do
-  Dir.chdir(File::dirname(__FILE__)) do
-    install(spec)
-  end
-end    

data/ext/add_to_parse_tree.inc

@@ -899,6 +899,20 @@ add_to_parse_tree(VALUE self, VALUE ary, NODE *node, ID *locals)
 	F_NODE(nd_body, "body");
 	break;
 
+      case NODE_MEMO:
+	ANN("NODE MEMO");
+	ANN("format: filename, safe_level, 0");
+	rb_aray_push(current, node->u1.value);
+	rb_aray_push(current, node->u2.value);
+	rb_aray_push(current, node->u3.value);
+	break;
+
+      case NODE_BLOCK_ARG:
+	ANN("NODE BLOCK ARG");
+	ANN("format: v 0, local_cnt(v)");
+	F_NODE(nd_head, "v");
+	break;
+
       default:
 	rb_bug("dump_node: unknown node: %s", ruby_node_name(nd_type(node)));
     }

data/ext/parse_tree.c

@@ -1,5 +1,5 @@
 /* What release we got? */
-#define PARSETREE19_VERSION "0.2"  
+#define PARSETREE19_VERSION "0.3"  
 #include "../include/vm_core_mini.h"   /* Pulls in ruby.h and node.h */
 #include "../include/ruby19_externs.h" 
 
@@ -49,7 +49,7 @@ parse_tree_for_iseq_internal(VALUE self, rb_iseq_t *iseq, VALUE tree)
 {
     VALUE result = rb_ary_new();
 
-    if (iseq->tree_node) {
+    if (iseq && iseq->tree_node) {
 	if (Qfalse == tree)
 	    result = rb_parser_dump_tree(iseq->tree_node, 0);
 	else
@@ -63,10 +63,9 @@ static VALUE
 parse_tree_for_iseq(VALUE self, VALUE iseqval, VALUE tree)
 {
     rb_iseq_t *iseq;
-    VALUE result = rb_ary_new();
 
     GetISeqPtr(iseqval, iseq);
-    parse_tree_for_iseq_internal(self, iseq, tree);
+    return parse_tree_for_iseq_internal(self, iseq, tree);
 }
 
 /* Defined in Ruby 1.9 proc.c */
@@ -76,7 +75,7 @@ static VALUE
 parse_tree_for_method(VALUE self, VALUE method, VALUE tree)
 {
     rb_iseq_t *iseq = rb_method_get_iseq(method);
-    parse_tree_for_iseq_internal(self, iseq, tree);
+    return parse_tree_for_iseq_internal(self, iseq, tree);
 }
 
 static VALUE 
@@ -84,7 +83,6 @@ parse_tree_common(VALUE self, VALUE source, VALUE filename, VALUE line,
                   VALUE tree)
 {
     VALUE tmp;
-    VALUE result = rb_ary_new();
     NODE *node = NULL;
 
 #ifdef FIXED

data/include/vm_core_mini.h

@@ -94,13 +94,13 @@ typedef struct rb_iseq_struct {
     /***************/
 
     VALUE type;          /* instruction sequence type */
-    VALUE name;          /* String: iseq name */
+    VALUE name;	         /* String: iseq name */
     VALUE filename;      /* file information where this sequence from */
     VALUE filepath;      /* real file path or nil */
     VALUE *iseq;         /* iseq (insn number and operands) */
     VALUE *iseq_encoded; /* encoded iseq */
     unsigned long iseq_size;
-    VALUE mark_ary;     /* Array: includes operands which should be GC marked */
+    VALUE mark_ary;	/* Array: includes operands which should be GC marked */
     VALUE coverage;     /* coverage array */
     unsigned short line_no;
 
@@ -108,7 +108,7 @@ typedef struct rb_iseq_struct {
     struct iseq_insn_info_entry *insn_info_table;
     size_t insn_info_size;
 
-    ID *local_table;            /* must free */
+    ID *local_table;		/* must free */
     int local_table_size;
 
     /* method, class frame: sizeof(vars) + 1, block frame: sizeof(vars) */
@@ -165,7 +165,7 @@ typedef struct rb_iseq_struct {
     /****************/
 
     VALUE self;
-    VALUE orig;                 /* non-NULL if its data have origin */
+    VALUE orig;			/* non-NULL if its data have origin */
 
     /* block inlining */
     /*
@@ -189,7 +189,7 @@ typedef struct rb_iseq_struct {
 
     /* If this instruction sequence came from eval, the string of the
        source as a String. */
-    VALUE source;
+    VALUE eval_source;
 
     /* If we are saving tree nodes (a compile option), then tree_node
        is the internal parse tree node representation for this
@@ -234,8 +234,8 @@ typedef struct rb_vm_struct {
 
     /* signal */
     struct {
-        VALUE cmd;
-        int safe;
+	VALUE cmd;
+	int safe;
     } trap_list[RUBY_NSIG];
 
     /* hook */
@@ -308,8 +308,8 @@ typedef struct rb_thread_struct
     rb_event_flag_t event_flags;
     int tracing;  /* 0 if not tracing. If less than 0, skip that many
                      C call/return pairs */
+
     int exec_event_tracing;  /* 0 if not in rb_threadptr_evec_event_hooks. */
-    int trace_skip_insn_count; /* # of VM instructions to skip */
 
     /* misc */
     int method_missing_reason;

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - R. Bernstein
@@ -13,12 +13,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-25 00:00:00 -05:00
+date: 2011-06-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
 description: "\n\
-  rb-parsetree is the C extension part of ParseTree for Ruby 1.9.\n"
+  rb-parsetree is the C extension part of ParseTree for Ruby 1.9. A patched version of Ruby 1.9.2 is required.\n"
 email: rockyb@rubyforge.org
 executables: []