kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: append to buffer

Browse source 
* parse.y (reg_compile_gen): always append error message to the
  error buffer.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-10-22 14:33:58 +00:00
parent bd3eb8afec
commit 2adba2dc5e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Oct 22 23:33:55 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (reg_compile_gen): always append error message to the
error buffer.
Sat Oct 22 22:33:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Oct 22 22:33:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (num_funcall1): check recursion by inverse pair, to * numeric.c (num_funcall1): check recursion by inverse pair, to

5
parse.y
View file

@ -10626,12 +10626,7 @@ reg_compile_gen(struct parser_params* parser, VALUE str, int options)
if (NIL_P(re)) { if (NIL_P(re)) {
VALUE m = rb_attr_get(rb_errinfo(), idMesg); VALUE m = rb_attr_get(rb_errinfo(), idMesg);
rb_set_errinfo(err); rb_set_errinfo(err);
if (!NIL_P(err)) {
rb_str_append(rb_str_cat(rb_attr_get(err, idMesg), "\n", 1), m);
}
else {
compile_error(PARSER_ARG "%"PRIsVALUE, m); compile_error(PARSER_ARG "%"PRIsVALUE, m);
}
return Qnil; return Qnil;
} }
return re; return re;