diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-13 18:22:04 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-13 18:22:04 +0000 |
commit | a953d28e3c8827f40eb803876be3fdc29e8e0b30 (patch) | |
tree | a5a2bd2007b01b23772dc1258d8f12c6dd692cef /parse.y | |
parent | d3974573e791db91180abacae649c2d6b40e3f5c (diff) | |
download | ruby-a953d28e3c8827f40eb803876be3fdc29e8e0b30.tar.gz |
* include/ruby/oniguruma.h (onigenc_get_prev_char_head): add end
argument.
* include/ruby/encoding.h (rb_enc_prev_char): ditto.
* regenc.c (onigenc_get_prev_char_head): add end argument.
* regparse.c: follow the interface change.
* regexec.c: ditto.
* string.c: ditto.
* parse.y: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4877,11 +4877,11 @@ parser_yyerror(struct parser_params *parser, const char *msg) if (len > max_line_margin * 2 + 10) { if (lex_p - p > max_line_margin) { - p = rb_enc_prev_char(p, lex_p - max_line_margin, rb_enc_get(lex_lastline)); + p = rb_enc_prev_char(p, lex_p - max_line_margin, pe, rb_enc_get(lex_lastline)); pre = "..."; } if (pe - lex_p > max_line_margin) { - pe = rb_enc_prev_char(lex_p, lex_p + max_line_margin, rb_enc_get(lex_lastline)); + pe = rb_enc_prev_char(lex_p, lex_p + max_line_margin, pe, rb_enc_get(lex_lastline)); post = "..."; } len = pe - p; |