xot 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb32bfca53b907bc70eda1e106532a0122abb189b0ff74fe150213bfc4b54e27
-  data.tar.gz: 5ab847804b982c1f5ab647237a87bd4665e2fbf5713d9b072b88aa409f8b9896
+  metadata.gz: 8cc5ed60541fa3ee86c6eec2210bd614ce1c57f61962021f22a779cae98e22b3
+  data.tar.gz: f1857f64a4750a53f7ae890c3c5b668f02e5cfe7a4095611a97184281d2e5da3
 SHA512:
-  metadata.gz: d1e9dab3c783e57d0c2623955a575a8f1f097ae00246695275b11407d2ee7c338f23785eac5f371179d259765bd177a36e005ca96d680c7e5f2a1e0d4692bfe6
-  data.tar.gz: 03f3adb2c666002145f1d3874221721dc23d04e93431574b163387fda9ccaa13430b292dd554af7d9f239577852297e2e7327f7edd7627ba100041006d338db1
+  metadata.gz: cda7e24a4978142f25ac13d0c96bb81d85b97fbeffea50fb9bed676f377a4daa47cfe9a2abd1c8f3035622feb45d30137f16cecf5b3fc191a705e23901d87dd2
+  data.tar.gz: e7a9e2ae5345700370276cba16b11c1ff4fc3f48c6f409037227330758c7de6bff67c7eeba6aa6c2c76150a6da8690252a4875d2a08e8a75e88f3c38fc678a66

data/ChangeLog.md

@@ -1,6 +1,16 @@
 # xot ChangeLog
 
 
+## [v0.3.7] - 2025-05-11
+
+- Delete Xot::clip(), and use std::clamp()
+
+
+## [v0.3.6] - 2025-04-08
+
+- Move cfrelease() and CFStringPtr from rays to xot
+
+
 ## [v0.3.5] - 2025-03-24
 
 - Add PULL_REQUEST_TEMPLATE.md

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.7

data/ext/xot/tester.cpp

@@ -90,12 +90,6 @@ test_util ()
 	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;

data/include/xot/string.h

@@ -5,6 +5,7 @@
 
 
 #include <stdarg.h>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -24,6 +25,11 @@
 	while (false)
 
 
+#if defined(OSX) || defined(IOS)
+	struct __CFString;
+#endif
+
+
 namespace Xot
 {
 
@@ -39,6 +45,8 @@ namespace Xot
 
 			String (const char* str);
 
+			String (const std::string& str);
+
 			template <typename ITERATOR>
 			String (ITERATOR begin, ITERATOR end) : Super(begin, end) {}
 
@@ -71,6 +79,15 @@ namespace Xot
 	template <typename T> String to_s (const T& val);
 
 
+#if defined(OSX) || defined(IOS)
+
+	typedef std::shared_ptr<const __CFString> CFStringPtr;
+
+	CFStringPtr cfstring (const char* str);
+
+#endif
+
+
 }// Xot
 
 

data/include/xot/util.h

@@ -34,13 +34,6 @@ namespace Xot
 		return (T) (base << nth);
 	}
 
-	template <typename T>
-	inline constexpr T
-	clip (T minval, T maxval, T value)
-	{
-		return value > maxval ? maxval : (value < minval ? minval : value);
-	}
-
 
 	inline constexpr double
 	deg2rad (double degree)
@@ -131,6 +124,13 @@ namespace Xot
 	}
 
 
+#if defined(OSX) || defined(IOS)
+
+	void safe_cfrelease (const void* ref);
+
+#endif
+
+
 }// Xot
 
 

data/lib/xot/rake/util.rb

@@ -69,6 +69,10 @@ module Xot
       env_array(:SRCEXTS, []) + %w[c cc cpp m mm]
     end
 
+    def defs()
+      env_array :DEFS, []
+    end
+
     def excludes()
       env_array :EXCLUDES, []
     end

data/lib/xot/rake.rb

@@ -39,10 +39,6 @@ module Xot
       Hash[*src_exts.map {|ext| [".#{ext}", to]}.flatten]
     end
 
-    def defs()
-      env_array :DEFS, []
-    end
-
     def test_alones()
       env :TESTS_ALONE, []
     end
