experteer-gettext 2.0.4.1 → 2.0.4.2

data/Rakefile

@@ -28,13 +28,12 @@ PKG_VERSION = GetText::VERSION
 desc "Create lib/gettext/poparser.rb"
 task :poparser do
   poparser_path = "lib/gettext/poparser.rb"
-  racc="racc"
-#  racc = File.join(Config::CONFIG['bindir'], "racc")
-#  if ! FileTest.exist?(racc)
-#    puts "racc was not found: #{racc}"
-#    exit 1
-#  else FileTest.exist?(racc)
-    system(racc,"-g","src/poparser.ry","-o","src/poparser.tmp.rb")
+  racc = File.join(Config::CONFIG['bindir'], "racc")
+  if ! FileTest.exist?(racc)
+    puts "racc was not found: #{racc}"
+    exit 1
+  else FileTest.exist?(racc)
+    ruby "#{racc} -g src/poparser.ry -o src/poparser.tmp.rb"
     $stderr.puts  %Q[ruby #{racc} -g src/poparser.ry -o src/poparser.tmp.rb]
 
     file = open(poparser_path, "w")
@@ -47,7 +46,7 @@ task :poparser do
 
   You may redistribute it and/or modify it under the same
   license terms as Ruby.
-EOS
+    EOS
     file.print "=end\n\n"
 
     tmpfile = open("src/poparser.tmp.rb")
@@ -56,7 +55,7 @@ EOS
     tmpfile.close
     File.delete("src/poparser.tmp.rb")
     $stderr.puts "Create #{poparser_path}."
-#  end
+  end
 end
 
 
@@ -67,15 +66,15 @@ task :makemo do
 
   $stderr.puts "Create samples mo files."
   GetText.create_mofiles(
-	:po_root => "samples/po", :mo_root => "samples/locale")
+    :po_root => "samples/po", :mo_root => "samples/locale")
 
   $stderr.puts "Create samples/cgi mo files."
   GetText.create_mofiles(
-	:po_root => "samples/cgi/po", :mo_root => "samples/cgi/locale")
+    :po_root => "samples/cgi/po", :mo_root => "samples/cgi/locale")
 
   $stderr.puts "Create test mo files."
   GetText.create_mofiles(
-	:po_root => "test/po", :mo_root => "test/locale")
+    :po_root => "test/po", :mo_root => "test/locale")
 end
 
 desc "Update pot/po files to match new version."
@@ -90,8 +89,8 @@ task :updatepo do
 
   #lib/gettext/*.rb -> rgettext.po
   GetText.update_pofiles("rgettext",
-                         Dir.glob("lib/**/*.rb") + ["src/poparser.ry"],
-                         "ruby-gettext #{GetText::VERSION}")
+    Dir.glob("lib/**/*.rb") + ["src/poparser.ry"],
+    "ruby-gettext #{GetText::VERSION}")
 end
 
 desc "Gather the newest po files. (for me)"
@@ -116,39 +115,39 @@ task :gatherpo => [:updatepo] do
 end
 
 def mv_pofiles(src_dir, target_dir, lang)
-   target = File.join(target_dir, lang)
-   unless File.exist?(target)
-     mkdir_p target
-     sh "cvs add #{target}"
-   end
-   cvs_add_targets = ""
-   Dir.glob(File.join(target_dir, "ja/*.po")).sort.each do |f|
-     srcfile = File.join(src_dir, File.basename(f))
-     if File.exist?(srcfile)
-       unless File.exist?(File.join(target, File.basename(f)))
-         cvs_add_targets << File.join(target, File.basename(f)) + " "
-       end
-       mv srcfile, target, :verbose => true
-     else
-       puts "mv #{srcfile} #{target}/ -- skipped"
-     end
-   end
-   sh "cvs add #{cvs_add_targets}" if cvs_add_targets.size > 0
+  target = File.join(target_dir, lang)
+  unless File.exist?(target)
+    mkdir_p target
+    sh "cvs add #{target}"
+  end
+  cvs_add_targets = ""
+  Dir.glob(File.join(target_dir, "ja/*.po")).sort.each do |f|
+    srcfile = File.join(src_dir, File.basename(f))
+    if File.exist?(srcfile)
+      unless File.exist?(File.join(target, File.basename(f)))
+        cvs_add_targets << File.join(target, File.basename(f)) + " "
+      end
+      mv srcfile, target, :verbose => true
+    else
+      puts "mv #{srcfile} #{target}/ -- skipped"
+    end
+  end
+  sh "cvs add #{cvs_add_targets}" if cvs_add_targets.size > 0
 end
 
 desc "Deploy localized pofiles to current source tree. (for me)"
 task :deploypo do
