rice 1.0.1 → 1.0.2

data/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@ IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
 if test -z "$doit"; then
   doit_exec=exec
 else
@@ -58,34 +58,49 @@ fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-posix_glob=
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
+chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
 while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-        shift
-        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
-        continue;;
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -t) dst_arg=$2
+	shift;;
 
-    -T) no_target_directory=true
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -165,21 +170,22 @@ while test $# -ne 0; do
 
     *)  break;;
   esac
+  shift
 done
 
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
   # Otherwise, the last argument is the destination.  Remove it from $@.
   for arg
   do
-    if test -n "$dstarg"; then
+    if test -n "$dst_arg"; then
       # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
+      set fnord "$@" "$dst_arg"
       shift # fnord
     fi
     shift # arg
-    dstarg=$arg
+    dst_arg=$arg
   done
 fi
 
@@ -224,7 +230,7 @@ for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
       dstdir=$dst
@@ -378,26 +384,19 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix=/ ;;
-	-*) prefix=./ ;;
-	*)  prefix= ;;
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
       esac
 
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
+      eval "$initialize_posix_glob"
 
       oIFS=$IFS
       IFS=/
-      $posix_glob && set -f
+      $posix_glob set -f
       set fnord $dstdir
       shift
-      $posix_glob && set +f
+      $posix_glob set +f
       IFS=$oIFS
 
       prefixes=
@@ -459,41 +458,54 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-	       || {
-		 echo "$0: cannot unlink or rename $dst" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
 
     trap '' 0
   fi

data/rice/Class.ipp

@@ -1,4 +1,6 @@
 #ifndef Rice__Class__ipp_
 #define Rice__Class__ipp_
 
+#include "Module.ipp"
+
 #endif // Rice__Class__ipp_

data/rice/Data_Type.ipp

@@ -7,6 +7,7 @@
 #include "detail/creation_funcs.hpp"
 #include "detail/method_data.hpp"
 #include "detail/Caster.hpp"
+#include "detail/demangle.hpp"
 
 #include <stdexcept>
 #include <typeinfo>
@@ -87,6 +88,23 @@ inline Rice::Data_Type<T>::
   unbound_instances().erase(this);
 }
 
+template<typename T>
+Rice::Module
+Rice::Data_Type<T>::
+klass() {
+  if(is_bound())
+  {
+    return klass_;
+  }
+  else
+  {
+    std::string s;
+    s += detail::demangle(typeid(T *).name());
+    s += " is unbound";
+    throw std::runtime_error(s.c_str());
+  }
+}
+
 template<typename T>
 Rice::Data_Type<T> & Rice::Data_Type<T>::
 operator=(Module const & klass)

data/rice/Data_Type_defn.hpp

@@ -122,7 +122,7 @@ public:
   //! Explictly return the Ruby type.
   /*! \return the ruby class to which the type is bound.
    */