@@ -288,7 +284,7 @@ module Xot
 
     def use_external_library(
       repos, branch: nil, tag: nil, commit: nil,
-      incdirs: nil, srcdirs: nil, excludes: [],
+      incdirs: nil, srcdirs: nil, defs: [], excludes: [],
       submodules: [], post_submodules: nil,
       &after_clone_block)
 
@@ -296,10 +292,12 @@ module Xot
       dir      = "#{vendor_dir}/#{name}"
       incdirs  = [incdirs].flatten.map {|s| s ? "#{dir}/#{s}" : dir}
       srcdirs  = [srcdirs].flatten.map {|s| s ? "#{dir}/#{s}" : dir}
+      defs     = [defs].flatten
       excludes = [excludes].flatten
 
       append_env 'INCDIRS',  incdirs
       append_env 'SRCDIRS',  srcdirs
+      append_env 'DEFS',     defs
       append_env 'EXCLUDES', excludes unless excludes.empty?
 
       alias_task :vendor  => "vendor:#{name}"

data/lib/xot/test.rb

@@ -17,11 +17,19 @@ module Xot
     end
 
     def assert_each_in_epsilon(expected, actual, *args)
+      assert_equal expected.size, actual.size
       expected.zip(actual) do |e, a|
         assert_in_epsilon e, a, *args
       end
     end
 
+    def assert_each_in_delta(expected, actual, *args)
+      assert_equal expected.size, actual.size
+      expected.zip(actual) do |e, a|
+        assert_in_delta e, a, *args
+      end
+    end
+
   end# Test
 
 

data/src/string.cpp

@@ -4,9 +4,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <algorithm>
-#include <memory>
 #include "xot/exception.h"
 
+#if defined(OSX) || defined(IOS)
+#import <CoreFoundation/CoreFoundation.h>
+#endif
+
 
 namespace Xot
 {
@@ -21,6 +24,11 @@ namespace Xot
 	{
 	}
 
+	String::String (const std::string& str)
+	:	Super(str)
+	{
+	}
+
 	String
 	String::upcase () const
 	{
@@ -167,5 +175,46 @@ namespace Xot
 		return val;
 	}
 
+#if defined(OSX) || defined(IOS)
+
+	template <> String
+	to_s<CFStringRef> (const CFStringRef& val)
+	{
+		if (!val || CFGetTypeID(val) != CFStringGetTypeID())
+			return String();
+
+		CFIndex len = CFStringGetMaximumSizeForEncoding(
+			CFStringGetLength(val), kCFStringEncodingUTF8) + 1;
+
+		std::unique_ptr<char[]> buffer(new char[len]);
+		if (!CFStringGetCString(val, buffer.get(), len, kCFStringEncodingUTF8))
+			system_error(__FILE__, __LINE__);
+
+		return buffer.get();
+	}
+
+	template <> String
+	to_s<CFStringPtr> (const CFStringPtr& val)
+	{
+		return to_s((CFStringRef) val.get());
+	}
+
+
+	static void
+	release_cfstring (CFTypeRef ref)
+	{
+		if (ref) CFRelease(ref);
+	}
+
+	CFStringPtr
+	cfstring (const char* str)
+	{
+		CFStringRef ref = CFStringCreateWithCString(
+			kCFAllocatorDefault, str, kCFStringEncodingUTF8);
+		return CFStringPtr(ref, release_cfstring);
+	}
+
+#endif
+
 
 }// Xot

data/src/util.cpp

@@ -3,6 +3,10 @@
 
 #include <stdlib.h>
 
+#if defined(OSX) || defined(IOS)
+#import <CoreFoundation/CFBase.h>
+#endif
+
 
 namespace Xot
 {
@@ -49,4 +53,15 @@ namespace Xot
 	}
 
 
+#if defined(OSX) || defined(IOS)
+
+	void
+	safe_cfrelease (const void* ref)
+	{
+		if (ref) CFRelease(ref);
+	}
+
+#endif
+
+
 }// Xot

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-05-10 00:00:00.000000000 Z
 dependencies: []
 description: This library include some useful utility classes and functions for development
   with C++.