utilrb 2.1.0.rc3 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6100c171a6de15632948260b64f0a620d7900649
-  data.tar.gz: c9134cfae24bccca6e0d9d1ecd5f5e591ff08493
+  metadata.gz: 1177a0481f28609c9b83fce1ab8c6d59de177135
+  data.tar.gz: 0cdd4d813b69adb757e7e802ebb5ad60f605cee0
 SHA512:
-  metadata.gz: 6dea0d5179e097046ceeba40bcde4be3224281e787e950686aeb6450eec44bf91066ed8b39b08aec8a78b6e8459e56dafff00954a3021053326372cf0effd120
-  data.tar.gz: 3b851d311ecddfe1f30ef87f06bf5b71ea3d0d0f3aac4eecb7408868e8b472f8430edc83fadbf9658d2c9614e26bc8f8bbdc9d8ac6dce27b7e996fb5491f688f
+  metadata.gz: f8ef0d60064a2b747bf83f861be83140dc6541c3e993368c4483c807212df4c5e68cbed356d52bcb56449d2ae0e63326334512a87b94fcd438cd7cae0c95ffda
+  data.tar.gz: c9d4ec56d77051ffda15c56120ca7accdfbaca2bd2c969e14cdd13e645b1b24b7ee274379ec76059ac2709f4e0690b8f4e1a7686908983887394e3523a87285a

data/.gitignore

@@ -11,3 +11,6 @@ tmp/
 lib/utilrb/utilrb.so
 pkg/
 /vendor/
+/.bundle/
+/Gemfile.lock
+

data/Rakefile

@@ -1,15 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-require 'rake/extensiontask'
-Rake::ExtensionTask.new('utilrb') do |ext|
-    ext.name = 'utilrb'
-    ext.ext_dir = 'ext/utilrb'
-    ext.lib_dir = 'lib/utilrb'
-    ext.source_pattern ="*.{c,cc,cpp}"
-end
-
-task :default => :compile
+task :default
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/lib/utilrb/common.rb

@@ -4,50 +4,5 @@ require 'utilrb/version'
 # the standard class extensions used by www.rock-robotics.org projects.
 module Utilrb
     LIB_DIR = File.expand_path(File.dirname(__FILE__))
-
-    unless defined? UTILRB_EXT_MODE
-	if ENV['UTILRB_EXT_MODE'] == 'no'
-	    UTILRB_EXT_MODE = nil
-	    STDERR.puts "Utilrb: not loading the C extension"
-	else
-	    begin
-		require 'utilrb/utilrb'
-		UTILRB_EXT_MODE = true
-		STDERR.puts "Utilrb: loaded C extension" if ENV['UTILRB_EXT_MODE']
-	    rescue LoadError => e
-		if ENV['UTILRB_EXT_MODE'] == 'yes'
-		    raise LoadError, "unable to load Util.rb C extension: #{e.message}"
-		else
-		    UTILRB_EXT_MODE = nil
-		end
-	    end
-	end
-    end
-
-    # Yields if the extension is not present
-    # This is used by Utilrb libraries to provide a 
-    # Ruby version if the C extension is not loaded
-    def self.unless_ext # :yield:
-	unless UTILRB_EXT_MODE
-	    return yield if block_given?
-	end
-    end
-
-    # Yields if the extension is present. This is used for Ruby code
-    # which depends on methods in the C extension
-    def self.if_ext(&block)
-	require_ext(nil, &block)
-    end
-
-    # Yields if the extension is present, and 
-    # issue a warning otherwise. This is used for Ruby
-    # code which depends on methods in the C extension
-    def self.require_ext(name)
-	if UTILRB_EXT_MODE
-	    yield if block_given?
-	elsif name
-	    STDERR.puts "Utilrb: not loading #{name} since the C extension is not available"
-	end
-    end
 end
 

data/lib/utilrb/enumerable/uniq.rb

@@ -48,21 +48,19 @@ class Object
     end
 end
 
-Utilrb.unless_ext do
-    module Enumerable
-	# call-seq:
-	#  each_uniq { |obj| ... }
-	# 
-	# Yields all unique values found in +enum+
-	def each_uniq
-	    seen = Set.new
-	    each do |obj|
-		if !seen.include?(obj)
-		    seen << obj
-		    yield(obj)
-		end
-	    end
-	end
+module Enumerable
+    # call-seq:
+    #  each_uniq { |obj| ... }
+    # 
+    # Yields all unique values found in +enum+
+    def each_uniq
+        seen = Set.new
+        each do |obj|
+            if !seen.include?(obj)
+                seen << obj
+                yield(obj)
+            end
+        end
     end
 end
 

data/lib/utilrb/version.rb

@@ -1,4 +1,4 @@
 module Utilrb
