From 30b1947df2da2192f7fcc812ac88dc1884715322 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 20 Aug 2013 17:41:13 +0000
Subject: * insns.def: fix regexp's once option behavior.   fix [ruby-trunk -
 Bug #6701] * insns.def: remove `onceinlinecache' and introduce `once'
 instruction.   `once' doesn't use `setinlinecache' insn any more. *
 vm_core.h: `union iseq_inline_storage_entry' to store once data. * compile.c:
 catch up above changes. * iseq.c: ditto. * vm.c, vm_insnhelper.c: ditto. fix
 `m_core_set_postexe()' which   is depend on `onceinlinecache' insn. *
 test/ruby/test_regexp.rb: add tests. * iseq.c: ISEQ_MINOR_VERSION to 1
 (should increment major?)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_regexp.rb | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'test/ruby/test_regexp.rb')

diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index c32b48fe4c..5982d23e1f 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -966,6 +966,45 @@ class TestRegexp < Test::Unit::TestCase
     }
   end
 
+  def test_once
+    pr1 = proc{|i| /#{i}/o}
+    assert_equal(/0/, pr1.call(0))
+    assert_equal(/0/, pr1.call(1))
+    assert_equal(/0/, pr1.call(2))
+
+    # recursive
+    pr2 = proc{|i|
+      if i > 0
+        /#{pr2.call(i-1).to_s}#{i}/
+      else
+        //
+      end
+    }
+    assert_equal(/(?-mix:(?-mix:(?-mix:)1)2)3/, pr2.call(3))
+
+    # multi-thread
+    m = Mutex.new
+    pr3 = proc{|i|
+      /#{m.unlock; sleep 0.5; i}/o
+    }
+    ary = []
+    n = 0
+    th1 = Thread.new{m.lock; ary << pr3.call(n+=1)}
+    th2 = Thread.new{m.lock; ary << pr3.call(n+=1)}
+    th1.join; th2.join
+    assert_equal([/1/, /1/], ary)
+
+    # escape
+    pr4 = proc{|i|
+      catch(:xyzzy){
+        /#{throw :xyzzy, i}/o
+        :ng
+      }
+    }
+    assert_equal(0, pr4.call(0))
+    assert_equal(1, pr4.call(1))
+  end
+
   # This assertion is for porting x2() tests in testpy.py of Onigmo.
   def assert_match_at(re, str, positions, msg = nil)
     re = Regexp.new(re) unless re.is_a?(Regexp)
-- 
cgit v1.2.3