rucy 0.1.12 → 0.1.13

data/src/value.cpp.erb

@@ -5,6 +5,7 @@
 #include <assert.h>
 #include "rucy/function.h"
 #include "rucy/exception.h"
+#include "rucy/debug.h"
 
 
 namespace Rucy
@@ -101,6 +102,12 @@ namespace Rucy
 		return RB_FLOAT_TYPE_P(val) || is_kind_of(rb_cFloat);
 	}
 
+	bool
+	Value::is_num () const
+	{
+		return is_i() || is_f();
+	}
+
 	bool
 	Value::is_s () const
 	{
@@ -325,13 +332,13 @@ namespace Rucy
 	}
 
 	Value&
-	Value::operator [] (int i)
+	Value::operator [] (size_t i)
 	{
 		return as_array()[i];
 	}
 
 	const Value&
-	Value::operator [] (int i) const
+	Value::operator [] (size_t i) const
 	{
 		return const_cast<Value*>(this)->operator[](i);
 	}
@@ -339,7 +346,7 @@ namespace Rucy
 	const char*
 	Value::c_str () const
 	{
-		return as<const char*>(true);
+		return as_s(true);
 	}
 
 	static int
@@ -367,6 +374,12 @@ namespace Rucy
 		return get_length(*this, size);
 	}
 
+	bool
+	Value::empty () const
+	{
+		return size() <= 0;
+	}
+
 
 	GlobalValue::GlobalValue ()
 	{
@@ -433,7 +446,7 @@ namespace Rucy
 		init(gc_);
 	}
 
-	GlobalValue::GlobalValue (const GlobalValue& obj, bool gc_)
+	GlobalValue::GlobalValue (const This& obj, bool gc_)
 	:	Super(obj)
 	{
 		init(gc_);
@@ -443,50 +456,41 @@ namespace Rucy
 	GlobalValue::operator = (const Value& v)
 	{
 		Super::operator=(v);
-		update_guard();
+		return *this;
+	}
+
+	GlobalValue&
+	GlobalValue::operator = (const This& obj)
+	{
+		Super::operator=(obj);
 		return *this;
 	}
 
 	GlobalValue::~GlobalValue ()
 	{
-		while (gc_guarded) gc(true);
+		if (gc_disable_count > 0)
+			rb_gc_unregister_address(&val);
 	}
 
 	void
-	GlobalValue::gc (bool enable) const
+	GlobalValue::enable_gc () const
 	{
-		gc_disable_count += enable ? -1 : +1;
-		update_guard();
+		if (--gc_disable_count == 0)
+			rb_gc_unregister_address(const_cast<RubyValue*>(&val));
 	}
 
 	void
-	GlobalValue::init (bool gc_)
+	GlobalValue::disable_gc () const
 	{
-		gc_disable_count = 0;
-		gc_guarded       = false;
-		if (!gc_) gc(false);
+		if (++gc_disable_count == 1)
+			rb_gc_register_address(const_cast<RubyValue*>(&val));
 	}
 
 	void
-	GlobalValue::update_guard () const
+	GlobalValue::init (bool gc_)
 	{
-		assert(gc_disable_count >= 0);
-
-		if (IMMEDIATE_P(val))
-		{
-			if (gc_guarded) rb_gc_unregister_address((RubyValue*) &val);
-			gc_guarded = false;
-		}
-		else if (gc_disable_count > 0)
-		{
-			if (!gc_guarded) rb_gc_register_address((RubyValue*) &val);
-			gc_guarded = true;
-		}
-		else
-		{
-			if (gc_guarded) rb_gc_unregister_address((RubyValue*) &val);
-			gc_guarded = false;
-		}
+		gc_disable_count = 0;
+		if (!gc_) disable_gc();
 	}
 
 
@@ -591,16 +595,7 @@ namespace Rucy
 	{
 		return Value(size, array);
 	}
-
-	Value
-	value (void* ptr)
-	{
-		if (ptr)
-			argument_error(__FILE__, __LINE__, "Rucy::value(void*) can take only (void*) NULL.");
-
-		return nil();
-	}
-%	(1..10).each do |n|
+%	(1..16).each do |n|
 
 	Value
 	array (<%= params(n, ', ') {|i| "Value v#{i}"} %>)

data/test/test_class.rb

@@ -14,10 +14,6 @@ class Temp < Rucy::Tester::Sub
     "Temp::name_overridable"
   end
 
-  def name_overridable_faster ()
-    "Temp::name_overridable_faster"
-  end
-
 end# Temp
 
 
@@ -94,7 +90,7 @@ class TestClass < Test::Unit::TestCase
     assert_equal "Base::name", base_raw.call_name
     assert_equal "Sub::name",  sub     .call_name
     assert_equal "Sub::name",  sub_raw .call_name
-    assert_equal "Sub::name",  temp    .call_name # returns "Sub" not "Temp"!
+    assert_equal "Sub::name",  temp    .call_name# "Sub" instead of "Temp"!
   end
 
   def test_call_name_overridable ()
@@ -105,37 +101,9 @@ class TestClass < Test::Unit::TestCase
     assert_equal "Temp::name_overridable", temp    .call_name_overridable
   end
 
-  class X < Sub; end
-
-  def test_is_overridden ()
-    m = :name_overridable_faster
-    def is_overridden (o) o.is_name_overridable_faster_overridden; end
-
-    assert_equal true, is_overridden(temp)
-
-    o = X.new
-    assert_equal false, is_overridden(o)
-    def o.name_overridable_faster () end
-    assert_equal true,  is_overridden(o)
-
-    o = X.new
-    assert_equal false, is_overridden(o)
-    eval "class X; def #{m}; end; end"
-    assert_equal true,  is_overridden(o)
-    eval "class X; remove_method :#{m}; end"
-    assert_equal false, is_overridden(o)
-
-    o = X.new
-    assert_equal false, is_overridden(o)
-    X.send(:define_method, m) {}
-    assert_equal true,  is_overridden(o)
-    X.send :remove_method, m
-    assert_equal false, is_overridden(o)
-  end
-
   def test_gc ()
     def simple_objs (name, n = 10) ([nil] * n).map {SimpleObj.new name} end
-    def gc (n = 10) n.times {GC.start}; print '' end
+    def gc () GC.start end
     rt = Rucy::Tester
 
     gc

metadata

@@ -1,71 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: rucy
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
-- snori
+- xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: xot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gemcutter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 description: This library helps you to develop Ruby Extension by C++.
-email: snori@xord.org
+email: xordog@gmail.com
 executables:
 - rucy2rdoc
 extensions:
 - Rakefile
 extra_rdoc_files:
+- ".doc/ext/rucy/struct.cpp"
+- ".doc/ext/rucy/tester.cpp"
+- ".doc/ext/rucy/exception.cpp"
+- ".doc/ext/rucy/function.cpp"
+- ".doc/ext/rucy/value.cpp"
+- ".doc/ext/rucy/class.cpp"
+files:
 - ".doc/ext/rucy/class.cpp"
 - ".doc/ext/rucy/exception.cpp"
 - ".doc/ext/rucy/function.cpp"
 - ".doc/ext/rucy/struct.cpp"
 - ".doc/ext/rucy/tester.cpp"
 - ".doc/ext/rucy/value.cpp"
-files:
 - README.md
 - Rakefile
 - VERSION
@@ -81,6 +59,7 @@ files:
 - ext/rucy/value.cpp
 - include/rucy.h
 - include/rucy/class.h
+- include/rucy/debug.h
 - include/rucy/exception.h
 - include/rucy/extension.h.erb
 - include/rucy/function.h.erb
@@ -91,6 +70,7 @@ files:
 - include/rucy/value.h.erb
 - lib/rucy.rb
 - lib/rucy/module.rb
+- lib/rucy/rake.rb
 - rucy.gemspec
 - src/class.cpp
 - src/exception.cpp
@@ -107,12 +87,6 @@ files:
 - test/test_function.rb
 - test/test_struct.rb
 - test/test_value.rb
-- ".doc/ext/rucy/class.cpp"
-- ".doc/ext/rucy/exception.cpp"
-- ".doc/ext/rucy/function.cpp"
-- ".doc/ext/rucy/struct.cpp"
-- ".doc/ext/rucy/tester.cpp"
-- ".doc/ext/rucy/value.cpp"
 homepage: https://github.com/xord/rucy
 licenses: []
 metadata: {}
@@ -122,17 +96,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby C++ Extension Helper Library.