PinInPy 1.0.5__tar.gz → 1.0.7__tar.gz

{pininpy-1.0.5 → pininpy-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PinInPy
-Version: 1.0.5
+Version: 1.0.7
 Summary: Python library for Pinyin searching
 Keywords: PinIn,pinyin match,pinyin,cffi
 Author-Email: SajoYukimi <kagiyamahino@gmail.com>

{pininpy-1.0.5 → pininpy-1.0.7}/PinIn4Cpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
 include(GenerateExportHeader)
 
-project(PinIn4Cpp VERSION 1.5.9)
+project(PinIn4Cpp VERSION 1.5.11)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

{pininpy-1.0.5 → pininpy-1.0.7}/PinIn4Cpp/include/PinIn4Cpp/detail/AdaptiveContainers.h

@@ -31,6 +31,7 @@ namespace PinInCpp {
 				if (this == &src) {
 					return *this;
 				}
+				TrueClear();//如果覆盖的是一个原本就有的数组，那么这个会检查并清理旧数据
 				copy(src);
 				return *this;
 			}
@@ -38,6 +39,7 @@ namespace PinInCpp {
 				if (this == &src) {
 					return *this;
 				}
+				TrueClear();//如果覆盖的是一个原本就有的数组，那么这个会检查并清理旧数据
 				move(std::forward<SVOArray&&>(src));//确保类型绝对正确
 				return *this;
 			}
@@ -197,6 +199,7 @@ namespace PinInCpp {
 					if (dataSize > SVOsize) {
 						::operator delete (data.longData.data, HeapAlign);
 					}
+					dataSize = 0;//返回小向量模式，避免二次析构出问题
 					throw;
 				}
 			}

{pininpy-1.0.5 → pininpy-1.0.7}/PinIn4Cpp/include/PinIn4Cpp/detail/ObjectPool.h

@@ -144,19 +144,13 @@ namespace PinInCpp {
 			SlabAllocator& operator=(const SlabAllocator&) = delete;
 
 			SlabAllocator(SlabAllocator&& src)noexcept {
-				data = src.data;
-				head = src.head;
-				src.data = nullptr;
-				src.head = nullptr;
+				std::swap(data, src.data);//Move-and-Swap，由于自身现在是空的，所以相当于把src置空了
+				std::swap(head, src.head);
 			}
 			SlabAllocator& operator=(SlabAllocator&& src)noexcept {
-				if (this == &src) {
-					return *this;
-				}
-				data = src.data;
-				head = src.head;
-				src.data = nullptr;
-				src.head = nullptr;
+				SlabAllocator tmp(std::move(src));//临时变量退出作用域自动析构
+				std::swap(data, tmp.data);
+				std::swap(head, tmp.head);
 				return *this;
 			}
 

{pininpy-1.0.5 → pininpy-1.0.7}/PinIn4Cpp/src/Keyboard.cpp

@@ -169,14 +169,24 @@ namespace PinInCpp {
 				}
 			}
 		}
+		else {//防止多重赋值的问题，下面也是
+			MapLocalFuzzy = std::nullopt;
+		}
+
 		if (src.MapKeys.has_value()) {
 			MapKeys = std::map<std::string_view, std::string_view>();
 			ViewDeepCopy(src.pool, src.MapKeys.value(), MapKeys.value());
 		}
+		else {
+			MapKeys = std::nullopt;
+		}
 		if (src.MapLocal.has_value()) {
 			MapLocal = std::map<std::string_view, std::string_view>();
 			ViewDeepCopy(src.pool, src.MapLocal.value(), MapLocal.value());
 		}
+		else {
+			MapLocal = std::nullopt;
+		}
 	}
 
 	std::string_view Keyboard::keys(std::string_view s)const noexcept {
@@ -378,12 +388,12 @@ namespace PinInCpp {
 
 	const Keyboard Keyboard::QUANPIN = Keyboard(std::nullopt, std::nullopt, Keyboard::Standard, false, true);
 	const Keyboard Keyboard::DAQIAN = Keyboard(PHONETIC_LOCAL, DAQIAN_KEYS, Keyboard::Standard, false, false);
-	const Keyboard Keyboard::XIAOHE = Keyboard(std::nullopt, XIAOHE_KEYS, Keyboard::Zero, true, false);
-	const Keyboard Keyboard::ZIRANMA = Keyboard(std::nullopt, ZIRANMA_KEYS, Keyboard::Zero, true, false);
-	const Keyboard Keyboard::SOUGOU = Keyboard(std::nullopt, SOUGOU_KEYS, Keyboard::ZeroOInitial, true, false);
-	const Keyboard Keyboard::ZHINENG_ABC = Keyboard(std::nullopt, ZHINENG_ABC_KEYS, Keyboard::ZeroOInitial, true, false);
-	const Keyboard Keyboard::GUOBIAO = Keyboard(std::nullopt, GUOBIAO_KEYS, Keyboard::ZeroAInitial, true, false);
-	const Keyboard Keyboard::MICROSOFT = Keyboard(std::nullopt, MICROSOFT_KEYS, Keyboard::ZeroOInitial, true, false);
-	const Keyboard Keyboard::PINYINPP = Keyboard(std::nullopt, PINYINPP_KEYS, Keyboard::Zero, true, false);
-	const Keyboard Keyboard::ZIGUANG = Keyboard(std::nullopt, ZIGUANG_KEYS, Keyboard::ZeroOInitial, true, false);
+	const Keyboard Keyboard::XIAOHE = Keyboard(std::nullopt, XIAOHE_KEYS, Keyboard::Zero, false, false);
+	const Keyboard Keyboard::ZIRANMA = Keyboard(std::nullopt, ZIRANMA_KEYS, Keyboard::Zero, false, false);
+	const Keyboard Keyboard::SOUGOU = Keyboard(std::nullopt, SOUGOU_KEYS, Keyboard::ZeroOInitial, false, false);
+	const Keyboard Keyboard::ZHINENG_ABC = Keyboard(std::nullopt, ZHINENG_ABC_KEYS, Keyboard::ZeroOInitial, false, false);
+	const Keyboard Keyboard::GUOBIAO = Keyboard(std::nullopt, GUOBIAO_KEYS, Keyboard::ZeroAInitial, false, false);
+	const Keyboard Keyboard::MICROSOFT = Keyboard(std::nullopt, MICROSOFT_KEYS, Keyboard::ZeroOInitial, false, false);
+	const Keyboard Keyboard::PINYINPP = Keyboard(std::nullopt, PINYINPP_KEYS, Keyboard::Zero, false, false);
+	const Keyboard Keyboard::ZIGUANG = Keyboard(std::nullopt, ZIGUANG_KEYS, Keyboard::ZeroOInitial, false, false);
 }

{pininpy-1.0.5 → pininpy-1.0.7}/PinIn4Cpp/src/PinInCAPI.cpp

@@ -276,7 +276,7 @@ PinInCpp_SearchResult PinInCpp_TreeSearcher_ExecuteSearch(PinInCpp_TreeSearcher
 		*resultBuf = item;
 		resultBuf++;
 	}
-	
+
 	return result;
 }
 

{pininpy-1.0.5 → pininpy-1.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PinInPy"
-version = "1.0.5"
+version = "1.0.7"
 dependencies = ["cffi"]
 requires-python = ">=3.10"
 authors = [