gettext 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2042428f38c26ad37b232abdd52d2450339e52fa476c129dd31ffd58ee7e7c8f
-  data.tar.gz: e7de1e426ce9699a0f8cc7e0fa7a1a9e4df9cc05af35b32911bb690dc2eeeac0
+  metadata.gz: 5391b52687ca78f695890c2d0b7d78b322ba32ce7b4978c12de1cbde7f2e682f
+  data.tar.gz: b589d0b3dc0a057526b17b5a196171365280d1e60fdc2f939be5a2381ecd1e4d
 SHA512:
-  metadata.gz: bcff65fd44de8574479c1d8d12d7d32c0b2fbb703516656f5ceadf57e3a6c7ceaa23985a1ad069db8fff222e53c3bd37333d1410c7e5c6d1398f2276e5300b8d
-  data.tar.gz: a653287bf1ca9b1361bc5e9aacb1bee26175d51a061d963915db161f80c38af2984bedb3757767d543e2f2c2e71dff5d6a30014a133fef38cde833985b478abc
+  metadata.gz: 774e933f6950156d08af1957e0f67d4a07b717ca42761c84fd6bf9ee2758304eb5ac0e58bdfbd6cce0a892ecce7ea6de4708cfee5ba39e58a64e325cb5acb885
+  data.tar.gz: c614dbf745ba89e691e4e40c38f73a2daba026eb58af0af0f638753a169f5ef18f2b93e9bf1311df4f086e916294db73ab0d3597f26fdd9ad51cf539c923ff26

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+## 3.3.5: 2020-02-15 {#version-3-3-5}
+
+### Improvements
+
+  * Added support for `|` method.
+    [GitHub#73][Reported by dorle-o]
+
+### Thanks
+
+  * dorle-o
+
 ## 3.3.4: 2020-02-12 {#version-3-3-4}
 
 ### Improvements

data/lib/gettext/tools/parser/ruby.rb

@@ -28,9 +28,9 @@ module GetText
       attr_accessor :comment_tag
       def initialize(*args)
         super(*args)
+        @start_block = false
         @in_block_arguments = false
         @ignore_next_comma = false
-        @context_stack = []
         @need_definition_name = false
         @current_po_entry = nil
         @current_po_entry_nth_attribute = 0
@@ -43,28 +43,31 @@ module GetText
       end
 
       def process_on_op(token, po)
-        @in_block_arguments = !@in_block_arguments if token == "|"
+        if @start_block
+          @in_block_arguments = (token == "|")
+        else
+          if @in_block_arguments and token == "|"
+            @in_block_arguments = false
+          end
+        end
         po
       end
 
       def process_on_kw(token, po)
         store_po_entry(po)
         case token
-        when "begin", "case", "do", "for"
-          @context_stack.push(token)
-        when "class", "def", "module"
-          @context_stack.push(token)
-        when "if", "unless", "until", "while"
-          # postfix case
-          unless state.allbits?(Ripper::EXPR_LABEL)
-            @context_stack.push(token)
-          end
-        when "end"
-          @context_stack.pop
+        when "do"
+          @start_block = true
         end
         po
       end
 
+      def process_on_lbrace(token, po)
+        store_po_entry(po)
+        @start_block = (state == Ripper::EXPR_BEG)
+        po
+      end
+
       def process_on_ident(token, po)
         store_po_entry(po)
 
@@ -280,11 +283,14 @@ module GetText
       def on_default(event, token, po)
         trace(event, token) do
           process_method = "process_#{event}"
+          start_block = @start_block
           if respond_to?(process_method)
-            __send__(process_method, token, po)
-          else
-            po
+            po = __send__(process_method, token, po)
+          end
+          if start_block and event != :on_sp
+            @start_block = false
           end
+          po
         end
       end
 
@@ -295,7 +301,16 @@ module GetText
       end
 
       def trace(event_name, token)
-        pp [event_name, token, state, @context_stack.last] if debug?
+        if debug?
+          status = [
+            event_name,
+            token,
+            state,
+          ]
+          status << :start_block if @start_block
+          status << :in_block_arguments if @in_block_arguments
+          pp status
+        end
         yield
       end
 

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "3.3.4"
+  VERSION = "3.3.5"
 end

data/po/bg/gettext.edit.po

@@ -342,7 +342,7 @@ msgid ""
 "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:20
+#: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
 msgid "World"
 msgstr ""
 
@@ -553,6 +553,10 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+#: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
+msgid "Hello"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
@@ -586,10 +590,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../test/fixtures/hello.rb:26
-msgid "Hello"
-msgstr ""
-
 #: ../test/fixtures/lower_n_.rb:33
 msgid ""
 "bbb\n"

data/po/bg/gettext.po

@@ -453,6 +453,9 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+msgid "Hello"
+msgstr ""
+
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 
@@ -479,9 +482,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-msgid "Hello"
-msgstr ""
-
 msgid ""
 "bbb\n"
 msgid_plural ""

data/po/bs/gettext.edit.po

@@ -347,7 +347,7 @@ msgid ""
 "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:20
+#: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
 msgid "World"
 msgstr ""
 
@@ -558,6 +558,10 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+#: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
+msgid "Hello"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
@@ -591,10 +595,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../test/fixtures/hello.rb:26
-msgid "Hello"
-msgstr ""
-
 #: ../test/fixtures/lower_n_.rb:33
 msgid ""
 "bbb\n"

data/po/bs/gettext.po

@@ -459,6 +459,9 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+msgid "Hello"
+msgstr ""
+
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 
@@ -485,9 +488,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-msgid "Hello"
-msgstr ""
-
 msgid ""
 "bbb\n"
 msgid_plural ""

data/po/ca/gettext.edit.po

@@ -342,7 +342,7 @@ msgid ""
 "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:20
+#: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
 msgid "World"
 msgstr ""
 
@@ -553,6 +553,10 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+#: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
+msgid "Hello"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
@@ -586,10 +590,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../test/fixtures/hello.rb:26
-msgid "Hello"
-msgstr ""
-
 #: ../test/fixtures/lower_n_.rb:33
 msgid ""
 "bbb\n"

data/po/ca/gettext.po

@@ -455,6 +455,9 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+msgid "Hello"
+msgstr ""
+
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 
@@ -481,9 +484,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-msgid "Hello"
-msgstr ""
-
 msgid ""
 "bbb\n"
 msgid_plural ""

data/po/cs/gettext.edit.po

@@ -349,7 +349,7 @@ msgid ""
 "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:20
+#: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
 msgid "World"
 msgstr ""
 
@@ -560,6 +560,10 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+#: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
+msgid "Hello"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
@@ -593,10 +597,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../test/fixtures/hello.rb:26
-msgid "Hello"
-msgstr ""
-
 #: ../test/fixtures/lower_n_.rb:33
 msgid ""
 "bbb\n"

data/po/cs/gettext.po

@@ -461,6 +461,9 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+msgid "Hello"
+msgstr ""
+
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 
@@ -487,9 +490,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-msgid "Hello"
-msgstr ""
-
 msgid ""
 "bbb\n"
 msgid_plural ""

data/po/de/gettext.edit.po

@@ -356,7 +356,7 @@ msgid ""
 "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:20
+#: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
 msgid "World"
 msgstr ""
 
@@ -567,6 +567,10 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+#: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
+msgid "Hello"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
@@ -600,10 +604,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../test/fixtures/hello.rb:26
-msgid "Hello"
-msgstr ""
-
 #: ../test/fixtures/lower_n_.rb:33
 msgid ""
 "bbb\n"

data/po/de/gettext.po

@@ -468,6 +468,9 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+msgid "Hello"
+msgstr ""
+
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 
@@ -494,9 +497,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-msgid "Hello"
-msgstr ""
-
 msgid ""
 "bbb\n"
 msgid_plural ""

data/po/el/gettext.edit.po

@@ -352,7 +352,7 @@ msgid ""
 "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:20
+#: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
 msgid "World"
 msgstr ""
 
@@ -563,6 +563,10 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+#: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
+msgid "Hello"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
@@ -596,10 +600,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../test/fixtures/hello.rb:26
-msgid "Hello"
-msgstr ""
-
 #: ../test/fixtures/lower_n_.rb:33
 msgid ""
 "bbb\n"

data/po/el/gettext.po

@@ -464,6 +464,9 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+msgid "Hello"
+msgstr ""
+
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 
@@ -490,9 +493,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-msgid "Hello"
-msgstr ""
-
 msgid ""
 "bbb\n"
 msgid_plural ""

data/po/eo/gettext.edit.po

@@ -355,7 +355,7 @@ msgid ""
 "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:20
+#: ../samples/hello2.rb:20 ../test/fixtures/_/pipe.rb:28
 msgid "World"
 msgstr ""
 
@@ -566,6 +566,10 @@ msgstr ""
 msgid "in_string_array"
 msgstr ""
 
+#: ../test/fixtures/_/pipe.rb:26 ../test/fixtures/hello.rb:26
+msgid "Hello"
+msgstr ""
+
 #: ../test/fixtures/backslash.rb:27
 msgid "You should escape '\\' as '\\\\'."
 msgstr ""
@@ -599,10 +603,6 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../test/fixtures/hello.rb:26
-msgid "Hello"
-msgstr ""
-
 #: ../test/fixtures/lower_n_.rb:33
 msgid ""
 "bbb\n"