-  static Module klass() { return klass_; }
+  static Module klass();
 
   //! Assignment operator which takes a Module
   /*! \param klass must be the class to which this data type is already

data/rice/Enum.hpp

@@ -1,7 +1,7 @@
 #ifndef Rice__Enum__hpp_
 #define Rice__Enum__hpp_
 
-#include "to_from_ruby.hpp"
+#include "to_from_ruby_defn.hpp"
 #include "Address_Registration_Guard.hpp"
 #include "Array.hpp"
 #include "Hash.hpp"

data/rice/Enum.ipp

@@ -158,7 +158,7 @@ inspect(Object self)
 {
   return String::format(
       "#<%s::%s>",
-      String(self.class_of().mod_name()).c_str(),
+      String(self.class_of().name()).c_str(),
       String(to_s(self)).c_str());
 }
 
@@ -168,8 +168,8 @@ compare(Object lhs, Object rhs)
 {
   if(lhs.class_of() != rhs.class_of())
   {
-    String lhs_name(lhs.class_of().mod_name());
-    String rhs_name(rhs.class_of().mod_name());
+    String lhs_name(lhs.class_of().name());
+    String rhs_name(rhs.class_of().name());
     rb_raise(
         rb_eTypeError,
         "Cannot compare %s to %s",

data/rice/Hash.ipp

@@ -3,7 +3,9 @@
 
 #include "protect.hpp"
 #include "to_from_ruby.hpp"
+#include "Builtin_Object.hpp"
 #include "Exception.hpp"
+#include "Builtin_Object.hpp"
 #include <algorithm>
 
 // TODO: Evil hack

data/rice/Makefile.am

@@ -12,6 +12,7 @@ Struct.cpp \
 Symbol.cpp \
 VM.cpp \
 detail/check_ruby_type.cpp \
+detail/demangle.cpp \
 detail/method_data.cpp \
 detail/protect.cpp
 
@@ -88,6 +89,7 @@ detail/default_allocation_func.hpp \
 detail/default_allocation_func.ipp \
 detail/define_method_and_auto_wrap.hpp \
 detail/define_method_and_auto_wrap.ipp \
+detail/demangle.hpp \
 detail/env.hpp \
 detail/from_ruby.hpp \
 detail/from_ruby.ipp \

data/rice/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -61,7 +61,7 @@ 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) \
-	method_data.$(OBJEXT) protect.$(OBJEXT)
+	demangle.$(OBJEXT) method_data.$(OBJEXT) protect.$(OBJEXT)
 librice_a_OBJECTS = $(am_librice_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -218,6 +218,7 @@ Struct.cpp \
 Symbol.cpp \
 VM.cpp \
 detail/check_ruby_type.cpp \
+detail/demangle.cpp \
 detail/method_data.cpp \
 detail/protect.cpp
 
@@ -294,6 +295,7 @@ detail/default_allocation_func.hpp \
 detail/default_allocation_func.ipp \
 detail/define_method_and_auto_wrap.hpp \
 detail/define_method_and_auto_wrap.ipp \
+detail/demangle.hpp \
 detail/env.hpp \
 detail/from_ruby.hpp \
 detail/from_ruby.ipp \
@@ -416,6 +418,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Symbol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VM.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ruby_type.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/method_data.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protect.Po@am__quote@
 
@@ -447,6 +450,20 @@ check_ruby_type.obj: detail/check_ruby_type.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o check_ruby_type.obj `if test -f 'detail/check_ruby_type.cpp'; then $(CYGPATH_W) 'detail/check_ruby_type.cpp'; else $(CYGPATH_W) '$(srcdir)/detail/check_ruby_type.cpp'; fi`
 
+demangle.o: detail/demangle.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT demangle.o -MD -MP -MF $(DEPDIR)/demangle.Tpo -c -o demangle.o `test -f 'detail/demangle.cpp' || echo '$(srcdir)/'`detail/demangle.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/demangle.Tpo $(DEPDIR)/demangle.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='detail/demangle.cpp' object='demangle.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o demangle.o `test -f 'detail/demangle.cpp' || echo '$(srcdir)/'`detail/demangle.cpp
+
+demangle.obj: detail/demangle.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT demangle.obj -MD -MP -MF $(DEPDIR)/demangle.Tpo -c -o demangle.obj `if test -f 'detail/demangle.cpp'; then $(CYGPATH_W) 'detail/demangle.cpp'; else $(CYGPATH_W) '$(srcdir)/detail/demangle.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/demangle.Tpo $(DEPDIR)/demangle.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='detail/demangle.cpp' object='demangle.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o demangle.obj `if test -f 'detail/demangle.cpp'; then $(CYGPATH_W) 'detail/demangle.cpp'; else $(CYGPATH_W) '$(srcdir)/detail/demangle.cpp'; fi`
+
 method_data.o: detail/method_data.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT method_data.o -MD -MP -MF $(DEPDIR)/method_data.Tpo -c -o method_data.o `test -f 'detail/method_data.cpp' || echo '$(srcdir)/'`detail/method_data.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/method_data.Tpo $(DEPDIR)/method_data.Po
@@ -499,8 +516,8 @@ 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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -512,8 +529,8 @@ TAGS:  $(HEADERS) $(SOURCES) config.hpp.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -523,13 +540,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES) config.hpp.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.hpp.in $(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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

data/rice/Module.cpp

@@ -1,5 +1,6 @@
 #include "Module.hpp"
 #include "Symbol.hpp"
+#include "String.hpp"
 #include "Array.hpp"
 #include "Exception.hpp"
 #include "protect.hpp"
@@ -23,8 +24,8 @@ Module(VALUE v)
   }
 }
 
-Rice::Object Rice::Module::
-mod_name() const
+Rice::String Rice::Module::
+name() const
 {
   return rb_mod_name(*this);
 }

data/rice/Module_defn.hpp

@@ -11,6 +11,7 @@ namespace Rice
 
 class Array;
 class Class;
+class String;
 
 //! A helper for defining a Module and its methods.
 /*! This class provides a C++-style interface to ruby's Module class and
@@ -32,7 +33,7 @@ public:
   Module(VALUE v);
 
   //! Return the name of the module.
-  Object mod_name() const;
+  String name() const;
 
   //! Swap with another Module.
   void swap(Module & other);

data/rice/String.cpp

@@ -1,4 +1,5 @@
 #include "String.hpp"
+#include "Builtin_Object.hpp"
 #include "protect.hpp"
 #include "detail/ruby.hpp"
 

data/rice/String.hpp

@@ -2,7 +2,8 @@
 #define Rice__String__hpp_
 
 #include "Identifier.hpp"
-#include "Builtin_Object.hpp"
+#include "Builtin_Object_defn.hpp"
+#include "to_from_ruby_defn.hpp"
 #include "detail/ruby.hpp"
 #include <string>
 

data/rice/detail/default_allocation_func.ipp

@@ -2,9 +2,9 @@
 
 template<typename T>
 VALUE Rice::detail::
-default_allocation_func(VALUE /* klass */)
+default_allocation_func(VALUE klass)
 {
-  Data_Object<T> m(static_cast<T*>(0));
+  Data_Object<T> m(static_cast<T*>(0), klass);
   return m.value();
 }