po parser: fix a too much unescape bug

Author: kou

lib/gettext/po_parser.rb

@@ -8,7 +8,7 @@
 
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 
@@ -19,7 +19,7 @@
 module GetText
   class POParser < Racc::Parser
 
-module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 123)
+module_eval(<<'...end po_parser.ry/module_eval...', 'po_parser.ry', 122)
   if GetText.respond_to?(:bindtextdomain)
     include GetText
     GetText.bindtextdomain("gettext")
@@ -44,20 +44,23 @@ def report_warning?
     @report_warning
   end
 
-  def unescape(orig)
-    ret = orig.gsub(/\\n/, "\n")
-    ret.gsub!(/\\t/, "\t")
-    ret.gsub!(/\\r/, "\r")
-    ret.gsub!(/\\"/, "\"")
-    ret
+  def unescape(string)
+    string.gsub(/\\(.)/) do
+      escaped_character = $1
+      case escaped_character
+      when "t"
+        "\t"
+      when "r"
+        "\r"
+      when "n"
+        "\n"
+      else
+        escaped_character
+      end
+    end
   end
   private :unescape
 
-  def unescape_string(string)
-    string.gsub(/\\\\/, "\\")
-  end
-  private :unescape_string
-
   def parse(str, data)
     @translator_comments = []
     @extracted_comments = []
@@ -102,7 +105,7 @@ def parse(str, data)
         @q.push [:COMMENT, $&]
         str = $'
       when /\A\"(.*)\"/
-        @q.push [:STRING, unescape_string($1)]
+        @q.push [:STRING, unescape($1)]
         str = $'
       else
         #c = str[0,1]
@@ -387,7 +390,7 @@ def parse_flags_line(line)
 
 module_eval(<<'.,.,', 'po_parser.ry', 26)
   def _reduce_5(val, _values, result)
-        @msgctxt = unescape(val[1])
+        @msgctxt = val[1]
 
     result
   end
@@ -399,9 +402,8 @@ def _reduce_5(val, _values, result)
 
 module_eval(<<'.,.,', 'po_parser.ry', 38)
   def _reduce_8(val, _values, result)
-        msgid_raw = val[1]
-    msgid = unescape(msgid_raw)
-    msgstr = unescape(val[3])
+        msgid = val[1]
+    msgstr = val[3]
     use_message_p = true
     if @fuzzy and not msgid.empty?
       use_message_p = (not ignore_fuzzy?)
@@ -411,7 +413,7 @@ def _reduce_8(val, _values, result)
         else
           $stderr.print _("Warning: fuzzy message was used.\n")
         end
-        $stderr.print "  #{@po_file}: msgid '#{msgid_raw}'\n"
+        $stderr.print "  #{@po_file}: msgid '#{msgid}'\n"
       end
     end
     @fuzzy = false
@@ -422,7 +424,7 @@ def _reduce_8(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 61)
+module_eval(<<'.,.,', 'po_parser.ry', 60)
   def _reduce_9(val, _values, result)
         if @fuzzy and ignore_fuzzy?
       if val[1] != ""
@@ -444,7 +446,7 @@ def _reduce_9(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 82)
+module_eval(<<'.,.,', 'po_parser.ry', 81)
   def _reduce_10(val, _values, result)
         if val[0].size > 0
       result = val[0] + "\000" + val[1]
@@ -458,31 +460,31 @@ def _reduce_10(val, _values, result)
 
 # reduce 11 omitted
 
-module_eval(<<'.,.,', 'po_parser.ry', 94)
+module_eval(<<'.,.,', 'po_parser.ry', 93)
   def _reduce_12(val, _values, result)
         result = val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 101)
+module_eval(<<'.,.,', 'po_parser.ry', 100)
   def _reduce_13(val, _values, result)
         on_comment(val[0])
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 109)
+module_eval(<<'.,.,', 'po_parser.ry', 108)
   def _reduce_14(val, _values, result)
         result = val.delete_if{|item| item == ""}.join
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'po_parser.ry', 113)
+module_eval(<<'.,.,', 'po_parser.ry', 112)
   def _reduce_15(val, _values, result)
         result = val[0]