rb-threadframe 0.40 → 0.41

data/NEWS

@@ -1,3 +1,10 @@
+Jan 13, 2012 (0.41) 
+
+ - Patches redone for Ruby 1.9.3 p362
+ - Make pure Ruby gem. 
+   NOTE: Until Ruby 1.9.2 patches are redone, this gem will not work on 
+   Ruby 1.9.2. Use an older gem for that.
+
 Nov 25, 2012 (0.40) 
  - Redone for Ruby 1.9.3 p327
  - RubyVM::ThreadFrame is now RubyVM::Frame. RubyVM::ThreadFrame is still 

data/README.md

@@ -1,9 +1,8 @@
 # rb-threadframe
 
-rb-threadframe is a set of patches to Ruby MRI 1.9.2 and 1.9.3 that
-adds introspection of call frames and adds other run-time support for debuggers and run-time introspection. 
+A set of patches to Ruby MRI 1.9.3 and 1.9.2 that adds run-time introspection, a call frame object, and other run-time support for things like debuggers.
 
-For MRI 1.9.2, there are additional routines are in a C extension. For MRI 1.9.3, everthing is in a patched Ruby. Necessary patches and some simple patch code are found in this repository though. 
+For MRI 1.9.2, there are additional routines are in a C extension. For MRI 1.9.3, everthing is in a patched Ruby. Necessary patches and some simple patch code are found in this repository though. See https://github.com/rocky/rb-threadframe/wiki/How-to-Install for how to install.
 
 ## Requirements
 

data/lib/thread_frame.rb

@@ -1,9 +1,11 @@
 # Boilerplate to pull shared object and helper routines.
-if RUBY_VERSION == '1.9.2'
-  require_relative '../ext/thread_frame'
-end
 require_relative 'iseq_extra'
 
+class RubyVM::Frame
+  VERSION = '0.41'
+end
+
+
 RubyVM::ThreadFrame = RubyVM::Frame
 class Thread
   # For compatibility with old stuff

data/test/unit/test-frame.rb

@@ -50,7 +50,6 @@ class TestThread < Test::Unit::TestCase
     # because the location is reported on a traceback
     # and that probably can't happen at PC 0.
     def bug_when_zero_pc
-      skip "pc_offset= not implemented on 1.9.3" if '1.9.3' == RUBY_VERSION
       @not_first = true
       tf = RubyVM::Frame::current.prev
       pc_save = tf.pc_offset
@@ -91,9 +90,6 @@ class TestThread < Test::Unit::TestCase
     assert_equal(self, tf.self)
     assert_equal(0, tf.arity)
     assert_equal(0, tf.argc)
-    ## FIXME: Should we allow this?
-    ## assert tf.dfp(0)
-    ## assert tf.lfp(0)
 
     # assert_raises IndexError do
     #   x = tf.lfp(tf.iseq.local_size+1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-threadframe
 version: !ruby/object:Gem::Version
-  version: '0.40'
+  version: '0.41'
   prerelease: 
 platform: ruby
 authors:
@@ -9,17 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies: []
-description: ! '
+description: ! 'A set of patches to Ruby MRI 1.9.3 and 1.9.2 that adds run-time introspection,
+  a call frame object, and other run-time support for things like debuggers.
 
-  rb-threadframe gives introspection access for frames of a thread.
+
+  Necessary patches and some simple patch code are found in the git repository. See
+  https://github.com/rocky/rb-threadframe/wiki/How-to-Install for how to install.
 
 '
 email: rockyb@rubyforge.net
 executables: []
-extensions:
-- ext/extconf.rb
+extensions: []
 extra_rdoc_files:
 - README.md
 - threadframe.rd
@@ -29,15 +31,8 @@ files:
 - Makefile
 - LICENSE
 - NEWS
-- include/thread_pthread.h
-- include/node.h
-- include/method_mini.h
-- include/ruby19_externs.h
-- include/vm_core_mini.h
 - lib/iseq_extra.rb
 - lib/thread_frame.rb
-- ext/1.9.3/thread_frame.c
-- ext/version.h
 - test/unit/test-trace.rb
 - test/unit/test-iseq-save.rb
 - test/unit/test-prev.rb
@@ -58,7 +53,6 @@ files:
 - test/unit/test-sp-size.rb
 - test/ruby/test_tracefunc_adds.rb
 - threadframe.rd
-- ext/extconf.rb
 homepage: http://github.com/rocky/rb-threadframe/tree/master
 licenses:
 - MIT
@@ -67,7 +61,7 @@ rdoc_options:
 - --main
 - README.md
 - --title
-- ThreadFrame 0.40 Documentation
+- ThreadFrame 0.41 Documentation
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -87,5 +81,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Frame introspection
+summary: Call stack introspection and run-time support for debuggers
 test_files: []

data/ext/1.9.3/thread_frame.c

@@ -1,22 +0,0 @@
-/* Ruby 1.9.3 doesn't need a C extension while 1.9.2 does. I can't figure
-   out a way build a gem so that it loads the C extension conditionally.
-   So instead we have a simple stupid stub extension. 
-
-   This as it is not elegant. 
-*/
-   
-#include <ruby.h>
-#include <ruby/version.h>
-#include <string.h>
-void
-Init_thread_frame(void)
-{
-    if (0 == strncmp("1.9.2", ruby_version, sizeof("1.9.2")))
-    {
-	rb_raise(rb_eLoadError, 
-		 "Gem installed under Ruby 1.9.3 but this Ruby 1.9.2. Please reinstall 'rb-threadframe' gem under 1.9.2.");
-    } else if (0 == strncmp("1.9.3", ruby_version, sizeof("1.9.3"))) {
-	rb_raise(rb_eLoadError, 
-		 "Under Ruby 1.9.3 there is no reason to load this thread_frame C extension.");
-    }
-}

data/ext/extconf.rb

