better_caller 0.0.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: da7bccbac5aea167c768fb4c8b74703eb13cca8896f3718b1cfc74a1bac0b473
+  data.tar.gz: 522737eaacca956092fd04c90583ab193d1e896490987531b38cd594326056a5
+SHA512:
+  metadata.gz: 61c3c0aff0780808e9ed72d2911146f7ef8263f9193d6d75503781f8acccb6028ec02e421f5e4f7b80f7639f8f2c8b10f1f3986c6d02ef2750085cac35b49847
+  data.tar.gz: d3ccfd79904cbac4ba9215ccf2752615835e3f183cc6405ccf805a1fb63aa61461e0beb5e4c5a5f74826ad76a352be794bb2fc4fc33d359e46884b36ba17d9e7

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/Gemfile

@@ -0,0 +1,11 @@
+source :rubygems
+
+group :development do
+  # Frameworks/libraries
+  gem 'bundler', '~> 1.0.0'
+  gem 'jeweler', '~> 1.5.2'
+  
+  # Documentation
+  gem 'yard', '~> 0.6.0'
+  gem 'RedCloth'
+end

data/Gemfile.lock

@@ -0,0 +1,20 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RedCloth (4.2.3)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    yard (0.6.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  bundler (~> 1.0.0)
+  jeweler (~> 1.5.2)
+  yard (~> 0.6.0)

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Tim Morgan
+Copyright (c) 2009-2011 Tim Morgan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -0,0 +1,71 @@
+h2. ⚠️ DEPRECATED
+
+*This gem is no longer maintained.* Ruby's modern @caller_locations@ builtin (added in 2.0) covers most use cases.
+
+----
+
+h1. better_caller
+
+| *Author* | Tim Morgan |
+| *Date* | Dec 23, 2009 |
+| *License* | MIT (see @LICENSE.txt@ for details) |
+
+h2. Introduction by example
+
+Actions speak louder than words. Gone are the days of this old suckageness:
+
+<pre><code>
+caller #=> ["test.rb:8:in `foo'", "test.rb:16:in `<main>'"]
+</code></pre>
+
+With better_caller, you get this new hotness:
+
+<pre><code>
+require 'better_caller'
+better_caller #=> [["test.rb", 8, :foo, #<Binding:0x000001010cae50>], ["test.rb", 16, :"<main>", #<Binding:0x000001010caef8>]]	
+</code></pre>
+
+There are a couple of things you may notice. First of all, the okay-that's-nice
+thing: String parsing is a thing of the past. You get the file, line, and method
+as separate elements. This happens *at the Ruby interpreter level*.
+
+Now, the holy-shit-that's-awesome feature: *You get bindings, all the way up
+the stack.* Yes, that's right, you can do this:
+
+<pre><code>
+eval "local_variables", better_caller.first.last #=> [ :var1, :var2, :foo ]
+</code></pre>
+
+You also get this stuff in exception, mondo excellent for debugging:
+
+<pre><code>
+$!.better_backtrace # now you can figure out what your local variables were at the time of the exception!
+</code></pre>
+
+h2. This is horribly slow, right? You're using some @set_trace_func@ magic
+that's going to make my Ruby 1,000,000% slower, right?
+
+No. better_caller is a C function that uses the internal Ruby memory structures
+to build its output. Absolutely no @set_trace_func@ and no speed hit.
+
+h2. Super ominous alpha warning
+
+better_caller is extremely, hyperbolically alpha right now. Here are some known
+obstacles currently preventing it from blowing minds:
+
+* *It only works with a very specific version of Ruby (in particular,
+  1.9.2-p136).* This is because it uses some private Ruby C functions to work
+  its magic, so it keeps a copy of some header files that you're not really
+  supposed to be using.
+* *Storing local variables in exceptions isn't quite working yet.* Hopefully
+  I'll have a fix soon; be patient.
+
+Despite that, it does work sometimes, and when it does, I think it rocks. If you
+do too, please do me the honor of contributing to this project, _especially_ if
+you're one of the three people on the planet that understand the workings of
+Ruby frame pointers. That would be swell.
+
+h3. Additional to-do items
+
+* Comments
+* Some way of doing specs?

data/Rakefile

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "better_caller"
+  gem.homepage = "http://github.com/RISCfuture/better_caller"
+  gem.license = "MIT"
+  gem.summary = %Q{Symbolic call stack with bindings}
+  gem.description = %Q{A more programmer-friendly call stack complete with bindings for each level: no more string parsing\!}
+  gem.email = "git@timothymorgan.info"
+  gem.authors = ["Tim Morgan"]
+  gem.extensions = [ 'ext/extconf.rb' ]
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'yard'
+YARD::Rake::YardocTask.new('doc') do |doc|
+  doc.options << "-m" << "textile"
+  doc.options << "--protected"
+  doc.options << "--no-private"
+  doc.options << "-r" << "README.textile"
+  doc.options << "-o" << "doc"
+  doc.options << "--title" << "better_caller Documentation".inspect
+  
+  doc.files = [ 'lib/**/*', 'README.textile' ]
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.2

data/better_caller.gemspec

@@ -0,0 +1,94 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{better_caller}
+  s.version = "0.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tim Morgan"]
+  s.date = %q{2011-01-04}
+  s.description = %q{A more programmer-friendly call stack complete with bindings for each level: no more string parsing!}
+  s.email = %q{git@timothymorgan.info}
+  s.extensions = ["ext/extconf.rb"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.textile"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "better_caller.gemspec",
+    "ext/better_caller.c",
+    "ext/debug.h",
+    "ext/dln.h",
+    "ext/encdb.h",
+    "ext/eval_intern.h",
+    "ext/extconf.rb",
+    "ext/gc.h",
+    "ext/id.h",
+    "ext/iseq.h",
+    "ext/method.h",
+    "ext/node.h",
+    "ext/parse.h",
+    "ext/regenc.h",
+    "ext/regint.h",
+    "ext/regparse.h",
+    "ext/revision.h",
+    "ext/thread_pthread.h",
+    "ext/thread_win32.h",
+    "ext/timev.h",
+    "ext/transcode_data.h",
+    "ext/transdb.h",
+    "ext/version.h",
+    "ext/vm_core.h",
+    "ext/vm_exec.h",
+    "ext/vm_insnhelper.h",
+    "ext/vm_opts.h",
+    "lib/better_caller/extensions.rb"
+  ]
+  s.homepage = %q{http://github.com/RISCfuture/better_caller}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{[DEPRECATED] Symbolic call stack with bindings}
+  s.post_install_message = <<~MSG
+
+    ⚠️  DEPRECATED: better_caller is no longer maintained.
+
+    Ruby's modern `caller_locations` builtin (added in 2.0) covers most use cases.
+
+    This is the final release. No further updates are planned.
+
+  MSG
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<RedCloth>, [">= 0"])
+    else
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<RedCloth>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<RedCloth>, [">= 0"])
+  end
+end
+