-    VERSION = "2.1.0.rc3"
+    VERSION = "3.0.0.rc1"
 end
 

data/manifest.xml

@@ -13,7 +13,5 @@
   <rosdep name="ruby"/>
   <rosdep name="bundler"/>
   <rosdep name="facets" />
-  <rosdep name="rake-compiler" />
   <test_depend package="flexmock" />
-
 </package>

data/package.xml

@@ -12,13 +12,11 @@
   <run_depend>catkin</run_depend>
 
   <build_depend>ruby</build_depend>
+  <build_depend>bundler</build_depend>
   <build_depend>facets</build_depend>
-  <build_depend>hoe</build_depend>
-  <build_depend>rake-compiler</build_depend>
 
   <run_depend>ruby</run_depend>
   <run_depend>facets</run_depend>
-  <run_depend>hoe</run_depend>
 
   <export>
     <build_type>

data/utilrb.gemspec

@@ -14,13 +14,11 @@ Gem::Specification.new do |s|
     s.licenses = ["BSD"]
 
     s.require_paths = ["lib"]
-    s.extensions = ['ext/utilrb/extconf.rb']
-    s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "History.txt"]
+    s.extra_rdoc_files = ["License.txt"]
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
     s.add_runtime_dependency "facets", ">= 2.4.0"
     s.add_runtime_dependency "rake", ">= 0.9"
-    s.add_runtime_dependency "rake-compiler", "~> 0.8.0"
     s.add_development_dependency "flexmock", ">= 2.0.0"
     s.add_development_dependency "minitest", ">= 5.0", "~> 5.0"
     s.add_development_dependency "coveralls"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utilrb
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc3
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Sylvain Joyeux
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
@@ -105,12 +91,9 @@ description: |-
   the standard class extensions I use in other projects.
 email: sylvain.joyeux@m4x.org
 executables: []
-extensions:
-- ext/utilrb/extconf.rb
+extensions: []
 extra_rdoc_files:
-- History.txt
 - License.txt
-- Manifest.txt
 files:
 - ".boring"
 - ".gemtest"
@@ -121,16 +104,11 @@ files:
 - History.txt
 - License.txt
 - Makefile
-- Manifest.txt
 - README.md
 - Rakefile
 - benchmarks/validate_options.rb
 - bm/allocation.rb
 - bm/speed.rb
-- ext/utilrb/extconf.rb
-- ext/utilrb/ruby_allocator.hh
-- ext/utilrb/utilrb.cc
-- ext/utilrb/value_set.cc
 - lib/utilrb.rb
 - lib/utilrb/array.rb
 - lib/utilrb/array/to_s.rb
@@ -211,14 +189,12 @@ files:
 - lib/utilrb/timepoints.rb
 - lib/utilrb/unbound_method.rb
 - lib/utilrb/unbound_method/call.rb
-- lib/utilrb/value_set.rb
 - lib/utilrb/version.rb
 - lib/utilrb/weakref.rb
 - lib/utilrb/yard.rb
 - lib/yard-utilrb.rb
 - manifest.xml
 - package.xml
-- patches/gc_live_objects.patch
 - utilrb.gemspec
 homepage: http://rock-robotics.org
 licenses:

data/Manifest.txt

