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

Show proper location for warning [Feature #15575]

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-02-04 08:13:37 +00:00
parent 9acd2b20c8
commit df2b8c05ba
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compile.c
View File

@ -5922,14 +5922,17 @@ qcall_branch_end(rb_iseq_t *iseq, LINK_ANCHOR *const ret, LABEL *else_label, VAL
} }
static int static int
check_yield_place(const rb_iseq_t *iseq) check_yield_place(const rb_iseq_t *iseq, int line)
{ {
VALUE file;
switch (iseq->body->local_iseq->body->type) { switch (iseq->body->local_iseq->body->type) {
case ISEQ_TYPE_TOP: case ISEQ_TYPE_TOP:
case ISEQ_TYPE_MAIN: case ISEQ_TYPE_MAIN:
return FALSE; return FALSE;
case ISEQ_TYPE_CLASS: case ISEQ_TYPE_CLASS:
rb_warn("`yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575]"); file = rb_iseq_path(iseq);
rb_compile_warn(RSTRING_PTR(file), line,
"`yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575]");
return TRUE; return TRUE;
default: default:
return TRUE; return TRUE;
@ -6843,7 +6846,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
INIT_ANCHOR(args); INIT_ANCHOR(args);
if (check_yield_place(iseq) == FALSE) { if (check_yield_place(iseq, line) == FALSE) {
COMPILE_ERROR(ERROR_ARGS "Invalid yield"); COMPILE_ERROR(ERROR_ARGS "Invalid yield");
goto ng; goto ng;
} }