rice 1.0.2 → 1.1.0

data/rice/global_function.hpp

@@ -4,10 +4,16 @@
 namespace Rice
 {
 
-template<typename Func_T>
-void define_global_function(
-    char const * name,
-    Func_T func);
+  /**
+   * Helper forwarder method to easily wrap
+   * globally available functions. This simply
+   * forwards off a call to define_module_function
+   * on rb_mKernel
+   */
+  template<typename Func_T>
+  void define_global_function(
+      char const * name,
+      Func_T func);
 
 } // Rice
 

data/rice/global_function.ipp

@@ -5,7 +5,6 @@ void Rice::define_global_function(
     char const * name,
     Func_T func)
 {
-  detail::define_method_and_auto_wrap(
-      rb_cObject, name, func);
+  Module(rb_mKernel).define_module_function(name, func);
 }
 

data/rice/ruby_mark.hpp

@@ -0,0 +1,13 @@
+#ifndef ruby_mark__hpp
+#define ruby_mark__hpp
+
+//! Default function to call to mark a data object.
+/*! This function can be specialized for a particular type to override
+ *  the default behavior (which is to not mark any additional objects).
+ */
+template<typename T>
+void ruby_mark(T * obj)
+{
+}
+
+#endif // ruby_mark__hpp

data/rice/ruby_try_catch.hpp

@@ -1,7 +1,7 @@
 #ifndef Rice__ruby_try_catch__hpp_
 #define Rice__ruby_try_catch__hpp_
 
-#include "Exception_Base.hpp"
+#include "Exception_Base_defn.hpp"
 #include "Jump_Tag.hpp"
 #include "detail/ruby.hpp"
 #include <stdexcept>

data/rice/rubypp.rb

@@ -0,0 +1,97 @@
+class Preprocessor
+  def initialize(input, output, filename)
+    @input = input
+    @output = output
+    @filename = filename
+    @linenum = 1
+  end
+
+  def getline
+    line = @input.gets
+    @linenum += 1 if not line.nil?
+    return line
+  end
+
+  def preprocess
+    success = false
+    begin
+      loop do
+        line = getline
+        break if line.nil?
+        case line
+        when /(.*[^\\]|^)\#\{(.*?)\}(.*)/
+          puts "#{$1}#{evaluate($2, @linenum)}#{$3}"
+        when /^\#ruby\s+<<(.*)/
+          marker = $1
+          str = ''
+          evalstart = @linenum
+          loop do
+            line = getline
+            if line.nil? then
+              raise "End of input without #{marker}"
+            end
+            break if line.chomp == marker
+            str << line
+          end
+          result = evaluate(str, evalstart)
+          puts result if not result.nil?
+        when /^\#ruby\s+(.*)/
+          str = line = $1
+          while line[-1] == ?\\
+            str.chop!
+            line = getline
+            break if line.nil?
+            line.chomp!
+            str << line
+          end
+          result = evaluate(str, @linenum)
+          puts result if not result.nil?
+        else
+          puts line
+        end
+      end
+      success = true
+    ensure
+      if not success then
+        $stderr.puts "Error on line #{@linenum}:"
+      end
+    end
+  end
+
+  def evaluate(str, linenum)
+    result = eval(str, TOPLEVEL_BINDING, @filename, linenum)
+    success = true
+    return result
+  end
+
+  def puts(line='')
+    @output.puts(line)
+  end
+end
+
+def puts(line='')
+  $preprocessor.puts(line)
+end
+
+def rubypp(input_file, output_file)
+  input = input_file ? File.open(input_file) : $stdin
+  output = output_file ? File.open(output_file, 'w') : $stdout
+
+  success = false
+  begin
+    $preprocessor = Preprocessor.new(input, output, input_file || "(stdin)")
+    $preprocessor.preprocess()
+    success = true
+  ensure
+    if not success then
+      File.unlink(output_file) rescue Errno::ENOENT
+    end
+  end
+end
+
+if __FILE__ == $0 then
+  input_file = ARGV[0]
+  output_file = ARGV[1]
+  rubypp(input_file, output_file)
+end
+

data/rice/to_from_ruby.ipp

