ruby-internal 0.6.0 → 0.7.0

data/ext/cached/ruby-1.9.1/internal/yarv-headers/parse.h

@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,10 +28,11 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -160,144 +160,29 @@
      tLAST_TOKEN = 376
    };
 #endif
-/* Tokens.  */
-#define keyword_class 258
-#define keyword_module 259
-#define keyword_def 260
-#define keyword_undef 261
-#define keyword_begin 262
-#define keyword_rescue 263
-#define keyword_ensure 264
-#define keyword_end 265
-#define keyword_if 266
-#define keyword_unless 267
-#define keyword_then 268
-#define keyword_elsif 269
-#define keyword_else 270
-#define keyword_case 271
-#define keyword_when 272
-#define keyword_while 273
-#define keyword_until 274
-#define keyword_for 275
-#define keyword_break 276
-#define keyword_next 277
-#define keyword_redo 278
-#define keyword_retry 279
-#define keyword_in 280
-#define keyword_do 281
-#define keyword_do_cond 282
-#define keyword_do_block 283
-#define keyword_do_LAMBDA 284
-#define keyword_return 285
-#define keyword_yield 286
-#define keyword_super 287
-#define keyword_self 288
-#define keyword_nil 289
-#define keyword_true 290
-#define keyword_false 291
-#define keyword_and 292
-#define keyword_or 293
-#define keyword_not 294
-#define modifier_if 295
-#define modifier_unless 296
-#define modifier_while 297
-#define modifier_until 298
-#define modifier_rescue 299
-#define keyword_alias 300
-#define keyword_defined 301
-#define keyword_BEGIN 302
-#define keyword_END 303
-#define keyword__LINE__ 304
-#define keyword__FILE__ 305
-#define keyword__ENCODING__ 306
-#define tIDENTIFIER 307
-#define tFID 308
-#define tGVAR 309
-#define tIVAR 310
-#define tCONSTANT 311
-#define tCVAR 312
-#define tLABEL 313
-#define tINTEGER 314
-#define tFLOAT 315
-#define tSTRING_CONTENT 316
-#define tCHAR 317
-#define tNTH_REF 318
-#define tBACK_REF 319
-#define tREGEXP_END 320
-#define tUPLUS 321
-#define tUMINUS 322
-#define tPOW 323
-#define tCMP 324
-#define tEQ 325
-#define tEQQ 326
-#define tNEQ 327
-#define tGEQ 328
-#define tLEQ 329
-#define tANDOP 330
-#define tOROP 331
-#define tMATCH 332
-#define tNMATCH 333
-#define tDOT2 334
-#define tDOT3 335
-#define tAREF 336
-#define tASET 337
-#define tLSHFT 338
-#define tRSHFT 339
-#define tCOLON2 340
-#define tCOLON3 341
-#define tOP_ASGN 342
-#define tASSOC 343
-#define tLPAREN 344
-#define tLPAREN_ARG 345
-#define tRPAREN 346
-#define tLBRACK 347
-#define tLBRACE 348
-#define tLBRACE_ARG 349
-#define tSTAR 350
-#define tAMPER 351
-#define tLAMBDA 352
-#define tSYMBEG 353
-#define tSTRING_BEG 354
-#define tXSTRING_BEG 355
-#define tREGEXP_BEG 356
-#define tWORDS_BEG 357
-#define tQWORDS_BEG 358
-#define tSTRING_DBEG 359
-#define tSTRING_DVAR 360
-#define tSTRING_END 361
-#define tLAMBEG 362
-#define tLOWEST 363
-#define tUMINUS_NUM 364
-#define idNULL 365
-#define idRespond_to 366
-#define idIFUNC 367
-#define idCFUNC 368
-#define idThrowState 369
-#define id_core_set_method_alias 370
-#define id_core_set_variable_alias 371
-#define id_core_undef_method 372
-#define id_core_define_method 373
-#define id_core_define_singleton_method 374
-#define id_core_set_postexe 375
-#define tLAST_TOKEN 376
-
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
+
+/* Line 1676 of yacc.c  */
+
     VALUE val;
     NODE *node;
     ID id;
     int num;
-}
-/* Line 1489 of yacc.c.  */
-	YYSTYPE;
+
+
+
+/* Line 1676 of yacc.c  */
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
+