-     srcdir = ENV["SRCDIR"] ||= File.join(ENV["HOME"], "pofiles")
-     lang = ENV["LOCALE"]
-     unless lang
-       puts "USAGE: rake deploypo [SRCDIR=#{ENV["HOME"]}/pofiles] LOCALE=ja"
-       exit
-    end
-    puts "SRCDIR = #{srcdir}, LOCALE = #{lang}"
+  srcdir = ENV["SRCDIR"] ||= File.join(ENV["HOME"], "pofiles")
+  lang = ENV["LOCALE"]
+  unless lang
+    puts "USAGE: rake deploypo [SRCDIR=#{ENV["HOME"]}/pofiles] LOCALE=ja"
+    exit
+  end
+  puts "SRCDIR = #{srcdir}, LOCALE = #{lang}"
 
-    mv_pofiles(srcdir, "po", lang)
-    mv_pofiles(srcdir, "samples/cgi/po", lang)
-    mv_pofiles(srcdir, "samples/po", lang)
+  mv_pofiles(srcdir, "po", lang)
+  mv_pofiles(srcdir, "samples/cgi/po", lang)
+  mv_pofiles(srcdir, "samples/po", lang)
 end
 
 ############################################################
@@ -188,45 +187,18 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = false
 end
 
-task :package => [:makemo]
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = 'gettext'
-    s.version = PKG_VERSION
-    s.summary = 'Ruby-GetText-Package is a library and tools to localize messages.'
-    s.author = 'Masao Mutoh'
-    s.email = 'mutomasa at gmail.com'
-    s.homepage = 'http://gettext.rubyforge.org/'
-    s.rubyforge_project = "gettext"
-    s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS|^doc|^data|^src|^tmp.pot$|^test\/locale|^samples\/cgi\/locale|^samples\/locale|.gem$/}
-    s.require_path = 'lib'
-    s.executables = Dir.entries('bin').delete_if {|item| /^\.|CVS|~$/ =~ item }
-    s.bindir = 'bin'
-    s.add_dependency('locale', '>= 2.0.4')
-    s.has_rdoc = true
-    s.description = <<-EOF
-   Ruby-GetText-Package is a GNU GetText-like program for Ruby.
-   The catalog file(po-file) is same format with GNU GetText.
-  So you can use GNU GetText tools for maintaining.
-    EOF
-    end
-  rescue LoadError
-    puts "Jeweler not available."
-  end              
 ############################################################
 # Misc tasks
 ############################################################
 desc 'Run all tests'
 task :test do
-   Dir.chdir("test") do
-     if RUBY_PLATFORM =~ /win32/
-       sh "rake.bat", "test"
-     else
-       sh "rake", "test"
-     end
-   end
+  Dir.chdir("test") do
+    if RUBY_PLATFORM =~ /win32/
+      sh "rake.bat", "test"
+    else
+      sh "rake", "test"
+    end
+  end
 end
 
 Rake::RDocTask.new { |rdoc|
@@ -251,10 +223,39 @@ task :release => [ :package ] do
   rubyforge.configure
   rubyforge.login
   rubyforge.add_release("gettext", "gettext",
-                        "Ruby-GetText-Package #{PKG_VERSION}",
-                        "pkg/gettext-#{PKG_VERSION}.gem",
-                        "pkg/ruby-gettext-package-#{PKG_VERSION}.tar.gz")
+    "Ruby-GetText-Package #{PKG_VERSION}",
+    "pkg/gettext-#{PKG_VERSION}.gem",
+    "pkg/ruby-gettext-package-#{PKG_VERSION}.tar.gz")
 end
 
 desc "Setup Ruby-GetText-Package. (for setup.rb)"
 task :setup => [:makemo]