@@ -164,9 +164,9 @@ char from_ruby<char>(Rice::Object x)
 {
   if(x.rb_type() == T_STRING)
   {
-    if(RSTRING(x.value())->len == 0)
+    if(RSTRING_LEN(x.value()) == 0)
     {
-      return RSTRING(x.value())->ptr[0];
+      return RSTRING_PTR(x.value())[0];
     }
     else
     {
@@ -263,7 +263,7 @@ namespace Rice
   {
     inline VALUE str2ccstr(VALUE x)
     {
-      return (VALUE)(STR2CSTR(x));
+      return (VALUE)(StringValuePtr(x));
     }
   }
 }

data/ruby.ac

@@ -1,5 +1,6 @@
 dnl Get a key from ruby's configuration table
-AC_DEFUN([RUBY_CONFIG], [$RUBY -rrbconfig -e "puts Config::CONFIG[['$1']]"])
+AC_DEFUN([RUBY_CONFIG], [
+          $RUBY -rrbconfig -e "puts(Config::CONFIG[['$1']] || '')"])
 
 AC_DEFUN([RB_INIT_RUBY], [
 
@@ -20,9 +21,15 @@ AC_ARG_WITH(
 
 AC_SUBST(RUBY)
 
+RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"`
+AC_SUBST(RUBY_VERSION_CODE)
+
+RUBY_CONFIG_SO_NAME=`RUBY_CONFIG(RUBY_SO_NAME)`
 RUBY_CONFIG_ARCHDIR=`RUBY_CONFIG(archdir)`
+RUBY_CONFIG_ARCH=`RUBY_CONFIG(arch)`
 RUBY_CONFIG_LIBDIR=`RUBY_CONFIG(libdir)`
 RUBY_CONFIG_BINDIR=`RUBY_CONFIG(bindir)`
+RUBY_CONFIG_RUBYHDRDIR=`RUBY_CONFIG(rubyhdrdir)`
 RUBY_CONFIG_CFLAGS=`RUBY_CONFIG(CFLAGS)`
 RUBY_CONFIG_LIBS=`RUBY_CONFIG(LIBS)`
 RUBY_CONFIG_DLDLIBS=`RUBY_CONFIG(DLDLIBS)`
@@ -31,7 +38,14 @@ RUBY_CONFIG_LIBRUBYARG=`RUBY_CONFIG(LIBRUBYARG)`
 RUBY_CONFIG_LIBRUBYARG_STATIC=`RUBY_CONFIG(LIBRUBYARG_STATIC)`
 RUBY_CONFIG_CCDLFLAGS=`RUBY_CONFIG(CCDLFLAGS)`
 
-RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
+if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then
+  # 1.9
+  RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
+  RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
+else
+  # 1.8
+  RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
+fi
 AC_SUBST(RUBY_CPPFLAGS)
 
 RUBY_CFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
@@ -40,7 +54,7 @@ AC_SUBST(RUBY_CFLAGS)
 RUBY_CXXFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
 AC_SUBST(RUBY_CXXFLAGS)
 
-RUBY_LDFLAGS="-L${RUBY_ARCHDIR} -L${RUBY_CONFIG_LIBDIR} ${RUBY_LDFLAGS}"
+RUBY_LDFLAGS="-L${RUBY_CONFIG_ARCHDIR} -L${RUBY_CONFIG_LIBDIR} ${RUBY_CONFIG_LDFLAGS}"
 AC_SUBST(RUBY_LDFLAGS)
 
 RUBY_LIBS="${RUBY_CONFIG_LIBS} ${RUBY_CONFIG_DLDLIBS}"
@@ -75,16 +89,38 @@ dnl searching for standard header files as a side-effect (which we want)
 CPPFLAGS_save="${CPPFLAGS}"
 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
 CXXFLAGS="${CPPFLAGS}"
-AC_CHECK_HEADER(ruby.h,,AC_MSG_ERROR(
+AC_CHECK_HEADERS(ruby.h,,AC_MSG_ERROR(
                 could not find ruby.h (check config.log)),[ ])
-AC_CHECK_HEADER(node.h,,AC_MSG_ERROR(
-                could not find node.h (check config.log)),[
+AC_CHECK_HEADERS(node.h,,,[
+#include <ruby.h>
+])
+AC_CHECK_HEADERS(ruby/node.h,
+                 [ AC_DEFINE(REALLY_HAVE_RUBY_NODE_H, [],
+                             [ Define this macro to use ruby/node.h ]) ],
+                             ,[
+#include <ruby.h>
+])
+AC_CHECK_HEADERS(version.h,,,[
 #include <ruby.h>
 ])
-AC_CHECK_HEADER(version.h,,AC_MSG_ERROR(
-                could not find version.h (check config.log)),[
+AC_CHECK_HEADERS(env.h,,,[
 #include <ruby.h>
 ])
+
+dnl We need to set the LD flags to include the path to this Ruby's
+dnl library path so that this library check will work for ruby installs
+dnl sitting in unconvential locations
+save_ldflags="$LDFLAGS"
+LDFLAGS="$RUBY_LDFLAGS"
+
+AC_CHECK_LIB($RUBY_CONFIG_SO_NAME,
+             rb_class_boot,
+             [ AC_DEFINE(HAVE_RB_CLASS_BOOT, [], [
+              Define this macro if rb_class_boot is defined ]) ] )
+
+LDFLAGS="$save_ldflags"
+
+
 CPPFLAGS="${CPPFLAGS_save}"
 
 AC_MINGW32

data/ruby/Makefile.in

@@ -119,6 +119,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RICE_CPPFLAGS = @RICE_CPPFLAGS@
 RICE_LDFLAGS = @RICE_LDFLAGS@
+RICE_ROOT = @RICE_ROOT@
 RICE_SAMPLES = @RICE_SAMPLES@
 RICE_USING_MINGW32 = @RICE_USING_MINGW32@
 RUBY = @RUBY@
@@ -130,6 +131,7 @@ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
 RUBY_LIBRUBYARG_STATIC = @RUBY_LIBRUBYARG_STATIC@
 RUBY_LIBS = @RUBY_LIBS@
 RUBY_SITELIBDIR = @RUBY_SITELIBDIR@
+RUBY_VERSION_CODE = @RUBY_VERSION_CODE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@

data/ruby/lib/Makefile.in

@@ -118,6 +118,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RICE_CPPFLAGS = @RICE_CPPFLAGS@
 RICE_LDFLAGS = @RICE_LDFLAGS@
+RICE_ROOT = @RICE_ROOT@
 RICE_SAMPLES = @RICE_SAMPLES@
 RICE_USING_MINGW32 = @RICE_USING_MINGW32@
 RUBY = @RUBY@
@@ -129,6 +130,7 @@ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
 RUBY_LIBRUBYARG_STATIC = @RUBY_LIBRUBYARG_STATIC@
 RUBY_LIBS = @RUBY_LIBS@
 RUBY_SITELIBDIR = @RUBY_SITELIBDIR@
+RUBY_VERSION_CODE = @RUBY_VERSION_CODE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@

data/ruby/lib/mkmf-rice.rb.in

@@ -31,6 +31,9 @@ def init_mkmf_rice(config = CONFIG)
   # Ruby < 1.8.6 does not have $DEFLIBPATH
   $DEFLIBPATH ||= []
 
+  # We use this for the samples
+  $DEFLIBPATH.unshift(with_config('libpath')) if with_config('libpath')
+
   # Ruby 1.8.6 uses $preload without setting it
   $preload ||= nil
 
@@ -180,7 +183,7 @@ class RiceMakefileCreator
     end
 
     def puts(*strings)
-      print strings.map { |s| "#{s}\n" }
+      print(*strings.map { |s| "#{s}\n" })
     end
 
     def close

data/ruby/lib/version.rb

@@ -0,0 +1,3 @@
+module Rice
+  VERSION = "1.1.0"
+end

data/sample/Makefile.am

@@ -1,5 +1,5 @@
-RUBY_EXTCONF_OPTIONS = -I../../ruby/lib
-EXTCONF_OPTIONS = --with-cppflags="-I../.." --with-ldflags="-L../../rice"
+RUBY_EXTCONF_OPTIONS = -I@RICE_ROOT@/ruby/lib
+EXTCONF_OPTIONS = --with-cppflags="-I@RICE_ROOT@" --with-libpath="@RICE_ROOT@/rice"
 
 EXTRA_DIST = \
 	enum/extconf.rb \

data/sample/Makefile.in

@@ -107,6 +107,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RICE_CPPFLAGS = @RICE_CPPFLAGS@
 RICE_LDFLAGS = @RICE_LDFLAGS@
+RICE_ROOT = @RICE_ROOT@
 RICE_SAMPLES = @RICE_SAMPLES@
 RICE_USING_MINGW32 = @RICE_USING_MINGW32@
 RUBY = @RUBY@
@@ -118,6 +119,7 @@ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
 RUBY_LIBRUBYARG_STATIC = @RUBY_LIBRUBYARG_STATIC@
 RUBY_LIBS = @RUBY_LIBS@
 RUBY_SITELIBDIR = @RUBY_SITELIBDIR@
+RUBY_VERSION_CODE = @RUBY_VERSION_CODE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -171,8 +173,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-RUBY_EXTCONF_OPTIONS = -I../../ruby/lib
-EXTCONF_OPTIONS = --with-cppflags="-I../.." --with-ldflags="-L../../rice"
+RUBY_EXTCONF_OPTIONS = -I@RICE_ROOT@/ruby/lib
+EXTCONF_OPTIONS = --with-cppflags="-I@RICE_ROOT@" --with-libpath="@RICE_ROOT@/rice"
 EXTRA_DIST = \
 	enum/extconf.rb \
 	enum/sample_enum.cpp \

data/test/Makefile.am

@@ -22,7 +22,8 @@ unittest_SOURCES = \
 	test_String.cpp \
 	test_Struct.cpp \
 	test_Symbol.cpp \
-	test_To_From_Ruby.cpp
+	test_To_From_Ruby.cpp \
+	test_global_functions.cpp
 
 vm_unittest_SOURCES = \
 	unittest.cpp \

data/test/Makefile.in

@@ -55,7 +55,8 @@ am_unittest_OBJECTS = unittest.$(OBJEXT) \
 	test_Identifier.$(OBJEXT) test_Jump_Tag.$(OBJEXT) \
 	test_Module.$(OBJEXT) test_Object.$(OBJEXT) \
 	test_String.$(OBJEXT) test_Struct.$(OBJEXT) \
-	test_Symbol.$(OBJEXT) test_To_From_Ruby.$(OBJEXT)
+	test_Symbol.$(OBJEXT) test_To_From_Ruby.$(OBJEXT) \
+	test_global_functions.$(OBJEXT)
 unittest_OBJECTS = $(am_unittest_OBJECTS)
 unittest_LDADD = $(LDADD)
 am_vm_unittest_OBJECTS = unittest.$(OBJEXT) test_VM.$(OBJEXT)
@@ -141,6 +142,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RICE_CPPFLAGS = @RICE_CPPFLAGS@
 RICE_LDFLAGS = @RICE_LDFLAGS@
+RICE_ROOT = @RICE_ROOT@
 RICE_SAMPLES = @RICE_SAMPLES@
 RICE_USING_MINGW32 = @RICE_USING_MINGW32@
 RUBY = @RUBY@
@@ -152,6 +154,7 @@ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
 RUBY_LIBRUBYARG_STATIC = @RUBY_LIBRUBYARG_STATIC@
 RUBY_LIBS = @RUBY_LIBS@
 RUBY_SITELIBDIR = @RUBY_SITELIBDIR@
+RUBY_VERSION_CODE = @RUBY_VERSION_CODE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -225,7 +228,8 @@ unittest_SOURCES = \
 	test_String.cpp \
 	test_Struct.cpp \
 	test_Symbol.cpp \
-	test_To_From_Ruby.cpp
+	test_To_From_Ruby.cpp \
+	test_global_functions.cpp
 
 vm_unittest_SOURCES = \
 	unittest.cpp \
@@ -311,6 +315,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Symbol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_To_From_Ruby.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_VM.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_global_functions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittest.Po@am__quote@
 
 .cpp.o:

data/test/test_Array.cpp

@@ -15,7 +15,7 @@ TESTCASE(default_construct)
 {
   Array a;
   ASSERT_EQUAL(T_ARRAY, rb_type(a));
-  ASSERT_EQUAL(0, RARRAY(a.value())->len);
+  ASSERT_EQUAL(0, RARRAY_LEN(a.value()));
 }
 
 TESTCASE(construct_from_vector_of_int)
@@ -158,7 +158,7 @@ TESTCASE(shift)
 TESTCASE(to_c_array)
 {
   Array a;
-  ASSERT_EQUAL(RARRAY(a.value())->ptr, a.to_c_array());
+  ASSERT_EQUAL(RARRAY_PTR(a.value()), a.to_c_array());
 }
 
 TESTCASE(iterate)

data/test/test_Class.cpp

@@ -49,6 +49,9 @@ TESTCASE(include_module)
   expected_ancestors.push(Module(rb_mEnumerable));
   expected_ancestors.push(Module(rb_cObject));
   expected_ancestors.push(Module(rb_mKernel));
+#ifdef RUBY_VM
+  expected_ancestors.push(Module(rb_cBasicObject));
+#endif
   ASSERT_EQUAL(expected_ancestors, ancestors);
 }
 
@@ -118,7 +121,7 @@ TESTCASE(define_module_function_simple)
       Exception,
       c.define_module_function("foo", &define_method_simple_helper),
       ASSERT_EQUAL(
-          Object(rb_eNoMethodError), // TODO: 1.6.x?
+          Object(rb_eTypeError),
           Object(CLASS_OF(ex.value()))
           )
       );