rice 1.1.0 → 1.2.0

data/rice/Enum.hpp

@@ -36,11 +36,10 @@ struct Default_Enum_Traits
  *  Example:
  *  \code
  *    enum Color { Red, Green, Blue };
- *    Enum<Color> rb_cColor = define_enum<Color>()
+ *    Enum<Color> rb_cColor = define_enum<Color>("Color")
  *      .define_value("Red", Red)
  *      .define_value("Green", Green)
- *      .define_value("Blue", Blue)
- *      .initialize("Color");
+ *      .define_value("Blue", Blue);
  *  \endcode
  */
 template<typename Enum_T, typename Enum_Traits = Default_Enum_Traits<Enum_T> >

data/rice/Enum.ipp

@@ -75,7 +75,7 @@ initialize(
     .define_method("to_i", to_i)
     .define_method("inspect", inspect)
     .define_method("<=>", compare)
-    .define_method("hash", hash)
+    //.define_method("hash", hash)
     .define_method("eql?", eql)
     .define_method("==", eql)
     .define_method("===", eql)

data/rice/Hash.hpp

@@ -192,7 +192,7 @@ public:
 private:
   Hash hash_;
   st_table * tbl_;
-#if RUBY_VERSION_CODE >= 190
+#if RICE__RUBY_VERSION_CODE >= 190
   st_index_t bin_;
 #else
   int bin_;

data/rice/Makefile.am

@@ -3,6 +3,7 @@ lib_LIBRARIES = librice.a
 librice_a_SOURCES = \
 Class.cpp \
 Data_Type.cpp \
+Director.cpp \
 Exception.cpp \
 Identifier.cpp \
 Module.cpp \
@@ -11,6 +12,7 @@ String.cpp \
 Struct.cpp \
 Symbol.cpp \
 VM.cpp \
+Arg_operators.cpp \
 detail/check_ruby_type.cpp \
 detail/demangle.cpp \
 detail/method_data.cpp \
@@ -24,6 +26,9 @@ Address_Registration_Guard_defn.hpp \
 Allocation_Strategies.hpp \
 Array.hpp \
 Array.ipp \
+Arg.hpp \
+Arg_impl.hpp \
+Arg_operators.hpp \
 Builtin_Object.hpp \
 Builtin_Object.ipp \
 Builtin_Object_defn.hpp \
@@ -40,6 +45,7 @@ Data_Type.hpp \
 Data_Type.ipp \
 Data_Type_defn.hpp \
 Data_Type_fwd.hpp \
+Director.hpp \
 Enum.hpp \
 Enum.ipp \
 Exception.hpp \
@@ -82,6 +88,7 @@ detail/Auto_Function_Wrapper.hpp \
 detail/Auto_Function_Wrapper.ipp \
 detail/Auto_Member_Function_Wrapper.hpp \
 detail/Auto_Member_Function_Wrapper.ipp \
+detail/Arguments.hpp \
 detail/Caster.hpp \
 detail/Exception_Handler.hpp \
 detail/Exception_Handler.ipp \

data/rice/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,
@@ -58,9 +58,10 @@ ARFLAGS = cru
 librice_a_AR = $(AR) $(ARFLAGS)
 librice_a_LIBADD =
 am_librice_a_OBJECTS = Class.$(OBJEXT) Data_Type.$(OBJEXT) \
-	Exception.$(OBJEXT) Identifier.$(OBJEXT) Module.$(OBJEXT) \
-	Object.$(OBJEXT) String.$(OBJEXT) Struct.$(OBJEXT) \
-	Symbol.$(OBJEXT) VM.$(OBJEXT) check_ruby_type.$(OBJEXT) \
+	Director.$(OBJEXT) Exception.$(OBJEXT) Identifier.$(OBJEXT) \
+	Module.$(OBJEXT) Object.$(OBJEXT) String.$(OBJEXT) \
+	Struct.$(OBJEXT) Symbol.$(OBJEXT) VM.$(OBJEXT) \
+	Arg_operators.$(OBJEXT) check_ruby_type.$(OBJEXT) \
 	demangle.$(OBJEXT) method_data.$(OBJEXT) protect.$(OBJEXT) \
 	mininode.$(OBJEXT)
 librice_a_OBJECTS = $(am_librice_a_OBJECTS)
@@ -206,12 +207,14 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LIBRARIES = librice.a
 librice_a_SOURCES = \
 Class.cpp \
 Data_Type.cpp \
+Director.cpp \
 Exception.cpp \
 Identifier.cpp \
 Module.cpp \
@@ -220,6 +223,7 @@ String.cpp \
 Struct.cpp \
 Symbol.cpp \
 VM.cpp \
+Arg_operators.cpp \
 detail/check_ruby_type.cpp \
 detail/demangle.cpp \
 detail/method_data.cpp \
@@ -233,6 +237,9 @@ Address_Registration_Guard_defn.hpp \
 Allocation_Strategies.hpp \
 Array.hpp \
 Array.ipp \
+Arg.hpp \
+Arg_impl.hpp \
+Arg_operators.hpp \
 Builtin_Object.hpp \
 Builtin_Object.ipp \
 Builtin_Object_defn.hpp \
@@ -249,6 +256,7 @@ Data_Type.hpp \
 Data_Type.ipp \
 Data_Type_defn.hpp \
 Data_Type_fwd.hpp \
+Director.hpp \
 Enum.hpp \
 Enum.ipp \
 Exception.hpp \
@@ -291,6 +299,7 @@ detail/Auto_Function_Wrapper.hpp \
 detail/Auto_Function_Wrapper.ipp \
 detail/Auto_Member_Function_Wrapper.hpp \
 detail/Auto_Member_Function_Wrapper.ipp \
+detail/Arguments.hpp \
 detail/Caster.hpp \
 detail/Exception_Handler.hpp \
 detail/Exception_Handler.ipp \
@@ -336,8 +345,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; \
@@ -418,8 +427,10 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Arg_operators.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Class.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Data_Type.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Director.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exception.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Identifier.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Module.Po@am__quote@
@@ -542,7 +553,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/rice/Module_impl.hpp

@@ -5,6 +5,7 @@
 #include "detail/ruby.hpp"
 #include "Object_defn.hpp"
 #include "Address_Registration_Guard_defn.hpp"
+#include "Arg.hpp"
 
 namespace Rice
 {
@@ -97,12 +98,24 @@ public:
    *  \param name the name of the method
    *  \param func the implementation of the function, either a function
    *  pointer or a member function pointer.
+   *  \param arguments the list of arguments of this function, used for
+   *  defining default parameters (optional)
    *  \return *this
    */
   template<typename Func_T>
   Derived_T & define_method(
       Identifier name,
-      Func_T func);
+      Func_T func,
+      Arguments* arguments = 0);
+
+  // FIXME There's GOT to be a better way to
+  // do this. Handles the case where there is a single
+  // argument defined for this method
+  template<typename Func_T>
+  Derived_T & define_method(
+      Identifier name,
+      Func_T func,
+      Arg const& arg);
 
   //! Define a singleton method.
   /*! The method's implementation can be any function or member
@@ -113,12 +126,22 @@ public:
    *  \param name the name of the method
    *  \param func the implementation of the function, either a function
    *  pointer or a member function pointer.
+   *  \param arguments the list of arguments of this function, used for
+   *  defining default parameters (optional)
    *  \return *this
    */
   template<typename Func_T>
   Derived_T & define_singleton_method(
       Identifier name,
-      Func_T func);
+      Func_T func,
+      Arguments* arguments = 0);
+
+  // FIXME: See define_method with Arg above
+  template<typename Func_T>
+  Derived_T & define_singleton_method(
+      Identifier name,
+      Func_T func,
+      Arg const& arg);
 
   //! Define a module function.
   /*! A module function is a function that can be accessed either as a
@@ -131,12 +154,22 @@ public:
    *  \param name the name of the method
    *  \param func the implementation of the function, either a function
    *  pointer or a member function pointer.
+   *  \param arguments the list of arguments of this function, used for
+   *  defining default parameters (optional)
    *  \return *this
    */
   template<typename Func_T>
   Derived_T & define_module_function(
       Identifier name,
-      Func_T func);
+      Func_T func,
+      Arguments* arguments = 0);
+
+  // FIXME: See define_method with Arg above
+  template<typename Func_T>
+  Derived_T & define_module_function(
+      Identifier name,
+      Func_T func,
+      Arg const& arg);
 
   //! Define an iterator.
   /*! Essentially this is a conversion from a C++-style begin/end

data/rice/Module_impl.ipp

@@ -120,13 +120,30 @@ Derived_T &
 Rice::Module_impl<Base_T, Derived_T>::
 define_method(
     Identifier name,
-    Func_T func)
+    Func_T func,
+    Arguments* arguments)
 {
   detail::define_method_and_auto_wrap(
-      *this, name, func, this->handler());
+      *this, name, func, this->handler(), arguments);
   return (Derived_T &)*this;
 }
 
+template<typename Base_T, typename Derived_T>
+template<typename Func_T>
+inline
+Derived_T &
+Rice::Module_impl<Base_T, Derived_T>::
+define_method(
+    Identifier name,
+    Func_T func,
+    Arg const& arg)
+{
+  Arguments* args = new Arguments();
+  args->add(arg);
+  return define_method(name, func, args);
+}
+
+
 template<typename Base_T, typename Derived_T>
 template<typename Func_T>
 inline
@@ -134,13 +151,29 @@ Derived_T &
 Rice::Module_impl<Base_T, Derived_T>::
 define_singleton_method(
     Identifier name,
-    Func_T func)
+    Func_T func,
+    Arguments* arguments)
 {
   detail::define_method_and_auto_wrap(
-      rb_class_of(*this), name, func, this->handler());
+      rb_class_of(*this), name, func, this->handler(), arguments);
   return (Derived_T &)*this;
 }
 
+template<typename Base_T, typename Derived_T>
+template<typename Func_T>
+inline
+Derived_T &
+Rice::Module_impl<Base_T, Derived_T>::
+define_singleton_method(
+    Identifier name,
+    Func_T func,
+    Arg const& arg)
+{
+  Arguments* args = new Arguments();
+  args->add(arg);
+  return define_singleton_method(name, func, args);
+}
+
 template<typename Base_T, typename Derived_T>
 template<typename Func_T>
 inline
@@ -148,7 +181,8 @@ Derived_T &
 Rice::Module_impl<Base_T, Derived_T>::
 define_module_function(
     Identifier name,
-    Func_T func)
+    Func_T func,
+    Arguments* arguments)
 {
   if(this->rb_type() != T_MODULE)
   {
@@ -157,11 +191,26 @@ define_module_function(
         "can only define module functions for modules");
   }
 
-  define_method(name, func);
-  define_singleton_method(name, func);
+  define_method(name, func, arguments);
+  define_singleton_method(name, func, arguments);
   return (Derived_T &)*this;
 }
 
+template<typename Base_T, typename Derived_T>
+template<typename Func_T>
+inline
+Derived_T &
+Rice::Module_impl<Base_T, Derived_T>::
+define_module_function(
+    Identifier name,
+    Func_T func,
+    Arg const& arg)
+{
+  Arguments* args = new Arguments();
+  args->add(arg);
+  return define_module_function(name, func, args);
+}
+
 template<typename Base_T, typename Derived_T>
 template<typename T, typename Iterator_T>
 inline

data/rice/VM.cpp

@@ -33,7 +33,7 @@ Rice::VM::
   init_stack();
 }
 
-#if RUBY_VERSION_CODE < 186
+#if RICE__RUBY_VERSION_CODE < 186
   extern "C"
   void Init_stack(VALUE *);
 #endif
@@ -41,7 +41,7 @@ Rice::VM::
 void Rice::VM::
 init_stack()
 {
-#if RUBY_VERSION_CODE >= 186
+#if RICE__RUBY_VERSION_CODE >= 186
   RUBY_INIT_STACK;
 #else
   VALUE v;

data/rice/config.hpp

@@ -8,7 +8,7 @@
 #define HAVE_NODE_H 1
 
 /* Define this macro if rb_class_boot is defined */
