PinInPy 1.0.4__tar.gz → 1.0.6__tar.gz

{pininpy-1.0.4 → pininpy-1.0.6}/PKG-INFO

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

{pininpy-1.0.4 → pininpy-1.0.6}/PinIn4Cpp/CMakeLists.txt

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

{pininpy-1.0.4 → pininpy-1.0.6}/PinIn4Cpp/include/PinIn4Cpp/Keyboard.h

@@ -100,6 +100,9 @@ namespace PinInCpp {
 		public: //作为字符串视图的数据源，他不需要终止符
 			StrPool() = default;
 			StrPool(const StrPool&) = default;
+			StrPool& operator=(const StrPool& src) = default;
+			StrPool(StrPool&&) noexcept = default;
+			StrPool& operator=(StrPool&&) noexcept = default;
 			size_t put(std::string_view str) {
 				size_t result = strs.size();
 				strs.insert(strs.end(), str.begin(), str.end());

{pininpy-1.0.4 → pininpy-1.0.6}/PinIn4Cpp/src/Keyboard.cpp

@@ -1,5 +1,5 @@
 #include "PinIn4Cpp/Keyboard.h"
-#include <iostream>
+
 namespace PinInCpp {
 	namespace detail {
 		bool hasInitial(std::string_view s) {//判断是否有声母
@@ -93,10 +93,10 @@ namespace PinInCpp {
 		char* poolptr = pool.data();
 		const char* srcpoolptr = srcPool.data();
 		for (const auto& [key, value] : srcMap) {
-			int KeyOffset = key.data() - srcpoolptr;
+			size_t KeyOffset = key.data() - srcpoolptr;
 			size_t keySize = key.size();
 
-			int valueOffset = value.data() - srcpoolptr;
+			size_t valueOffset = value.data() - srcpoolptr;
 			size_t valueSize = value.size();
 			Target.insert_or_assign(std::string_view(poolptr + KeyOffset, keySize), std::string_view(poolptr + valueOffset, valueSize));
 		}
@@ -146,7 +146,6 @@ namespace PinInCpp {
 		duo = src.duo;
 		sequence = src.sequence;
 		cutter = src.cutter;
-
 		copy(src);
 		return *this;
 	}
@@ -161,23 +160,33 @@ namespace PinInCpp {
 			auto& Target = MapLocalFuzzy.value();
 
 			for (const auto& [key, vec] : src.MapLocalFuzzy.value()) {
-				int offset = key.data() - srcpoolptr;
+				size_t offset = key.data() - srcpoolptr;
 
 				std::string_view keyView(poolptr + offset, key.size());//构造键
 				for (const auto& v : vec) {
-					int offset = v.data() - srcpoolptr;
+					size_t offset = v.data() - srcpoolptr;
 					Target[keyView].emplace_back(std::string_view(poolptr + offset, v.size()));
 				}
 			}
 		}
+		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 {
@@ -379,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.4 → pininpy-1.0.6}/PinIn4Cpp/src/PinInCAPI.cpp

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

{pininpy-1.0.4 → pininpy-1.0.6}/pyproject.toml

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