data/ext/better_caller.c

@@ -47,7 +47,7 @@ static VALUE backtrace_each(rb_thread_t *th, const rb_control_frame_t *limit_cfp
 			elem = rb_ary_new();
 			rb_ary_push(elem, rb_str_new2(file));
 			rb_ary_push(elem, INT2FIX(line_no));
-			rb_ary_push(elem, ID2SYM(cfp->method_id));
+			rb_ary_push(elem, ID2SYM(cfp->me->def ? cfp->me->def->original_id : cfp->me->called_id));
 			rb_ary_push(elem, Qnil);
 			rb_ary_push(ary, elem);
 		}
@@ -88,61 +88,20 @@ static VALUE better_caller(int argc, VALUE *argv) {
 	return backtrace(GET_THREAD(), lev);
 }
 
-// static VALUE thread_bindings(VALUE self) {
-// 	VALUE bindings = rb_iv_get(self, "@bindings");
-// 	if (bindings == Qnil) return Qnil;
-// 	return rb_ary_subseq(bindings, 0, RARRAY_LEN(bindings) - 1);
-// }
-// 
 static VALUE exception_better_backtrace(VALUE self) {
 	return rb_iv_get(self, "@better_backtrace");
 }
-// 
+
 static void process_event(rb_event_flag_t event, VALUE data, VALUE self, ID id, VALUE klass) {
-// 	VALUE thread = rb_thread_current();
-// 	VALUE subarray;
-// 	
-// 	VALUE bindings = rb_iv_get(thread, "@bindings");
-// 	if (bindings == Qnil) {
-// 		bindings = rb_ary_new();
-// 		rb_iv_set(thread, "@bindings", bindings);
-// 	}
-// 	
  	switch (event) {
-// 		// case RUBY_EVENT_LINE:
-// 		// 	if (RARRAY_LEN(bindings) == 0) rb_ary_push(bindings, rb_binding_new());
-// 		// 	break;
-// 			
-// 		case RUBY_EVENT_CLASS:
-// 		case RUBY_EVENT_CALL:
-// 		case RUBY_EVENT_C_CALL:
-// 			subarray = rb_ary_new();
-// 			rb_ary_push(subarray, rb_str_new2(rb_sourcefile()));
-// 			rb_ary_push(subarray, id ? ID2SYM(id) : Qnil);
-// 			rb_ary_push(subarray, rb_binding_new());
-// 			rb_ary_push(bindings, subarray);
-// 			break;
-// 		
-// 		case RUBY_EVENT_END:
-// 		case RUBY_EVENT_RETURN:
-// 		case RUBY_EVENT_C_RETURN:
-// 			rb_ary_pop(bindings);
-// 			break;
-// 		
  		case RUBY_EVENT_RAISE:
-			rb_iv_set(rb_gv_get("$!"), "@better_backtrace", better_caller(0, 0));
-// 			rb_iv_set(rb_gv_get("$!"), "@bindings", bindings);
-// 			rb_ary_pop(bindings);
+			rb_funcall(rb_gv_get("$!"), rb_intern("set_better_backtrace"), 1, better_caller(0, 0));
  			break;
 	}
 }
 
 void Init_better_caller() {
 	rb_define_method(rb_eException, "better_backtrace", exception_better_backtrace, 0);
-	// rb_define_method(rb_cThread, "bindings", thread_bindings, 0);
 	rb_define_global_function("better_caller", better_caller, -1);
-	// int events = RUBY_EVENT_CLASS|RUBY_EVENT_CALL|RUBY_EVENT_C_CALL|RUBY_EVENT_END|RUBY_EVENT_RETURN|RUBY_EVENT_C_RETURN|RUBY_EVENT_RAISE;
-	// rb_add_event_hook(process_event, events, Qnil);
-	// rb_add_event_hook(process_event, RUBY_EVENT_ALL, Qnil);
 	rb_add_event_hook(process_event, RUBY_EVENT_RAISE, Qnil);
 }