+
+
+begin
+  require 'jeweler'
+  ignore=/pkg|CVS|^doc|^data|^src|^tmp.pot$|^test|^samples\/cgi\/locale|^samples\/locale|.gem|^nbproject$/
+  Jeweler::Tasks.new do |s|
+    s.name = 'gettext'
+    s.version = PKG_VERSION
+    s.summary = 'Ruby-GetText-Package is a library and tools to localize messages.'
+    s.author = 'Masao Mutoh'
+    s.email = 'mutomasa at gmail.com'
+    s.homepage = 'http://gettext.rubyforge.org/'
+    s.rubyforge_project = "gettext"
+    s.files = FileList['**/*'].to_a.select{|v| v !~ ignore }
+    s.require_path = 'lib'
+    s.executables = Dir.entries('bin').delete_if {|item| /^\.|CVS|~$/ =~ item }
+    s.bindir = 'bin'
+    s.add_dependency('locale', '>= 2.0.4')
+    s.has_rdoc = true
+    s.description = <<-EOF
+   Ruby-GetText-Package is a GNU GetText-like program for Ruby.
+   The catalog file(po-file) is same format with GNU GetText.
+  So you can use GNU GetText tools for maintaining.
+    EOF
+  end
+rescue LoadError
+  puts "Jeweler not available."
+end
+

data/VERSION

@@ -1,3 +1,3 @@
-2.0.4.1
+2.0.4
 
 

data/lib/gettext/core_ext/string.rb

@@ -22,8 +22,8 @@ class String
 
   PERCENT_MATCH_RE = Regexp.union(
       /%%/,
-      /%\{(.+?)\}/,
-      /%<(.+?)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/
+      /%\{(\w+)\}/,
+      /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/
   )
 
   # call-seq:

data/lib/gettext/parser/ruby.rb

@@ -14,7 +14,6 @@
 
 require 'irb/ruby-lex.rb'
 require 'stringio'
-require 'gettext/translation_target.rb'
 
 class RubyLexX < RubyLex  # :nodoc: all
   # Parser#parse resemlbes RubyLex#lex
@@ -58,25 +57,6 @@ class RubyLexX < RubyLex  # :nodoc: all
     return nil
   end
 
-  # Original parser does not keep the content of the comments,
-  # so monkey patching this with new token type and extended
-  # identify_comment implementation
-  RubyToken.def_token :TkCOMMENT_WITH_CONTENT, TkVal
-
-  def identify_comment
-    @ltype = "#"
-    get_readed # skip the hash sign itself
-
-    while ch = getc
-      if ch == "\n"
-        @ltype = nil
-        ungetc
-        break
-      end
-    end
-    return Token(TkCOMMENT_WITH_CONTENT, get_readed)
-  end
-
 end
 
 module GetText
@@ -101,73 +81,70 @@ module GetText
       #rl.readed_auto_clean_up = true
 
       target = nil
+      msgid = nil
       line_no = nil
-      last_extracted_comment = ''
-      reset_extracted_comment = false
       rl.parse do |tk|
         begin
           case tk
           when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT
             if ID.include?(tk.name)
-              target = TranslationTarget.new(:normal)
+              target = :normal
             elsif PLURAL_ID.include?(tk.name)
-              target = TranslationTarget.new(:plural)
+              target = :plural
             elsif MSGCTXT_ID.include?(tk.name)
-              target = TranslationTarget.new(:msgctxt)
+              target = :msgctxt
             elsif MSGCTXT_PLURAL_ID.include?(tk.name)