data/ext/cached/ruby-1.9.1/internal/yarv-headers/revision.h

@@ -1 +1 @@
-#define RUBY_REVISION 19983
+#define RUBY_REVISION 24175

data/ext/cached/ruby-1.9.1/internal/yarv-headers/transcode_data.h

@@ -2,7 +2,7 @@
 
   transcode_data.h -
 
-  $Author: akr $
+  $Author: yugui $
   created at: Mon 10 Dec 2007 14:01:47 JST 2007
 
   Copyright (C) 2007 Martin Duerst
@@ -35,6 +35,7 @@
 #define FUNio	(PType 0x0E)	/* function from info to output */
 #define FUNso	(PType 0x0F)	/* function from start to output */
 #define STR1	(PType 0x11)	/* string 4 <= len <= 259 bytes: 1byte length + content */
+#define GB4bt	(PType 0x12)	/* GB18030 four bytes payload */
 
 #define STR1_LENGTH(byte_addr) (*(byte_addr) + 4)
 #define STR1_BYTEINDEX(w) ((w) >> 6)
@@ -44,13 +45,19 @@
 #define o1(b1)		(PType((((unsigned char)(b1))<<8)|ONEbt))
 #define o2(b1,b2)	(PType((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|TWObt))
 #define o3(b1,b2,b3)	(PType(((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|THREEbt)&0xffffffffU))
-#define o4(b0,b1,b2,b3)	(PType(((((unsigned char)(b1))<< 8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|((((unsigned char)(b0))&0x07)<<5)|FOURbt)&0xffffffffU))
+#define o4(b0,b1,b2,b3)	(PType(((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|(((unsigned char)(b3))<<24)|((((unsigned char)(b0))&0x07)<<5)|FOURbt)&0xffffffffU))
+#define g4(b0,b1,b2,b3) (PType(((((unsigned char)(b0))<<8)|(((unsigned char)(b2))<<16)|((((unsigned char)(b1))&0x0f)<<24)|((((unsigned char)(b3))&0x0f)<<28)|GB4bt)&0xffffffffU))
 
 #define getBT1(a)	(((a)>> 8)&0xFF)
 #define getBT2(a)	(((a)>>16)&0xFF)
 #define getBT3(a)	(((a)>>24)&0xFF)
 #define getBT0(a)	((((a)>> 5)&0x07)|0xF0)   /* for UTF-8 only!!! */
 
+#define getGB4bt0(a)	(((a)>> 8)&0xFF)
+#define getGB4bt1(a)	(((a)>>24)&0x0F|0x30)
+#define getGB4bt2(a)	(((a)>>16)&0xFF)
+#define getGB4bt3(a)	(((a)>>28)&0x0F|0x30)
+
 #define o2FUNii(b1,b2)	(PType((((unsigned char)(b1))<<8)|(((unsigned char)(b2))<<16)|FUNii))
 
 /* do we need these??? maybe not, can be done with simple tables */

data/ext/cached/ruby-1.9.1/internal/yarv-headers/transdb.h

@@ -1,7 +1,17 @@
+rb_declare_transcoder("Big5", "UTF-8", "big5");
+rb_declare_transcoder("UTF-8", "Big5", "big5");
+rb_declare_transcoder("GB2312", "UTF-8", "chinese");
+rb_declare_transcoder("GB12345", "UTF-8", "chinese");
+rb_declare_transcoder("UTF-8", "GB2312", "chinese");
+rb_declare_transcoder("UTF-8", "GB12345", "chinese");
 rb_declare_transcoder("", "amp_escape", "escape");
 rb_declare_transcoder("", "xml_text_escape", "escape");
 rb_declare_transcoder("", "xml_attr_content_escape", "escape");
 rb_declare_transcoder("", "xml_attr_quote", "escape");
+rb_declare_transcoder("GB18030", "UTF-8", "gb18030");
+rb_declare_transcoder("UTF-8", "GB18030", "gb18030");
+rb_declare_transcoder("GBK", "UTF-8", "gbk");
+rb_declare_transcoder("UTF-8", "GBK", "gbk");
 rb_declare_transcoder("ISO-2022-JP", "stateless-ISO-2022-JP", "iso2022");
 rb_declare_transcoder("stateless-ISO-2022-JP", "ISO-2022-JP", "iso2022");
 rb_declare_transcoder("stateless-ISO-2022-JP", "EUC-JP", "iso2022");
