* regcomp.c: Merge Onigmo 988517a4f16f14acbd7cc9d5b51a096d5153992c.

  [Bug #9344].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 7efd56df51..19f52ea8f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 12 11:30:50 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* regcomp.c: Merge Onigmo 988517a4f16f14acbd7cc9d5b51a096d5153992c.
+	  [Bug #9344].
+
 Fri Sep 12 11:22:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (Doxyfile): revert r43888, not to require preinstalled
diff --git a/regparse.c b/regparse.c
index 7e57cfaaee..d5693d109e 100644
--- a/regparse.c
+++ b/regparse.c
@@ -5288,30 +5288,23 @@ set_quantifier(Node* qnode, Node* target, int group, ScanEnv* env)
 #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;
diff --git a/version.h b/version.h
index 1c1fd89d9b..eb4c6dfec6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-09-12"
-#define RUBY_PATCHLEVEL 568
+#define RUBY_PATCHLEVEL 569
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9