@@ -1,14 +0,0 @@
-require 'mkmf'
-
-fail "You need to install a threadframe-patched Ruby.
-See http://github.com/rocky/rb-threadframe/wiki/How-to-Install" unless 
-  RbConfig::CONFIG.member?('rb-threadframe')
-
-# Allow use customization of compile options. For example, the 
-# following lines could be put in config_options:
-# CONFIG['optflags'] = ''   # Or -O3
-# CONFIG['debugflags'] = '-g3 -ggdb' 
-config_file = File.join(File.dirname(__FILE__), 'config_options.rb')
-load config_file if File.exist?(config_file)
-
-create_makefile("thread_frame", RUBY_VERSION)

data/ext/version.h

@@ -1 +0,0 @@
-#define THREADFRAME_VERSION "0.40"

data/include/method_mini.h

@@ -1,90 +0,0 @@
-/**********************************************************************
- From Ruby 1.9's method.h. 
-
-  Copyright (C) 2009 Koichi Sasada
-
-**********************************************************************/
-#ifndef METHOD_H
-#define METHOD_H
-
-typedef enum {
-    NOEX_PUBLIC    = 0x00,
-    NOEX_NOSUPER   = 0x01,
-    NOEX_PRIVATE   = 0x02,
-    NOEX_PROTECTED = 0x04,
-    NOEX_MASK      = 0x06,
-    NOEX_BASIC     = 0x08,
-    NOEX_UNDEF     = NOEX_NOSUPER,
-    NOEX_MODFUNC   = 0x12,
-    NOEX_SUPER     = 0x20,
-    NOEX_VCALL     = 0x40,
-    NOEX_RESPONDS  = 0x80
-} rb_method_flag_t;
-
-#define NOEX_SAFE(n) ((int)((n) >> 8) & 0x0F)
-#define NOEX_WITH(n, s) ((s << 8) | (n) | (ruby_running ? 0 : NOEX_BASIC))
-#define NOEX_WITH_SAFE(n) NOEX_WITH(n, rb_safe_level())
-
-/* method data type */
-
-typedef enum {
-    VM_METHOD_TYPE_ISEQ,
-    VM_METHOD_TYPE_CFUNC,
-    VM_METHOD_TYPE_ATTRSET,
-    VM_METHOD_TYPE_IVAR,
-    VM_METHOD_TYPE_BMETHOD,
-    VM_METHOD_TYPE_ZSUPER,
-    VM_METHOD_TYPE_UNDEF,
-    VM_METHOD_TYPE_NOTIMPLEMENTED,
-    VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */
-    VM_METHOD_TYPE_MISSING   /* wrapper for method_missing(id) */
-} rb_method_type_t;
-
-typedef struct rb_method_cfunc_struct {
-    VALUE (*func)(ANYARGS);
-    int argc; /* This should probably be called "arity" since it is based
-		 on the static prototype, not the supplied arguments
-		 at runtime. */
-    int actual_argc; /* This probably should be called argc. It is the
-			argument count at runtime.*/
-} rb_method_cfunc_t;
-
-typedef struct rb_method_attr_struct {
-    ID id;
-    VALUE location;
-} rb_method_attr_t;
-
-/* typedef struct rb_iseq_struct rb_iseq_t; */
-
-typedef struct rb_method_definition_struct {
-    rb_method_type_t type; /* method type */
-    ID original_id;
-    union {
-	rb_iseq_t *iseq;            /* should be mark */
-	rb_method_cfunc_t cfunc;
-	rb_method_attr_t attr;
-	VALUE proc;                 /* should be mark */
-	enum method_optimized_type {
-	    OPTIMIZED_METHOD_TYPE_SEND,
-	    OPTIMIZED_METHOD_TYPE_CALL
-	} optimize_type;
-    } body;
-    int alias_count;
-} rb_method_definition_t;
-
-typedef struct rb_method_entry_struct {
-    rb_method_flag_t flag;
-    char mark;
-    rb_method_definition_t *def;
-    ID called_id;
-    VALUE klass;                    /* should be mark */
-} rb_method_entry_t;
-
-struct unlinked_method_entry_list_entry {
-    struct unlinked_method_entry_list_entry *next;
-    rb_method_entry_t *me;
-};
-
-#define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF)
-
-#endif /* METHOD_H */

data/include/node.h

