ruby-changes:8861
From: nobu <ko1@a...>
Date: Sun, 30 Nov 2008 15:27:29 +0900 (JST)
Subject: [ruby-changes:8861] Ruby:r20396 (mvm): * inits.c (rb_vm_call_inits): let all InitVM functions use
nobu 2008-11-30 15:26:49 +0900 (Sun, 30 Nov 2008) New Revision: 20396 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20396 Log: * inits.c (rb_vm_call_inits): let all InitVM functions use ruby_vm_t instead of rb_vm_t. Modified files: branches/mvm/ChangeLog branches/mvm/array.c branches/mvm/bignum.c branches/mvm/compar.c branches/mvm/complex.c branches/mvm/cont.c branches/mvm/dir.c branches/mvm/dmyext.c branches/mvm/encoding.c branches/mvm/enum.c branches/mvm/enumerator.c branches/mvm/error.c branches/mvm/eval.c branches/mvm/eval_jump.c branches/mvm/file.c branches/mvm/gc.c branches/mvm/hash.c branches/mvm/inits.c branches/mvm/io.c branches/mvm/iseq.c branches/mvm/load.c branches/mvm/main.c branches/mvm/marshal.c branches/mvm/math.c branches/mvm/numeric.c branches/mvm/object.c branches/mvm/pack.c branches/mvm/proc.c branches/mvm/process.c branches/mvm/random.c branches/mvm/range.c branches/mvm/rational.c branches/mvm/re.c branches/mvm/signal.c branches/mvm/string.c branches/mvm/struct.c branches/mvm/thread.c branches/mvm/time.c branches/mvm/transcode.c branches/mvm/variable.c branches/mvm/version.c branches/mvm/vm.c Index: mvm/complex.c =================================================================== --- mvm/complex.c (revision 20395) +++ mvm/complex.c (revision 20396) @@ -1400,7 +1400,7 @@ } void -InitVM_Complex(rb_vm_t *vm) +InitVM_Complex(ruby_vm_t *vm) { assert(fprintf(stderr, "assert() is now active\n")); Index: mvm/array.c =================================================================== --- mvm/array.c (revision 20395) +++ mvm/array.c (revision 20396) @@ -3775,7 +3775,7 @@ } void -InitVM_Array(rb_vm_t *vm) +InitVM_Array(ruby_vm_t *vm) { rb_cArray = rb_define_class("Array", rb_cObject); rb_include_module(rb_cArray, rb_mEnumerable); Index: mvm/encoding.c =================================================================== --- mvm/encoding.c (revision 20395) +++ mvm/encoding.c (revision 20396) @@ -1283,7 +1283,7 @@ } void -InitVM_Encoding(rb_vm_t *vm) +InitVM_Encoding(ruby_vm_t *vm) { VALUE list; int i; Index: mvm/math.c =================================================================== --- mvm/math.c (revision 20395) +++ mvm/math.c (revision 20396) @@ -697,7 +697,7 @@ } void -InitVM_Math(rb_vm_t *vm) +InitVM_Math(ruby_vm_t *vm) { rb_mMath = rb_define_module("Math"); Index: mvm/time.c =================================================================== --- mvm/time.c (revision 20395) +++ mvm/time.c (revision 20396) @@ -2387,7 +2387,7 @@ } void -InitVM_Time(rb_vm_t *vm) +InitVM_Time(ruby_vm_t *vm) { rb_cTime = rb_define_class("Time", rb_cObject); rb_include_module(rb_cTime, rb_mComparable); Index: mvm/re.c =================================================================== --- mvm/re.c (revision 20395) +++ mvm/re.c (revision 20396) @@ -3358,7 +3358,7 @@ } void -InitVM_Regexp(rb_vm_t *vm) +InitVM_Regexp(ruby_vm_t *vm) { rb_eRegexpError = rb_define_class("RegexpError", rb_eStandardError); Index: mvm/ChangeLog =================================================================== --- mvm/ChangeLog (revision 20395) +++ mvm/ChangeLog (revision 20396) @@ -1,3 +1,8 @@ +Sun Nov 30 15:26:44 2008 Nobuyoshi Nakada <nobu@r...> + + * inits.c (rb_vm_call_inits): let all InitVM functions use + ruby_vm_t instead of rb_vm_t. + Thu Nov 27 17:06:46 2008 Nobuyoshi Nakada <nobu@r...> * vm_core.h (rb_vm_t): moved back from include/ruby/vm.h again. Index: mvm/enumerator.c =================================================================== --- mvm/enumerator.c (revision 20395) +++ mvm/enumerator.c (revision 20396) @@ -760,7 +760,7 @@ } void -InitVM_Enumerator(rb_vm_t *vm) +InitVM_Enumerator(ruby_vm_t *vm) { rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1); rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1); Index: mvm/variable.c =================================================================== --- mvm/variable.c (revision 20395) +++ mvm/variable.c (revision 20396) @@ -31,7 +31,7 @@ } void -InitVM_var_tables(rb_vm_t *vm) +InitVM_var_tables(ruby_vm_t *vm) { vm->mark_object_ary = rb_ary_new(); vm->global_tbl = st_init_numtable(); Index: mvm/iseq.c =================================================================== --- mvm/iseq.c (revision 20395) +++ mvm/iseq.c (revision 20396) @@ -1333,7 +1333,7 @@ } void -InitVM_ISeq(rb_vm_t *vm) +InitVM_ISeq(ruby_vm_t *vm) { /* declare ::VM::InstructionSequence */ rb_cISeq = rb_define_class_under(rb_cRubyVM, "InstructionSequence", rb_cObject); Index: mvm/enum.c =================================================================== --- mvm/enum.c (revision 20395) +++ mvm/enum.c (revision 20396) @@ -1813,7 +1813,7 @@ } void -InitVM_Enumerable(rb_vm_t *vm) +InitVM_Enumerable(ruby_vm_t *vm) { rb_mEnumerable = rb_define_module("Enumerable"); Index: mvm/string.c =================================================================== --- mvm/string.c (revision 20395) +++ mvm/string.c (revision 20396) @@ -7068,7 +7068,7 @@ } void -InitVM_String(rb_vm_t *vm) +InitVM_String(ruby_vm_t *vm) { rb_cString = rb_define_class("String", rb_cObject); rb_include_module(rb_cString, rb_mComparable); Index: mvm/object.c =================================================================== --- mvm/object.c (revision 20395) +++ mvm/object.c (revision 20396) @@ -2467,7 +2467,7 @@ } void -InitVM_Object(rb_vm_t *vm) +InitVM_Object(ruby_vm_t *vm) { VALUE metaclass; Index: mvm/io.c =================================================================== --- mvm/io.c (revision 20395) +++ mvm/io.c (revision 20396) @@ -8489,7 +8489,7 @@ } void -InitVM_IO(rb_vm_t *vm) +InitVM_IO(ruby_vm_t *vm) { #undef rb_intern #define rb_intern(str) rb_intern_const(str) Index: mvm/dmyext.c =================================================================== --- mvm/dmyext.c (revision 20395) +++ mvm/dmyext.c (revision 20396) @@ -6,6 +6,6 @@ } void -InitVM_ext(rb_vm_t *vm) +InitVM_ext(ruby_vm_t *vm) { } Index: mvm/pack.c =================================================================== --- mvm/pack.c (revision 20395) +++ mvm/pack.c (revision 20396) @@ -2178,7 +2178,7 @@ } void -InitVM_pack(rb_vm_t *vm) +InitVM_pack(ruby_vm_t *vm) { rb_define_method(rb_cArray, "pack", pack_pack, 1); rb_define_method(rb_cString, "unpack", pack_unpack, 1); Index: mvm/load.c =================================================================== --- mvm/load.c (revision 20395) +++ mvm/load.c (revision 20396) @@ -684,7 +684,7 @@ } void -InitVM_load(rb_vm_t *vm) +InitVM_load(ruby_vm_t *vm) { static const char var_load_path[] = "$:"; ID id_load_path = rb_intern2(var_load_path, sizeof(var_load_path)-1); Index: mvm/range.c =================================================================== --- mvm/range.c (revision 20395) +++ mvm/range.c (revision 20396) @@ -918,7 +918,7 @@ } void -InitVM_Range(rb_vm_t *vm) +InitVM_Range(ruby_vm_t *vm) { rb_cRange = rb_struct_define_without_accessor( "Range", rb_cObject, range_alloc, Index: mvm/proc.c =================================================================== --- mvm/proc.c (revision 20395) +++ mvm/proc.c (revision 20396) @@ -1792,7 +1792,7 @@ } void -InitVM_Proc(rb_vm_t *vm) +InitVM_Proc(ruby_vm_t *vm) { /* Proc */ rb_cProc = rb_define_class("Proc", rb_cObject); @@ -1918,7 +1918,7 @@ } void -InitVM_Binding(rb_vm_t *vm) +InitVM_Binding(ruby_vm_t *vm) { rb_cBinding = rb_define_class("Binding", rb_cObject); rb_undef_alloc_func(rb_cBinding); Index: mvm/thread.c =================================================================== --- mvm/thread.c (revision 20395) +++ mvm/thread.c (revision 20396) @@ -3697,7 +3697,7 @@ } void -InitVM_Thread(rb_vm_t *vm) +InitVM_Thread(ruby_vm_t *vm) { VALUE cThGroup; Index: mvm/dir.c =================================================================== --- mvm/dir.c (revision 20395) +++ mvm/dir.c (revision 20396) @@ -2371,7 +2371,7 @@ } void -InitVM_Dir(rb_vm_t *vm) +InitVM_Dir(ruby_vm_t *vm) { rb_cDir = rb_define_class("Dir", rb_cObject); Index: mvm/eval_jump.c =================================================================== --- mvm/eval_jump.c (revision 20395) +++ mvm/eval_jump.c (revision 20396) @@ -126,7 +126,7 @@ } void -InitVM_jump(rb_vm_t *vm) +InitVM_jump(ruby_vm_t *vm) { rb_define_global_function("at_exit", rb_f_at_exit, 0); } Index: mvm/struct.c =================================================================== --- mvm/struct.c (revision 20395) +++ mvm/struct.c (revision 20396) @@ -879,7 +879,7 @@ } void -InitVM_Struct(rb_vm_t *vm) +InitVM_Struct(ruby_vm_t *vm) { rb_cStruct = rb_define_class("Struct", rb_cObject); rb_include_module(rb_cStruct, rb_mEnumerable); Index: mvm/main.c =================================================================== --- mvm/main.c (revision 20395) +++ mvm/main.c (revision 20396) @@ -32,7 +32,7 @@ ruby_sysinit(&argc, &argv); { - rb_vm_t *vm; + ruby_vm_t *vm; int ret; RUBY_INIT_STACK; Index: mvm/eval.c =================================================================== --- mvm/eval.c (revision 20395) +++ mvm/eval.c (revision 20396) @@ -1156,7 +1156,7 @@ } void -InitVM_eval(rb_vm_t *vm) +InitVM_eval(ruby_vm_t *vm) { rb_define_virtual_variable("$@", errat_getter, errat_setter); rb_define_virtual_variable("$!", errinfo_getter, 0); Index: mvm/gc.c =================================================================== --- mvm/gc.c (revision 20395) +++ mvm/gc.c (revision 20396) @@ -2074,7 +2074,7 @@ } void -InitVM_heap(rb_vm_t *vm) +InitVM_heap(ruby_vm_t *vm) { #if !(defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE) init_heap(vm->objspace); @@ -2798,7 +2798,7 @@ } void -InitVM_GC(rb_vm_t *vm) +InitVM_GC(ruby_vm_t *vm) { VALUE rb_mObSpace; VALUE rb_mProfiler; Index: mvm/process.c =================================================================== --- mvm/process.c (revision 20395) +++ mvm/process.c (revision 20396) @@ -5023,7 +5023,7 @@ } void -InitVM_process(rb_vm_t *vm) +InitVM_process(ruby_vm_t *vm) { VALUE rb_mProcUID; VALUE rb_mProcGID; Index: mvm/hash.c =================================================================== --- mvm/hash.c (revision 20395) +++ mvm/hash.c (revision 20396) @@ -2572,7 +2572,7 @@ } void -InitVM_Hash(rb_vm_t *vm) +InitVM_Hash(ruby_vm_t *vm) { rb_cHash = rb_define_class("Hash", rb_cObject); Index: mvm/error.c =================================================================== --- mvm/error.c (revision 20395) +++ mvm/error.c (revision 20396) @@ -1002,7 +1002,7 @@ } void -InitVM_Exception(rb_vm_t *vm) +InitVM_Exception(ruby_vm_t *vm) { rb_eException = rb_define_class("Exception", rb_cObject); rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1); @@ -1170,7 +1170,7 @@ } void -InitVM_syserr(rb_vm_t *vm) +InitVM_syserr(ruby_vm_t *vm) { rb_eNOERROR = set_syserr(0, "NOERROR"); #include "known_errors.inc" Index: mvm/numeric.c =================================================================== --- mvm/numeric.c (revision 20395) +++ mvm/numeric.c (revision 20396) @@ -3066,7 +3066,7 @@ } void -InitVM_Numeric(rb_vm_t *vm) +InitVM_Numeric(ruby_vm_t *vm) { rb_eZeroDivError = rb_define_class("ZeroDivisionError", rb_eStandardError); rb_eFloatDomainError = rb_define_class("FloatDomainError", rb_eRangeError); Index: mvm/cont.c =================================================================== --- mvm/cont.c (revision 20395) +++ mvm/cont.c (revision 20396) @@ -860,7 +860,7 @@ } void -InitVM_Cont(rb_vm_t *vm) +InitVM_Cont(ruby_vm_t *vm) { rb_cFiber = rb_define_class("Fiber", rb_cObject); rb_undef_alloc_func(rb_cFiber); Index: mvm/compar.c =================================================================== --- mvm/compar.c (revision 20395) +++ mvm/compar.c (revision 20396) @@ -203,7 +203,7 @@ } void -InitVM_Comparable(rb_vm_t *vm) +InitVM_Comparable(ruby_vm_t *vm) { rb_mComparable = rb_define_module("Comparable"); rb_define_method(rb_mComparable, "==", cmp_equal, 1); Index: mvm/vm.c =================================================================== --- mvm/vm.c (revision 20395) +++ mvm/vm.c (revision 20396) @@ -1767,7 +1767,7 @@ } void -InitVM_VM(rb_vm_t *vm) +InitVM_VM(ruby_vm_t *vm) { VALUE opts; VALUE klass; @@ -1939,7 +1939,7 @@ } void -InitVM_top_self(rb_vm_t *vm) +InitVM_top_self(ruby_vm_t *vm) { vm->top_self = rb_obj_alloc(rb_cObject); rb_define_singleton_method(rb_vm_top_self(), "to_s", main_to_s, 0); Index: mvm/version.c =================================================================== --- mvm/version.c (revision 20395) +++ mvm/version.c (revision 20396) @@ -30,7 +30,7 @@ } void -InitVM_version(rb_vm_t *vm) +InitVM_version(ruby_vm_t *vm) { rb_define_global_const("RUBY_VERSION", MKSTR(version)); rb_define_global_const("RUBY_RELEASE_DATE", MKSTR(release_date)); Index: mvm/inits.c =================================================================== --- mvm/inits.c (revision 20395) +++ mvm/inits.c (revision 20396) @@ -16,8 +16,8 @@ #include "inits.c" #define CALL(n) {void Init_##n(void); Init_##n();} #else -#define CALL(n) {void InitVM_##n(rb_vm_t *); InitVM_##n(vm);} -#define rb_call_inits(void) rb_vm_call_inits(rb_vm_t *vm) +#define CALL(n) {void InitVM_##n(ruby_vm_t *); InitVM_##n(vm);} +#define rb_call_inits(void) rb_vm_call_inits(ruby_vm_t *vm) #endif void Index: mvm/bignum.c =================================================================== --- mvm/bignum.c (revision 20395) +++ mvm/bignum.c (revision 20396) @@ -2675,7 +2675,7 @@ } void -InitVM_Bignum(rb_vm_t *vm) +InitVM_Bignum(ruby_vm_t *vm) { rb_cBignum = rb_define_class("Bignum", rb_cInteger); Index: mvm/marshal.c =================================================================== --- mvm/marshal.c (revision 20395) +++ mvm/marshal.c (revision 20396) @@ -1723,7 +1723,7 @@ } void -InitVM_marshal(rb_vm_t *vm) +InitVM_marshal(ruby_vm_t *vm) { VALUE rb_mMarshal = rb_define_module("Marshal"); Index: mvm/rational.c =================================================================== --- mvm/rational.c (revision 20395) +++ mvm/rational.c (revision 20396) @@ -1501,7 +1501,7 @@ } void -InitVM_Rational(rb_vm_t *vm) +InitVM_Rational(ruby_vm_t *vm) { assert(fprintf(stderr, "assert() is now active\n")); Index: mvm/signal.c =================================================================== --- mvm/signal.c (revision 20395) +++ mvm/signal.c (revision 20396) @@ -1149,7 +1149,7 @@ } void -InitVM_signal(rb_vm_t *vm) +InitVM_signal(ruby_vm_t *vm) { #ifndef MACOS_UNUSE_SIGNAL VALUE mSignal = rb_define_module("Signal"); Index: mvm/file.c =================================================================== --- mvm/file.c (revision 20395) +++ mvm/file.c (revision 20396) @@ -4696,7 +4696,7 @@ } void -InitVM_File(rb_vm_t *vm) +InitVM_File(ruby_vm_t *vm) { VALUE separator; Index: mvm/random.c =================================================================== --- mvm/random.c (revision 20395) +++ mvm/random.c (revision 20396) @@ -545,12 +545,12 @@ } void -InitVM_RandomSeed(rb_vm_t *vm) +InitVM_RandomSeed(ruby_vm_t *vm) { } static void -InitVM_RandomSeed2(rb_vm_t *vm) +InitVM_RandomSeed2(ruby_vm_t *vm) { struct Random *r; VALUE rv = Data_Make_Struct(rb_cData, struct Random, random_mark, -1, r); @@ -576,7 +576,7 @@ } void -InitVM_Random(rb_vm_t *vm) +InitVM_Random(ruby_vm_t *vm) { InitVM_RandomSeed2(vm); rb_define_global_function("srand", rb_f_srand, -1); Index: mvm/transcode.c =================================================================== --- mvm/transcode.c (revision 20395) +++ mvm/transcode.c (revision 20396) @@ -4017,7 +4017,7 @@ } void -InitVM_transcode(rb_vm_t *vm) +InitVM_transcode(ruby_vm_t *vm) { rb_eUndefinedConversionError = rb_define_class_under(rb_cEncoding, "UndefinedConversionError", rb_eEncodingError); rb_eInvalidByteSequenceError = rb_define_class_under(rb_cEncoding, "InvalidByteSequenceError", rb_eEncodingError); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/