-              target = TranslationTarget.new(:msgctxt_plural)
+              target = :msgctxt_plural
             else
               target = nil
             end
             line_no = tk.line_no.to_s
           when RubyToken::TkSTRING
-            target.set_current_attribute tk.value if target
+            if target
+              if msgid
+                msgid += tk.value
+              else
+                msgid = tk.value
+              end
+            end
           when RubyToken::TkPLUS, RubyToken::TkNL
             #do nothing
           when RubyToken::TkCOMMA
-            target.advance_to_next_attribute if target
+            if msgid
+              case target
+              when :plural
+                msgid += "\000"
+                target = :normal
+              when :msgctxt
+                msgid += "\004"
+                target = :normal
+              when :msgctxt_plural
+                msgid += "\004"
+                target = :plural
+              else
+                target = :normal
+              end
+            end
           else
-            if target && target.msgid
-              existing=targets.find {|t| t.matches?(target)}
-              existing=targets.index(existing) if existing
-              if existing
-                target = targets[existing].merge(target)
-                targets[existing] = target
+            if msgid
+              key_existed = targets.assoc(msgid.gsub(/\n/, '\n'))
+              if key_existed
+                targets[targets.index(key_existed)] = key_existed <<
+                file_name + ":" + line_no
               else
-                targets << target
+                targets << [msgid.gsub(/\n/, '\n'), file_name + ":" + line_no]
               end
-              target.occurrences << file_name + ":" + line_no
-              target.add_extracted_comment last_extracted_comment unless last_extracted_comment.empty?
+              msgid = nil
               target = nil
             end
           end
+          targets
         rescue
-          $stderr.print "\n\nError"
-          $stderr.print " parsing #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}" if tk
-          $stderr.print "\n #{$!.inspect} in\n"
-          $stderr.print $!.backtrace.join("\n")
+          $stderr.print "\n\nError: #{$!.inspect} "
+          $stderr.print " in #{file_name}:#{tk.line_no}\n\t #{lines[tk.line_no - 1]}" if tk
           $stderr.print "\n"
           exit 1
         end
-
-        case tk 
-        when RubyToken::TkCOMMENT_WITH_CONTENT
-          last_extracted_comment = "" if reset_extracted_comment
-          if last_extracted_comment.empty?
-            # new comment from programmer to translator?
-            comment1 = tk.value.lstrip
-            if comment1 =~ /^TRANSLATORS\:/
-              last_extracted_comment += $'
-            end
-          else
-            last_extracted_comment += "\n" 
-            last_extracted_comment += tk.value
-          end
-          reset_extracted_comment = false
-        when RubyToken::TkNL
-        else
-          reset_extracted_comment = true
-        end
       end
       targets
     end

data/lib/gettext/poparser.rb

@@ -9,15 +9,18 @@
 
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
-# from Racc grammer file "".
+# This file is automatically generated by racc 1.4.5
+# from racc grammer file "src/poparser.ry".
 #
 
-require 'racc/parser.rb'
+require 'racc/parser'
+
+
 module GetText
+
   class PoParser < Racc::Parser
 
-module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 108)
+module_eval <<'..end src/poparser.ry modeval..ida5d3d657e2', 'src/poparser.ry', 108
   include GetText
   GetText.bindtextdomain("rgettext")
 
@@ -126,8 +129,31 @@ module_eval(<<'...end poparser.ry/module_eval...', 'poparser.ry', 108)
     Encoding.default_external
   end
   private :detect_file_encoding
