xot 0.1.11 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 72b3519f57041623e24f6d9addaf4053720f695d
-  data.tar.gz: 7a3215a899ada49f8d22fe1100a1fe941f9c0875
+SHA256:
+  metadata.gz: 0e6a18a9ea642c4ac20d70096dddf5eadf89e6de95b093940402e5cefa746be3
+  data.tar.gz: b2118e8a68ca94e770ae1ef26f9f60a26f77ccf04e2fc7ba28b7fc89f4da1aa8
 SHA512:
-  metadata.gz: cd63c1d4fdbdc5df82b8f10d279efd371cc00219c9c5cfd10cbfd51238023cbfde1c7f1f941d21d73c668492cf8c83bf513c5cb57305d562297ff59c623f261f
-  data.tar.gz: 7d5a161027335a059db6de4ef00415b5bf859485ef0fa24c42d293564d6f2d66269e2fcb528bdbf5fb8a05c692760a9a2ff7a050e2c2707a31a1235ec96ad952
+  metadata.gz: 00c9091d6f2204c2a23d942acd788e157d0b14b1de2b5ea1e378725748cc36f37c46abdbe20a5a75a0070976210ef8f4405d03b356be26d53095d5c8010aa8fa
+  data.tar.gz: 6711e0296cea2b5fc0a7849322a65bd1bb3f8b70d0a81fec444bb4d52b5143b67ad8ee29fcb456334c7aec26975b59c12b5c6bc0ceba239a3525789e6f0f1ba6

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 xord.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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,20 @@
 
 
 %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
+require 'xot/module'
 
 
-MODULES = [Xot].map {|m| m.const_get :Module}
-MODULE  = MODULES.last
+MODULES = [Xot]
 DLNAME  = 'tester'
 
+build_native_library
+build_ruby_extension dlname: DLNAME
+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.11
+0.1.16

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
@@ -52,9 +54,6 @@ namespace Xot
 	}// Types
 
 
-	enum {UNKNOWN = 0};
-
-
 	using namespace Types;
 
 

data/include/xot/exception.h

@@ -46,17 +46,29 @@ namespace Xot
 	namespace ErrorFunctions
 	{
 
-		void xot_error             (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void xot_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void argument_error        (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void argument_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void index_error           (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void index_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void invalid_state_error   (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void invalid_state_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void system_error          (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void system_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void not_implemented_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void not_implemented_error (
+			const char* file, int line, const char* format = NULL, ...);
 
 	}// ErrorFunctions
 

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;