@@ -1,117 +0,0 @@
-.gemtest
-History.txt
-License.txt
-Manifest.txt
-README.rd
-Rakefile
-bm/allocation.rb
-bm/speed.rb
-ext/utilrb/extconf.rb
-ext/utilrb/proc.c
-ext/utilrb/ruby_allocator.hh
-ext/utilrb/utilrb.cc
-ext/utilrb/value_set.cc
-ext/utilrb/weakref.cc
-lib/utilrb.rb
-lib/utilrb/array.rb
-lib/utilrb/array/to_s.rb
-lib/utilrb/column_formatter.rb
-lib/utilrb/common.rb
-lib/utilrb/configsearch.rb
-lib/utilrb/configsearch/configuration_finder.rb
-lib/utilrb/dir.rb
-lib/utilrb/dir/empty.rb
-lib/utilrb/doc/rake.rb
-lib/utilrb/enumerable.rb
-lib/utilrb/enumerable/null.rb
-lib/utilrb/enumerable/random_element.rb
-lib/utilrb/enumerable/sequence.rb
-lib/utilrb/enumerable/to_s_helper.rb
-lib/utilrb/enumerable/uniq.rb
-lib/utilrb/event_loop.rb
-lib/utilrb/exception.rb
-lib/utilrb/exception/full_message.rb
-lib/utilrb/gc.rb
-lib/utilrb/gc/force.rb
-lib/utilrb/hash.rb
-lib/utilrb/hash/map_key.rb
-lib/utilrb/hash/map_value.rb
-lib/utilrb/hash/recursive_merge.rb
-lib/utilrb/hash/slice.rb
-lib/utilrb/hash/to_s.rb
-lib/utilrb/hash/to_sym_keys.rb
-lib/utilrb/kernel.rb
-lib/utilrb/kernel/arity.rb
-lib/utilrb/kernel/load_dsl_file.rb
-lib/utilrb/kernel/options.rb
-lib/utilrb/kernel/poll.rb
-lib/utilrb/kernel/require.rb
-lib/utilrb/kernel/with_module.rb
-lib/utilrb/logger.rb
-lib/utilrb/logger/forward.rb
-lib/utilrb/logger/hierarchy.rb
-lib/utilrb/logger/indent.rb
-lib/utilrb/logger/io.rb
-lib/utilrb/logger/log_pp.rb
-lib/utilrb/logger/root.rb
-lib/utilrb/logger/silent.rb
-lib/utilrb/marshal/load_with_missing_constants.rb
-lib/utilrb/module.rb
-lib/utilrb/module/ancestor_p.rb
-lib/utilrb/module/attr_enumerable.rb
-lib/utilrb/module/attr_predicate.rb
-lib/utilrb/module/cached_enum.rb
-lib/utilrb/module/const_defined_here_p.rb
-lib/utilrb/module/define_method.rb
-lib/utilrb/module/define_or_reuse.rb
-lib/utilrb/module/dsl_attribute.rb
-lib/utilrb/module/include.rb
-lib/utilrb/module/inherited_enumerable.rb
-lib/utilrb/object.rb
-lib/utilrb/object/address.rb
-lib/utilrb/object/attribute.rb
-lib/utilrb/object/scoped_eval.rb
-lib/utilrb/object/singleton_class.rb
-lib/utilrb/pathname.rb
-lib/utilrb/pathname/find_matching_parent.rb
-lib/utilrb/pkgconfig.rb
-lib/utilrb/qt/mime_data/mime_data.rb
-lib/utilrb/qt/variant/from_ruby.rb
-lib/utilrb/rake_common.rb
-lib/utilrb/set.rb
-lib/utilrb/set/to_s.rb
-lib/utilrb/socket/tcp_server.rb
-lib/utilrb/socket/tcp_socket.rb
-lib/utilrb/spawn.rb
-lib/utilrb/symbol/to_str.rb
-lib/utilrb/thread_pool.rb
-lib/utilrb/time.rb
-lib/utilrb/time/to_hms.rb
-lib/utilrb/timepoints.rb
-lib/utilrb/unbound_method.rb
-lib/utilrb/unbound_method/call.rb
-lib/utilrb/value_set.rb
-lib/utilrb/weakref.rb
-lib/utilrb/yard.rb
-patches/gc_live_objects.patch
-test/data/test_pkgconfig.pc
-test/data/test_pkgconfig_empty.pc
-test/test_array.rb
-test/test_dir.rb
-test/test_enumerable.rb
-test/test_event_loop.rb
-test/test_exception.rb
-test/test_gc.rb
-test/test_hash.rb
-test/test_kernel.rb
-test/test_logger.rb
-test/test_misc.rb
-test/test_module.rb
-test/test_object.rb
-test/test_pkgconfig.rb
-test/test_proc.rb
-test/test_set.rb
-test/test_thread_pool.rb
-test/test_time.rb
-test/test_unbound_method.rb
-test/test_weakref.rb

data/ext/utilrb/extconf.rb

@@ -1,22 +0,0 @@
-require 'mkmf'
-
-CONFIG['LDSHARED'].gsub! '$(CC)', "$(CXX)"
-if try_link("int main() { }", "-module")
-    $LDFLAGS += " -module"
-end
-
-create_makefile("utilrb/utilrb")
-
-## WORKAROUND a problem with mkmf.rb
-# It seems that the newest version do define an 'install' target. However, that
-# install target tries to install in the system directories
-#
-# The issue is that RubyGems *does* call make install. Ergo, gem install utilrb
-# is broken right now
-#lines = File.readlines("Makefile")
-#lines.delete_if { |l| l =~ /^install:/ }
-#lines << "install:"
-#File.open("Makefile", 'w') do |io|
-#      io.write lines.join("\n")
-#end
-

data/ext/utilrb/ruby_allocator.hh