data/ext/debug.h

@@ -2,7 +2,7 @@
 
   debug.h - YARV Debug function interface
 
-  $Author: ko1 $
+  $Author: akr $
   created at: 04/08/25 02:33:49 JST
 
   Copyright (C) 2004-2007 Koichi Sasada

data/ext/dln.h

@@ -2,7 +2,7 @@
 
   dln.h -
 
-  $Author: nobu $
+  $Author: akr $
   created at: Wed Jan 19 16:53:09 JST 1994
 
   Copyright (C) 1993-2007 Yukihiro Matsumoto
@@ -30,8 +30,8 @@
 
 DEPRECATED(char *dln_find_exe(const char*,const char*));
 DEPRECATED(char *dln_find_file(const char*,const char*));
-char *dln_find_exe_r(const char*,const char*,char*,int);
-char *dln_find_file_r(const char*,const char*,char*,int);
+char *dln_find_exe_r(const char*,const char*,char*,size_t);
+char *dln_find_file_r(const char*,const char*,char*,size_t);
 
 #ifdef USE_DLN_A_OUT
 extern char *dln_argv0;

data/ext/encdb.h

@@ -1,5 +1,7 @@
 ENC_DEFINE("ASCII-8BIT");
 ENC_DEFINE("Big5");
+ENC_DEFINE("Big5-HKSCS");
+ENC_DEFINE("Big5-UAO");
 ENC_DEFINE("CP949");
 ENC_DEFINE("Emacs-Mule");
 ENC_DEFINE("EUC-JP");
@@ -76,7 +78,10 @@ ENC_REPLICATE("macRomania", "ASCII-8BIT");
 ENC_REPLICATE("macThai", "ASCII-8BIT");
 ENC_REPLICATE("macTurkish", "ASCII-8BIT");
 ENC_REPLICATE("macUkraine", "ASCII-8BIT");