@@ -1,483 +0,0 @@
-/**********************************************************************
-
-  node.h -
-
-  $Author: muraken $
-  created at: Fri May 28 15:14:02 JST 1993
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_NODE_H
-#define RUBY_NODE_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-enum node_type {
-    NODE_SCOPE,
-#define NODE_SCOPE       NODE_SCOPE
-    NODE_BLOCK,
-#define NODE_BLOCK       NODE_BLOCK
-    NODE_IF,
-#define NODE_IF          NODE_IF
-    NODE_CASE,
-#define NODE_CASE        NODE_CASE
-    NODE_WHEN,
-#define NODE_WHEN        NODE_WHEN
-    NODE_OPT_N,
-#define NODE_OPT_N       NODE_OPT_N
-    NODE_WHILE,
-#define NODE_WHILE       NODE_WHILE
-    NODE_UNTIL,
-#define NODE_UNTIL       NODE_UNTIL
-    NODE_ITER,
-#define NODE_ITER        NODE_ITER
-    NODE_FOR,
-#define NODE_FOR         NODE_FOR
-    NODE_BREAK,
-#define NODE_BREAK       NODE_BREAK
-    NODE_NEXT,
-#define NODE_NEXT        NODE_NEXT
-    NODE_REDO,
-#define NODE_REDO        NODE_REDO
-    NODE_RETRY,
-#define NODE_RETRY       NODE_RETRY
-    NODE_BEGIN,
-#define NODE_BEGIN       NODE_BEGIN
-    NODE_RESCUE,
-#define NODE_RESCUE      NODE_RESCUE
-    NODE_RESBODY,
-#define NODE_RESBODY     NODE_RESBODY
-    NODE_ENSURE,
-#define NODE_ENSURE      NODE_ENSURE
-    NODE_AND,
-#define NODE_AND         NODE_AND
-    NODE_OR,
-#define NODE_OR          NODE_OR
-    NODE_MASGN,
-#define NODE_MASGN       NODE_MASGN
-    NODE_LASGN,
-#define NODE_LASGN       NODE_LASGN
-    NODE_DASGN,
-#define NODE_DASGN       NODE_DASGN
-    NODE_DASGN_CURR,
-#define NODE_DASGN_CURR  NODE_DASGN_CURR
-    NODE_GASGN,
-#define NODE_GASGN       NODE_GASGN
-    NODE_IASGN,
-#define NODE_IASGN       NODE_IASGN
-    NODE_IASGN2,
-#define NODE_IASGN2      NODE_IASGN2
-    NODE_CDECL,
-#define NODE_CDECL       NODE_CDECL
-    NODE_CVASGN,
-#define NODE_CVASGN      NODE_CVASGN
-    NODE_CVDECL,
-#define NODE_CVDECL      NODE_CVDECL
-    NODE_OP_ASGN1,
-#define NODE_OP_ASGN1    NODE_OP_ASGN1
-    NODE_OP_ASGN2,
-#define NODE_OP_ASGN2    NODE_OP_ASGN2
-    NODE_OP_ASGN_AND,
-#define NODE_OP_ASGN_AND NODE_OP_ASGN_AND
-    NODE_OP_ASGN_OR,
-#define NODE_OP_ASGN_OR  NODE_OP_ASGN_OR
-    NODE_CALL,
-#define NODE_CALL        NODE_CALL
-    NODE_FCALL,
-#define NODE_FCALL       NODE_FCALL
-    NODE_VCALL,
-#define NODE_VCALL       NODE_VCALL
-    NODE_SUPER,
-#define NODE_SUPER       NODE_SUPER
-    NODE_ZSUPER,
-#define NODE_ZSUPER      NODE_ZSUPER
-    NODE_ARRAY,
-#define NODE_ARRAY       NODE_ARRAY
-    NODE_ZARRAY,
-#define NODE_ZARRAY      NODE_ZARRAY
-    NODE_VALUES,
-#define NODE_VALUES      NODE_VALUES
-    NODE_HASH,
-#define NODE_HASH        NODE_HASH
-    NODE_RETURN,
-#define NODE_RETURN      NODE_RETURN
-    NODE_YIELD,
-#define NODE_YIELD       NODE_YIELD
-    NODE_LVAR,
-#define NODE_LVAR        NODE_LVAR
-    NODE_DVAR,
-#define NODE_DVAR        NODE_DVAR
-    NODE_GVAR,
-#define NODE_GVAR        NODE_GVAR
-    NODE_IVAR,
-#define NODE_IVAR        NODE_IVAR
-    NODE_CONST,
-#define NODE_CONST       NODE_CONST
-    NODE_CVAR,
-#define NODE_CVAR        NODE_CVAR
-    NODE_NTH_REF,
-#define NODE_NTH_REF     NODE_NTH_REF
-    NODE_BACK_REF,
-#define NODE_BACK_REF    NODE_BACK_REF
-    NODE_MATCH,
-#define NODE_MATCH       NODE_MATCH
-    NODE_MATCH2,
-#define NODE_MATCH2      NODE_MATCH2
-    NODE_MATCH3,
-#define NODE_MATCH3      NODE_MATCH3
-    NODE_LIT,
-#define NODE_LIT         NODE_LIT
-    NODE_STR,
-#define NODE_STR         NODE_STR
-    NODE_DSTR,
-#define NODE_DSTR        NODE_DSTR
-    NODE_XSTR,
-#define NODE_XSTR        NODE_XSTR
-    NODE_DXSTR,
-#define NODE_DXSTR       NODE_DXSTR
-    NODE_EVSTR,
-#define NODE_EVSTR       NODE_EVSTR
-    NODE_DREGX,
-#define NODE_DREGX       NODE_DREGX
-    NODE_DREGX_ONCE,
-#define NODE_DREGX_ONCE  NODE_DREGX_ONCE
-    NODE_ARGS,
-#define NODE_ARGS        NODE_ARGS
-    NODE_ARGS_AUX,
-#define NODE_ARGS_AUX    NODE_ARGS_AUX
-    NODE_OPT_ARG,
-#define NODE_OPT_ARG     NODE_OPT_ARG
-    NODE_POSTARG,
-#define NODE_POSTARG     NODE_POSTARG
-    NODE_ARGSCAT,
-#define NODE_ARGSCAT     NODE_ARGSCAT
-    NODE_ARGSPUSH,
-#define NODE_ARGSPUSH    NODE_ARGSPUSH
-    NODE_SPLAT,
-#define NODE_SPLAT       NODE_SPLAT
-    NODE_TO_ARY,
-#define NODE_TO_ARY      NODE_TO_ARY
-    NODE_BLOCK_ARG,
-#define NODE_BLOCK_ARG   NODE_BLOCK_ARG
-    NODE_BLOCK_PASS,
-#define NODE_BLOCK_PASS  NODE_BLOCK_PASS
-    NODE_DEFN,
-#define NODE_DEFN        NODE_DEFN
-    NODE_DEFS,
-#define NODE_DEFS        NODE_DEFS
-    NODE_ALIAS,
-#define NODE_ALIAS       NODE_ALIAS
-    NODE_VALIAS,
-#define NODE_VALIAS      NODE_VALIAS
-    NODE_UNDEF,
-#define NODE_UNDEF       NODE_UNDEF
-    NODE_CLASS,
-#define NODE_CLASS       NODE_CLASS
-    NODE_MODULE,
-#define NODE_MODULE      NODE_MODULE
-    NODE_SCLASS,
-#define NODE_SCLASS      NODE_SCLASS
-    NODE_COLON2,
-#define NODE_COLON2      NODE_COLON2
-    NODE_COLON3,
-#define NODE_COLON3      NODE_COLON3
-    NODE_DOT2,
-#define NODE_DOT2        NODE_DOT2
-    NODE_DOT3,
-#define NODE_DOT3        NODE_DOT3
-    NODE_FLIP2,
-#define NODE_FLIP2       NODE_FLIP2
-    NODE_FLIP3,
-#define NODE_FLIP3       NODE_FLIP3
-    NODE_SELF,
-#define NODE_SELF        NODE_SELF
-    NODE_NIL,
-#define NODE_NIL         NODE_NIL
-    NODE_TRUE,
-#define NODE_TRUE        NODE_TRUE
-    NODE_FALSE,
-#define NODE_FALSE       NODE_FALSE
-    NODE_ERRINFO,
-#define NODE_ERRINFO     NODE_ERRINFO
-    NODE_DEFINED,
-#define NODE_DEFINED     NODE_DEFINED
-    NODE_POSTEXE,
-#define NODE_POSTEXE     NODE_POSTEXE
-    NODE_ALLOCA,
-#define NODE_ALLOCA      NODE_ALLOCA
-    NODE_BMETHOD,
-#define NODE_BMETHOD     NODE_BMETHOD
-    NODE_MEMO,
-#define NODE_MEMO        NODE_MEMO
-    NODE_IFUNC,
-#define NODE_IFUNC       NODE_IFUNC
-    NODE_DSYM,
-#define NODE_DSYM        NODE_DSYM
-    NODE_ATTRASGN,
-#define NODE_ATTRASGN    NODE_ATTRASGN
-    NODE_PRELUDE,
-#define NODE_PRELUDE     NODE_PRELUDE
-    NODE_LAMBDA,
-#define NODE_LAMBDA      NODE_LAMBDA
-    NODE_OPTBLOCK,
-#define NODE_OPTBLOCK    NODE_OPTBLOCK
-    NODE_LAST
-#define NODE_LAST        NODE_LAST
-};
-
-typedef struct RNode {
-    unsigned long flags;
-    char *nd_file;
-    union {
-	struct RNode *node;
-	ID id;
-	VALUE value;
-	VALUE (*cfunc)(ANYARGS);
-	ID *tbl;
-    } u1;
-    union {
-	struct RNode *node;
-	ID id;
-	long argc;
-	VALUE value;
-    } u2;
-    union {
-	struct RNode *node;
-	ID id;
-	long state;
-	struct rb_global_entry *entry;
-	long cnt;
-	VALUE value;
-    } u3;
-} NODE;
-
-#define RNODE(obj)  (R_CAST(RNode)(obj))
-
-/* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_FL_NEWLINE */
-#define NODE_FL_NEWLINE (((VALUE)1)<<7)
-#define NODE_FL_CREF_PUSHED_BY_EVAL NODE_FL_NEWLINE
-
-#define NODE_TYPESHIFT 8
-#define NODE_TYPEMASK  (((VALUE)0x7f)<<NODE_TYPESHIFT)
-
-#define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
-#define nd_set_type(n,t) \
-    RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|((((unsigned long)t)<<NODE_TYPESHIFT)&NODE_TYPEMASK))
-
-#define NODE_LSHIFT (NODE_TYPESHIFT+7)
-#define NODE_LMASK  (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1)
-#define nd_line(n) (int)(RNODE(n)->flags>>NODE_LSHIFT)
-#define nd_set_line(n,l) \
-    RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))
-
-#define nd_head  u1.node
-#define nd_alen  u2.argc
-#define nd_next  u3.node
-
-#define nd_cond  u1.node
-#define nd_body  u2.node
-#define nd_else  u3.node
-
-#define nd_orig  u3.value
-
-#define nd_resq  u2.node
-#define nd_ensr  u3.node
-
-#define nd_1st   u1.node
-#define nd_2nd   u2.node
-
-#define nd_stts  u1.node
-
-#define nd_entry u3.entry
-#define nd_vid   u1.id
-#define nd_cflag u2.id
-#define nd_cval  u3.value
-
-#define nd_oid   u1.id
-#define nd_cnt   u3.cnt
-#define nd_tbl   u1.tbl
-
-#define nd_var   u1.node
-#define nd_iter  u3.node
-
-#define nd_value u2.node
-#define nd_aid   u3.id
-
-#define nd_lit   u1.value
-
-#define nd_frml  u2.argc
-#define nd_rest  u1.id
-#define nd_opt   u1.node
-#define nd_pid   u1.id
-#define nd_plen  u2.argc
-
-#define nd_recv  u1.node
-#define nd_mid   u2.id
-#define nd_args  u3.node
-
-#define nd_noex  u3.id
-#define nd_defn  u3.node
-
-#define nd_cfnc  u1.cfunc
-#define nd_argc  u2.argc
-
-#define nd_cpath u1.node
-#define nd_super u3.node
-
-#define nd_modl  u1.id
-#define nd_clss  u1.value
-
-#define nd_beg   u1.node
-#define nd_end   u2.node
-#define nd_state u3.state
-#define nd_rval  u2.value
-
-#define nd_nth   u2.argc
-
-#define nd_tag   u1.id
-#define nd_tval  u2.value
-
-#define nd_visi  u2.argc
-
-#define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
-
-#define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d))
-#define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(a,d))
-#define NEW_IFUNC(f,c) NEW_NODE(NODE_IFUNC,f,c,0)
-#define NEW_SCOPE(a,b) NEW_NODE(NODE_SCOPE,local_tbl(),b,a)
-#define NEW_BLOCK(a) NEW_NODE(NODE_BLOCK,a,0,0)
-#define NEW_IF(c,t,e) NEW_NODE(NODE_IF,c,t,e)
-#define NEW_UNLESS(c,t,e) NEW_IF(c,e,t)
-#define NEW_CASE(h,b) NEW_NODE(NODE_CASE,h,b,0)
-#define NEW_WHEN(c,t,e) NEW_NODE(NODE_WHEN,c,t,e)
-#define NEW_OPT_N(b) NEW_NODE(NODE_OPT_N,0,b,0)
-#define NEW_WHILE(c,b,n) NEW_NODE(NODE_WHILE,c,b,n)
-#define NEW_UNTIL(c,b,n) NEW_NODE(NODE_UNTIL,c,b,n)
-#define NEW_FOR(v,i,b) NEW_NODE(NODE_FOR,v,b,i)
-#define NEW_ITER(a,b) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b),0)
-#define NEW_LAMBDA(a) NEW_NODE(NODE_LAMBDA,a,0,0)
-#define NEW_BREAK(s) NEW_NODE(NODE_BREAK,s,0,0)
-#define NEW_NEXT(s) NEW_NODE(NODE_NEXT,s,0,0)
-#define NEW_REDO() NEW_NODE(NODE_REDO,0,0,0)
-#define NEW_RETRY() NEW_NODE(NODE_RETRY,0,0,0)
-#define NEW_BEGIN(b) NEW_NODE(NODE_BEGIN,0,b,0)
-#define NEW_RESCUE(b,res,e) NEW_NODE(NODE_RESCUE,b,res,e)
-#define NEW_RESBODY(a,ex,n) NEW_NODE(NODE_RESBODY,n,ex,a)
-#define NEW_ENSURE(b,en) NEW_NODE(NODE_ENSURE,b,0,en)
-#define NEW_RETURN(s) NEW_NODE(NODE_RETURN,s,0,0)
-#define NEW_YIELD(a,s) NEW_NODE(NODE_YIELD,a,0,s)
-#define NEW_LIST(a)  NEW_ARRAY(a)
-#define NEW_ARRAY(a) NEW_NODE(NODE_ARRAY,a,1,0)
-#define NEW_ZARRAY() NEW_NODE(NODE_ZARRAY,0,0,0)
-#define NEW_HASH(a)  NEW_NODE(NODE_HASH,a,0,0)
-#define NEW_MASGN(l,r)   NEW_NODE(NODE_MASGN,l,0,r)
-#define NEW_GASGN(v,val) NEW_NODE(NODE_GASGN,v,val,rb_global_entry(v))
-#define NEW_LASGN(v,val) NEW_NODE(NODE_LASGN,v,val,0)
-#define NEW_DASGN(v,val) NEW_NODE(NODE_DASGN,v,val,0)
-#define NEW_DASGN_CURR(v,val) NEW_NODE(NODE_DASGN_CURR,v,val,0)
-#define NEW_IASGN(v,val) NEW_NODE(NODE_IASGN,v,val,0)
-#define NEW_IASGN2(v,val) NEW_NODE(NODE_IASGN2,v,val,0)
-#define NEW_CDECL(v,val,path) NEW_NODE(NODE_CDECL,v,val,path)
-#define NEW_CVASGN(v,val) NEW_NODE(NODE_CVASGN,v,val,0)
-#define NEW_CVDECL(v,val) NEW_NODE(NODE_CVDECL,v,val,0)
-#define NEW_OP_ASGN1(p,id,a) NEW_NODE(NODE_OP_ASGN1,p,id,a)
-#define NEW_OP_ASGN2(r,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o))
-#define NEW_OP_ASGN22(i,o) NEW_NODE(NODE_OP_ASGN2,i,o,rb_id_attrset(i))
-#define NEW_OP_ASGN_OR(i,val) NEW_NODE(NODE_OP_ASGN_OR,i,val,0)
-#define NEW_OP_ASGN_AND(i,val) NEW_NODE(NODE_OP_ASGN_AND,i,val,0)
-#define NEW_GVAR(v) NEW_NODE(NODE_GVAR,v,0,rb_global_entry(v))
-#define NEW_LVAR(v) NEW_NODE(NODE_LVAR,v,0,0)
-#define NEW_DVAR(v) NEW_NODE(NODE_DVAR,v,0,0)
-#define NEW_IVAR(v) NEW_NODE(NODE_IVAR,v,0,0)
-#define NEW_CONST(v) NEW_NODE(NODE_CONST,v,0,0)
-#define NEW_CVAR(v) NEW_NODE(NODE_CVAR,v,0,0)
-#define NEW_NTH_REF(n)  NEW_NODE(NODE_NTH_REF,0,n,0)
-#define NEW_BACK_REF(n) NEW_NODE(NODE_BACK_REF,0,n,0)
-#define NEW_MATCH(c) NEW_NODE(NODE_MATCH,c,0,0)
-#define NEW_MATCH2(n1,n2) NEW_NODE(NODE_MATCH2,n1,n2,0)
-#define NEW_MATCH3(r,n2) NEW_NODE(NODE_MATCH3,r,n2,0)
-#define NEW_LIT(l) NEW_NODE(NODE_LIT,l,0,0)
-#define NEW_STR(s) NEW_NODE(NODE_STR,s,0,0)
-#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,1,0)
-#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,s,0,0)
-#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,s,0,0)
-#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,s,0,0)
-#define NEW_EVSTR(n) NEW_NODE(NODE_EVSTR,0,(n),0)
-#define NEW_CALL(r,m,a) NEW_NODE(NODE_CALL,r,m,a)
-#define NEW_FCALL(m,a) NEW_NODE(NODE_FCALL,0,m,a)
-#define NEW_VCALL(m) NEW_NODE(NODE_VCALL,0,m,0)
-#define NEW_SUPER(a) NEW_NODE(NODE_SUPER,0,0,a)
-#define NEW_ZSUPER() NEW_NODE(NODE_ZSUPER,0,0,0)
-#define NEW_ARGS(m,o) NEW_NODE(NODE_ARGS,o,m,0)
-#define NEW_ARGS_AUX(r,b) NEW_NODE(NODE_ARGS_AUX,r,b,0)
-#define NEW_OPT_ARG(i,v) NEW_NODE(NODE_OPT_ARG,i,v,0)
-#define NEW_POSTARG(i,v) NEW_NODE(NODE_POSTARG,i,v,0)
-#define NEW_ARGSCAT(a,b) NEW_NODE(NODE_ARGSCAT,a,b,0)
-#define NEW_ARGSPUSH(a,b) NEW_NODE(NODE_ARGSPUSH,a,b,0)
-#define NEW_SPLAT(a) NEW_NODE(NODE_SPLAT,a,0,0)
-#define NEW_TO_ARY(a) NEW_NODE(NODE_TO_ARY,a,0,0)
-#define NEW_BLOCK_ARG(v) NEW_NODE(NODE_BLOCK_ARG,v,0,local_cnt(v))
-#define NEW_BLOCK_PASS(b) NEW_NODE(NODE_BLOCK_PASS,0,b,0)
-#define NEW_ALIAS(n,o) NEW_NODE(NODE_ALIAS,n,o,0)
-#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,n,o,0)
-#define NEW_UNDEF(i) NEW_NODE(NODE_UNDEF,0,i,0)
-#define NEW_CLASS(n,b,s) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(0,b),(s))
-#define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b),0)
-#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,b),0)
-#define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0)
-#define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0)
-#define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0)
-#define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0)
-#define NEW_SELF() NEW_NODE(NODE_SELF,0,0,0)
-#define NEW_NIL() NEW_NODE(NODE_NIL,0,0,0)
-#define NEW_TRUE() NEW_NODE(NODE_TRUE,0,0,0)
-#define NEW_FALSE() NEW_NODE(NODE_FALSE,0,0,0)
-#define NEW_ERRINFO() NEW_NODE(NODE_ERRINFO,0,0,0)
-#define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0)
-#define NEW_PREEXE(b) NEW_SCOPE(b)
-#define NEW_POSTEXE(b) NEW_NODE(NODE_POSTEXE,0,b,0)
-#define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b)
-#define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a)
-#define NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0)
-#define NEW_OPTBLOCK(a) NEW_NODE(NODE_OPTBLOCK,a,0,0)
-
-VALUE rb_parser_new(void);
-VALUE rb_parser_end_seen_p(VALUE);
-VALUE rb_parser_encoding(VALUE);
-
-NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int);
-NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int);
-NODE *rb_parser_compile_file(volatile VALUE, const char*, VALUE, int);
-
-NODE *rb_compile_cstr(const char*, const char*, int, int);
-NODE *rb_compile_string(const char*, VALUE, int);
-NODE *rb_compile_file(const char*, VALUE, int);
-
-NODE *rb_node_newnode(enum node_type,VALUE,VALUE,VALUE);
-NODE *rb_node_newnode_longlife(enum node_type,VALUE,VALUE,VALUE);
-
-struct rb_global_entry {
-    struct rb_global_variable *var;
-    ID id;
-};
-
-struct rb_global_entry *rb_global_entry(ID);
-VALUE rb_gvar_get(struct rb_global_entry *);
-VALUE rb_gvar_set(struct rb_global_entry *, VALUE);
-VALUE rb_gvar_defined(struct rb_global_entry *);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_NODE_H */