@@ -1,76 +0,0 @@
-#ifndef RUBY_ALLOCATOR_HH
-#define RUBY_ALLOCATOR_HH
-
-#include <ruby.h>
-
-template <class T> class ruby_allocator
-{
-public:
-  typedef T                 value_type;
-  typedef value_type*       pointer;
-  typedef const value_type* const_pointer;
-  typedef value_type&       reference;
-  typedef const value_type& const_reference;
-  typedef std::size_t       size_type;
-  typedef std::ptrdiff_t    difference_type;
-  
-  template <class U> 
-  struct rebind { typedef ruby_allocator<U> other; };
-
-  ruby_allocator() {}
-  ruby_allocator(const ruby_allocator&) {}
-  template <class U> 
-  ruby_allocator(const ruby_allocator<U>&) {}
-  ~ruby_allocator() {}
-
-  pointer address(reference x) const { return &x; }
-  const_pointer address(const_reference x) const { 
-    return x;
-  }
-
-  pointer allocate(size_type n, const_pointer = 0) {
-    void* p = ruby_xmalloc(n * sizeof(T));
-    if (!p)
-      throw std::bad_alloc();
-    return static_cast<pointer>(p);
-  }
-
-  void deallocate(pointer p, size_type) { ruby_xfree(p); }
-
-  size_type max_size() const { 
-    return static_cast<size_type>(-1) / sizeof(T);
-  }
-
-  void construct(pointer p, const value_type& x) { 
-    new(p) value_type(x); 
-  }
-  void destroy(pointer p) { p->~value_type(); }
-
-private:
-  void operator=(const ruby_allocator&);
-};
-
-template<> class ruby_allocator<void>
-{
-  typedef void        value_type;
-  typedef void*       pointer;
-  typedef const void* const_pointer;
-
-  template <class U> 
-  struct rebind { typedef ruby_allocator<U> other; };
-};
-
-
-template <class T>
-inline bool operator==(const ruby_allocator<T>&, 
-                       const ruby_allocator<T>&) {
-  return true;
-}
-
-template <class T>
-inline bool operator!=(const ruby_allocator<T>&, 
-                       const ruby_allocator<T>&) {
-  return false;
-}
-
-#endif

data/ext/utilrb/utilrb.cc

@@ -1,56 +0,0 @@
-#include <ruby.h>
-#include <set>
-
-static VALUE mUtilrb;
-
-using namespace std;
-
-#ifndef RUBINIUS
-static VALUE enumerable_each_uniq_i(VALUE i, VALUE* memo)
-{ 
-    set<VALUE>& seen = *reinterpret_cast< set<VALUE>* >(memo); 
-    if (seen.find(i) == seen.end())
-    {
-	seen.insert(i);
-	return rb_yield(i);
-    }
-    else
-	return Qnil;
-
-}
-
-/* :nodoc: */
-static VALUE enumerable_each_uniq(VALUE self)
-{
-    set<VALUE> seen;
-    rb_iterate(rb_each, self, 
-	    RUBY_METHOD_FUNC(enumerable_each_uniq_i), (VALUE)&seen);
-    return self;
-}
-
-static VALUE kernel_is_immediate(VALUE klass, VALUE object)
-{ return IMMEDIATE_P(object) ? Qtrue : Qfalse; }
-#endif
-
-static VALUE kernel_crash(VALUE klass)
-{
-    *((int*)0) = 10;
-    // Return something to shut gcc up
-    return Qfalse;
-}
-
-extern "C" void Init_value_set();
-
-extern "C" void Init_utilrb()
-{
-    mUtilrb = rb_define_module("Utilrb");
-
-#ifndef RUBINIUS
-    rb_define_method(rb_mEnumerable, "each_uniq", RUBY_METHOD_FUNC(enumerable_each_uniq), 0);
-    rb_define_singleton_method(rb_mKernel, "crash!", RUBY_METHOD_FUNC(kernel_crash), 0);
-    rb_define_singleton_method(rb_mKernel, "immediate?", RUBY_METHOD_FUNC(kernel_is_immediate), 1);
-#endif
-
-    Init_value_set();
-}
-

data/ext/utilrb/value_set.cc

