rice 1.2.0 → 1.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rice
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Paul Brannan
@@ -10,10 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -04:00
+date: 2009-12-14 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: |
   Rice is a C++ interface to Ruby's C API.  It provides a type-safe and
   exception-safe interface in order to make embedding Ruby and writing
@@ -154,9 +163,9 @@ files:
 - rice/detail/node.hpp
 - rice/detail/Wrapped_Function.hpp
 - rice/detail/protect.hpp
-- rice/detail/mininode.cpp.rpp
 - rice/detail/demangle.hpp
 - rice/detail/define_method_and_auto_wrap.hpp
+- rice/detail/traits.hpp
 - rice/detail/default_allocation_func.ipp
 - rice/detail/wrap_function.hpp
 - rice/detail/Caster.hpp
@@ -166,13 +175,11 @@ files:
 - rice/detail/st.hpp
 - rice/detail/from_ruby.hpp
 - rice/detail/win32.hpp
-- rice/detail/mininode.hpp.rpp
 - rice/detail/creation_funcs.ipp
 - rice/detail/to_ruby.hpp
-- rice/detail/remove_const.hpp
 - rice/detail/Auto_Function_Wrapper.hpp
+- rice/detail/cfp.hpp
 - rice/detail/env.hpp
-- rice/detail/method_data.cpp.rpp
 - rice/detail/to_ruby.ipp
 - rice/detail/method_data.hpp
 - rice/detail/Exception_Handler.hpp
@@ -184,6 +191,7 @@ files:
 - rice/detail/Iterator.hpp
 - rice/detail/Not_Copyable.hpp
 - rice/detail/Exception_Handler_defn.hpp
+- rice/detail/cfp.ipp
 - rice/detail/define_method_and_auto_wrap.ipp
 - rice/detail/Auto_Function_Wrapper.ipp
 - rice/detail/Exception_Handler.ipp
@@ -225,6 +233,13 @@ files:
 - test/test_Enum.cpp
 - test/test_Address_Registration_Guard.cpp
 - test/test_Director.cpp
+- test/ext/Makefile.am
+- test/ext/Makefile.in
+- test/ext/t1/extconf.rb
+- test/ext/t1/Foo.hpp
+- test/ext/t1/t1.cpp
+- test/ext/t2/extconf.rb
+- test/ext/t2/t2.cpp
 has_rdoc: true
 homepage: http://rice.rubyforge.org/
 licenses: []

data/rice/detail/method_data.cpp.rpp

