Don't attach things to kakarijoshis

Kimtaro · Jul 17, 2013 · b294970 · b294970
1 parent 19d75df
commit b294970
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/lib/providers/mecab_ipadic.rb b/lib/providers/mecab_ipadic.rb
@@ -163,6 +163,7 @@ def initialize(text, output)
       FUHENKAGATA = '不変化型'
       JINMEI = '人名'
       MEIREI_I = '命令ｉ'
+      KAKARIJOSHI = '係助詞'
 
       # Etc
       NA = 'な'
@@ -177,6 +178,7 @@ def words
         words = []
         tokens = @tokens.find_all { |t| t[:type] == :parsed }
         tokens = tokens.to_enum
+        previous = nil
 
         # This is becoming very big
         begin
@@ -272,7 +274,8 @@ def words
             when JODOUSHI
               pos = Ve::PartOfSpeech::Postposition
 
-              if [TOKUSHU_TA, TOKUSHU_NAI, TOKUSHU_TAI, TOKUSHU_MASU, TOKUSHU_NU].include?(token[:inflection_type])
+              if (previous.nil? || (!previous.nil? && previous[:pos2] != KAKARIJOSHI)) &&
+                 [TOKUSHU_TA, TOKUSHU_NAI, TOKUSHU_TAI, TOKUSHU_MASU, TOKUSHU_NU].include?(token[:inflection_type])
                 attach_to_previous = true
               elsif token[:inflection_type] == FUHENKAGATA && token[:lemma] == NN
                 attach_to_previous = true
@@ -338,6 +341,8 @@ def words
 
               words << word
             end
+
+            previous = token
           end
         rescue StopIteration
         end

diff --git a/tests/mecab_ipadic_parse_test.rb b/tests/mecab_ipadic_parse_test.rb
@@ -739,11 +739,23 @@ def test_words
                              :pos => [Ve::PartOfSpeech::Verb, Ve::PartOfSpeech::Verb],
                              :extra => [{:reading=>"オシエテ", :transcription=>"オシエテ", :grammar=>nil}, {:reading=>"クダサイ", :transcription=>"クダサイ", :grammar=>nil}],
                              :tokens => [0..1, 2..2]},
-'教えてください', <<-EOR.split("\n"))
+                             '教えてください', <<-EOR.split("\n"))
 教え	動詞,自立,*,*,一段,連用形,教える,オシエ,オシエ,おしえ/教え,
 て	助詞,接続助詞,*,*,*,*,て,テ,テ,,
 ください	動詞,非自立,*,*,五段・ラ行特殊,命令ｉ,くださる,クダサイ,クダサイ,,
 EOS
+EOR
+
+    # はない
+    assert_parses_into_words(Ve::Parse::MecabIpadic, {:words => ["は", "ない"],
+                             :lemmas => ["は", "ない"],
+                             :pos => [Ve::PartOfSpeech::Postposition, Ve::PartOfSpeech::Postposition],
+                             :extra => [{:reading=>"ハ", :transcription=>"ワ", :grammar=>nil}, {:reading=>"ナイ", :transcription=>"ナイ", :grammar=>nil}],
+                             :tokens => [0..0, 1..1]},
+                             'はない', <<-EOR.split("\n"))
+は	助詞,係助詞,*,*,*,*,は,ハ,ワ,,
+ない	助動詞,*,*,*,特殊・ナイ,基本形,ない,ナイ,ナイ,,
+EOS
 EOR
 
     # TODO: xした should parse as adjective?