1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* regparse.c (onig_syntax_warn): added.

Browse Source 
* regparse.c (CC_ESC_WARN, CLOSE_BRACKET_WITHOUT_ESC_WARN,
  CC_DUP_WARN, UNKNOWN_ESC_WARN): use onig_syntax_warn.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-10-10 18:12:26 +00:00
parent 95b3da63f1
commit 8e9fb2e14c
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun Oct 11 03:10:50 2009 NARUSE, Yui <naruse@ruby-lang.org>
* regparse.c (onig_syntax_warn): added.
* regparse.c (CC_ESC_WARN, CLOSE_BRACKET_WITHOUT_ESC_WARN,
CC_DUP_WARN, UNKNOWN_ESC_WARN): use onig_syntax_warn.
Sun Oct 11 00:14:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Oct 11 00:14:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (marshal_dump, marshal_load): prevent from GC. * marshal.c (marshal_dump, marshal_load): prevent from GC.

51
regparse.c
View File

@ -2845,17 +2845,29 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
#endif /* USE_NAMED_GROUP */ #endif /* USE_NAMED_GROUP */
static void static void
CC_ESC_WARN(ScanEnv* env, UChar *c) onig_syntax_warn(ScanEnv *env, const char *fmt, ...)
{
va_list args;
UChar buf[WARN_BUFSIZE];
va_start(args, fmt);
onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
env->pattern, env->pattern_end,
(const UChar *)fmt, args);
va_end(args);
if (env->sourcefile == NULL)
rb_warn(fmt, buf);
else
rb_compile_warn(env->sourcefile, env->sourceline, fmt, buf);
}
static void
CC_ESC_WARN(ScanEnv *env, UChar *c)
{ {
if (onig_warn == onig_null_warn) return ; if (onig_warn == onig_null_warn) return ;
if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_CC_OP_NOT_ESCAPED) && if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_CC_OP_NOT_ESCAPED) &&
IS_SYNTAX_BV(env->syntax, ONIG_SYN_BACKSLASH_ESCAPE_IN_CC)) { IS_SYNTAX_BV(env->syntax, ONIG_SYN_BACKSLASH_ESCAPE_IN_CC)) {
UChar buf[WARN_BUFSIZE]; onig_syntax_warn(env, "character class has '%s' without escape", c);
onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
env->pattern, env->pattern_end,
(UChar* )"character class has '%s' without escape", c);
(*onig_warn)((char* )buf);
} }
} }
@ -2865,48 +2877,27 @@ CLOSE_BRACKET_WITHOUT_ESC_WARN(ScanEnv* env, UChar* c)
if (onig_warn == onig_null_warn) return ; if (onig_warn == onig_null_warn) return ;
if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_OP_NOT_ESCAPED)) { if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_OP_NOT_ESCAPED)) {
UChar buf[WARN_BUFSIZE]; onig_syntax_warn(env, "regular expression has '%s' without escape", c);
onig_snprintf_with_pattern(buf, WARN_BUFSIZE, (env)->enc,
(env)->pattern, (env)->pattern_end,
(UChar* )"regular expression has '%s' without escape", c);
(*onig_warn)((char* )buf);
} }
} }
static void static void
CC_DUP_WARN(ScanEnv *env) CC_DUP_WARN(ScanEnv *env)
{ {
UChar buf[WARN_BUFSIZE];
if (onig_warn == onig_null_warn || !RTEST(ruby_verbose)) return ; if (onig_warn == onig_null_warn || !RTEST(ruby_verbose)) return ;
if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_DUP) && if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_DUP) &&
!((env)->warnings_flag & ONIG_SYN_WARN_CC_DUP)) { !((env)->warnings_flag & ONIG_SYN_WARN_CC_DUP)) {
(env)->warnings_flag |= ONIG_SYN_WARN_CC_DUP; (env)->warnings_flag |= ONIG_SYN_WARN_CC_DUP;
onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc, onig_syntax_warn(env, "character class has duplicated range");
env->pattern, env->pattern_end,
(UChar* )"character class has duplicated range");
if (env->sourcefile == NULL)
(*onig_warn)((char* )buf);
else
rb_compile_warn(env->sourcefile, env->sourceline, (char* )buf);
} }
} }
static void static void
UNKNOWN_ESC_WARN(ScanEnv *env, int c) UNKNOWN_ESC_WARN(ScanEnv *env, int c)
{ {
UChar buf[WARN_BUFSIZE];
if (onig_warn == onig_null_warn || !RTEST(ruby_verbose)) return ; if (onig_warn == onig_null_warn || !RTEST(ruby_verbose)) return ;
onig_syntax_warn(env, "Unknown escape \\%c is ignored", c);
onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
env->pattern, env->pattern_end,
(UChar* )"Unknown escape \\%c is ignored", c);
if (env->sourcefile == NULL)
(*onig_warn)((char* )buf);
else
rb_compile_warn(env->sourcefile, env->sourceline, (char* )buf);
} }
static UChar* static UChar*