po-parser: fix a bug that fuzzy flags may be added to unrelated entry

If we parse the following PO with ignore_fuzzy: true, "non-fuzzy"
entry has "fuzzy" flag that was added to "hello" entry:

    #, fuzzy
    #: file.rb:10
    msgid "hello"
    msgstr "bonjour"

    msgid "non-fuzzy"
    msgstr "non-fuzzy string"

Author: kou

lib/gettext/po_parser.rb

@@ -19,7 +19,7 @@
 module GetText
   class POParser < Racc::Parser
 
-module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 122)
+module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 126)
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("gettext")
@@ -62,16 +62,8 @@ def unescape(string)
   private :unescape
 
   def parse(str, data)
-    @translator_comments = []
-    @extracted_comments = []
-    @references = []
-    @flags = []
-    @previous = []
-    @comments = []
+    clear
     @data = data
-    @fuzzy = false
-    @msgctxt = nil
-    @msgid_plural = nil
 
     str = str.strip
     @q = []
@@ -157,15 +149,7 @@ def on_message(msgid, msgstr)
       @data.set_comment(msgid, format_comment(@comments))
     end
 
-    @translator_comments = []
-    @extracted_comments = []
-    @references = []
-    @flags = []
-    @previous = []
-    @references = []
-    @comments.clear
-    @msgctxt = nil
-    @msgid_plural = nil
+    clear
   end
 
   def format_comment(comments)
@@ -263,6 +247,18 @@ def parse_references_line(line)
   def parse_flags_line(line)
     line.split(/\s+/)
   end
+
+  def clear
+    @translator_comments = []
+    @extracted_comments = []
+    @references = []
+    @flags = []
+    @previous = []
+    @references = []
+    @comments = []
+    @msgctxt = nil
+    @msgid_plural = nil
+  end
 ...end po_parser.ry/module_eval...
 ##### State transition tables begin ###
 
@@ -417,14 +413,18 @@ def _reduce_8(val, _values, result)
       end
     end
     @fuzzy = false
-    on_message(msgid, msgstr) if use_message_p
+    if use_message_p
+      on_message(msgid, msgstr)
+    else
+      clear
+    end
     result = ""
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 60)
+module_eval(<<'.,.,', 'po_parser.ry', 64)
   def _reduce_9(val, _values, result)
         if @fuzzy and ignore_fuzzy?
       if val[1] != ""
@@ -446,7 +446,7 @@ def _reduce_9(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 81)
+module_eval(<<'.,.,', 'po_parser.ry', 85)
   def _reduce_10(val, _values, result)
         if val[0].size > 0
       result = val[0] + "\000" + val[1]
@@ -460,31 +460,31 @@ def _reduce_10(val, _values, result)
 
 # reduce 11 omitted
 
-module_eval(<<'.,.,', 'po_parser.ry', 93)
+module_eval(<<'.,.,', 'po_parser.ry', 97)
   def _reduce_12(val, _values, result)
         result = val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 100)
+module_eval(<<'.,.,', 'po_parser.ry', 104)
   def _reduce_13(val, _values, result)
         on_comment(val[0])
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 108)
+module_eval(<<'.,.,', 'po_parser.ry', 112)
   def _reduce_14(val, _values, result)
         result = val.delete_if{|item| item == ""}.join
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 112)
+module_eval(<<'.,.,', 'po_parser.ry', 116)
   def _reduce_15(val, _values, result)
         result = val[0]
 

src/po_parser.ry

@@ -2,9 +2,9 @@
 #
 #  po_parser.ry - ruby version of msgfmt
 #
-#  Copyright (C) 2002-2008 Masao Mutoh <mutomasa at gmail.com>
-#  Copyright (C) 2012-2017 Kouhei Sutou <[email protected]>
-#  Copyright (C) 2012-2013 Haruka Yoshihara <[email protected]>
+#  Copyright (C) 2002-2008  Masao Mutoh <mutomasa at gmail.com>
+#  Copyright (C) 2012-2023  Sutou Kouhei <[email protected]>
+#  Copyright (C) 2012-2013  Haruka Yoshihara <[email protected]>
 #
 #  You may redistribute it and/or modify it under the same
 #  license terms as Ruby or LGPL.
@@ -51,7 +51,11 @@ class GetText::POParser
       end
     end
     @fuzzy = false
-    on_message(msgid, msgstr) if use_message_p
+    if use_message_p
+      on_message(msgid, msgstr)
+    else
+      clear
+    end
     result = ""
   }
 
@@ -161,16 +165,8 @@ require "gettext/po"
   private :unescape
 
   def parse(str, data)
-    @translator_comments = []
-    @extracted_comments = []
-    @references = []
-    @flags = []
-    @previous = []
-    @comments = []
+    clear
     @data = data
-    @fuzzy = false
-    @msgctxt = nil
-    @msgid_plural = nil
 
     str = str.strip
     @q = []
@@ -256,15 +252,7 @@ require "gettext/po"
       @data.set_comment(msgid, format_comment(@comments))
     end
 
-    @translator_comments = []
-    @extracted_comments = []
-    @references = []
-    @flags = []
-    @previous = []
-    @references = []
-    @comments.clear
-    @msgctxt = nil
-    @msgid_plural = nil
+    clear
   end
 
   def format_comment(comments)
@@ -362,5 +350,17 @@ require "gettext/po"
   def parse_flags_line(line)
     line.split(/\s+/)
   end
+
+  def clear
+    @translator_comments = []
+    @extracted_comments = []
+    @references = []
+    @flags = []
+    @previous = []
+    @references = []
+    @comments = []
+    @msgctxt = nil
+    @msgid_plural = nil
+  end
 ---- footer
 

test/test_po_parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  Sutou Kouhei <[email protected]>
+# Copyright (C) 2012-2023  Sutou Kouhei <[email protected]>
 # Copyright (C) 2012  Haruka Yoshihara <[email protected]>
 #
 # License: Ruby's or LGPL
@@ -238,6 +238,33 @@ def test_fuzzy
       assert_equal("fuzzy", entries["hello"].flag)
     end
 
+    def test_fuzzy_ignore
+      po_file = create_po_file(<<-PO)
+#, fuzzy
+#: file.rb:10
+msgid "hello"
+msgstr "bonjour"
+
+msgid "non-fuzzy"
+msgstr "non-fuzzy string"
+PO
+      entries = suppress_warning do
+        parse_po_file(po_file)
+      end
+
+      actual = entries.collect do |entry|
+        [
+          entry.msgid,
+          entry.msgstr,
+          entry.flags,
+        ]
+      end
+      assert_equal([
+                     ["non-fuzzy", "non-fuzzy string", []],
+                   ],
+                   actual)
+    end
+
     private
     def parse_po_file(po_file, options={:ignore_fuzzy => true})
       ignore_fuzzy = options[:ignore_fuzzy]