-ENC_ALIAS("CP950", "BIG5");
+ENC_ALIAS("CP950", "Big5");
+ENC_SET_BASE("Big5-HKSCS", "Big5");
+ENC_ALIAS("CP951", "Big5-HKSCS");
+ENC_SET_BASE("Big5-UAO", "Big5");
 ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule");
 ENC_ALIAS("eucJP", "EUC-JP") /* UI-OSF Application Platform Profile for Japanese Environment Version 1.1 */;
 ENC_REPLICATE("eucJP-ms", "EUC-JP") /* TOG/JVC CDE/Motif Technical WG */;
@@ -92,6 +97,8 @@ ENC_DUMMY("ISO-2022-JP");
 ENC_ALIAS("ISO2022-JP", "ISO-2022-JP");
 ENC_REPLICATE("ISO-2022-JP-2", "ISO-2022-JP");
 ENC_ALIAS("ISO2022-JP2", "ISO-2022-JP-2");
+ENC_REPLICATE("CP50220", "ISO-2022-JP");
+ENC_REPLICATE("CP50221", "ISO-2022-JP");
 ENC_ALIAS("ISO8859-1", "ISO-8859-1");
 ENC_REPLICATE("Windows-1252", "ISO-8859-1");
 ENC_ALIAS("CP1252", "Windows-1252");
@@ -139,9 +146,18 @@ ENC_ALIAS("CP65000", "UTF-7");
 ENC_ALIAS("CP65001", "UTF-8");
 ENC_REPLICATE("UTF8-MAC", "UTF-8");
 ENC_ALIAS("UTF-8-MAC", "UTF8-MAC");
+ENC_ALIAS("UTF-8-HFS", "UTF8-MAC") /* Emacs 23.2 */;
 ENC_ALIAS("UCS-2BE", "UTF-16BE");
 ENC_ALIAS("UCS-4BE", "UTF-32BE");
 ENC_ALIAS("UCS-4LE", "UTF-32LE");
 ENC_ALIAS("CP1251", "Windows-1251");
+ENC_REPLICATE("UTF8-DoCoMo", "UTF-8");
+ENC_REPLICATE("SJIS-DoCoMo", "Windows-31J");
+ENC_REPLICATE("UTF8-KDDI", "UTF-8");
+ENC_REPLICATE("SJIS-KDDI", "Windows-31J");
+ENC_REPLICATE("ISO-2022-JP-KDDI", "ISO-2022-JP");
+ENC_REPLICATE("stateless-ISO-2022-JP-KDDI", "stateless-ISO-2022-JP");
+ENC_REPLICATE("UTF8-SoftBank", "UTF-8");
+ENC_REPLICATE("SJIS-SoftBank", "Windows-31J");
 
-#define ENCODING_COUNT 83
+#define ENCODING_COUNT 95

data/ext/eval_intern.h