@@ -75,6 +85,58 @@ rb_declare_transcoder("WINDOWS-1256", "UTF-8", "single_byte");
 rb_declare_transcoder("UTF-8", "WINDOWS-1256", "single_byte");
 rb_declare_transcoder("WINDOWS-1257", "UTF-8", "single_byte");
 rb_declare_transcoder("UTF-8", "WINDOWS-1257", "single_byte");
+rb_declare_transcoder("IBM437", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM437", "single_byte");
+rb_declare_transcoder("IBM775", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM775", "single_byte");
+rb_declare_transcoder("IBM852", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM852", "single_byte");
+rb_declare_transcoder("IBM855", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM855", "single_byte");
+rb_declare_transcoder("IBM857", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM857", "single_byte");
+rb_declare_transcoder("IBM860", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM860", "single_byte");
+rb_declare_transcoder("IBM861", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM861", "single_byte");
+rb_declare_transcoder("IBM862", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM862", "single_byte");
+rb_declare_transcoder("IBM863", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM863", "single_byte");
+rb_declare_transcoder("IBM865", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM865", "single_byte");
+rb_declare_transcoder("IBM866", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM866", "single_byte");
+rb_declare_transcoder("IBM869", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "IBM869", "single_byte");
+rb_declare_transcoder("MACCROATIAN", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "MACCROATIAN", "single_byte");
+rb_declare_transcoder("MACCYRILLIC", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "MACCYRILLIC", "single_byte");
+rb_declare_transcoder("MACGREEK", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "MACGREEK", "single_byte");
+rb_declare_transcoder("MACICELAND", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "MACICELAND", "single_byte");
+rb_declare_transcoder("MACROMAN", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "MACROMAN", "single_byte");
+rb_declare_transcoder("MACROMANIA", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "MACROMANIA", "single_byte");
+rb_declare_transcoder("MACTURKISH", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "MACTURKISH", "single_byte");
+rb_declare_transcoder("MACUKRAINE", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "MACUKRAINE", "single_byte");
+rb_declare_transcoder("KOI8-U", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "KOI8-U", "single_byte");
+rb_declare_transcoder("KOI8-R", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "KOI8-R", "single_byte");
+rb_declare_transcoder("TIS-620", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "TIS-620", "single_byte");
+rb_declare_transcoder("CP850", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "CP850", "single_byte");
+rb_declare_transcoder("CP852", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "CP852", "single_byte");
+rb_declare_transcoder("CP855", "UTF-8", "single_byte");
+rb_declare_transcoder("UTF-8", "CP855", "single_byte");
 rb_declare_transcoder("UTF-16BE", "UTF-8", "utf_16_32");
 rb_declare_transcoder("UTF-8", "UTF-16BE", "utf_16_32");
 rb_declare_transcoder("UTF-16LE", "UTF-8", "utf_16_32");

data/ext/cached/ruby-1.9.1/internal/yarv-headers/version.h

@@ -1,15 +1,12 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_RELEASE_DATE "2008-10-28"
-#define RUBY_VERSION_CODE 191
-#define RUBY_RELEASE_CODE 20081028
-#define RUBY_PATCHLEVEL 0
-
+#define RUBY_RELEASE_DATE "2009-07-16"
+#define RUBY_PATCHLEVEL 243
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-#define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_YEAR 2009
+#define RUBY_RELEASE_MONTH 7
+#define RUBY_RELEASE_DAY 12
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
@@ -25,32 +22,29 @@ RUBY_EXTERN const char ruby_copyright[];
 #define RUBY_BIRTH_MONTH 2
 #define RUBY_BIRTH_DAY 24
 
+#define RUBY_PATCHLEVEL_STR "p"STRINGIZE(RUBY_PATCHLEVEL)
+
 #ifndef RUBY_REVISION
-#include "revision.h"
+# include "revision.h"
 #endif
-#ifndef RUBY_REVISION
-#define RUBY_REVISION 0
+# ifndef RUBY_REVISION
+# define RUBY_REVISION 0
 #endif
 
-#if RUBY_PATCHLEVEL
-#define RUBY_PATCHLEVEL_STR " patchlevel "STRINGIZE(RUBY_PATCHLEVEL)
-#else
-#define RUBY_PATCHLEVEL_STR ""
-#endif
 #if RUBY_REVISION
-#ifdef RUBY_BRANCH_NAME
-#define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
-#else
-#define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)
-#endif
+# ifdef RUBY_BRANCH_NAME
+#  define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
+# else
+#  define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)
+# endif
 #else
-#define RUBY_REVISION_STR ""
+# define RUBY_REVISION_STR ""
 #endif
 
 # define RUBY_DESCRIPTION	    \
     "ruby "RUBY_VERSION		    \
+    RUBY_PATCHLEVEL_STR             \
     " ("RUBY_RELEASE_DATE	    \
-    RUBY_PATCHLEVEL_STR		    \
     RUBY_REVISION_STR") "	    \
     "["RUBY_PLATFORM"]"
 # define RUBY_COPYRIGHT 	    \

data/ext/cached/ruby-1.9.1/internal/yarv-headers/vm_core.h

@@ -2,7 +2,7 @@
 
   vm_core.h - 
 
-  $Author: ko1 $
+  $Author: yugui $
   created at: 04/01/01 19:41:38 JST
 
   Copyright (C) 2004-2007 Koichi Sasada
@@ -363,6 +363,7 @@ typedef struct rb_thread_struct
     int slice;
 
     native_thread_data_t native_thread_data;
+    void *blocking_region_buffer;
 
     VALUE thgroup;
     VALUE value;
@@ -431,11 +432,12 @@ typedef struct rb_thread_struct
 /* iseq.c */
 VALUE rb_iseq_new(NODE*, VALUE, VALUE, VALUE, VALUE);
 VALUE rb_iseq_new_top(NODE *node, VALUE name, VALUE filename, VALUE parent);
+VALUE rb_iseq_new_main(NODE *node, VALUE filename);
 VALUE rb_iseq_new_with_bopt(NODE*, VALUE, VALUE, VALUE, VALUE, VALUE);
 VALUE rb_iseq_new_with_opt(NODE*, VALUE, VALUE, VALUE, VALUE, const rb_compile_option_t*);
 VALUE rb_iseq_compile(VALUE src, VALUE file, VALUE line);
-VALUE ruby_iseq_disasm(VALUE self);
-VALUE ruby_iseq_disasm_insn(VALUE str, VALUE *iseqval, int pos, rb_iseq_t *iseq, VALUE child);
+VALUE rb_iseq_disasm(VALUE self);
+VALUE rb_iseq_disasm_insn(VALUE str, VALUE *iseqval, int pos, rb_iseq_t *iseq, VALUE child);
 const char *ruby_node_name(int node);
 int rb_iseq_first_lineno(rb_iseq_t *iseq);
 
@@ -567,23 +569,28 @@ VALUE rb_thread_alloc(VALUE klass);
 VALUE rb_proc_alloc(VALUE klass);
 
 /* for debug */
-extern void vm_stack_dump_raw(rb_thread_t *, rb_control_frame_t *);
-#define SDR() vm_stack_dump_raw(GET_THREAD(), GET_THREAD()->cfp)
-#define SDR2(cfp) vm_stack_dump_raw(GET_THREAD(), (cfp))
+extern void rb_vmdebug_stack_dump_raw(rb_thread_t *, rb_control_frame_t *);
+#define SDR() rb_vmdebug_stack_dump_raw(GET_THREAD(), GET_THREAD()->cfp)
+#define SDR2(cfp) rb_vmdebug_stack_dump_raw(GET_THREAD(), (cfp))
 void rb_vm_bugreport(void);
 
 
 /* functions about thread/vm execution */
 
 VALUE rb_iseq_eval(VALUE iseqval);
+VALUE rb_iseq_eval_main(VALUE iseqval);
 void rb_enable_interrupt(void);
 void rb_disable_interrupt(void);
 int rb_thread_method_id_and_class(rb_thread_t *th, ID *idp, VALUE *klassp);
 
-VALUE vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self,
-		     int argc, const VALUE *argv, rb_block_t *blockptr);
-VALUE vm_make_proc(rb_thread_t *th, rb_control_frame_t *cfp, const rb_block_t *block, VALUE klass);
-VALUE vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp);
+VALUE rb_vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self,
+			int argc, const VALUE *argv, rb_block_t *blockptr);
+VALUE rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass);
+VALUE rb_vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp);
+
+void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
+int ruby_thread_has_gvl_p(void);
+rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
 
 NOINLINE(void rb_gc_save_machine_context(rb_thread_t *));
 
@@ -624,30 +631,14 @@ void rb_thread_execute_interrupts(rb_thread_t *);
   RUBY_VM_CHECK_INTS_TH(GET_THREAD())
 
 /* tracer */
-static inline void
-exec_event_hooks(rb_event_hook_t *hook, rb_event_flag_t flag, VALUE self, ID id, VALUE klass)
-{
-    if (self == rb_mRubyVMFrozenCore) return;
-    while (hook) {
-	if (flag & hook->flag) {
-	    (*hook->func)(flag, hook->data, self, id, klass);
-	}
-	hook = hook->next;
-    }
-}
+void
+rb_threadptr_exec_event_hooks(rb_thread_t *th, rb_event_flag_t flag, VALUE self, ID id, VALUE klass);
 
 #define EXEC_EVENT_HOOK(th, flag, self, id, klass) do { \
     rb_event_flag_t wait_event__ = th->event_flags; \
     if (UNLIKELY(wait_event__)) { \
 	if (wait_event__ & (flag | RUBY_EVENT_VM)) { \
-	    VALUE self__ = (self), klass__ = (klass); \
-	    ID id__ = (id); \
-	    if (wait_event__ & flag) { \
-		exec_event_hooks(th->event_hooks, flag, self__, id__, klass__); \
-	    } \
-	    if (wait_event__ & RUBY_EVENT_VM) { \
-		exec_event_hooks(th->vm->event_hooks, flag, self__, id__, klass__); \
-	    } \
+	    rb_threadptr_exec_event_hooks(th, flag, self, id, klass); \
 	} \
     } \
 } while (0)

data/ext/cached/ruby-1.9.1/internal/yarv-headers/vm_exec.h

@@ -2,15 +2,15 @@
 
   vm.h -
 
-  $Author: ko1 $
+  $Author: yugui $
   created at: 04/01/01 16:56:59 JST
 
   Copyright (C) 2004-2007 Koichi Sasada
 
 **********************************************************************/
 
-#ifndef RUBY_VM_H
-#define RUBY_VM_H
+#ifndef RUBY_VM_EXEC_H
+#define RUBY_VM_EXEC_H
 
 typedef long OFFSET;
 typedef unsigned long lindex_t;
@@ -59,9 +59,6 @@ typedef rb_iseq_t *ISEQ;
 #define throwdebug if(0)printf
 /* #define throwdebug printf */
 
-#define SDR2(cfp) vm_stack_dump_raw(GET_THREAD(), (cfp))
-
-
 /************************************************/
 #if   DISPATCH_XXX
 error !
@@ -184,4 +181,4 @@ default:                        \
 
 #define SCREG(r) (reg_##r)
 
-#endif /* RUBY_VM_H */
+#endif /* RUBY_VM_EXEC_H */

data/ext/cached/ruby-1.9.1/internal/yarv-headers/vm_insnhelper.h

@@ -2,7 +2,7 @@
 
   insnhelper.h - helper macros to implement each instructions
 
-  $Author: ko1 $
+  $Author: yugui $
   created at: 04/01/01 15:50:34 JST
 
   Copyright (C) 2004-2007 Koichi Sasada
@@ -53,11 +53,12 @@ enum {
   BOP_NOT,
   BOP_NEQ,
 
-  BOP_LAST_,
+  BOP_LAST_
 };
 
 extern char ruby_vm_redefined_flag[BOP_LAST_];
 extern VALUE ruby_vm_global_state_version;
+extern VALUE ruby_vm_const_missing_count;
 
 #define GET_VM_STATE_VERSION() (ruby_vm_global_state_version)
 #define INC_VM_STATE_VERSION() \
@@ -158,8 +159,8 @@ extern VALUE ruby_vm_global_state_version;
   c1->nd_next = __tmp_c2->nd_next; \
 } while (0)
 
-#define CALL_METHOD(num, blockptr, flag, id, mn, recv, klass) do { \
-    VALUE v = vm_call_method(th, GET_CFP(), num, blockptr, flag, id, mn, recv, klass); \
+#define CALL_METHOD(num, blockptr, flag, id, mn, recv) do { \
+    VALUE v = vm_call_method(th, GET_CFP(), num, blockptr, flag, id, mn, recv); \
     if (v == Qundef) { \
 	RESTORE_REGS(); \
 	NEXT_INSN(); \
@@ -188,7 +189,7 @@ extern VALUE ruby_vm_global_state_version;
 
 #define CALL_SIMPLE_METHOD(num, id, recv) do { \
     VALUE klass = CLASS_OF(recv); \
-    CALL_METHOD(num, 0, 0, id, rb_method_node(klass, id), recv, CLASS_OF(recv)); \
+    CALL_METHOD(num, 0, 0, id, rb_method_node(klass, id), recv); \
 } while (0)
 
 #endif /* RUBY_INSNHELPER_H */

data/ext/internal/module/cfp.h

@@ -0,0 +1,13 @@
+#ifndef ruby_internal__module_cfp__h
+#define ruby_internal__module_cfp__h
+
+#include "vm_core.h"
+#include "eval_intern.h"
+
+rb_control_frame_t *
+vm_get_ruby_level_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
+
+rb_control_frame_t *
+rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
+
+#endif // ruby_internal__module_cfp__h

data/ext/internal/module/extconf.rb

@@ -1,8 +1,8 @@
 $: << '../..'
 require 'mkmf-ruby-internal'
 
-have_func('vm_get_ruby_level_cfp')
-have_func('vm_get_ruby_level_next_cfp')
+have_func('vm_get_ruby_level_cfp', 'cfp.h')
+have_func('rb_vm_get_ruby_level_next_cfp', 'cfp.h')
 have_header('ruby/node.h') or have_header('node.h')
 
 ruby_version_code = RUBY_VERSION.gsub(/\./, '').to_i

data/ext/internal/module/module.c

@@ -5,6 +5,7 @@
 #include <ruby/st.h>
 #include "vm_core.h"
 #include "eval_intern.h"
+#include "cfp.h"
 #else
 #include <rubysig.h>
 #include <st.h>
@@ -335,17 +336,11 @@ static VALUE module_name_proc = Qnil;
 
 #ifdef RUBY_VM
 
-#if defined(HAVE_VM_GET_RUBY_LEVEL_NEXT_CFP)
-/* Declared and defined in vm.c */
-rb_control_frame_t *
-vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
-#endif
-
 static void set_cref_stack(rb_iseq_t * iseqdat, VALUE klass, VALUE noex)
 {
   rb_thread_t * th = GET_THREAD();
-#if defined(HAVE_VM_GET_RUBY_LEVEL_NEXT_CFP)
-  rb_control_frame_t * cfp = vm_get_ruby_level_next_cfp(th, th->cfp);
+#if defined(HAVE_RB_VM_GET_RUBY_LEVEL_NEXT_CFP)
+  rb_control_frame_t * cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
 #elif defined(HAVE_VM_GET_RUBY_LEVEL_CFP)
   rb_control_frame_t * cfp = vm_get_ruby_level_cfp(th, th->cfp);
 #else

data/ext/internal/node/nodes.rb

@@ -48,6 +48,7 @@ class Nodes
     @nodes = {}
     nodes.each do |name, node|
       members = {}
+      # TODO: is there any way to enforce order here?
       (node['members'] || {}).each do |member_name, member|
         member ||= {}
         members[member_name] = MemberInfo.new(
@@ -64,7 +65,7 @@ class Nodes
   end
 
   def each(&block)
-    @nodes.each(&block)
+    @nodes.sort.each(&block)
   end
 
   def [](name)

data/ext/internal/vm/iseq/iseq.c

@@ -11,6 +11,8 @@
 
 #include "vm_core.h"
 
+#include "iseq_load.inc"
+
 #ifdef HAVE_ISEQ_H
 #include "iseq.h"
 #endif
@@ -23,9 +25,6 @@
 #define RARRAY_PTR(a) RARRAY(a)->ptr
 #endif
 
-// Defined but not declared by ruby
-VALUE iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt);
-
 static VALUE rb_cModulePlaceholder;
 
 static VALUE rb_mMarshal;