-#define HAVE_RB_CLASS_BOOT 
+#define HAVE_RB_CLASS_BOOT /**/
 
 /* Define to 1 if you have the <ruby.h> header file. */
 #define HAVE_RUBY_H 1

data/rice/detail/Arguments.hpp

@@ -0,0 +1,118 @@
+#ifndef Rice__Arguments__hpp_
+#define Rice__Arguments__hpp_
+
+#include "../Arg_impl.hpp"
+#include <sstream>
+#include <vector>
+#include "../to_from_ruby_defn.hpp"
+
+namespace Rice {
+
+  class Arguments
+  {
+    public:
+      Arguments() {
+        required_ = 0;
+        optional_ = 0;
+      }
+
+      ~Arguments() {
+      }
+
+      /**
+       * Get the full argument count of this
+       * list of arguments.
+       * Returns -1 no defined arguments
+       */
+      int count() {
+        if(required_ == 0 && optional_ == 0) {
+          return -1;
+        } else {
+          return required_ + optional_;
+        }
+      }
+
+      /**
+       * Get the rb_scan_args format string for this
+       * list of arguments.
+       * In the case of no Args (default case), this
+       * method uses the passed in full argument count
+       */
+      const char* formatString(int fullArgCount)
+      {
+        std::stringstream s;
+        if(required_ == 0 && optional_ == 0)
+        {
+          s << fullArgCount << 0;
+        }
+        else
+        {
+          s << required_ << optional_;
+        }
+
+        return s.str().c_str();
+      }
+
+      /**
+       * Add a defined Arg to this list of Arguments
+       */
+      void add(const Arg& arg)
+      {
+        args_.push_back(arg);
+
+        if(arg.hasDefaultValue())
+        {
+          optional_++;
+        }
+        else
+        {
+          required_++;
+        }
+      }
+
+      /**
+       * Is the argument at the request location an optional
+       * argument?
+       */
+      bool isOptional(unsigned int pos)
+      {
+        if(required_ == 0 && optional_ == 0)
+        {
+          return false;
+        }
+        if(pos >= args_.size())
+        {
+          return false;
+        }
+        return args_[pos].hasDefaultValue();
+      }
+
+      /**
+       * Given a position, a type, and a ruby VALUE, figure out
+       * what argument value we need to return according to
+       * defaults and if that VALUE is nil or not
+       */
+      template<typename Arg_T>
+      Arg_T getArgumentOrDefault(int pos, VALUE in)
+      {
+        if(isOptional(pos) && NIL_P(in))
+        {
+          return args_[pos].getDefaultValue<Arg_T>();
+        }
+        else
+        {
+          return from_ruby<Arg_T>(in);
+        }
+      }
+
+    private:
+      std::vector<Arg> args_;
+
+      /** Keep counts of required and optional parameters */
+      int required_;
+      int optional_;
+  };
+
+}
+
+#endif // Rice__Arguments__hpp_