rice 1.1.0 → 1.2.0

data/rice/global_function.hpp

@@ -1,6 +1,8 @@
 #ifndef Rice__global_function__hpp_
 #define Rice__global_function__hpp_
 
+#include "Arg.hpp"
+
 namespace Rice
 {
 
@@ -13,7 +15,16 @@ namespace Rice
   template<typename Func_T>
   void define_global_function(
       char const * name,
-      Func_T func);
+      Func_T func,
+      Arguments* arguments = 0);
+
+  // FIXME: See Module::define_method with Arg
+  template<typename Func_T>
+  void define_global_function(
+      char const * name,
+      Func_T func,
+      Arg const& arg);
+  
 
 } // Rice
 

data/rice/global_function.ipp

@@ -3,8 +3,20 @@
 template<typename Func_T>
 void Rice::define_global_function(
     char const * name,
-    Func_T func)
+    Func_T func,
+    Arguments* arguments)
 {
-  Module(rb_mKernel).define_module_function(name, func);
+  Module(rb_mKernel).define_module_function(name, func, arguments);
+}
+
+template<typename Func_T>
+void Rice::define_global_function(
+    char const * name,
+    Func_T func,
+    Arg const& arg)
+{
+  Arguments* args = new Arguments();
+  args->add(arg);
+  define_global_function(name, func, args);
 }
 

data/ruby/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -183,6 +183,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = lib
@@ -193,8 +194,8 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -294,7 +295,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

data/ruby/lib/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -182,6 +182,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 rubydir = @RUBY_SITELIBDIR@
@@ -193,8 +194,8 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \

data/ruby/lib/version.rb

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

data/sample/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -171,6 +171,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 RUBY_EXTCONF_OPTIONS = -I@RICE_ROOT@/ruby/lib
@@ -193,8 +194,8 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \

data/test/Makefile.am

@@ -12,6 +12,8 @@ unittest_SOURCES = \
 	test_Constructor.cpp \
 	test_Critical_Guard.cpp \
 	test_Data_Object.cpp \
+	test_Data_Type.cpp \
+	test_Director.cpp \
 	test_Enum.cpp \
 	test_Exception.cpp \
 	test_Hash.cpp \

data/test/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -50,7 +50,8 @@ am_unittest_OBJECTS = unittest.$(OBJEXT) \
 	test_Allocation_Strategies.$(OBJEXT) test_Array.$(OBJEXT) \
 	test_Builtin_Object.$(OBJEXT) test_Class.$(OBJEXT) \
 	test_Constructor.$(OBJEXT) test_Critical_Guard.$(OBJEXT) \
-	test_Data_Object.$(OBJEXT) test_Enum.$(OBJEXT) \
+	test_Data_Object.$(OBJEXT) test_Data_Type.$(OBJEXT) \
+	test_Director.$(OBJEXT) test_Enum.$(OBJEXT) \
 	test_Exception.$(OBJEXT) test_Hash.$(OBJEXT) \
 	test_Identifier.$(OBJEXT) test_Jump_Tag.$(OBJEXT) \
 	test_Module.$(OBJEXT) test_Object.$(OBJEXT) \
@@ -206,6 +207,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 unittest_SOURCES = \
@@ -218,6 +220,8 @@ unittest_SOURCES = \
 	test_Constructor.cpp \
 	test_Critical_Guard.cpp \
 	test_Data_Object.cpp \
+	test_Data_Type.cpp \
+	test_Director.cpp \
 	test_Enum.cpp \
 	test_Exception.cpp \
 	test_Hash.cpp \
@@ -254,8 +258,8 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -303,6 +307,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Constructor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Critical_Guard.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Data_Object.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Data_Type.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Director.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Enum.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Exception.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Hash.Po@am__quote@
@@ -337,7 +343,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -380,7 +386,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
 	if test -n "$$list"; then \
@@ -391,7 +397,7 @@ check-TESTS: $(TESTS)
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
 		echo "XPASS: $$tst"; \
@@ -403,7 +409,7 @@ check-TESTS: $(TESTS)
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *$$ws$$tst$$ws*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
 		echo "XFAIL: $$tst"; \
 	      ;; \
@@ -417,23 +423,36 @@ check-TESTS: $(TESTS)
 	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \

data/test/test_Class.cpp

@@ -9,6 +9,7 @@
 #include <iostream>
 
 using namespace Rice;
+using namespace std;
 
 TESTSUITE(Class);
 
@@ -87,7 +88,7 @@ namespace
 
 bool define_method_simple_ok;
 
-void define_method_simple_helper(Object o)
+void define_method_simple_helper()
 {
   define_method_simple_ok = true;
 }
