Merge pull request #106 from bab2min/dev_joinerror

Dev 0.13.1

Author: bab2min

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.12)
 
-project(kiwi VERSION 0.13.0 DESCRIPTION "Kiwi, Korean Intelligent Word Identifier")
+project(kiwi VERSION 0.13.1 DESCRIPTION "Kiwi, Korean Intelligent Word Identifier")
 
 set ( CMAKE_CXX_STANDARD 11 )
 set ( CMAKE_VERBOSE_MAKEFILE true )

include/kiwi/FrozenTrie.h

@@ -115,6 +115,8 @@ namespace kiwi
 			const Node* root() const { return nodes.get(); }
 
 			const Value& value(size_t idx) const { return values[idx]; };
+
+			bool hasMatch(_Value v) const { return !this->isNull(v) && !this->hasSubmatch(v); }
 		};
 	}
 }

include/kiwi/Macro.h

@@ -5,6 +5,6 @@
 
 #define KIWI_VERSION_MAJOR 0
 #define KIWI_VERSION_MINOR 13
-#define KIWI_VERSION_PATCH 0
+#define KIWI_VERSION_PATCH 1
 
 #define KIWI_VERSION_STRING KIWI_STR(KIWI_VERSION_MAJOR) "." KIWI_STR(KIWI_VERSION_MINOR) "." KIWI_STR(KIWI_VERSION_PATCH)

src/Joiner.cpp

@@ -186,7 +186,7 @@ namespace kiwi
 				if (!node) break;
 			}
 
-			if (node && (formHead = node->val(kiwi->formTrie)) != nullptr)
+			if (node && kiwi->formTrie.hasMatch(formHead = node->val(kiwi->formTrie)))
 			{
 				Vector<const Morpheme*> cands;
 				do