-...end poparser.ry/module_eval...
-##### State transition tables begin ###
+..end src/poparser.ry modeval..ida5d3d657e2
+
+##### racc 1.4.5 generates ###
+
+racc_reduce_table = [
+ 0, 0, :racc_error,
+ 0, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 10, :_reduce_none,
+ 2, 12, :_reduce_5,
+ 1, 13, :_reduce_none,
+ 1, 13, :_reduce_none,
+ 4, 15, :_reduce_8,
+ 5, 16, :_reduce_9,
+ 2, 17, :_reduce_10,
+ 1, 17, :_reduce_none,
+ 3, 18, :_reduce_12,
+ 1, 11, :_reduce_13,
+ 2, 14, :_reduce_14,
+ 1, 14, :_reduce_15 ]
+
+racc_reduce_n = 16
+
+racc_shift_n = 26
 
 racc_action_table = [
      3,    13,     5,     7,     9,    15,    16,    17,    20,    17,
@@ -161,109 +187,86 @@ racc_goto_pointer = [
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
-racc_reduce_table = [
-  0, 0, :racc_error,
-  0, 10, :_reduce_none,
-  2, 10, :_reduce_none,
-  2, 10, :_reduce_none,
-  2, 10, :_reduce_none,
-  2, 12, :_reduce_5,
-  1, 13, :_reduce_none,
-  1, 13, :_reduce_none,
-  4, 15, :_reduce_8,
-  5, 16, :_reduce_9,
-  2, 17, :_reduce_10,
-  1, 17, :_reduce_none,
-  3, 18, :_reduce_12,
-  1, 11, :_reduce_13,
-  2, 14, :_reduce_14,
-  1, 14, :_reduce_15 ]
-
-racc_reduce_n = 16
-
-racc_shift_n = 26
-
 racc_token_table = {
-  false => 0,
-  :error => 1,
-  :COMMENT => 2,
-  :MSGID => 3,
-  :MSGCTXT => 4,
-  :MSGID_PLURAL => 5,
-  :MSGSTR => 6,
-  :STRING => 7,
-  :PLURAL_NUM => 8 }
-
-racc_nt_base = 9
+ false => 0,
+ Object.new => 1,
+ :COMMENT => 2,
+ :MSGID => 3,
+ :MSGCTXT => 4,
+ :MSGID_PLURAL => 5,
+ :MSGSTR => 6,
+ :STRING => 7,
+ :PLURAL_NUM => 8 }
 
 racc_use_result_var = true
 
+racc_nt_base = 9
+
 Racc_arg = [
-  racc_action_table,
-  racc_action_check,
-  racc_action_default,
-  racc_action_pointer,
-  racc_goto_table,
-  racc_goto_check,
-  racc_goto_default,
-  racc_goto_pointer,
-  racc_nt_base,
-  racc_reduce_table,
-  racc_token_table,
-  racc_shift_n,
-  racc_reduce_n,
-  racc_use_result_var ]
+ racc_action_table,
+ racc_action_check,
+ racc_action_default,
+ racc_action_pointer,
+ racc_goto_table,
+ racc_goto_check,
+ racc_goto_default,
+ racc_goto_pointer,
+ racc_nt_base,
+ racc_reduce_table,
+ racc_token_table,
+ racc_shift_n,
+ racc_reduce_n,
+ racc_use_result_var ]
 
 Racc_token_to_s_table = [
-  "$end",
-  "error",
-  "COMMENT",
-  "MSGID",
-  "MSGCTXT",
-  "MSGID_PLURAL",
-  "MSGSTR",
-  "STRING",
-  "PLURAL_NUM",
-  "$start",
-  "msgfmt",
-  "comment",
-  "msgctxt",
-  "message",
-  "string_list",
-  "single_message",
-  "plural_message",
-  "msgstr_plural",
-  "msgstr_plural_line" ]
+'$end',
+'error',
+'COMMENT',
+'MSGID',
+'MSGCTXT',
+'MSGID_PLURAL',
+'MSGSTR',
+'STRING',
+'PLURAL_NUM',
+'$start',
+'msgfmt',
+'comment',
+'msgctxt',
+'message',
+'string_list',
+'single_message',
+'plural_message',
+'msgstr_plural',
+'msgstr_plural_line']
 
 Racc_debug_parser = true
 
-##### State transition tables end #####
+##### racc system variables end #####
 
-# reduce 0 omitted
+ # reduce 0 omitted
 
