From decc012cf07d4a55d2d01c2ad34e28c733bd32aa Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 19 May 2016 02:37:38 +0000 Subject: re.c: match? should return nil if no match * re.c (rb_reg_match_m_p): should return nil if no match, as the document says. [Feature #8110] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- re.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 're.c') diff --git a/re.c b/re.c index 36c12a6f6b..c83b3f5ba2 100644 --- a/re.c +++ b/re.c @@ -3230,7 +3230,7 @@ rb_reg_match_m_p(int argc, VALUE *argv, VALUE re) int tmpreg; rb_scan_args(argc, argv, "11", &str, &initpos); - if (NIL_P(str)) return Qnil; + if (NIL_P(str)) return Qfalse; str = SYMBOL_P(str) ? rb_sym2str(str) : rb_str_to_str(str); if (argc == 2) { pos = NUM2LONG(initpos); @@ -3238,14 +3238,14 @@ rb_reg_match_m_p(int argc, VALUE *argv, VALUE re) if (pos < 0) { pos += NUM2LONG(rb_str_length(str)); if (pos == 0) goto run; - if (pos < 0) return Qnil; + if (pos < 0) return Qfalse; } pos = rb_str_offset(str, pos); } run: if (pos >= RSTRING_LEN(str)) { - return Qnil; + return Qfalse; } reg = rb_reg_prepare_re0(re, str, err); tmpreg = reg != RREGEXP_PTR(re); -- cgit v1.2.3