@@ -130,19 +131,27 @@ TESTCASE(define_module_function_simple)
 namespace
 {
 
-int define_method_int_result;
+  int define_method_int_result;
 
-void define_method_int_helper(Object o, int i)
-{
-  define_method_int_result = i;
-}
+  class IntHelper {
+    public: 
+      IntHelper() { }
+
+      void define_method_int_helper(int i)
+      {
+        define_method_int_result = i;
+      }
+  };
 
 } // namespace
 
 TESTCASE(define_method_int)
 {
-  Class c(anonymous_class());
-  c.define_method("foo", &define_method_int_helper);
+  Class c = 
+    define_class<IntHelper>("IntHelper")
+      .define_constructor(Constructor<IntHelper>())
+      .define_method("foo", &IntHelper::define_method_int_helper);
+
   Object o = c.call("new");
   define_method_int_result = 0;
   o.call("foo", 42);
@@ -151,9 +160,13 @@ TESTCASE(define_method_int)
 
 TESTCASE(define_method_int_passed_two_args)
 {
-  Class c(anonymous_class());
-  c.define_method("foo", &define_method_int_helper);
+  Class c = 
+    define_class<IntHelper>("IntHelper")
+      .define_constructor(Constructor<IntHelper>())
+      .define_method("foo", &IntHelper::define_method_int_helper);
+
   Object o = c.call("new");
+
   ASSERT_EXCEPTION_CHECK(
       Exception,
       o.call("foo", 1, 2),
@@ -166,9 +179,13 @@ TESTCASE(define_method_int_passed_two_args)
 
 TESTCASE(define_method_int_passed_no_args)
 {
-  Class c(anonymous_class());
-  c.define_method("foo", &define_method_int_helper);
+  Class c = 
+    define_class<IntHelper>("IntHelper")
+      .define_constructor(Constructor<IntHelper>())
+      .define_method("foo", &IntHelper::define_method_int_helper);
+
   Object o = c.call("new");
+
   ASSERT_EXCEPTION_CHECK(
       Exception,
       o.call("foo"),
@@ -191,7 +208,7 @@ struct Foo
 int define_method_int_foo_result_i;
 Foo * define_method_int_foo_result_x;
 
-void define_method_int_foo_helper(Object o, int i, Foo * x)
+void define_method_int_foo_helper(int i, Foo * x)
 {
   define_method_int_foo_result_i = i;
   define_method_int_foo_result_x = x;
@@ -221,6 +238,11 @@ TESTCASE(define_method_int_foo)
   ASSERT_EQUAL(foo, define_method_int_foo_result_x);
 }
 
+
+TESTCASE(define_method_with_default_arguments)
+{
+}
+
 namespace
 {
 
@@ -234,7 +256,7 @@ void handle_silly_exception(Silly_Exception const & ex)
   throw Exception(rb_eRuntimeError, "SILLY");
 }
 
-void throw_silly_exception(Object self)
+void throw_silly_exception()
 {
   throw Silly_Exception();
 }

data/test/test_Constructor.cpp

@@ -1,7 +1,11 @@
 #include "unittest.hpp"
 #include "rice/Constructor.hpp"
 #include "rice/Data_Type.hpp"
-#include "rice/Constructor.hpp"
+
+#include "rice/detail/env.hpp"
+
+#include <iostream>
+using namespace std;
 
 using namespace Rice;
 
@@ -60,4 +64,175 @@ TESTCASE(non_default_constructor)
   ASSERT_EQUAL(rb_cNon_Default_Constructible, o.class_of());
   ASSERT_EQUAL(42, o->i());
 }
+/*
+namespace {
+
+  class AbstractClass
+  {
+    public:
+
+    int doSomething()
+    {
+      return doSomethingImpl();
+    }
+
+    int doSomethingParam(int a, int b)
+    {
+      return doSomethingParamImpl(a, b);
+    }
+
+    virtual int doSomethingImpl() = 0;
+
+    virtual int doSomethingParamImpl(int a, int b) = 0;
+  };
+
+  class Director : public AbstractClass
+  {
+    Rice::Object m_rbSelf;
+
+    public:
+      Director(Rice::Object self) : m_rbSelf(self) { }
+
+      virtual int doSomethingImpl() 
+      {
+        cout << endl << "In Impl, frame's last_func is " << rb_id2name(ruby_frame->last_func) << endl;
+        cout << endl << "In Impl, frame's orig_func is " << rb_id2name(ruby_frame->orig_func) << endl;
+        cout << endl << "In Impl, frame's last_class is " << Class(ruby_frame->last_class).name().str() << endl;
+
+        cout << endl << "In Impl, frame's prev's last_func is " << rb_id2name(ruby_frame->prev->last_func) << endl;
+        cout << endl << "In Impl, frame's prev's orig_func is " << rb_id2name(ruby_frame->prev->orig_func) << endl;
+
+        cout << endl << "We've got classname (frame) " << rb_obj_classname(ruby_frame->self) << " vs (self) " << rb_obj_classname(m_rbSelf.value()) << endl;
+        cout << endl << "We've got classname (frame prev) " << rb_obj_classname(ruby_frame->prev->self) << " vs (self) " << rb_obj_classname(m_rbSelf.value()) << endl;
+
+        // Need to get the Ruby callee, compare that to m_rbSelf, and 
+        // if they're equal, go UP the chain, otherwise go DOWN
+        if(ruby_frame->self == m_rbSelf.value()) { 
+          // As doSomethingImpl is pure virtual, we need to implement a default here so
+          // that super calls don't blow things up
+          return 100;
+        } else {
+          return from_ruby<int>( m_rbSelf.call("do_something_impl") );
+        }
+
+      }
+
+      virtual int doSomethingParamImpl(int a, int b) 
+      {
+        return from_ruby<int>( m_rbSelf.call("do_something_param_impl", a, b) );
+      }
+  };
+}
+
+TESTCASE(director_system_polymorphic_calls)
+{
+  Data_Type<AbstractClass> a = define_class<AbstractClass>("__AbstractClass__");
 
+  Data_Type<Director> d = define_class<Director, AbstractClass>("AbstractClass");
+  d.define_constructor(Constructor<Director, Rice::Object>());
+  d.define_method("do_something", &AbstractClass::doSomething);
+  d.define_method("do_something_impl", &Director::doSomethingImpl);
+
+  Module m = define_module("Testing");
+  m.instance_eval(
+    "class MyWorker < AbstractClass;"
+    "def do_something_impl; 8; end;"
+    "end"
+  );
+
+  Object result = m.instance_eval("worker = MyWorker.new; worker.do_something");
+
+  ASSERT_EQUAL(
+    8, from_ruby<int>(result.value())
+  );
+}
+
+TESTCASE(director_system_polymorphic_calls_with_parameters)
+{
+  Data_Type<AbstractClass> a = define_class<AbstractClass>("__AbstractClass__");
+
+  Data_Type<Director> d = define_class<Director, AbstractClass>("AbstractClass");
+  d.define_constructor(Constructor<Director, Rice::Object>());
+  d.define_method("do_something_param", &AbstractClass::doSomethingParam);
+  d.define_method("do_something_param_impl", &Director::doSomethingParamImpl);
+
+  Module m = define_module("Testing");
+  m.instance_eval(
+    "class MyWorker < AbstractClass;"
+    "def do_something_param_impl(a, b); a * b; end;"
+    "end"
+  );
+
+  Object result = m.instance_eval("worker = MyWorker.new; worker.do_something_param(2, 10)");
+
+  ASSERT_EQUAL(
+    20, from_ruby<int>(result.value())
+  );
+}
+
+TESTCASE(director_system_polymorphic_calls_very_deep)
+{
+  Data_Type<AbstractClass> a = define_class<AbstractClass>("__AbstractClass__");
+
+  Data_Type<Director> d = define_class<Director, AbstractClass>("AbstractClass");
+  d.define_constructor(Constructor<Director, Rice::Object>());
+  d.define_method("do_something", &AbstractClass::doSomething);
+  d.define_method("do_something_impl", &Director::doSomethingImpl);
+
+  Module m = define_module("Testing");
+  m.instance_eval(
+    "class MyWorker < AbstractClass;"
+    "def do_something_impl; 4; end;"
+    "end;"
+    "class MyWorker2 < MyWorker;"
+    "def do_something_impl; 6; end;"
+    "end;"
+    "class MyWorker3 < MyWorker2;"
+    "def do_something_impl; 8; end;"
+    "end;"
+    "class MyWorker4 < MyWorker3;"
+    "def do_something_impl; 10; end;"
+    "end;"
+  );
+
+  Object result = m.instance_eval("worker = MyWorker4.new; worker.do_something");
+
+  ASSERT_EQUAL(
+    10, from_ruby<int>(result.value())
+  );
+}
+
+TESTCASE(director_system_super_calls_dont_infinite_loop) 
+{
+  Data_Type<AbstractClass> a = define_class<AbstractClass>("__AbstractClass__");
+
+  Data_Type<Director> d = define_class<Director, AbstractClass>("AbstractClass");
+  d.define_constructor(Constructor<Director, Rice::Object>());
+  d.define_method("do_something", &AbstractClass::doSomething);
+  d.define_method("do_something_impl", &Director::doSomethingImpl);
+
+  Module m = define_module("Testing");
+  m.instance_eval(
+    "class MyWorker < AbstractClass;"
+    "@@call_count = 0;"
+    "def do_something_impl;"
+    "@@call_count += 1;"
+    "if @@call_count == 1; super; else; -1; end;"
+    "end; end;"
+  );
+
+  Object result = m.instance_eval("worker = MyWorker.new; worker.do_something");
+
+  // -1 means that the do_something_impl got called twice, aka we were in an infinite loop
+  // had the class var check not been there
+  ASSERT_NOT_EQUAL(
+    -1,
+    from_ruby<int>(result.value())
+  );
+
+  ASSERT_EQUAL(
+    100,
+    from_ruby<int>(result.value())
+  );
+}
+*/