data/include/ruby19_externs.h

@@ -1,36 +0,0 @@
-/* Ruby 1.9 externs that we need. 
-
-   We assume all structure typedefs needed below have been defined
-   previously. 
-
-   Routines marked "new" are not found in an unmodified Ruby 1.9.
-   Routines marked remove "static" are static routines that need to be
-   made extern.
-*/
-
-
-/* From iseq */
-extern VALUE iseq_alloc_shared(VALUE klass); /* new */
-extern VALUE rb_cISeq;
-extern const char * ruby_node_name(int node);
-extern VALUE rb_iseq_arity(VALUE iseqval);
-
-/* From proc.c */
-extern int   method_arity(VALUE method);       /* removed "static" */
-extern VALUE rb_binding_frame_new(void *vth, void *vcfp);  /* new */
-
-
-/* From thread.c */
-extern rb_control_frame_t * thread_control_frame(void *); /* new */
-extern VALUE rb_cThread;  /* Thread class */
-
-
-extern VALUE rb_iseq_disasm_internal(rb_iseq_t *iseqdat); /* new */
-extern VALUE rb_cRubyVM;  /* RubyVM class */
-
-/* From vm.c */
-extern int rb_vm_get_sourceline(const rb_control_frame_t *cfp);
-extern rb_control_frame_t * rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp); 
- 
-/* From node.c */
-extern VALUE rb_parser_dump_tree(NODE *node, int comment);

