Changeset 112

Timestamp:

01/17/2007 00:49:22 (22 months ago)

Author:

why

Message:

• ext/sand_table/sand_table.c: move Sandwick to Sandbox::Wick and get everything using alloc_sandwick(). Remove sandbox_dup_into.
  

Files:

• trunk/ext/sand_table/sand_table.c (modified) (6 diffs)

trunk/ext/sand_table/sand_table.c

@@ -17 +17 @@
 
 static VALUE Qimport, Qinit, Qload, Qenv, Qio, Qreal, Qref, Qall;
-VALUE rb_cSandbox, rb_cSandboxFull, rb_cSandboxSafe, rb_eSandboxException, rb_cSandboxRef, rb_cSandwick;
+VALUE rb_cSandbox, rb_cSandboxFull, rb_cSandboxSafe, rb_eSandboxException, rb_cSandboxRef, rb_cSandboxWick;
 static ID s_options;
 
@@ -358 +358 @@
   wick->scope = NULL;
   wick->dyna_vars = NULL;
-
+  wick->self = Data_Wrap_Struct(rb_cSandboxWick, mark_sandwick, free_sandwick, wick);
   rb_gc_register_address(&wick->self);
-  wick->self = Data_Wrap_Struct(rb_cSandwick, mark_sandwick, free_sandwick, wick);
 
   return wick;
@@ -429 +428 @@
   VALUE link;
 {
-  sandwick *wick = ALLOC(sandwick);
+  sandwick *wick = alloc_sandwick();
   wick->calltype = SANDBOX_ACTION;
   wick->action = action;
@@ -825 +824 @@
   Data_Get_Struct( self, sandkit, kit );
   return kit->oMain;
-}
-
-VALUE
-sandbox_dup_into( kit, obj )
-  sandkit *kit;
-  VALUE obj;
-{
-  return sandbox_run(kit, sandbox_action_wick(rb_marshal_load, rb_marshal_dump(obj, Qnil)));
 }
 
@@ -3004 +2995 @@
   Init_kit_real(&base, 0);
 
-  rb_cSandwick = rb_class_new(rb_cObject);
-
   rb_cSandbox = rb_define_module("Sandbox");
   rb_cSandboxFull = rb_define_class_under(rb_cSandbox, "Full", rb_cObject);
@@ -3024 +3013 @@
   rb_eSandboxException = rb_define_class_under(rb_cSandbox, "Exception", rb_eException);
   rb_cSandboxRef = rb_define_class_under(rb_cSandbox, "Ref", rb_cObject);
+  rb_cSandboxWick = rb_define_class_under(rb_cSandbox, "Wick", rb_cObject);
 
   s_options = rb_intern("@options");