@@ -157,7 +157,7 @@ enum ruby_tag_type {
 #define TAG_MASK	RUBY_TAG_MASK
 
 #define NEW_THROW_OBJECT(val, pt, st) \
-  ((VALUE)NEW_NODE(NODE_LIT, (val), (pt), (st)))
+  ((VALUE)rb_node_newnode(NODE_LIT, (VALUE)(val), (VALUE)(pt), (VALUE)(st)))
 #define SET_THROWOBJ_CATCH_POINT(obj, val) \
   (RNODE((obj))->u2.value = (val))
 #define SET_THROWOBJ_STATE(obj, val) \
@@ -172,7 +172,7 @@ enum ruby_tag_type {
 #define SCOPE_SET(f)   (rb_vm_cref()->nd_visi = (f))
 
 #define CHECK_STACK_OVERFLOW(cfp, margin) do \
-  if (((VALUE *)(cfp)->sp) + (margin) + sizeof(rb_control_frame_t) >= ((VALUE *)cfp)) { \
+  if ((VALUE *)((char *)(((VALUE *)(cfp)->sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)cfp)) { \
       rb_exc_raise(sysstack_error); \
   } \
 while (0)
@@ -185,8 +185,8 @@ enum {
     RAISED_STACKOVERFLOW = 2,
     RAISED_NOMEMORY = 4
 };
-int rb_thread_set_raised(rb_thread_t *th);
-int rb_thread_reset_raised(rb_thread_t *th);
+int rb_threadptr_set_raised(rb_thread_t *th);
+int rb_threadptr_reset_raised(rb_thread_t *th);
 #define rb_thread_raised_set(th, f)   ((th)->raised_flag |= (f))
 #define rb_thread_raised_reset(th, f) ((th)->raised_flag &= ~(f))
 #define rb_thread_raised_p(th, f)     (((th)->raised_flag & (f)) != 0)
@@ -205,11 +205,28 @@ NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, VALUE *argv,
 
 VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
 NODE *rb_vm_cref(void);
-VALUE rb_obj_is_proc(VALUE);
-VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename);
+VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename, VALUE filepath);
+void rb_vm_set_progname(VALUE filename);
 void rb_thread_terminate_all(void);
 VALUE rb_vm_top_self();
 VALUE rb_vm_cbase(void);
+int rb_vm_get_sourceline(const rb_control_frame_t *);
 void rb_trap_restore_mask(void);
 
+#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
+#define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
+#endif
+
+#if defined DOSISH || defined __CYGWIN__
+static inline void
+translit_char(char *p, int from, int to)
+{
+    while (*p) {
+	if ((unsigned char)*p == from)
+	    *p = to;
+	p = CharNext(p);
+    }
+}
+#endif
+
 #endif /* RUBY_EVAL_INTERN_H */

data/ext/extconf.rb

@@ -1,3 +1,4 @@
 require 'mkmf'
 
 create_makefile 'better_caller'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/better_caller/extensions')

data/ext/gc.h

@@ -2,8 +2,10 @@
 #ifndef RUBY_GC_H
 #define RUBY_GC_H 1
 
-#if defined(__i386) && defined(__GNUC__)
-#define SET_MACHINE_STACK_END(p) __asm__("mov %%esp, %0" : "=r" (*p))
+#if defined(__x86_64__) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__("movq\t%%rsp, %0" : "=r" (*p))
+#elif defined(__i386) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__("movl\t%%esp, %0" : "=r" (*p))
 #else
 NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
 #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
@@ -26,7 +28,7 @@ rb_gc_debug_indent(void)
 }
 
 static void
-rb_gc_debug_body(char *mode, char *msg, int st, void *ptr)
+rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr)
 {
     if (st == 0) {
 	ruby_gc_debug_indent--;
@@ -64,7 +66,7 @@ rb_gc_debug_body(char *mode, char *msg, int st, void *ptr)
 # define STACK_UPPER(x, a, b) b
 #else
 RUBY_EXTERN int ruby_stack_grow_direction;
-int ruby_get_stack_grow_direction(VALUE *addr);
+int ruby_get_stack_grow_direction(volatile VALUE *addr);
 # define stack_growup_p(x) (			\
 	(ruby_stack_grow_direction ?		\
 	 ruby_stack_grow_direction :		\

data/ext/id.h

@@ -1,9 +1,9 @@
 /* DO NOT EDIT THIS FILE DIRECTLY */
 /**********************************************************************
 
-  id.h - 
+  id.h -
 
-  $Author: nobu $
+  $Author: akr $
   created at: Sun Oct 19 21:12:51 2008
 
   Copyright (C) 2007 Koichi Sasada
@@ -61,15 +61,20 @@ enum ruby_method_ids {
     idRespond_to = 366,
     idIFUNC = 367,
     idCFUNC = 368,
-    idThrowState = 369,
-    id_core_set_method_alias = 370,
-    id_core_set_variable_alias = 371,
-    id_core_undef_method = 372,
-    id_core_define_method = 373,
-    id_core_define_singleton_method = 374,
-    id_core_set_postexe = 375,
-    tLAST_TOKEN = 376,
+    id_core_set_method_alias = 369,
+    id_core_set_variable_alias = 370,
+    id_core_undef_method = 371,
+    id_core_define_method = 372,
+    id_core_define_singleton_method = 373,
+    id_core_set_postexe = 374,
+    tLAST_TOKEN = 375,
 #endif
+    idDot2 = tDOT2,
+    idDot3 = tDOT3,
+    idUPlus = tUPLUS,
+    idUMinus = tUMINUS,
+    idPow = tPOW,
+    idCmp = tCMP,
     idPLUS = '+',
     idMINUS = '-',
     idMULT = '*',
@@ -86,12 +91,14 @@ enum ruby_method_ids {
     idNot = '!',
     idBackquote = '`',
     idEqTilde = tMATCH,
+    idNeqTilde = tNMATCH,
     idAREF = tAREF,
     idASET = tASET,
     idLAST_TOKEN = tLAST_TOKEN >> ID_SCOPE_SHIFT,
     tIntern,
     tMethodMissing,
     tLength,
+    tSize,
     tGets,
     tSucc,
     tEach,
@@ -112,6 +119,7 @@ enum ruby_method_ids {
     TOKEN2ID(Intern),
     TOKEN2ID(MethodMissing),
     TOKEN2ID(Length),
+    TOKEN2ID(Size),
     TOKEN2ID(Gets),
     TOKEN2ID(Succ),
     TOKEN2ID(Each),
@@ -149,14 +157,13 @@ ruby_method_id_check_for(idNULL, 365);
 ruby_method_id_check_for(idRespond_to, 366);
 ruby_method_id_check_for(idIFUNC, 367);
 ruby_method_id_check_for(idCFUNC, 368);
-ruby_method_id_check_for(idThrowState, 369);
-ruby_method_id_check_for(id_core_set_method_alias, 370);
-ruby_method_id_check_for(id_core_set_variable_alias, 371);
-ruby_method_id_check_for(id_core_undef_method, 372);
-ruby_method_id_check_for(id_core_define_method, 373);
-ruby_method_id_check_for(id_core_define_singleton_method, 374);
-ruby_method_id_check_for(id_core_set_postexe, 375);
-ruby_method_id_check_for(tLAST_TOKEN, 376);
+ruby_method_id_check_for(id_core_set_method_alias, 369);
+ruby_method_id_check_for(id_core_set_variable_alias, 370);
+ruby_method_id_check_for(id_core_undef_method, 371);
+ruby_method_id_check_for(id_core_define_method, 372);
+ruby_method_id_check_for(id_core_define_singleton_method, 373);
+ruby_method_id_check_for(id_core_set_postexe, 374);
+ruby_method_id_check_for(tLAST_TOKEN, 375);
 };
 #endif
 

data/ext/iseq.h

@@ -2,7 +2,7 @@
 
   iseq.h -
 
-  $Author: yugui $
+  $Author: mame $
   created at: 04/01/01 23:36:57 JST
 
   Copyright (C) 2004-2008 Koichi Sasada
@@ -19,7 +19,7 @@ VALUE rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
 			     VALUE exception, VALUE body);
 
 /* iseq.c */
-VALUE ruby_iseq_load(VALUE data, VALUE parent, VALUE opt);
+VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt);
 struct st_table *ruby_insn_make_insn_table(void);
 
 #define ISEQ_TYPE_TOP    INT2FIX(1)
@@ -32,12 +32,12 @@ struct st_table *ruby_insn_make_insn_table(void);
 #define ISEQ_TYPE_MAIN   INT2FIX(8)
 #define ISEQ_TYPE_DEFINED_GUARD INT2FIX(9)
 
-#define CATCH_TYPE_RESCUE INT2FIX(1)
-#define CATCH_TYPE_ENSURE INT2FIX(2)
-#define CATCH_TYPE_RETRY  INT2FIX(3)
-#define CATCH_TYPE_BREAK  INT2FIX(4)
-#define CATCH_TYPE_REDO   INT2FIX(5)
-#define CATCH_TYPE_NEXT   INT2FIX(6)
+#define CATCH_TYPE_RESCUE ((int)INT2FIX(1))
+#define CATCH_TYPE_ENSURE ((int)INT2FIX(2))
+#define CATCH_TYPE_RETRY  ((int)INT2FIX(3))
+#define CATCH_TYPE_BREAK  ((int)INT2FIX(4))
+#define CATCH_TYPE_REDO   ((int)INT2FIX(5))
+#define CATCH_TYPE_NEXT   ((int)INT2FIX(6))
 
 struct iseq_insn_info_entry {
     unsigned short position;
@@ -74,14 +74,15 @@ struct iseq_compile_data {
     struct iseq_label_data *end_label;
     struct iseq_label_data *redo_label;
     VALUE current_block;
-    VALUE loopval_popped;	/* used by NODE_BREAK */
     VALUE ensure_node;
     VALUE for_iseq;
     struct iseq_compile_data_ensure_node_stack *ensure_node_stack;
+    int loopval_popped;	/* used by NODE_BREAK */
     int cached_const;
     struct iseq_compile_data_storage *storage_head;
     struct iseq_compile_data_storage *storage_current;
     int last_line;
+    int last_coverable_line;
     int flip_cnt;
     int label_no;
     int node_level;