@@ -1,301 +0,0 @@
-#include "method_data.hpp"
-
-// TODO: This is silly, autoconf...
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
-#include "../config.hpp"
-
-#ruby <<END
-MAX_ARGS = 15
-nil
-END
-
-#if defined(HAVE_NODE_H)
-/* pre-YARV */
-#include <node.h>
-#elif defined(REALLY_HAVE_RUBY_NODE_H)
-/* YARV */
-#include <ruby/node.h>
-#else
-/* YARV without node.h */
-#include "mininode.hpp"
-using namespace Rice::detail::Mininode;
-#endif
-
-#include "env.hpp"
-
-#ifdef RUBY_VM
-
-/* YARV */
-
-namespace
-{
-
-struct rb_thread_struct
-{   
-    VALUE self;
-    void *vm;
-    VALUE *stack;
-    unsigned long stack_size;
-    VALUE *cfp;
-    /* ... */
-};
-
-typedef struct rb_thread_struct rb_thread_t;
-
-} // namespace
-
-extern "C" rb_thread_t * ruby_current_thread;
-
-#endif
-
-namespace
-{
-
-#ifdef RUBY_VM
-
-/* YARV */
-
-#define CFP_DATA_MEMO_NODE_AND_PC cfp[0]
-#define CFP_METHOD_CLASS cfp[11]
-
-/* On YARV, we store the method data on the stack.  We don't have to pop
- * it off the stack, because the stack pointer will be reset to the
- * previous frame's stack pointer when the function returns.
- */
-static void fix_frame()
-{
-  do {
-    VALUE * cfp = ruby_current_thread->cfp;
-    CFP_DATA_MEMO_NODE_AND_PC = RBASIC(CFP_METHOD_CLASS)->klass;
-
-    if(rb_type(CFP_DATA_MEMO_NODE_AND_PC) != T_NODE)
-    {
-      /* This can happen for module functions that are created after
-       * the stub function */
-      rb_raise(
-          rb_eRuntimeError,
-          "Cannot find method data for module function");
-    }
-    else
-    {
-      CFP_METHOD_CLASS = RCLASS_SUPER(CFP_METHOD_CLASS);
-    }
-  } while(0);
-}
-
-#define FIX_FRAME() \
-  fix_frame()
-
-static NODE * data_memo_node()
-{
-  VALUE * cfp = ruby_current_thread->cfp;
-  return (NODE *)CFP_DATA_MEMO_NODE_AND_PC;
-}
-
-#else
-
-/* pre-YARV */
-
-/* Okay to not pop this temporary frame, since it will be popped by the
- * caller
- */
-#define FIX_FRAME() \
-  struct FRAME _frame = *ruby_frame; \
-  _frame.last_class = RCLASS(ruby_frame->last_class)->super; \
-  _frame.prev = ruby_frame; \
-  ruby_frame = &_frame; \
-
-static NODE * data_memo_node()
-{
-  return (NODE *)(RBASIC(ruby_frame->prev->last_class)->klass);
-}
-
-#endif
-
-typedef VALUE (*Method_Func)(ANYARGS);
-
-static Method_Func actual_cfunc()
-{
-  return data_memo_node()->nd_cfnc;
-}
-
-static VALUE data_wrapper_m1(int argc, VALUE * argv, VALUE self)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(argc, argv, self);
-  return result;
-}
-
-static VALUE data_wrapper_0(VALUE self)
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self);
-  return result;
-}
-
-#ruby <<END
-  (1..MAX_ARGS).each do |i|
-    params = (1..i).map { |j| "VALUE arg#{j}" }.join(', ')
-    args = (1..i).map { |j| "arg#{j}" }.join(', ')
-
-    puts <<-END
-static VALUE data_wrapper_#{i}(VALUE self, #{params})
-{
-  VALUE result;
-  FIX_FRAME();
-  result = (*actual_cfunc())(self, #{args});
-  return result;
-}
-    END
-  end
-
-  nil
-END
-
-} // namespace
-
-/* Define a method and attach data to it.
- *
- * The method looks to ruby like a normal aliased CFUNC, with a modified
- * origin class:
- *
- * NODE_FBODY
- *   |- (u1) orig - origin class
- *   |  |- basic
- *   |  |  |- flags - origin class flags + FL_SINGLETON
- *   |  |  +- klass - NODE_MEMO
- *   |  |     |- (u1) cfnc - actual C function to call
- *   |  |     |- (u2) rval - stored data
- *   |  |     +- (u3) 0
- *   |  |- iv_tbl - 0
- *   |  |- m_tbl - 0
- *   |  +- super - actual origin class
- *   |- (u2) mid - name of the method
- *   +- (u3) head - NODE_CFUNC
- *      |- (u1) cfnc - wrapper function to call
- *      +- (u2) argc - function arity
- *
- * Or, on YARV:
- *
- * NODE_FBODY
- *   |- (u1) oid - name of the method
- *   +- (u2) body - NODE_METHOD
- *      |- (u1) clss - origin class
- *      |  |- basic
- *      |  |  |- flags - origin class flags + FL_SINGLETON
- *      |  |  +- klass - NODE_MEMO
- *      |  |     |- (u1) cfnc - actual C function to call
- *      |  |     |- (u2) rval - stored data
- *      |  |     +- (u3) 0
- *      |  |- ptr - rb_classext_t
- *      |  |  |- super - actual origin class
- *      |  |  +- iv_tbl - 0
- *      |  |- m_tbl - 0
- *      |  +- iv_index_tbl - 0?
- *      |- (u2) body - NODE_CFUNC
- *      |  |- (u1) cfnc - wrapper function to call
- *      |  |- (u2) argc - function arity
- *      +- (u3) noex - NOEX_PUBLIC
- *
- * When the wrapper function is called, last_class is set to the origin
- * class found in the FBODY node.  So that the method data will be
- * accessible, and so last_class will point to klass and not to our MEMO
- * node, it is necessary to "fix" the current frame.
- *
- * Pre-YARV, this means we duplicate the current frame and set last_class:
- *
- * ruby_frame
- *   |- last_class - klass
- *   |- prev
- *   |  |- last_class - NODE_MEMO
- *   |  |  |- (u1) cfnc - actual C function to call
- *   |  |  |- (u2) rval - stored data
- *   |  |  +- (u3) 0
- *   |  |- prev - the real previous frame
- *   |  +- ...
- *   +- ...
- *
- * The method data is then accessible via
- * ruby_frame->prev->last_class->rval.
- *
- * On YARV, the current frame is not duplicated; rather, the method data
- * is placed on the stack and is referenced by one of the unused members
- * of the control frame (the program counter):
- *
- * ruby_current_thread->cfp
- *   |- pc - NODE_MEMO
- *   |  |- (u1) cfnc - actual C function to call
- *   |  |- (u2) rval - stored data
- *   |  +- (u3) 0
- *   |- method_class - klass
- *   +- ...
- *
- */
-VALUE
-Rice::detail::
-define_method_with_data(
-    VALUE klass, ID id, VALUE (*cfunc)(ANYARGS), int arity, VALUE data)
-{
-  /* TODO: origin should have #to_s and #inspect methods defined */
-#ifdef HAVE_RB_CLASS_BOOT
-  VALUE origin = rb_class_boot(klass);
-#else
-  VALUE origin = rb_class_new(klass);
-#endif
-  NODE * node;
-
-  VALUE (*data_wrapper)(ANYARGS);
-  switch(arity)
-  {
-#ruby <<END
-  (0..MAX_ARGS).each do |i|
-    puts <<-END
-    case #{i}: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_#{i}); break;
-    END
-  end
-  nil
-END
-    case -1: data_wrapper = RUBY_METHOD_FUNC(data_wrapper_m1); break;
-    default: rb_raise(rb_eArgError, "unsupported arity %d", arity);
-  }
-
-  FL_SET(origin, FL_SINGLETON);
-  rb_singleton_class_attached(origin, klass);
-  rb_name_class(origin, SYM2ID(rb_class_name(klass)));
-
-  RBASIC(origin)->klass = (VALUE)NEW_NODE(NODE_MEMO, cfunc, data, 0);
-
-#ifdef RUBY_VM
-  /* YARV */
-  node = NEW_FBODY(
-      NEW_METHOD(
-          NEW_CFUNC(data_wrapper, arity),
-          origin,
-          NOEX_PUBLIC),
-      id);
-  st_insert(RCLASS_M_TBL(klass), id, (st_data_t)node);
-#else
-  /* pre-YARV */
-  node = NEW_FBODY(
-      NEW_CFUNC(data_wrapper, arity),
-      id,
-      origin);
-  rb_add_method(klass, id, node, NOEX_PUBLIC);
-#endif
-
-  return Qnil;
-}
-
-VALUE
-Rice::detail::
-method_data()
-{
-  return data_memo_node()->nd_rval;
-}
-