-# reduce 1 omitted
+ # reduce 1 omitted
 
-# reduce 2 omitted
+ # reduce 2 omitted
 
-# reduce 3 omitted
+ # reduce 3 omitted
 
-# reduce 4 omitted
+ # reduce 4 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 23)
-  def _reduce_5(val, _values, result)
-        @msgctxt = unescape(val[1]) + "\004"
-  
-    result
+module_eval <<'.,.,', 'src/poparser.ry', 25
+  def _reduce_5( val, _values, result )
+    @msgctxt = unescape(val[1]) + "\004"
+   result
   end
 .,.,
 
-# reduce 6 omitted
+ # reduce 6 omitted
 
-# reduce 7 omitted
+ # reduce 7 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 35)
-  def _reduce_8(val, _values, result)
-        if @fuzzy and $ignore_fuzzy 
+module_eval <<'.,.,', 'src/poparser.ry', 48
+  def _reduce_8( val, _values, result )
+    if @fuzzy and $ignore_fuzzy 
       if val[1] != ""
         $stderr.print _("Warning: fuzzy message was ignored.\n")
         $stderr.print "         msgid '#{val[1]}'\n"
@@ -275,14 +278,13 @@ module_eval(<<'.,.,', 'poparser.ry', 35)
       on_message(@msgctxt + unescape(val[1]), unescape(val[3]))
     end
     result = ""
-  
-    result
+   result
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 52)
-  def _reduce_9(val, _values, result)
-        if @fuzzy and $ignore_fuzzy
+module_eval <<'.,.,', 'src/poparser.ry', 65
+  def _reduce_9( val, _values, result )
+    if @fuzzy and $ignore_fuzzy
       if val[1] != ""
         $stderr.print _("Warning: fuzzy message was ignored.\n")
         $stderr.print "msgid = '#{val[1]}\n"
@@ -294,62 +296,55 @@ module_eval(<<'.,.,', 'poparser.ry', 52)
       on_message(@msgctxt + unescape(val[1]) + "\000" + unescape(val[3]), unescape(val[4]))
     end
     result = ""
-  
-    result
+   result
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 70)
-  def _reduce_10(val, _values, result)
-        if val[0].size > 0
+module_eval <<'.,.,', 'src/poparser.ry', 76
+  def _reduce_10( val, _values, result )
+    if val[0].size > 0
       result = val[0] + "\000" + val[1]
     else
       result = ""
     end
-  
-    result
+   result
   end
 .,.,
 
-# reduce 11 omitted
+ # reduce 11 omitted
 
-module_eval(<<'.,.,', 'poparser.ry', 82)
-  def _reduce_12(val, _values, result)
-        result = val[2]
-  
-    result
+module_eval <<'.,.,', 'src/poparser.ry', 84
+  def _reduce_12( val, _values, result )
+    result = val[2]
+   result
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 89)
-  def _reduce_13(val, _values, result)
-        on_comment(val[0])
-  
-    result
+module_eval <<'.,.,', 'src/poparser.ry', 91
+  def _reduce_13( val, _values, result )
+    on_comment(val[0])
+   result
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 97)
-  def _reduce_14(val, _values, result)
-        result = val.delete_if{|item| item == ""}.join
-  
-    result
+module_eval <<'.,.,', 'src/poparser.ry', 99
+  def _reduce_14( val, _values, result )
+    result = val.delete_if{|item| item == ""}.join
+   result
   end
 .,.,
 
-module_eval(<<'.,.,', 'poparser.ry', 101)
-  def _reduce_15(val, _values, result)
-        result = val[0]
-  
-    result
+module_eval <<'.,.,', 'src/poparser.ry', 103
+  def _reduce_15( val, _values, result )
+    result = val[0]
+   result
   end
 .,.,
 
-def _reduce_none(val, _values, result)
-  val[0]
-end
+ def _reduce_none( val, _values, result )
+  result
+ end
 
   end   # class PoParser
-  end   # module GetText
-
 
+end   # module GetText