naruse	2009-09-09 17:19:06 +0900 (Wed, 09 Sep 2009)

  New Revision: 24819

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24819

  Log:
    Only 1 kcode effects options [ruby-core:25411]

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24818)
+++ ChangeLog	(revision 24819)
@@ -1,3 +1,8 @@
+Wed Sep  9 17:17:31 2009  NARUSE, Yui  <naruse@r...>
+
+	* re.c (parser_regx_options): only one kcode should effect
+	  options [ruby-core:25411]
+
 Wed Sep  9 15:46:28 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* load.c (rb_feature_provided): fixed for autoloading extension
Index: parse.y
===================================================================
--- parse.y	(revision 24818)
+++ parse.y	(revision 24819)
@@ -5588,6 +5588,7 @@
 parser_regx_options(struct parser_params *parser)
 {
     int kcode = 0;
+    int kopt = 0;
     int options = 0;
     int c, opt, kc;
 
@@ -5597,13 +5598,14 @@
             options |= RE_OPTION_ONCE;
         }
         else if (rb_char_to_option_kcode(c, &opt, &kc)) {
-            options |= opt;
+            kopt = opt;
 	    if (kc >= 0) kcode = c;
         }
         else {
 	    tokadd(c);
         }
     }
+    options |= kopt;
     pushback(c);
     if (toklen()) {
 	tokfix();

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/