Merge pull request #215 from bab2min/dev/issue_214

Fix #214

Author: bab2min

Diff for: .github/workflows/arm64_centos7.yml

@@ -14,7 +14,7 @@ jobs:
       with:
         submodules: true
         lfs: true
-    - uses: bab2min/run-on-arch-action@multiple-step
+    - uses: bab2min/run-on-arch-action@multiple-step-v2
       id: runcmd
       with:
         image: quay.io/pypa/manylinux2014_aarch64

Diff for: .github/workflows/ppc64le_centos7.yml

@@ -14,7 +14,7 @@ jobs:
       with:
         submodules: true
         lfs: true
-    - uses: bab2min/run-on-arch-action@multiple-step
+    - uses: bab2min/run-on-arch-action@multiple-step-v2
       id: runcmd
       with:
         image: quay.io/pypa/manylinux2014_ppc64le

Diff for: include/kiwi/Form.h

@@ -166,6 +166,28 @@ namespace kiwi
 
 		/** 분할된 형태소의 경우 원형 형태소를 반환한다. 그 외에는 자기 자신을 반환한다. */
 		const Morpheme* getCombined() const { return this + combined; }
+
+		bool hasComplex() const
+		{
+			if (getCombined()->complex) return true;
+
+			for (auto c : chunks)
+			{
+				if (c->complex) return true;
+			}
+			return false;
+		}
+
+		template<class Container>
+		bool hasMorpheme(Container&& m) const
+		{
+			if (m.count(getCombined())) return true;
+			for (auto c : chunks)
+			{
+				if (m.count(c)) return true;
+			}
+			return false;
+		}
 	};
 
 	/**

Diff for: src/PathEvaluator.hpp

@@ -871,8 +871,8 @@ namespace kiwi
 		{
 			for (auto& curMorph : cands)
 			{
-				if (splitComplex && curMorph->getCombined()->complex) continue;
-				if (blocklist && blocklist->count(curMorph->getCombined())) continue;
+				if (splitComplex && curMorph->hasComplex()) continue;
+				if (blocklist && curMorph->hasMorpheme(*blocklist)) continue;
 
 				// 덧붙은 받침(zCoda)을 위한 지름길
 				if (curMorph->tag == POSTag::z_coda)

Diff for: test/test_cpp.cpp

@@ -187,6 +187,20 @@ TEST(KiwiCpp, SplitComplex)
 			EXPECT_EQ(res2.first[0].str, u"감사");
 		}
 	}
+	
+	{
+		auto testCases = {
+			u"집에 갔어요",
+			u"집에 가요",
+		};
+		for (auto s : testCases)
+		{
+			auto res1 = kiwi.analyze(s, Match::allWithNormalizing);
+			auto res2 = kiwi.analyze(s, Match::allWithNormalizing | Match::splitComplex);
+			EXPECT_EQ(res1.first[res1.first.size() - 1].str, u"어요");
+			EXPECT_EQ(res2.first[res2.first.size() - 1].str, u"요");
+		}
+	}
 }
 
 TEST(KiwiCpp, OldHangul)