data/rice/detail/mininode.cpp.rpp

@@ -1,62 +0,0 @@
-// TODO: This is silly, autoconf...
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
-#include "../config.hpp"
-
-// TODO: This is silly, autoconf...
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
-#if !defined(HAVE_NODE_H) && !defined(REALLY_HAVE_RUBY_NODE_H)
-
-#include "mininode.hpp"
-#include <cstring>
-
-extern "C"
-char const * ruby_node_name(int node);
-
-namespace
-{
-
-int node_value(char const * name)
-{
-  /* TODO: any way to end the block? */
-  int j;
-  for(j = 0; ; ++j)
-  {
-    if(!std::strcmp(name, ruby_node_name(j)))
-    {
-      return j;
-    }
-  }
-}
-
-} // namespace
-
-#ruby <<END
-require 'node_names'
-NODE_NAMES.each do |name|
-  puts <<-END
-static int NODE_#{name}_ = -1;
-
-int Rice::detail::Mininode::get_NODE_#{name}()
-{
-  if(NODE_#{name}_ == -1)
-  {
-    NODE_#{name}_ = node_value("NODE_#{name}");
-  }
-
-  return NODE_#{name}_;
-}
-  END
-end
-nil
-END
-
-#endif
-

data/rice/detail/mininode.hpp.rpp

@@ -1,119 +0,0 @@
-#ifndef Rice__detail__mininode__hpp
-#define Rice__detail__mininode__hpp
-
-#include "ruby.hpp"
-
-// TODO: This is silly, autoconf...
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
-#include "../config.hpp"
-
-// TODO: This is silly, autoconf...
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
-#if !defined(HAVE_NODE_H) && !defined(REALLY_HAVE_RUBY_NODE_H)
-
-namespace Rice
-{
-
-namespace detail
-{
-
-namespace Mininode
-{
-
-typedef struct RNode {
-  unsigned long flags;
-  void * reserved;
-  union {
-    struct RNode * node;
-    VALUE (*cfunc)(ANYARGS);
-  } u1;
-  union {
-    struct RNode * node;
-    VALUE value;
-  } u2;
-  union {
-    struct RNode * node;
-  } u3;
-} NODE;
-
-#define nd_cfnc u1.cfunc
-#define nd_rval u2.value
-
-/* TODO: No way to know the correct size of node_type */
-enum node_type {
-  NODE_FOO,
-};
-
-extern "C"
-void rb_add_method(VALUE, ID, NODE *, int);
-
-extern "C"
-NODE *rb_node_newnode(enum node_type, VALUE, VALUE, VALUE);
-
-template<typename T, typename A0, typename A1, typename A2>
-inline NODE * NEW_NODE(T t, A0 a0, A1 a1, A2 a2)
-{
-  return rb_node_newnode((node_type)t, (VALUE)a0, (VALUE)a1, (VALUE)a2);
-}
-
-#ruby <<END
-require 'node_names'
-
-NODE_NAMES.each do |name|
-puts "#define NODE_#{name} Rice::detail::Mininode::get_NODE_#{name}()"
-end
-
-puts
-
-NODE_NAMES.each do |name|
-puts "int get_NODE_#{name}();"
-end
-nil
-END
-
-static const int NOEX_PUBLIC = 0x0;
-
-inline NODE * NEW_METHOD(NODE * body, VALUE origin, int noex)
-{
-  return NEW_NODE(NODE_METHOD, origin, body, noex);
-}
-
-#ifdef RUBY_VM
-
-inline NODE * NEW_FBODY(NODE * body, ID id)
-{
-  return NEW_NODE(NODE_FBODY, id, body, 0);
-}
-
-#else
-
-inline NODE * NEW_FBODY(NODE * body, ID id, VALUE origin)
-{
-  return NEW_NODE(NODE_FBODY, body, id, origin);
-}
-
-#endif // RUBY_VM
-
-inline NODE * NEW_CFUNC(RUBY_METHOD_FUNC cfunc, int arity)
-{
-  return NEW_NODE(NODE_CFUNC, cfunc, arity, 0);
-}
-
-} // namespace Mininode
-
-} // namespace detail
-
-} // namespace Rice
-
-#endif
-
-#endif // Rice__detail__mininode__hpp
-