data/include/thread_pthread.h

@@ -1,24 +0,0 @@
-/**********************************************************************
-
-  thread_pthread.h -
-
-  $Author$
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_THREAD_PTHREAD_H
-#define RUBY_THREAD_PTHREAD_H
-
-#include <pthread.h>
-typedef pthread_t rb_thread_id_t;
-typedef pthread_mutex_t rb_thread_lock_t;
-typedef pthread_cond_t rb_thread_cond_t;
-
-typedef struct native_thread_data_struct {
-    void *signal_thread_list;
-    pthread_cond_t sleep_cond;
-} native_thread_data_t;
-
-#endif /* RUBY_THREAD_PTHREAD_H */

data/include/vm_core_mini.h

@@ -1,373 +0,0 @@
-/* Headers Exposing a little more of the 1.9 runtime and some 
-   method prototypes for extensions to the Thread class.
-*/
-#include <ruby.h>
-#include <signal.h>
-#include "thread_pthread.h"
-#include "node.h"
-
-/* From vm_core.h: */
-
-/* Frame information: */
-#define VM_FRAME_MAGIC_METHOD 0x11
-#define VM_FRAME_MAGIC_BLOCK  0x21
-#define VM_FRAME_MAGIC_CLASS  0x31
-#define VM_FRAME_MAGIC_TOP    0x41
-#define VM_FRAME_MAGIC_FINISH 0x51
-#define VM_FRAME_MAGIC_CFUNC  0x61
-#define VM_FRAME_MAGIC_PROC   0x71
-#define VM_FRAME_MAGIC_IFUNC  0x81
-#define VM_FRAME_MAGIC_EVAL   0x91
-#define VM_FRAME_MAGIC_LAMBDA 0xa1
-#define VM_FRAME_MAGIC_MASK_BITS   8
-#define VM_FRAME_MAGIC_MASK   (~(~0<<VM_FRAME_MAGIC_MASK_BITS))
-
-#define VM_FRAME_TYPE(cfp) ((cfp)->flag & VM_FRAME_MAGIC_MASK)
-
-#define VM_FRAME_TRACE_RETURN 0x01  /* Call trace hook on return. */
-#define VM_FRAME_TRACE_OFF    0x02  /* Turn of event hook tracing in this frame
-				       and any frames created from this one. */
-
-/* other frame flag */
-#define VM_FRAME_FLAG_PASSED 0x0100
-
-#define RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp) (cfp+1)
-#define RUBYVM_CFUNC_FRAME_P(cfp) \
-  (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_CFUNC)
-#define RUBY_VM_NEXT_CONTROL_FRAME(cfp) (cfp-1)
-#define RUBY_VM_END_CONTROL_FRAME(th) \
-  ((rb_control_frame_t *)((th)->stack + (th)->stack_size))
-#define RUBY_VM_VALID_CONTROL_FRAME_P(cfp, ecfp) \
-  ((void *)(ecfp) > (void *)(cfp))
-#define RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp) \
-  (!RUBY_VM_VALID_CONTROL_FRAME_P((cfp), RUBY_VM_END_CONTROL_FRAME(th)))
-
-#define RUBY_VM_IFUNC_P(ptr)        (BUILTIN_TYPE(ptr) == T_NODE)
-#define RUBY_VM_NORMAL_ISEQ_P(ptr) \
-  (ptr && !RUBY_VM_IFUNC_P(ptr))
-
-
-#if 1
-#define GetCoreDataFromValue(obj, type, ptr) do { \
-    ptr = (type*)DATA_PTR(obj); \
-} while (0)
-#else
-#define GetCoreDataFromValue(obj, type, ptr) Data_Get_Struct(obj, type, ptr)
-#endif
-#if 1
-#define GetCoreDataFromValue(obj, type, ptr) do { \
-    ptr = (type*)DATA_PTR(obj); \
-} while (0)
-#else
-#define GetCoreDataFromValue(obj, type, ptr) Data_Get_Struct(obj, type, ptr)
-#endif
-#define GetISeqPtr(obj, ptr) \
-  GetCoreDataFromValue(obj, rb_iseq_t, ptr)
-
-/* Opaque types (for now at least) */
-typedef struct iseq_catch_table_entry iseq_catch_table_entry_t;
-
-#ifndef NSIG
-# define NSIG (_SIGMAX + 1)      /* For QNX */
-#endif
-
-#define RUBY_NSIG NSIG
-
-typedef struct rb_compile_option_struct {
-    int inline_const_cache;
-    int peephole_optimization;
-    int tailcall_optimization;
-    int specialized_instruction;
-    int operands_unification;
-    int instructions_unification;
-    int stack_caching;
-    int trace_instruction;
-    int save_tree_node;
-    int save_compile_opts;
-    int debug_level;
-} rb_compile_option_t;
-
-/* Instruction sequence */
-typedef struct rb_iseq_struct {
-    /***************/
-    /* static data */
-    /***************/
-
-    VALUE type;          /* instruction sequence type */
-    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 coverage;     /* coverage array */
-    unsigned short line_no;
-
-    /* insn info, must be freed */
-    struct iseq_insn_info_entry *insn_info_table;
-    size_t insn_info_size;
-
-    ID *local_table;		/* must free */
-    int local_table_size;
-
-    /* method, class frame: sizeof(vars) + 1, block frame: sizeof(vars) */
-    int local_size;
-
-    struct iseq_inline_cache_entry *ic_entries;
-    int ic_size;
-
-    /**
-     * argument information
-     *
-     *  def m(a1, a2, ..., aM,                    # mandatory
-     *        b1=(...), b2=(...), ..., bN=(...),  # optional
-     *        *c,                                 # rest
-     *        d1, d2, ..., dO,                    # post
-     *        &e)                                 # block
-     * =>
-     *
-     *  argc           = M
-     *  arg_rest       = M+N+1 // or -1 if no rest arg
-     *  arg_opts       = N
-     *  arg_opts_tbl   = [ (N entries) ]
-     *  arg_post_len   = O // 0 if no post arguments
-     *  arg_post_start = M+N+2
-     *  arg_block      = M+N + 1 + O + 1 // -1 if no block arg
-     *  arg_simple     = 0 if not simple arguments.
-     *                 = 1 if no opt, rest, post, block.
-     *                 = 2 if ambiguous block parameter ({|a|}).
-     *  arg_size       = argument size.
-     */
-
-    int argc;
-    int arg_simple;
-    int arg_rest;
-    int arg_block;
-    int arg_opts;
-    int arg_post_len;
-    int arg_post_start;
-    int arg_size;
-    VALUE *arg_opt_table;
-
-    size_t stack_max; /* for stack overflow check */
-
-    /* catch table */
-    iseq_catch_table_entry_t *catch_table;
-    int catch_table_size;
-
-    /* for child iseq */
-    struct rb_iseq_struct *parent_iseq;
-    struct rb_iseq_struct *local_iseq;
-
-    /****************/
-    /* dynamic data */
-    /****************/
-
-    VALUE self;
-    VALUE orig;			/* non-NULL if its data have origin */
-
-    /* block inlining */
-    /*
-     * NODE *node;
-     * void *special_block_builder;
-     * void *cached_special_block_builder;
-     * VALUE cached_special_block;
-     */
-
-    /* klass/module nest information stack (cref) */
-    NODE *cref_stack;
-    VALUE klass;
-
-    /* misc */
-    ID defined_method_id;       /* for define_method */
-
-    /* used at compile time */
-    struct iseq_compile_data *compile_data;
-    /* Used to set a breakpoint at a VM instruction */
-    unsigned char *breakpoints; 
-
-    /* If this instruction sequence came from eval, the string of the
-       source as a String. */
-    VALUE eval_source;
-
-    /* If we are saving tree nodes (a compile option), then tree_node
-       is the internal parse tree node representation for this
-       instruction sequence.
-    */
-    NODE *tree_node;
-    int in_use;  /* Reference count of number of times and instruction
-		    sequence is in use such as via thread_frame object
-		    access or is stored in ISEQS__ or SCRIPT_ISEQS.
-		  */
-} rb_iseq_t;
-
-enum ruby_special_exceptions {
-    ruby_error_reenter,
-    ruby_error_nomemory,
-    ruby_error_sysstack,
-    ruby_special_error_count
-};
-
-typedef struct rb_vm_struct {
-    VALUE self;
-
-    rb_thread_lock_t global_vm_lock;
-
-    struct rb_thread_struct *main_thread;
-    struct rb_thread_struct *running_thread;
-
-    st_table *living_threads;
-    VALUE thgroup_default;
-
-    int running;
-    int thread_abort_on_exception;
-    unsigned long trace_flag;
-    volatile int sleeper;
-
-    /* object management */
-    VALUE mark_object_ary;
-
-    VALUE special_exceptions[ruby_special_error_count];
-
-    /* load */
-    VALUE top_self;
-    VALUE load_path;
-    VALUE loaded_features;
-    struct st_table *loading_table;
-
-    /* signal */
-    struct {
-	VALUE cmd;
-	int safe;
-    } trap_list[RUBY_NSIG];
-
-    /* hook */
-    rb_event_hook_t *event_hooks;
-
-    int src_encoding_index;
-
-    VALUE verbose, debug, progname;
-    VALUE coverages;
-
-    struct unlinked_method_entry_list_entry *unlinked_method_entry_list;
-
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-    struct rb_objspace *objspace;
-#endif
-} rb_vm_t;
-
-#include "method_mini.h"
-
-typedef struct {
-    VALUE *pc;                  /* cfp[0] */
-    VALUE *sp;                  /* cfp[1] */
-    VALUE *bp;                  /* cfp[2] */
-    rb_iseq_t *iseq;            /* cfp[3] */
-    VALUE flag;                 /* cfp[4] */
-    VALUE self;                 /* cfp[5] / block[0] */
-    VALUE *lfp;                 /* cfp[6] / block[1] */
-    VALUE *dfp;                 /* cfp[7] / block[2] */
-    rb_iseq_t *block_iseq;      /* cfp[8] / block[3] */
-    VALUE proc;                 /* cfp[9] / block[4] */
-    const rb_method_entry_t *me;/* cfp[10] */
-    short int tracing;          /* Bits to control per-frame event tracing. 
-				   See VM_FRAME_TRACE_xxx defines.
-				 */
-} rb_control_frame_t;
-
-typedef struct rb_block_struct {
-    VALUE self;                 /* share with method frame if it's only block */
-    VALUE *lfp;                 /* share with method frame if it's only block */
-    VALUE *dfp;                 /* share with method frame if it's only block */
-    rb_iseq_t *iseq;
-    VALUE proc;
-} rb_block_t;
-
-#define GetThreadPtr(obj, ptr) \
-  GetCoreDataFromValue(obj, rb_thread_t, ptr)
-
-#define GetProcPtr(obj, ptr) \
-  GetCoreDataFromValue(obj, rb_proc_t, ptr)
-
-typedef struct rb_thread_struct
-{
-    VALUE self;
-    rb_vm_t *vm;
-
-    /* execution information */
-    VALUE *stack;               /* must free, must mark. rb: seems to be nil. */
-    unsigned long stack_size;   /* Number of stack (or rb_control_frame_t) entries */
-    rb_control_frame_t *cfp;
-
-    int safe_level;
-    int raised_flag;
-    VALUE last_status; /* $? */
-
-    /* passing state */
-    int state;
-
-    /* tracer */
-    rb_event_hook_t *event_hooks;
-    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. */
-
-    /* misc */
-    int method_missing_reason;
-    int abort_on_exception;
-
-    /* for rb_iterate */
-    const rb_block_t *passed_block;
-
-    /* for bmethod */
-    const rb_method_entry_t *passed_me;
-
-    /* for load(true) */
-    VALUE top_self;
-    VALUE top_wrapper;
-
-    /* eval env */
-    rb_block_t *base_block;
-
-    VALUE *local_lfp;
-    VALUE local_svar;
-
-    /* Lot's of other stuff ... 
-       thread control ... */
-} rb_thread_t;
-
-typedef struct {
-    rb_block_t block;
-
-    VALUE envval;               /* for GC mark */
-    VALUE blockprocval;
-    int safe_level;
-    int is_from_method;
-    int is_lambda;
-} rb_proc_t;
-
-#define GetEnvPtr(obj, ptr) \
-  GetCoreDataFromValue(obj, rb_env_t, ptr)
-
-typedef struct {
-    VALUE *env;
-    int env_size;
-    int local_size;
-    VALUE prev_envval;		/* for GC mark */
-    rb_block_t block;
-} rb_env_t;
-
-#define GetBindingPtr(obj, ptr) \
-  GetCoreDataFromValue(obj, rb_binding_t, ptr)
-
-typedef struct {
-    VALUE env;
-    VALUE filename;
-    unsigned short line_no;
-} rb_binding_t;
-
-#define GET_THREAD() ruby_current_thread
-extern rb_thread_t *ruby_current_thread;