gen_eval 0.3.2 → 0.4.0

data/ext/gen_eval/compat.h

@@ -5,13 +5,52 @@
 
 #include <ruby.h>
 
+/* test for 1.9 */
+#if !defined(RUBY_19) && defined(ROBJECT_EMBED_LEN_MAX)
+# define RUBY_19
+#endif
+
 /* macros for backwards compatibility with 1.8 */
 #ifndef RUBY_19
 # define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
 # define RCLASS_SUPER(c) (RCLASS(c)->super)
 # define RCLASS_IV_TBL(c) (RCLASS(c)->iv_tbl)
+# define OBJ_UNTRUSTED OBJ_TAINTED
+# include "st.h"
+#endif
+
+#ifdef RUBY_19
+inline static VALUE
+class_alloc(VALUE flags, VALUE klass)
+{
+  rb_classext_t *ext = ALLOC(rb_classext_t);
+  NEWOBJ(obj, struct RClass);
+  OBJSETUP(obj, klass, flags);
+  obj->ptr = ext;
+  RCLASS_IV_TBL(obj) = 0;
+  RCLASS_M_TBL(obj) = 0;
+  RCLASS_SUPER(obj) = 0;
+  RCLASS_IV_INDEX_TBL(obj) = 0;
+  return (VALUE)obj;
+}
 #endif
 
+inline static VALUE
+create_class(VALUE flags, VALUE klass)
+{
+#ifdef RUBY_19
+  VALUE new_klass = class_alloc(flags, klass);
+#else
+  NEWOBJ(new_klass, struct RClass);
+  OBJSETUP(new_klass, klass, flags);
+#endif
+
+  return (VALUE)new_klass;
+}
+  
+# define FALSE 0
+# define TRUE 1
+
 /* a useful macro. cannot use ordinary CLASS_OF as it does not return an lvalue */
 #define KLASS_OF(c) (RBASIC(c)->klass)
 

data/ext/gen_eval/extconf.rb

@@ -1,8 +1,5 @@
 require 'mkmf'
 
-# 1.9 compatibility
-$CFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /1.9/
-
 # let's use c99
 $CFLAGS += " -std=c99"
 

data/ext/gen_eval/gen_eval.c

@@ -114,13 +114,14 @@ rb_mirror_object(VALUE context)
     VALUE duped_context;
   
 #ifdef RUBY_19
-    if(TYPE(context) == T_OBJECT)
+    if(TYPE(context) == T_OBJECT) {
         duped_context = rb_funcall(rb_cObject, rb_intern("new"), 0);
-    else 
-        duped_context = rb_funcall(rb_cClass, rb_intern("new"), 0);
-
+    }
+    else  {
+      duped_context = create_class(T_ICLASS, rb_cClass);
+    }
 #else
-    duped_context = rb_funcall(rb_cClass, rb_intern("new"), 0);
+    duped_context = create_class(T_ICLASS, rb_cClass);
 #endif    
     
     /* the duped_context shares the context's iv_tbl.
@@ -145,8 +146,6 @@ rb_mirror_object(VALUE context)
         RCLASS_M_TBL(duped_context) = (struct st_table *) RCLASS_M_TBL(context);
         RCLASS_IV_TBL(duped_context) = (struct st_table *) RCLASS_IV_TBL(context);
 #endif        
-
-        
     }
 
     /* ensure singleton exists */

data/lib/gen_eval/version.rb

@@ -1,3 +1,3 @@
 module GenEval
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gen_eval
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +13:00
+date: 2010-11-02 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency