xot 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 917b9cdb102ebbcb2b9b78eee59fa4e746edb124
-  data.tar.gz: b76b933faf98ddaeeac34ae81d8954f75b0ed710
+SHA256:
+  metadata.gz: 88efd5d3701a109d4d84b73ca708534afd4b241b65e346a7713b7432c4448375
+  data.tar.gz: 7e34ffbf480f514bd89288861adfe607250c370bb6f39a9a6f269ffec1a9fadf
 SHA512:
-  metadata.gz: 5f5a99b2dcef89976face14279f8ad0089ce8af434a92f3849dc0ed710563e6245cd03a7388020496a65421c9fb3254a324c2f0a420d6df63e8e254185473afb
-  data.tar.gz: 56390fe7523401d8608145374c39174969a6be7f4b8943accd9186ae8842641962d6ca241aca3c0db9fccb6a35ab05b948685b85e44bc35bb9993403417dd24d
+  metadata.gz: 0c966eca380aa4d048f3f97a522e6b26b4b7bcf26b63f35f1a68ed3fa1e6d9fc075360004bbdfe338c7d2f57cf5b6b35be0ac76b7ed27d8beb20c38b6143b9ab
+  data.tar.gz: 2626967aa53d9f1493a132bba2bdb18ae0b7ea67a4991351941c60116e6a27460ad07e8b4be560f32063c546a44ee004e3552ab2a740c6e0e358558951fc3abf

data/README.md

@@ -1,4 +1,4 @@
 
 # Xot - Some useful utility classes and functions.
 
- by snori@xord.org
+ by xordog@gmail.com

data/Rakefile

@@ -2,25 +2,19 @@
 
 
 %w[.]
-  .map  {|s| File.expand_path "../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'xot/rake'
 require 'xot/module'
 
-include Xot::Rake
 
-
-MODULES = [Xot].map {|m| m.const_get :Module}
-MODULE  = MODULES.last
+MODULES = [Xot]
 DLNAME  = 'tester'
 
+build_native_library
+build_ruby_extension dlname: :tester
+test_ruby_extension
+build_ruby_gem
 
-task :default => :build
-
-task :build => :lib
-
-empty_task :test
-
-
-MODULES.each {|m| m.load_tasks :lib, :ext, :test, :gem}
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/ext/xot/extconf.rb

@@ -2,7 +2,7 @@
 
 
 %w[.]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'mkmf'
@@ -12,9 +12,8 @@ require 'xot/module'
 
 Xot::ExtConf.new Xot do
   setup do
-    headers << 'boost/noncopyable.hpp' << 'ruby.h'
+    headers << 'ruby.h'
   end
 
-  dir_config 'boost'
   create_makefile 'xot/tester'
 end

data/ext/xot/tester.cpp

@@ -4,6 +4,26 @@
 #include "xot.h"
 
 
+static bool
+test_string ()
+{
+	if (Xot::String("aBc")            .upcase()   != "ABC") return false;
+	if (Xot::String("aBc")            .downcase() != "abc") return false;
+	if (Xot::String(" \taBc \r\n\f\v").strip()    != "aBc") return false;
+	if (Xot::String(" \t\r\n\f\v")    .strip()    != "") return false;
+	if (Xot::String("")               .strip()    != "") return false;
+	return true;
+}
+
+static bool
+test_time ()
+{
+	double t = Xot::time();
+	Xot::sleep(0.001);
+	if (Xot::time() <= t) return false;
+	return true;
+}
+
 template <typename EXCEPTION>
 static bool
 test_exception (bool should_catch = true)
@@ -65,27 +85,53 @@ test_ref ()
 static bool
 test_util ()
 {
+	if (Xot::bit(0) != 0x1) return false;
+	if (Xot::bit(1) != 0x2) return false;
+	if (Xot::bit(2) != 0x4) return false;
+	if (Xot::bit(3) != 0x8) return false;
+
 	if (!(Xot::clip(10, 100,  50) ==  50)) return false;
 	if (!(Xot::clip(10, 100,  10) ==  10)) return false;
 	if (!(Xot::clip(10, 100, 100) == 100)) return false;
 	if (!(Xot::clip(10, 100,   0) ==  10)) return false;
 	if (!(Xot::clip(10, 100, 200) == 100)) return false;
 
+	static const int F0 = Xot::bit(0), F1 = Xot::bit(1), F2 = Xot::bit(2);
+
+	int flags = 0;
+	if (Xot::has_flag(flags, 0))  return false;
+	if (Xot::has_flag(flags, F0)) return false;
+
+	Xot::     add_flag(&flags, F0);
+	if (!Xot::has_flag(flags, F0)) return false;
+
+	Xot::     add_flag(&flags, F1);
+	if (!Xot::has_flag(flags, F0))           return false;
+	if (!Xot::has_flag(flags, F1))           return false;
+	if (!Xot::has_flag(flags, F0 | F1))      return false;
+	if ( Xot::has_flag(flags, F0 | F1 | F2)) return false;
+
+	Xot::  remove_flag(&flags, F1);
+	if (!Xot::has_flag(flags, F0))           return false;
+	if ( Xot::has_flag(flags, F1))           return false;
+	if ( Xot::has_flag(flags, F0 | F1))      return false;
+	if ( Xot::has_flag(flags, F0 | F1 | F2)) return false;
+
 	int value;
 	int* p = &value;
 	if (!(Xot::get_pointer_flag(p) == false)) return false;
 
-	p = Xot::set_pointer_flag(p);
+	p =   Xot::set_pointer_flag(p);
 	if (!(Xot::get_pointer_flag(p) == true))  return false;
 
-	p = Xot::set_pointer_flag(p, false);
+	p =   Xot::set_pointer_flag(p, false);
 	if (!(Xot::get_pointer_flag(p) == false)) return false;
 
-	p = Xot::set_pointer_flag(p, true);
+	p =   Xot::set_pointer_flag(p, true);
 	if (!(Xot::get_pointer_flag(p) == true))  return false;
 
-	if (!(                      p         != &value))  return false;
-	if (!(Xot::set_pointer_flag(p, false) == &value))  return false;
+	if (!(                      p         != &value)) return false;
+	if (!(Xot::set_pointer_flag(p, false) == &value)) return false;
 
 	return true;
 }
@@ -94,9 +140,11 @@ test_util ()
 static VALUE
 test_native (VALUE self)
 {
+	if (!test_string())    return false;
+	if (!test_time())      return false;
 	if (!test_exception()) return false;
-	if (!test_ref()) return false;
-	if (!test_util()) return false;
+	if (!test_ref())       return false;
+	if (!test_util())      return false;
 	return true;
 }
 

data/include/xot.h

@@ -5,13 +5,15 @@
 
 
 #include <xot/defs.h>
-#include <xot/string.h>
 #include <xot/exception.h>
+#include <xot/debug.h>
+
+#include <xot/string.h>
+#include <xot/time.h>
 #include <xot/ref.h>
 #include <xot/pimpl.h>
-#include <xot/time.h>
+#include <xot/noncopyable.h>
 #include <xot/util.h>
-#include <xot/debug.h>
 
 
 #endif//EOH

data/include/xot/debug.h

@@ -4,11 +4,16 @@
 #define __XOT_DEBUG_H__
 
 
+#if 1//def _DEBUG
+#define XOT_USE_DOUT
+#endif
+
+
 namespace Xot
 {
 
 
-#ifdef _DEBUG
+#ifdef XOT_USE_DOUT
 
 	void dout (const char* format, ...);
 

data/include/xot/defs.h

@@ -26,6 +26,8 @@ namespace Xot
 	{
 
 
+		typedef   signed char schar;
+
 		typedef unsigned char uchar;
 
 		#ifdef CYGWIN

data/include/xot/noncopyable.h

@@ -0,0 +1,30 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __XOT_NONCOPYABLE_H__
+#define __XOT_NONCOPYABLE_H__
+
+
+namespace Xot
+{
+
+
+	class NonCopyable
+	{
+
+		protected:
+
+			NonCopyable () = default;
+
+			~NonCopyable () = default;
+
+			NonCopyable (const NonCopyable&) = delete;
+
+			NonCopyable& operator = (const NonCopyable&) = delete;
+
+	};// NonCopyable
+
+
+}// Xot
+
+
+#endif//EOH

data/include/xot/pimpl.h

@@ -4,24 +4,20 @@
 #define __XOT_PIMPL_H__
 
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 
 namespace Xot
 {
 
 
-	template <typename T, bool SHARED = false> class PImpl;
-
-
 	template <typename T>
-	class PImpl<T, false> : public boost::scoped_ptr<T>
+	class PImpl : public std::unique_ptr<T>
 	{
 
-		typedef boost::scoped_ptr<T> Super;
+		typedef std::unique_ptr<T> Super;
 
-		typedef PImpl<T, false> This;
+		typedef PImpl<T> This;
 
 		public:
 
@@ -37,28 +33,24 @@ namespace Xot
 				return *this;
 			}
 
-			bool shared () const {return false;}
-
 	};// PImpl
 
 
 	template <typename T>
-	class PImpl<T, true> : public boost::shared_ptr<T>
+	class PSharedImpl : public std::shared_ptr<T>
 	{
 
-		typedef boost::shared_ptr<T> Super;
+		typedef std::shared_ptr<T> Super;
 
-		typedef PImpl<T, true> This;
+		typedef PImpl<T> This;
 
 		public:
 
-			PImpl () : Super(new T) {}
+			PSharedImpl () : Super(new T) {}
 
-			PImpl (T* p) : Super(p) {}
-
-			bool shared () const {return true;}
+			PSharedImpl (T* p) : Super(p) {}
 
-	};// PImpl
+	};// PSharedImpl
 
 
 }// Xot

data/include/xot/ref.h

@@ -11,11 +11,10 @@
 #include <limits.h>
 #include <assert.h>
 #include <typeinfo>
-#include <boost/noncopyable.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <type_traits>
 #include <xot/defs.h>
 #include <xot/exception.h>
+#include <xot/noncopyable.h>
 #include <xot/debug.h>
 
 
@@ -30,38 +29,39 @@ namespace Xot
 
 
 	template <typename SuperClass = EmptyClass>
-	class RefCountable : public SuperClass, public boost::noncopyable
+	class RefCountable : public SuperClass, public NonCopyable
 	{
 
 		public:
 
-			virtual void retain (void* data = NULL) const
+			virtual void retain (intptr_t data = 0) const
 			{
-				refc_update_count(+1);
+				refc_update_count(true);
 
 				#ifdef XOT_REF_DEBUG
 					doutln(
 						"%s: %d -> %d",
-						typeid(this).name(), refc_count() - 1, refc_count());
+						typeid(this).name(), refc_count - 1, refc_count);
 				#endif
 			}
 
-			virtual void release (void* data = NULL) const
+			virtual void release (intptr_t data = 0) const
 			{
-				assert(refc_count() >= 0);
-				bool del = !refc_retained() || refc_update_count(-1) == 0;
+				assert(refc_count >= 0);
+
+				bool del = refc_count == 0 || refc_update_count(false) == 0;
 
 				#ifdef XOT_REF_DEBUG
 					doutln(
-						"%s: %d -> %d, refcount:%s, delete:%s",
-						typeid(this).name(), refc_count() + 1, refc_count(),
-						refc_retained() ? "yes" : "no", del ? "yes" : "no");
+						"%s: %d -> %d, delete:%s",
+						typeid(this).name(), refc_count + 1, refc_count,
+						del ? "yes" : "no");
 				#endif
 
 				if (del) delete this;
 			}
 
