[macruby-changes] [4212] MacRuby/trunk/string.c

[source_changes at macosforge.org]

Revision: 4212
          http://trac.macosforge.org/projects/ruby/changeset/4212
Author:   martinlagardette at apple.com
Date:     2010-06-07 18:25:44 -0700 (Mon, 07 Jun 2010)
Log Message:
-----------
Do not yield in `rstr_match2` (already handled by `regex_match2`)

 - Fixes #739

Modified Paths:
--------------
    MacRuby/trunk/string.c

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2010-06-07 05:11:30 UTC (rev 4211)
+++ MacRuby/trunk/string.c	2010-06-08 01:25:44 UTC (rev 4212)
@@ -2911,11 +2911,7 @@
     }
     VALUE re = get_pat(argv[0], false);
     argv[0] = self;
-    VALUE result = regexp_match2(re, 0, argc, argv);
-    if (!NIL_P(result) && rb_block_given_p()) {
-	return rb_yield(result);
-    }
-    return result;
+    return regexp_match2(re, 0, argc, argv);
 }
 
 /*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100607/07b881f4/attachment.html>