Changeset 144
- Timestamp:
- 04/14/2007 21:36:23 (19 months ago)
- Files:
-
- 1 modified
-
trunk/ext/sand_table/sand_table.c (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ext/sand_table/sand_table.c
r143 r144 623 623 VALUE obj; 624 624 { 625 VALUE link; 626 VALUE klass; 625 627 sandtransfer *t = alloc_sandtransfer(); 626 628 t->trans = TRANS_NONE; … … 631 633 } 632 634 633 VALUElink = sandbox_get_linked_class(obj);635 link = sandbox_get_linked_class(obj); 634 636 if (!NIL_P(link)) 635 637 { … … 642 644 } 643 645 644 VALUEklass = Qnil;646 klass = Qnil; 645 647 link = Qnil; 646 648 if (rb_type(obj) == T_OBJECT) { … … 955 957 { 956 958 VALUE metaclass; 959 VALUE norm_cFloat; 960 VALUE rb_mMarshal; 957 961 958 962 kit->tbl = st_init_numtable(); … … 2146 2150 kit->mMath = sandbox_defmodule(kit, "Math"); 2147 2151 2148 VALUEnorm_cFloat = rb_cFloat;2152 norm_cFloat = rb_cFloat; 2149 2153 rb_cFloat = kit->cFloat; 2150 2154 rb_define_const(kit->mMath, "PI", rb_float_new(atan(1.0)*4.0)); … … 2182 2186 SAND_COPY_S(mMath, "erfc"); 2183 2187 2184 VALUErb_mMarshal = rb_const_get(rb_cObject, rb_intern("Marshal"));2188 rb_mMarshal = rb_const_get(rb_cObject, rb_intern("Marshal")); 2185 2189 kit->mMarshal = sandbox_defmodule(kit, "Marshal"); 2186 2190 … … 2259 2263 int use_base; 2260 2264 { 2265 VALUE rb_mFConst; 2266 2261 2267 kit->eIOError = sandbox_defclass(kit, "IOError", kit->eStandardError); 2262 2268 kit->eEOFError = sandbox_defclass(kit, "EOFError", kit->eIOError); … … 2440 2446 SAND_COPY(cFile, "flock"); 2441 2447 2442 VALUErb_mFConst = rb_const_get_at(rb_cFile, rb_intern("Constants"));2448 rb_mFConst = rb_const_get_at(rb_cFile, rb_intern("Constants")); 2443 2449 kit->mFConst = sandbox_defmodule_under(kit, kit->cFile, "Constants"); 2444 2450 rb_include_module(kit->cIO, kit->mFConst); … … 2663 2669 { 2664 2670 VALUE cThGroup; 2671 VALUE rb_cThGroup; 2672 VALUE rb_cProcStatus; 2673 VALUE rb_mProcess; 2674 VALUE rb_mProcUID; 2675 VALUE rb_mProcGID; 2676 VALUE rb_mProcID_Syscall; 2677 VALUE rb_mObSpace; 2678 2665 2679 2666 2680 /* FIXME: reimplement */ … … 2731 2745 SAND_COPY_KERNEL("callcc"); 2732 2746 2733 VALUErb_cThGroup = rb_const_get_at(rb_cObject, rb_intern("ThreadGroup"));2747 rb_cThGroup = rb_const_get_at(rb_cObject, rb_intern("ThreadGroup")); 2734 2748 kit->cThGroup = sandbox_defclass(kit, "ThreadGroup", kit->cObject); 2735 2749 SAND_COPY_ALLOC(cThGroup); … … 2794 2808 SAND_COPY_KERNEL("sleep"); 2795 2809 2796 VALUErb_mProcess = rb_const_get_at(rb_cObject, rb_intern("Process"));2810 rb_mProcess = rb_const_get_at(rb_cObject, rb_intern("Process")); 2797 2811 kit->mProcess = sandbox_defmodule(kit, "Process"); 2798 2812 SAND_COPY_CONST(mProcess, "WNOHANG"); … … 2812 2826 SAND_COPY_S(mProcess, "detach"); 2813 2827 2814 VALUErb_cProcStatus = rb_const_get_at(rb_mProcess, rb_intern("Status"));2828 rb_cProcStatus = rb_const_get_at(rb_mProcess, rb_intern("Status")); 2815 2829 kit->cProcStatus = sandbox_defclass_under(kit, kit->mProcess, "Status", kit->cObject); 2816 2830 SAND_UNDEF(cProcStatus, "new"); … … 2891 2905 */ 2892 2906 2893 VALUErb_mProcUID = rb_const_get_at(rb_mProcess, rb_intern("UID"));2894 VALUErb_mProcGID = rb_const_get_at(rb_mProcess, rb_intern("GID"));2907 rb_mProcUID = rb_const_get_at(rb_mProcess, rb_intern("UID")); 2908 rb_mProcGID = rb_const_get_at(rb_mProcess, rb_intern("GID")); 2895 2909 kit->mProcUID = sandbox_defmodule_under(kit, kit->mProcess, "UID"); 2896 2910 kit->mProcGID = sandbox_defmodule_under(kit, kit->mProcess, "GID"); … … 2917 2931 SAND_COPY_S(mProcGID, "switch"); 2918 2932 2919 VALUErb_mProcID_Syscall = rb_const_get_at(rb_mProcess, rb_intern("Sys"));2933 rb_mProcID_Syscall = rb_const_get_at(rb_mProcess, rb_intern("Sys")); 2920 2934 kit->mProcID_Syscall = sandbox_defmodule_under(kit, kit->mProcess, "Sys"); 2921 2935 … … 2947 2961 SAND_COPY(mGC, "garbage_collect"); 2948 2962 2949 VALUErb_mObSpace = rb_const_get_at(rb_cObject, rb_intern("ObjectSpace"));2963 rb_mObSpace = rb_const_get_at(rb_cObject, rb_intern("ObjectSpace")); 2950 2964 kit->mObSpace = sandbox_defmodule(kit, "ObjectSpace"); 2951 2965 SAND_COPY_S(mObSpace, "each_object");
