From a953d28e3c8827f40eb803876be3fdc29e8e0b30 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 13 Sep 2008 18:22:04 +0000 Subject: * 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 --- parse.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index eab982b75f..70d77e1429 100644 --- a/parse.y +++ b/parse.y @@ -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; -- cgit v1.2.3