Changeset 91

Timestamp:

09/23/2006 22:09:40 (2 years ago)

Author:

why

Message:

• ext/sand_table/sand_hacks.c: 1.9 support for sandbox_str, sandbox_copy_method
  and sandbox_import_class_path.
  
• ext/sand_table/sand_table.c: start supporting 1.9's booting of BasicObject?.
  
• ext/sand_table/sand_table.h: matju's 1.9 ary/str functions, along with a few other
  defs for easing both 1.8/1.9 support.
  

Location:

trunk/ext/sand_table

Files:

• sand_hacks.c (modified) (5 diffs)
• sand_table.c (modified) (11 diffs)
• sand_table.h (modified) (3 diffs)

trunk/ext/sand_table/sand_hacks.c

@@ -269 +269 @@
   const char *ptr;
 {   
-  NEWOBJ(str, struct RString);
-  OBJSETUP(str, kit->cString, T_STRING);
-
-  str->len = strlen(ptr);
-  str->aux.capa = str->len;
-  str->ptr = ALLOC_N(char,str->len+1);
-  memcpy(str->ptr, ptr, str->len);
-  str->ptr[str->len] = '\0';
-
-  return (VALUE)str;
+  VALUE str = rb_obj_alloc(kit->cString);
+  return rb_str_buf_cat2(str, ptr);
 }
 
@@ -290 +282 @@
      
   st_lookup(RCLASS(oklass)->m_tbl, def, (st_data_t *)&body);
