diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-28 09:43:49 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-28 09:43:49 +0000 |
| commit | 90d5bcf9104fe58887cf705b718a9c7b537b51a5 (patch) | |
| tree | ddad772917567e032a6b34254ebdf4f9d321bbb0 /parse.y | |
| parent | 8af7ed60368c030e95ec782022538254d256d590 (diff) | |
* re.c (rb_reg_expr_str): need to escape if the coderage is invalid.
* error.c, include/ruby/intern.h (rb_compile_error_with_enc): new
function to raise syntax error, with source encoding'ed message.
* parse.y (compile_error): use above function.
[ruby-core:33951] (#4217)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -308,6 +308,7 @@ static int parser_yyerror(struct parser_params*, const char*); #define ruby__end__seen (parser->parser_ruby__end__seen) #define ruby_sourceline (parser->parser_ruby_sourceline) #define ruby_sourcefile (parser->parser_ruby_sourcefile) +#define current_enc (parser->enc) #define yydebug (parser->parser_yydebug) #ifdef RIPPER #else @@ -586,8 +587,9 @@ static void ripper_compile_error(struct parser_params*, const char *fmt, ...); # define compile_error ripper_compile_error # define PARSER_ARG parser, #else -# define compile_error parser->nerr++,rb_compile_error -# define PARSER_ARG ruby_sourcefile, ruby_sourceline, +# define rb_compile_error rb_compile_error_with_enc +# define compile_error parser->nerr++,rb_compile_error_with_enc +# define PARSER_ARG ruby_sourcefile, ruby_sourceline, current_enc, #endif /* Older versions of Yacc set YYMAXDEPTH to a very low value by default (150, |