PinInPy 1.0.3__tar.gz → 1.0.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PinInPy
-Version: 1.0.3
+Version: 1.0.4
 Summary: Python library for Pinyin searching
 Keywords: PinIn,pinyin match,pinyin,cffi
 Author-Email: SajoYukimi <kagiyamahino@gmail.com>
@@ -12,7 +12,6 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

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

@@ -93,7 +93,7 @@ namespace PinInCpp {
 		void CreateViewOnMap(std::map<std::string_view, std::string_view>& Target, const std::vector<InsertStrData>& data);
 		void copy(const Keyboard& src);
 		class StrPool;
-		void ViewDeepCopy(const std::map<std::string_view, std::string_view>& srcMap, std::map<std::string_view, std::string_view>& Target);
+		void ViewDeepCopy(const StrPool& srcPool, const std::map<std::string_view, std::string_view>& srcMap, std::map<std::string_view, std::string_view>& Target);
 
 		//不是StringPoolBase的派生类，是用于Keyboard持有字符串生命周期的内存池
 		class StrPool {

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

@@ -1,5 +1,5 @@
 #include "PinIn4Cpp/Keyboard.h"
-
+#include <iostream>
 namespace PinInCpp {
 	namespace detail {
 		bool hasInitial(std::string_view s) {//判断是否有声母
@@ -89,15 +89,16 @@ namespace PinInCpp {
 			Target.insert_or_assign(key, value);
 		}
 	}
-	void Keyboard::ViewDeepCopy(const std::map<std::string_view, std::string_view>& srcMap, std::map<std::string_view, std::string_view>& Target) {
+	void Keyboard::ViewDeepCopy(const StrPool& srcPool, const std::map<std::string_view, std::string_view>& srcMap, std::map<std::string_view, std::string_view>& Target) {
 		char* poolptr = pool.data();
+		const char* srcpoolptr = srcPool.data();
 		for (const auto& [key, value] : srcMap) {
+			int KeyOffset = key.data() - srcpoolptr;
 			size_t keySize = key.size();
-			size_t keyStart = pool.put(key);
 
+			int valueOffset = value.data() - srcpoolptr;
 			size_t valueSize = value.size();
-			size_t valueStart = pool.put(value);
-			Target.insert_or_assign(std::string_view(poolptr + keyStart, keySize), std::string_view(poolptr + valueStart, valueSize));
+			Target.insert_or_assign(std::string_view(poolptr + KeyOffset, keySize), std::string_view(poolptr + valueOffset, valueSize));
 		}
 	}
 	Keyboard::Keyboard(const OptionalStrMap& MapLocalArg, const OptionalStrMap& MapKeysArg, CutterFn cutter, bool duo, bool sequence)
@@ -151,30 +152,31 @@ namespace PinInCpp {
 	}
 
 	void Keyboard::copy(const Keyboard& src) {
-		pool.reserve(src.pool.size());//预分配合适大小，避免数据重分配造成视图失效
+		pool = src.pool;
 		//重建视图
 		if (src.MapLocalFuzzy.has_value()) {
 			MapLocalFuzzy = std::map<std::string_view, std::vector<std::string_view>>();
 			char* poolptr = pool.data();
+			const char* srcpoolptr = src.pool.data();
 			auto& Target = MapLocalFuzzy.value();
 
 			for (const auto& [key, vec] : src.MapLocalFuzzy.value()) {
-				size_t keyStart = pool.put(key);
+				int offset = key.data() - srcpoolptr;
 
-				std::string_view keyView(poolptr + keyStart, key.size());//构造键
+				std::string_view keyView(poolptr + offset, key.size());//构造键
 				for (const auto& v : vec) {
-					size_t valueStart = pool.put(v);
-					Target[keyView].emplace_back(std::string_view(poolptr + valueStart, v.size()));
+					int offset = v.data() - srcpoolptr;
+					Target[keyView].emplace_back(std::string_view(poolptr + offset, v.size()));
 				}
 			}
 		}
 		if (src.MapKeys.has_value()) {
 			MapKeys = std::map<std::string_view, std::string_view>();
-			ViewDeepCopy(src.MapKeys.value(), MapKeys.value());
+			ViewDeepCopy(src.pool, src.MapKeys.value(), MapKeys.value());
 		}
 		if (src.MapLocal.has_value()) {
 			MapLocal = std::map<std::string_view, std::string_view>();
-			ViewDeepCopy(src.MapLocal.value(), MapLocal.value());
+			ViewDeepCopy(src.pool, src.MapLocal.value(), MapLocal.value());
 		}
 	}
 
@@ -309,8 +311,8 @@ namespace PinInCpp {
 		});
 
 	const static std::map<std::string, std::string> PHONETIC_LOCAL = std::map<std::string, std::string>({
-		{"yi", "i"}, {"you", "iu"}, {"yin", "in"}, {"ye", "ie"}, {"ying", "ing"},
-		{"wu", "u"}, {"wen", "un"}, {"yu", "v"}, {"yue", "ve"}, {"yuan", "van"},
+		{"yi", "i"}, {"you", "iu"}, {"yin", "in"}, {"ye", "ie"}, {"ying", "ing"}, {"yong", "iong"},
+		{"wu", "u" }, {"wen", "un"}, {"yu", "v"}, {"yue", "ve"}, {"yuan", "van"},
 		{"yun", "vn"}, {"ju", "jv"}, {"jue", "jve"}, {"juan", "jvan"}, {"jun", "jvn"},
 		{"qu", "qv"}, {"que", "qve"}, {"quan", "qvan"}, {"qun", "qvn"}, {"xu", "xv"},
 		{"xue", "xve"}, {"xuan", "xvan"}, {"xun", "xvn"}, {"shi", "sh"}, {"si", "s"},

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

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PinInPy"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = ["cffi"]
 requires-python = ">=3.10"
 authors = [
@@ -26,7 +26,6 @@ classifiers = [
     "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",