-  if (!body) {
+  if (!body || body->nd_body <= (NODE *)1) {
     rb_warn("%s: no method %s found for copying", FREAKYFREAKY, rb_id2name(def));
     return;
@@ -351 +343 @@
     while (*p && *p != ':') p++;
     str = rb_str_new(pbeg, p-pbeg);
-    id = rb_intern(RSTRING(str)->ptr);
+    id = rb_to_id(str);
     if (p[0] == ':') {
       if (p[1] != ':') goto undefined_class;
@@ -367 +359 @@
         switch (TYPE(c)) {
           case T_MODULE:
-            kitc = sandbox_defmodule(kit, RSTRING(str)->ptr);
+            kitc = sandbox_defmodule(kit, rb_str_ptr(str));
           break;
           case T_CLASS:
-            kitc = sandbox_defclass(kit, RSTRING(str)->ptr, super);
+            kitc = sandbox_defclass(kit, rb_str_ptr(str), super);
           break;
         }
@@ -376 +368 @@
         switch (TYPE(c)) {
           case T_MODULE:
-            kitc = rb_define_module_under(kitc, RSTRING(str)->ptr);
+            kitc = rb_define_module_under(kitc, rb_str_ptr(str));
           break;
           case T_CLASS:
-            kitc = rb_define_class_under(kitc, RSTRING(str)->ptr, super);
+            kitc = rb_define_class_under(kitc, rb_str_ptr(str), super);
           break;
         }

trunk/ext/sand_table/sand_table.c

@@ -36 +36 @@
 {
   rb_mark_tbl(kit->tbl);
+#ifdef KIT2
+  rb_gc_mark_maybe(kit->cBasicObject);
+#endif
   rb_gc_mark_maybe(kit->cObject);
   rb_gc_mark_maybe(kit->cModule);
@@ -115 +118 @@
   rb_gc_mark((VALUE)kit->top_cref);
   rb_gc_mark((VALUE)kit->ruby_cref);
-  rb_gc_mark_maybe(kit->ruby_class);
+  rb_gc_mark_maybe(kit->rclass);
   sandbox_mark_globals(kit->globals);
 }
@@ -201 +204 @@
   kit->top_cref = rb_node_newnode(NODE_CREF,kit->cObject,0,0);
   kit->ruby_cref = kit->top_cref;
-  kit->ruby_class = kit->cObject;
+  kit->ruby_cref->nd_clss = kit->cObject;
+  kit->rclass = kit->cObject;
 
   kit->self = Data_Wrap_Struct( class, mark_sandbox, free_sandbox, kit );
@@ -243 +247 @@
     int init_load = 0, init_env = 0, init_io = 0, init_real = 0;
     init = rb_Array(init);
-    for ( i = 0; i < RARRAY(init)->len; i++ )
+    for ( i = 0; i < rb_ary_len(init); i++ )
     {
       VALUE mod = rb_ary_entry(init, i);
@@ -272 +276 @@
     int i;
     Check_Type(import, T_ARRAY);
-    for ( i = 0; i < RARRAY(import)->len; i++ )
+    for ( i = 0; i < rb_ary_len(import); i++ )
     {
       rb_funcall(self, rb_intern("import"), 1, rb_ary_entry(import, i));
@@ -308 +312 @@
   SWAP_VAR(ruby_sandbox, self);
   SWAP_VAR(rb_class_tbl, tbl);
+#ifdef KIT2
+  SWAP(cBasicObject);
+#endif
   SWAP(cObject);
   SWAP(cModule);
@@ -375 +382 @@
   SWAP_VAR(rb_global_tbl, globals);
   SWAP_VAR(ruby_cref, ruby_cref);
-  SWAP_VAR(ruby_class, ruby_class);
+  // SWAP_VAR(ruby_class, rclass);
   SWAP(cMatch);
   SWAP(cMethod);
@@ -401 +408 @@
   {
     VALUE msg = rb_funcall(exc, rb_intern("message"), 0);
-    rb_raise(rb_eSandboxException, "%s: %s", rb_class2name(rb_obj_class(exc)), RSTRING(msg)->ptr);
+    rb_raise(rb_eSandboxException, "%s: %s", rb_class2name(rb_obj_class(exc)), rb_str_ptr(msg));
   }
 }
@@ -433 +440 @@
       rb_const_set(rb_cObject, rb_intern("TOPLEVEL_BINDING"), rb_eval_string("binding"));
   }
-  return rb_eval_string(RSTRING(str)->ptr);
+  return rb_eval_string(rb_str_ptr(str));
 }
 
@@ -582 +589 @@
   kit->cObject = 0;
 
+#ifdef KIT2
+  kit->cBasicObject = sandbox_bootclass(kit, "BasicObject", 0);
+  kit->cObject = sandbox_bootclass(kit, "Object", kit->cBasicObject);
+#else
   kit->cObject = sandbox_bootclass(kit, "Object", 0);
+#endif
   kit->cModule = sandbox_bootclass(kit, "Module", kit->cObject);
   kit->cClass =  sandbox_bootclass(kit, "Class",  kit->cModule);
 
+#ifdef KIT2
+  metaclass = sandbox_metaclass(kit, kit->cBasicObject, kit->cClass);
+  metaclass = sandbox_metaclass(kit, kit->cObject, metaclass);
+  SAND_COPY(cBasicObject, "==");
+  SAND_COPY(cBasicObject, "equal?");
+#else
   metaclass = sandbox_metaclass(kit, kit->cObject, kit->cClass);
+#endif
   metaclass = sandbox_metaclass(kit, kit->cModule, metaclass);
   metaclass = sandbox_metaclass(kit, kit->cClass, metaclass);
@@ -592 +611 @@
   kit->mKernel = sandbox_defmodule(kit, "Kernel");
   rb_include_module(kit->cObject, kit->mKernel);
-  rb_define_alloc_func(kit->cObject, sandbox_alloc_obj);
+  rb_define_alloc_func(kitBasicObject, sandbox_alloc_obj);
 
   rb_define_private_method(kit->cModule, "method_added", sandbox_dummy, 1);
-  rb_define_private_method(kit->cObject, "initialize", sandbox_dummy, 0);
+  rb_define_private_method(kitBasicObject, "initialize", sandbox_dummy, 0);
   rb_define_private_method(kit->cClass, "inherited", sandbox_dummy, 1);
   rb_define_private_method(kit->cModule, "included", sandbox_dummy, 1);

trunk/ext/sand_table/sand_table.h

@@ -28 +28 @@
 extern st_table *rb_global_tbl;
 
+#ifdef RARRAY_LEN
+#undef T_SYMBOL
+#define T_SYMBOL T_STRING
+static inline long  rb_str_len(VALUE s) {return RSTRING_LEN(s);}                                                               
+static inline char *rb_str_ptr(VALUE s) {return RSTRING_PTR(s);}                                                               
+static inline long  rb_ary_len(VALUE s) {return  RARRAY_LEN(s);}                                                               
+static inline VALUE *rb_ary_ptr(VALUE s) {return  RARRAY_PTR(s);}
+#else                                                                                                                         
+static inline long  rb_str_len(VALUE s) {return RSTRING(s)->len;}                                                              
+static inline char *rb_str_ptr(VALUE s) {return RSTRING(s)->ptr;}                                                              
+static inline long  rb_ary_len(VALUE s) {return  RARRAY(s)->len;}                                                              
+static inline VALUE *rb_ary_ptr(VALUE s) {return  RARRAY(s)->ptr;}                                                              
+#endif 
+
 #if RUBY_VERSION_CODE <= 185
 #warning "** Sandbox will NOT compile without a patched 1.8.5 -- Proceeding anyway! **"
+#endif
+
+#if RUBY_VERSION_CODE > 190
+#define KIT2
+#define kitBasicObject kit->cBasicObject
+#else
+#define kitBasicObject kit->cObject
 #endif
 
@@ -42 +63 @@
   VALUE _progname;
 
+#if KIT2
+  VALUE cBasicObject;
+#endif
   VALUE cObject;
   VALUE cModule;
@@ -131 +155 @@
   NODE *top_cref;
   NODE *ruby_cref;
-  VALUE ruby_class;
+  VALUE rclass;
   struct SCOPE *scope;
 } sandkit;