nagachika	2014-09-10 23:30:48 +0900 (Wed, 10 Sep 2014)

  New Revision: 47519

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

  Log:
    merge r46831 partially. extracted commits are as follows. [Bug #9344]
    https://github.com/k-takata/Onigmo/commit/bdfc1997aa15b6baddaf9a482c6610b32504bd86
    
    * regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09.
      this includes Support for Unicode 7.0 [Bug #9092].

  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/regparse.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/regparse.c
===================================================================
--- ruby_2_1/regparse.c	(revision 47518)
+++ ruby_2_1/regparse.c	(revision 47519)
@@ -5293,30 +5293,23 @@ set_quantifier(Node* qnode, Node* target https://github.com/ruby/ruby/blob/trunk/ruby_2_1/regparse.c#L5293
 #ifdef USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR
       if (!IS_QUANTIFIER_BY_NUMBER(qn) && !IS_QUANTIFIER_BY_NUMBER(qnt) &&
 	  IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT)) {
-        UChar buf[WARN_BUFSIZE];
-
         switch (ReduceTypeTable[targetq_num][nestq_num]) {
         case RQ_ASIS:
           break;
 
         case RQ_DEL:
-          if (onig_verb_warn != onig_null_warn) {
-            onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
-                                 env->pattern, env->pattern_end,
-                                 (UChar* )"redundant nested repeat operator");
-            (*onig_verb_warn)((char* )buf);
+          if (onig_warn != onig_null_warn) {
+              onig_syntax_warn(env, "regular expression has redundant nested repeat operator '%s'",
+                               PopularQStr[targetq_num]);
           }
           goto warn_exit;
           break;
 
         default:
-          if (onig_verb_warn != onig_null_warn) {
-            onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
-                                       env->pattern, env->pattern_end,
-            (UChar* )"nested repeat operator %s and %s was replaced with '%s'",
-            PopularQStr[targetq_num], PopularQStr[nestq_num],
-            ReduceQStr[ReduceTypeTable[targetq_num][nestq_num]]);
-            (*onig_verb_warn)((char* )buf);
+          if (onig_warn != onig_null_warn) {
+              onig_syntax_warn(env, "nested repeat operator '%s' and '%s' was replaced with '%s' in regular expression",
+                               PopularQStr[targetq_num], PopularQStr[nestq_num],
+                               ReduceQStr[ReduceTypeTable[targetq_num][nestq_num]]);
           }
           goto warn_exit;
           break;
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47518)
+++ ruby_2_1/ChangeLog	(revision 47519)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Sep 10 23:14:42 2014  NARUSE, Yui  <naruse@r...>
+
+	merge r46831 partially. extracted commits are as follows. [Bug #9344]
+	https://github.com/k-takata/Onigmo/commit/bdfc1997aa15b6baddaf9a482c6610b32504bd86
+
+	* regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09.
+	  this includes Support for Unicode 7.0 [Bug #9092].
+
 Wed Sep 10 22:58:25 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (Doxyfile): revert r43888, not to require preinstalled
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47518)
+++ ruby_2_1/version.h	(revision 47519)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-10"
-#define RUBY_PATCHLEVEL 233
+#define RUBY_PATCHLEVEL 234
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

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