xmp2assert 3 → 4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e895dead7be33e2d883950ffc4472e4ed4c49b
-  data.tar.gz: 81805143514b795409f5258853471d67794f698a
+  metadata.gz: 5a15f8a34b7183990bbd04f98d8f5b1fcc54cb9c
+  data.tar.gz: 7d04d08869fb960cf5ba2e5d5729be6b370ddc66
 SHA512:
-  metadata.gz: 974409606e9bc0812d5d01ba91329b51f2a095ced6fc5cf64b765685a4d978bd260e4279274a0402b7ca6480777df07d095cd883b53bd269d70e2333464e5897
-  data.tar.gz: 32860b61ca5ebf164f81e4209b8c66bc8ea243bd48793d75eb0f8f6fc6ff87b09477cb76810a4f1b15f19efc7827ad78fb639ffbe2db8854464c8bd01f6a1ccf
+  metadata.gz: 2e2b16bb8de650a087f79498a57f74ccdf1c6a881be820de74eec8cc7a361b7ab4a7df7de77e8e427d8c507d9768dc68381d820a8ba2f3fcfd7ec0c3f5db9fae
+  data.tar.gz: 65c30d860c41290b76038f0f76aec79a3ec3e67d8070f709fa354d76057967234c6a19e222d6bf89dba633075c9bdc74a2e088b01723318020a49cbefb50eeb6

data/lib/xmp2assert/converter.rb

@@ -142,12 +142,49 @@ class XMP2Assert::Converter
 
   def need_paren? list
     start = list.first.to_sym.to_s
-    stop  = list.last .to_sym.to_s
 
     if %r/(.+)_beg$/ =~ start then
-      return %r/#{$1}_end$/ !~ stop
+      t = $1
+      list.inject 0 do |i, tok|
+        tt = tok.to_sym.to_s
+        if %r/#{t}_beg$/ =~ tt
+          next i + 1
+        elsif %r/#{t}_end$/ =~ tt
+          j = i - 1
+          if j > 0 then
+            next j
+          elsif tok == list.last
+            return false
+          else
+            return true
+          end
+        else
+          next i
+        end
+      end
+      return true
+
     elsif %r/^l(paren|brace|bracket)$/ =~ start then
-      return %r/^r#{$1}$/ !~ stop
+      t = $1
+      list.inject 0 do |i, tok|
+        tt = tok.to_sym.to_s
+        if %r/^l#{t}$/ =~ tt
+          next i + 1
+        elsif %r/^r#{t}$/ =~ tt
+          j = i - 1
+          if j > 0 then
+            next j
+          elsif tok == list.last
+            return false
+          else
+            return true
+          end
+        else
+          next i
+        end
+      end
+      return true
+
     else
       return true
     end

data/lib/xmp2assert/version.rb

@@ -24,4 +24,4 @@
 # SOFTWARE.
 ;
 
-XMP2Assert::VERSION = 3
+XMP2Assert::VERSION = 4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmp2assert
 version: !ruby/object:Gem::Version
-  version: '3'
+  version: '4'
 platform: ruby
 authors:
 - Urabe, Shyouhei