Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Joiner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ namespace kiwi
if (l == r && (POSTag::sf <= l && l <= POSTag::sn)) return true;
if (r == POSTag::vcp) return false;
if (r == POSTag::xsa || r == POSTag::xsai || r == POSTag::xsv || r == POSTag::xsn) return isJClass(l);
if (l == POSTag::xpn || l == POSTag::so || l == POSTag::ss || l == POSTag::sw) return false;
if (l == POSTag::sn && r == POSTag::nnb) return false;
if (l == POSTag::xpn || l == POSTag::so || l == POSTag::ss || l == POSTag::sw
|| l == POSTag::sso || l == POSTag::ssc) return false;
if (l == POSTag::sn && (r == POSTag::nnb || r == POSTag::sw)) return false;
if (!(l == POSTag::sn || l == POSTag::sl)
&& (r == POSTag::sl || r == POSTag::sn)) return true;
if (l == POSTag::sn && r == POSTag::nr) return false;
if (l == POSTag::sso || l == POSTag::ssc) return false;
if (r == POSTag::sso) return true;
if ((isJClass(l) || isEClass(l)) && r == POSTag::ss) return true;
if (l == POSTag::z_siot && isNNClass(r)) return false;
Expand Down
60 changes: 60 additions & 0 deletions test/test_cpp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,66 @@ TEST(KiwiCpp, JoinRestore)
}
}

TEST(KiwiCpp, IssueP220)
{
Kiwi& kiwi = reuseKiwiInstance();

// 여는 괄호 뒤, 닫는 괄호 뒤에는 오른쪽이 무엇이든 공백을 넣지 않는다.
auto joiner = kiwi.newJoiner();
joiner.add(u"(", POSTag::sso);
joiner.add(u"mike", POSTag::sl);
joiner.add(u")", POSTag::ssc);
EXPECT_EQ(joiner.getU16(), u"(mike)");

joiner = kiwi.newJoiner();
joiner.add(u"(", POSTag::sso);
joiner.add(u"1", POSTag::sn);
joiner.add(u")", POSTag::ssc);
EXPECT_EQ(joiner.getU16(), u"(1)");

// 숫자 뒤에 오는 기호에는 공백을 넣지 않는다.
joiner = kiwi.newJoiner();
joiner.add(u"9", POSTag::sn);
joiner.add(u"%", POSTag::sw);
joiner.add(u"씩", POSTag::mag);
EXPECT_EQ(joiner.getU16(), u"9%씩");

joiner = kiwi.newJoiner();
joiner.add(u"30", POSTag::sn);
joiner.add(u"℃", POSTag::sw);
joiner.add(u"까지", POSTag::jx);
EXPECT_EQ(joiner.getU16(), u"30℃까지");

// 여는 괄호 앞과 한글 뒤 기호 앞의 공백은 그대로 유지된다.
joiner = kiwi.newJoiner();
joiner.add(u"mike", POSTag::sl);
joiner.add(u"(", POSTag::sso);
joiner.add(u"a", POSTag::sl);
joiner.add(u")", POSTag::ssc);
EXPECT_EQ(joiner.getU16(), u"mike (a)");

joiner = kiwi.newJoiner();
joiner.add(u"사과", POSTag::nng);
joiner.add(u"%", POSTag::sw);
EXPECT_EQ(joiner.getU16(), u"사과 %");

// 분석 결과를 형태와 품사만으로 다시 이었을 때 원문이 복원되어야 한다.
for (auto c : {
u8"9%씩 올랐다.",
u8"(mike)에게 물었다.",
u8"30℃까지 오른다.",
})
{
auto tokens = kiwi.analyze(c, Match::allWithNormalizing).first;
auto j = kiwi.newJoiner();
for (auto& t : tokens)
{
j.add(t.str, t.tag, false);
}
EXPECT_EQ(j.getU8(), c);
}
}

TEST(KiwiCpp, JoinZSiot)
{
Kiwi& kiwi = reuseKiwiInstance();
Expand Down
Loading