summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-28 02:27:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-28 02:27:14 +0000
commit2d82342cf299220e0e7f84d464b205231fd41e8f (patch)
tree17ecfd3cb9eaade2d48507ac28bc8777e3c12a4f /string.c
parent209a310c47a6e1f68f209bbf7038b12096d86b46 (diff)
string.c: unset $~ if unmatch
* string.c (rb_pat_search): unset $~ if the last match failed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/string.c b/string.c
index 6e316426af..2b0c69c6fc 100644
--- a/string.c
+++ b/string.c
@@ -3893,9 +3893,14 @@ rb_pat_search(VALUE pat, VALUE str, long pos, int set_backref_str)
{
if (BUILTIN_TYPE(pat) == T_STRING) {
pos = rb_str_index(str, pat, pos);
- if (pos >= 0 && set_backref_str) {
- str = rb_str_new_frozen(str);
- rb_backref_set_string(str, pos, RSTRING_LEN(pat));
+ if (set_backref_str) {
+ if (pos >= 0) {
+ str = rb_str_new_frozen(str);
+ rb_backref_set_string(str, pos, RSTRING_LEN(pat));
+ }
+ else {
+ rb_backref_set(Qnil);
+ }
}
return pos;
}