@@ -1,431 +0,0 @@
-#include <ruby.h>
-#include <set>
-#include <algorithm>
-#include "ruby_allocator.hh"
-
-using namespace std;
-
-static VALUE cValueSet;
-static ID id_new;
-
-typedef std::set<VALUE, std::less<VALUE>, ruby_allocator<VALUE> > ValueSet;
-static ValueSet& get_wrapped_set(VALUE self)
-{
-    ValueSet* object = 0;
-    Data_Get_Struct(self, ValueSet, object);
-    return *object;
-}
-
-static void value_set_mark(ValueSet const* set) { std::for_each(set->begin(), set->end(), rb_gc_mark); }
-static void value_set_free(ValueSet const* set) { delete set; }
-static VALUE value_set_alloc(VALUE klass)
-{
-    ValueSet* cxx_set = new ValueSet;
-    return Data_Wrap_Struct(klass, value_set_mark, value_set_free, cxx_set);
-}
-/* call-seq:
- *  set.empty?			    => true or false
- *
- * Checks if this set is empty
- */
-static VALUE value_set_empty_p(VALUE self)
-{ 
-    ValueSet& set = get_wrapped_set(self);
-    return set.empty() ? Qtrue : Qfalse;
-}
-
-/* call-seq:
- *  set.size			    => size
- *
- * Returns this set size
- */
-static VALUE value_set_size(VALUE self)
-{ 
-    ValueSet& set = get_wrapped_set(self);
-    return INT2NUM(set.size());
-}
-
-
-/* call-seq:
- *  set.each { |obj| ... }	    => set
- *
- */
-static VALUE value_set_each(VALUE self)
-{
-    ValueSet& set = get_wrapped_set(self);
-    for (ValueSet::iterator it = set.begin(); it != set.end();)
-    {
-	// Increment before calling yield() so that 
-	// the current element can be deleted safely
-	ValueSet::iterator this_it = it++;
-	rb_yield(*this_it);
-    }
-    return self;
-}
-
-/* call-seq:
- *  set.delete_if { |obj| ... }		=> set
- *
- * Deletes all objects for which the block returns true
- */
-static VALUE value_set_delete_if(VALUE self)
-{
-    ValueSet& set = get_wrapped_set(self);
-    for (ValueSet::iterator it = set.begin(); it != set.end();)
-    {
-	// Increment before calling yield() so that 
-	// the current element can be deleted safely
-	ValueSet::iterator this_it = it++;
-	bool do_delete = RTEST(rb_yield(*this_it));
-	if (do_delete)
-	    set.erase(this_it);
-    }
-    return self;
-}
-
-/* call-seq:
- *  set.include?(value)	    => true or false
- *
- * Checks if +value+ is in +set+
- */
-static VALUE value_set_include_p(VALUE vself, VALUE vother)
-{
-    ValueSet const& self  = get_wrapped_set(vself);
-    return self.find(vother) == self.end() ? Qfalse : Qtrue;
-}
-
-/* call-seq:
- *  set.to_value_set		    => set
- */
-static VALUE value_set_to_value_set(VALUE self) { return self; }
-
-/* call-seq:
- *  set.dup => other_set
- *
- * Duplicates this set, without duplicating the pointed-to objects
- */
-static VALUE value_set_dup(VALUE vself, VALUE vother)
-{
-    ValueSet const& self  = get_wrapped_set(vself);
-    VALUE vresult = rb_funcall2(cValueSet, id_new, 0, NULL);
-    ValueSet& result = get_wrapped_set(vresult);
-    for (ValueSet::const_iterator it = self.begin(); it != self.end(); ++it)
-	result.insert(result.end(), *it);
-
-    return vresult;
-}
-
-/* call-seq:
- *  set.include_all?(other)		=> true or false
- *
- * Checks if all elements of +other+ are in +set+
- */
-static VALUE value_set_include_all_p(VALUE vself, VALUE vother)
-{
-    ValueSet const& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	rb_raise(rb_eArgError, "expected a ValueSet");
-    ValueSet const& other = get_wrapped_set(vother);
-    return std::includes(self.begin(), self.end(), other.begin(), other.end()) ? Qtrue : Qfalse;
-}
-
-/* call-seq:
- *  set.union(other)		=> union_set
- *  set | other			=> union_set
- *
- * Computes the union of +set+ and +other+. This operation is O(N + M)
- * is +other+ is a ValueSet
- */
-static VALUE value_set_union(VALUE vself, VALUE vother)
-{
-    ValueSet const& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	rb_raise(rb_eArgError, "expected a ValueSet");
-    ValueSet const& other = get_wrapped_set(vother);
-    
-    VALUE vresult = rb_funcall2(cValueSet, id_new, 0, NULL);
-    ValueSet& result = get_wrapped_set(vresult);
-    std::set_union(self.begin(), self.end(), other.begin(), other.end(), 
-	    std::inserter(result, result.end()));
-    return vresult;
-}
-
-/* call-seq:
- *  set.merge(other)		=> set
- *
- * Merges the elements of +other+ into +self+. If +other+ is a ValueSet, the operation is O(N + M)
- */
-static VALUE value_set_merge(VALUE vself, VALUE vother)
-{
-    ValueSet& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	rb_raise(rb_eArgError, "expected a ValueSet");
-    ValueSet const& other = get_wrapped_set(vother);
-    
-    self.insert(other.begin(), other.end());
-    return vself;
-}
-
-/* call-seq:
- *   set.intersection!(other)	=> set
- *
- * Computes the intersection of +set+ and +other+, and modifies +self+ to be
- * that interesection. This operation is O(N + M) if +other+ is a ValueSet
- */
-static VALUE value_set_intersection_bang(VALUE vself, VALUE vother)
-{
-    ValueSet& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	rb_raise(rb_eArgError, "expected a ValueSet");
-    ValueSet const& other = get_wrapped_set(vother);
-    
-    ValueSet result;
-    std::set_intersection(self.begin(), self.end(), other.begin(), other.end(), 
-	    std::inserter(result, result.end()));
-    self.swap(result);
-    return vself;
-}
-
-/* call-seq:
- *   set.intersection(other)	=> intersection_set
- *   set & other		=> intersection_set
- *
- * Computes the intersection of +set+ and +other+. This operation
- * is O(N + M) if +other+ is a ValueSet
- */
-static VALUE value_set_intersection(VALUE vself, VALUE vother)
-{
-    ValueSet const& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	rb_raise(rb_eArgError, "expected a ValueSet");
-    ValueSet const& other = get_wrapped_set(vother);
-    
-    VALUE vresult = rb_funcall2(cValueSet, id_new, 0, NULL);
-    ValueSet& result = get_wrapped_set(vresult);
-    std::set_intersection(self.begin(), self.end(), other.begin(), other.end(), 
-	    std::inserter(result, result.end()));
-    return vresult;
-}
-
-/* call-seq:
- *  set.intersects?(other)	=> true or false
- *
- * Returns true if there is elements in +set+ that are also in +other
- */
-static VALUE value_set_intersects(VALUE vself, VALUE vother)
-{
-    ValueSet const& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	rb_raise(rb_eArgError, "expected a ValueSet");
-    ValueSet const& other = get_wrapped_set(vother);
-
-    ValueSet::const_iterator 
-	self_it   = self.begin(),
-	self_end  = self.end(),
-	other_it  = other.begin(),
-	other_end = other.end();
-
-    while(self_it != self_end && other_it != other_end)
-    {
-	if (*self_it < *other_it)
-	    ++self_it;
-	else if (*other_it < *self_it)
-	    ++other_it;
-	else
-	    return Qtrue;
-    }
-    return Qfalse;
-}
-
-/* call-seq:
- *   set.difference!(other)	=> set
- *
- * Modifies +set+ so that it is the set of all elements of +set+ not in +other+.
- * This operation is O(N + M).
- */
-static VALUE value_set_difference_bang(VALUE vself, VALUE vother)
-{
-    ValueSet& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	rb_raise(rb_eArgError, "expected a ValueSet");
-    ValueSet const& other = get_wrapped_set(vother);
-    
-    ValueSet result;
-    std::set_difference(self.begin(), self.end(), other.begin(), other.end(), 
-	    std::inserter(result, result.end()));
-    if (result.size() != self.size())
-        self.swap(result);
-    return vself;
-}
-
-/* call-seq:
- *   set.difference(other)	=> difference_set
- *   set - other		=> difference_set
- *
- * Computes the set of all elements of +set+ not in +other+. This operation
- * is O(N + M).
- */
-static VALUE value_set_difference(VALUE vself, VALUE vother)
-{
-    ValueSet const& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	rb_raise(rb_eArgError, "expected a ValueSet");
-    ValueSet const& other = get_wrapped_set(vother);
-    
-    VALUE vresult = rb_funcall2(cValueSet, id_new, 0, NULL);
-    ValueSet& result = get_wrapped_set(vresult);
-    std::set_difference(self.begin(), self.end(), other.begin(), other.end(), 
-	    std::inserter(result, result.end()));
-    return vresult;
-}
-
-/* call-seq:
- *  set.insert(value)		=> true or false
- * 
- * Inserts +value+ into +set+. Returns true if the value did not exist
- * in the set yet (it has actually been inserted), and false otherwise.
- * This operation is O(log N)
- */
-static VALUE value_set_insert(VALUE vself, VALUE v)
-{
-    ValueSet& self  = get_wrapped_set(vself);
-    bool exists = self.insert(v).second;
-    return exists ? Qtrue : Qfalse;
-}
-/* call-seq:
- *  set.delete(value)		=> true or false
- * 
- * Removes +value+ from +set+. Returns true if the value did exist
- * in the set yet (it has actually been removed), and false otherwise.
- */
-static VALUE value_set_delete(VALUE vself, VALUE v)
-{
-    ValueSet& self  = get_wrapped_set(vself);
-    size_t count = self.erase(v);
-    return count > 0 ? Qtrue : Qfalse;
-}
-
-/* call-seq:
- *  set == other		=> true or false
- *
- * Equality
- */
-static VALUE value_set_equal(VALUE vself, VALUE vother)
-{
-    ValueSet const& self  = get_wrapped_set(vself);
-    if (!RTEST(rb_obj_is_kind_of(vother, cValueSet)))
-	return Qfalse;
-    ValueSet const& other = get_wrapped_set(vother);
-    return (self == other) ? Qtrue : Qfalse;
-}
-
-/* call-seq:
- *  set.clear			=> set
- *
- * Remove all elements of this set
- */
-static VALUE value_set_clear(VALUE self)
-{
-    get_wrapped_set(self).clear();
-    return self;
-}
-
-/* call-seq:
- *  set.initialize_copy(other)  => set
- *
- * Initializes +set+ with the values in +other+. Needed by #dup
- */
-static VALUE value_set_initialize_copy(VALUE vself, VALUE vother)
-{
-    get_wrapped_set(vself) = get_wrapped_set(vother);
-    return vself;
-}
-
-
-
-
-
-
-
-/* call-seq:
- *  to_value_set    => value_set
- *
- * Converts this array into a ValueSet object
- */
-static VALUE array_to_value_set(VALUE self)
-{
-    VALUE vresult = rb_funcall2(cValueSet, id_new, 0, NULL);
-    ValueSet& result = get_wrapped_set(vresult);
-
-    long size  = RARRAY_LEN(self);
-    for (int i = 0; i < size; ++i)
-	result.insert(rb_ary_entry(self, i));
-
-    return vresult;
-}
-
-#ifndef RUBINIUS
-static VALUE enumerable_to_value_set_i(VALUE i, VALUE* memo)
-{
-    ValueSet& result = *reinterpret_cast<ValueSet*>(memo);
-    result.insert(i);
-    return Qnil;
-}
-
-/* call-seq:
- *  enum.to_value_set		=> value_set
- *
- * Builds a ValueSet object from this enumerable
- */
-static VALUE enumerable_to_value_set(VALUE self)
-{
-    VALUE vresult = rb_funcall2(cValueSet, id_new, 0, NULL);
-    ValueSet& result = get_wrapped_set(vresult);
-
-    rb_iterate(rb_each, self, RUBY_METHOD_FUNC(enumerable_to_value_set_i), reinterpret_cast<VALUE>(&result));
-    return vresult;
-}
-#endif
-
-/*
- * Document-class: ValueSet
- *
- * ValueSet is a wrapper around the C++ set<> template. set<> is an ordered container,
- * for which union(), intersection() and difference() is done in linear time. For performance
- * reasons, in the case of ValueSet, the values are ordered by their VALUE, which roughly is
- * their object_id.
- */
-
-extern "C" void Init_value_set()
-{
-#ifndef RUBINIUS
-    rb_define_method(rb_mEnumerable, "to_value_set", RUBY_METHOD_FUNC(enumerable_to_value_set), 0);
-#endif
-    rb_define_method(rb_cArray, "to_value_set", RUBY_METHOD_FUNC(array_to_value_set), 0);
-
-    cValueSet = rb_define_class("ValueSet", rb_cObject);
-    id_new = rb_intern("new");
-    rb_define_alloc_func(cValueSet, value_set_alloc);
-    rb_define_method(cValueSet, "each", RUBY_METHOD_FUNC(value_set_each), 0);
-    rb_define_method(cValueSet, "include?", RUBY_METHOD_FUNC(value_set_include_p), 1);
-    rb_define_method(cValueSet, "include_all?", RUBY_METHOD_FUNC(value_set_include_all_p), 1);
-    rb_define_method(cValueSet, "union", RUBY_METHOD_FUNC(value_set_union), 1);
-    rb_define_method(cValueSet, "intersection", RUBY_METHOD_FUNC(value_set_intersection), 1);
-    rb_define_method(cValueSet, "intersection!", RUBY_METHOD_FUNC(value_set_intersection_bang), 1);
-    rb_define_method(cValueSet, "intersects?", RUBY_METHOD_FUNC(value_set_intersects), 1);
-    rb_define_method(cValueSet, "difference", RUBY_METHOD_FUNC(value_set_difference), 1);
-    rb_define_method(cValueSet, "difference!", RUBY_METHOD_FUNC(value_set_difference_bang), 1);
-    rb_define_method(cValueSet, "insert", RUBY_METHOD_FUNC(value_set_insert), 1);
-    rb_define_method(cValueSet, "merge", RUBY_METHOD_FUNC(value_set_merge), 1);
-    rb_define_method(cValueSet, "delete", RUBY_METHOD_FUNC(value_set_delete), 1);
-    rb_define_method(cValueSet, "==", RUBY_METHOD_FUNC(value_set_equal), 1);
-    rb_define_method(cValueSet, "to_value_set", RUBY_METHOD_FUNC(value_set_to_value_set), 0);
-    rb_define_method(cValueSet, "dup", RUBY_METHOD_FUNC(value_set_dup), 0);
-    rb_define_method(cValueSet, "empty?", RUBY_METHOD_FUNC(value_set_empty_p), 0);
-    rb_define_method(cValueSet, "size", RUBY_METHOD_FUNC(value_set_size), 0);
-    rb_define_method(cValueSet, "clear", RUBY_METHOD_FUNC(value_set_clear), 0);
-    rb_define_method(cValueSet, "initialize_copy", RUBY_METHOD_FUNC(value_set_initialize_copy), 1);
-    rb_define_method(cValueSet, "delete_if", RUBY_METHOD_FUNC(value_set_delete_if), 0);
-}
-
-