-			virtual void* rucy_value () const
+			virtual void* rucy_wrapper_value () const
 			{
 				return NULL;
 			}
@@ -81,54 +81,21 @@ namespace Xot
 			{
 			}
 
-			virtual int refc_count () const
-			{
-				return refc.count;
-			}
+		private:
 
-			virtual bool refc_retained () const
-			{
-				return refc.aux & 0x1;
-			}
+			mutable int refc_count = 0;
 
-			virtual int refc_update_count (int add) const
+			int refc_update_count (bool increment) const
 			{
-				assert(add != 0);
-				if (add >= 0) refc.aux |= 0x1;// bit for retained flag.
-
-				int c = refc.count + add;
+				int c = refc_count + (increment ? +1 : -1);
 				if (c < 0)
-					invalid_state_error(__FILE__, __LINE__);
-				if (c > USHRT_MAX)
-					xot_error(__FILE__, __LINE__, "refc.count overflow.");
+					invalid_state_error(__FILE__, __LINE__, "refc_count underflow");
+				if (c > INT_MAX)
+					xot_error(__FILE__, __LINE__, "refc_count overflow.");
 
-				return refc.count = c;
+				return refc_count = c;
 			}
 
-			virtual ushort refc_aux () const
-			{
-				return refc.aux >> 1;
-			}
-
-			virtual void refc_set_aux (ushort aux) const
-			{
-				if ((0x1 << 15) & aux)
-					argument_error(__FILE__, __LINE__);
-
-				refc.aux = (refc.aux & 0x1) | (aux << 1);
-			}
-
-		private:
-
-			mutable struct Data
-			{
-
-				ushort count, aux;
-
-				Data () : count(0), aux(0) {}
-
-			} refc;
-
 	};// RefCountable
 
 
@@ -232,14 +199,14 @@ namespace Xot
 
 
 	template <typename T>
-	class Ref<T, typename boost::enable_if<boost::is_const<T> >::type>
+	class Ref<T, typename std::enable_if<std::is_const<T>::value>::type>
 	{
 
 		typedef Ref<T> This;
 
-		typedef typename boost::remove_const<T>::type Value;
+		typedef typename std::remove_const<T>::type Value;
 
-		typedef                              T   ConstValue;
+		typedef                            T   ConstValue;
 
 		typedef       Value&      Reference;