data/lib/utilrb/value_set.rb

@@ -1,49 +0,0 @@
-require 'utilrb/common'
-require 'utilrb/enumerable/to_s_helper'
-
-Utilrb.require_ext("ValueSet") do
-    class ValueSet
-	def <<(obj); insert(obj) ; self end
-	alias :| :union
-	alias :& :intersection
-	alias :- :difference
-	include Enumerable
-
-        def substract(other_set)
-            difference!(other_set.to_value_set)
-        end
-
-        def add(value)
-            insert(value)
-            self
-        end
-
-        def to_s
-	    elements = EnumerableToString.to_s_helper(self, '{', '}') do |obj|
-		obj.to_s
-	    end
-	    base = super[0..-2]
-	    "#{base} #{elements}>"
-	end
-	alias :inspect :to_s
-
-	def _dump(lvl = -1)
-	    Marshal.dump(to_a)
-	end
-	def self._load(str)
-	    Marshal.load(str).to_value_set
-	end
-
-        def eql?(obj)
-            self == obj
-        end
-
-        def hash
-            result = ValueSet.hash
-            for obj in self
-                result = result ^ obj.hash
-            end
-            result
-        end
-    end
-end

data/patches/gc_live_objects.patch

@@ -1,71 +0,0 @@
---- gc.c	2006-08-25 10:12:46.000000000 +0200
-+++ gc.c.new	2007-01-13 12:39:38.383681000 +0100
-@@ -88,6 +88,8 @@ static void run_final();
- static VALUE nomem_error;
- static void garbage_collect();
- 
-+static unsigned long live_objects = 0;
-+
- void
- rb_memerror()
- {
-@@ -401,6 +398,7 @@ rb_newobj()
-     RANY(obj)->file = ruby_sourcefile;
-     RANY(obj)->line = ruby_sourceline;
- #endif
-+    live_objects++;
-     return obj;
- }
- 
-@@ -1053,8 +1051,8 @@ gc_sweep()
-     RVALUE *p, *pend, *final_list;
-     int freed = 0;
-     int i;
--    unsigned long live = 0;
-     unsigned long free_min = 0;
-+    live_objects = 0;
- 
-     for (i = 0; i < heaps_used; i++) {
-         free_min += heaps[i].limit;
-@@ -1113,7 +1111,7 @@ gc_sweep()
- 	    }
- 	    else {
- 		RBASIC(p)->flags &= ~FL_MARK;
--		live++;
-+		live_objects++;
- 	    }
- 	    p++;
- 	}
-@@ -1131,7 +1129,7 @@ gc_sweep()
- 	}
-     }
-     if (malloc_increase > malloc_limit) {
--	malloc_limit += (malloc_increase - malloc_limit) * (double)live / (live + freed);
-+	malloc_limit += (malloc_increase - malloc_limit) * (double)live_objects / (live_objects + freed);
- 	if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT;
-     }
-     malloc_increase = 0;
-@@ -2003,6 +2001,15 @@ rb_obj_id(VALUE obj)
-     return (VALUE)((long)obj|FIXNUM_FLAG);
- }
- 
-+/* call-seq:
-+ *  GC.live_objects => number
-+ *
-+ * Returns the count of objects currently allocated
-+ */
-+static
-+VALUE rb_gc_live_objects(VALUE self)
-+{ return INT2FIX(live_objects); }
-+
- /*
-  *  The <code>GC</code> module provides an interface to Ruby's mark and
-  *  sweep garbage collection mechanism. Some of the underlying methods
-@@ -2027,6 +2034,7 @@ Init_GC()
-     rb_define_module_function(rb_mObSpace, "remove_finalizer", rm_final, 1);
-     rb_define_module_function(rb_mObSpace, "finalizers", finals, 0);
-     rb_define_module_function(rb_mObSpace, "call_finalizer", call_final, 1);
-+    rb_define_module_function(rb_mObSpace, "live_objects", rb_gc_live_objects, 0);
- 
-     rb_define_module_function(rb_mObSpace, "define_finalizer", define_final, -1);
-     rb_define_module_function(rb_mObSpace, "undefine_finalizer", undefine_final, 1);