archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-28 15:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

parse.y: yyerror1

Browse source 
* parse.y (yyerror1): pass location to parser_yyerror.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-12-31 15:05:26 +00:00
parent 374e7c79ea
commit 5ceb137091
1 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

63
parse.y
View file

@ -292,6 +292,7 @@ struct parser_params {
static int parser_yyerror(struct parser_params*, const YYLTYPE *yylloc, const char*); static int parser_yyerror(struct parser_params*, const YYLTYPE *yylloc, const char*);
#define yyerror0(msg) parser_yyerror(parser, NULL, (msg)) #define yyerror0(msg) parser_yyerror(parser, NULL, (msg))
#define yyerror1(loc, msg) parser_yyerror(parser, (loc), (msg))
#define yyerror(yylloc, parser, msg) parser_yyerror(parser, yylloc, msg) #define yyerror(yylloc, parser, msg) parser_yyerror(parser, yylloc, msg)
#define token_flush(p) ((p)->lex.ptok = (p)->lex.pcur) #define token_flush(p) ((p)->lex.ptok = (p)->lex.pcur)
@ -1339,7 +1340,7 @@ stmt_or_begin : stmt
} }
| keyword_BEGIN | keyword_BEGIN
{ {
yyerror0("BEGIN is permitted only at toplevel"); yyerror1(&@1, "BEGIN is permitted only at toplevel");
/*%%%*/ /*%%%*/
/* local_push(0); */ /* local_push(0); */
/*% /*%
@ -1392,7 +1393,7 @@ stmt : keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
| keyword_alias tGVAR tNTH_REF | keyword_alias tGVAR tNTH_REF
{ {
/*%%%*/ /*%%%*/
yyerror0("can't make alias for the number variables"); yyerror1(&@3, "can't make alias for the number variables");
$$ = new_begin(0, &@$); $$ = new_begin(0, &@$);
/*% /*%
$$ = dispatch2(var_alias, $2, $3); $$ = dispatch2(var_alias, $2, $3);
@ -2039,7 +2040,7 @@ lhs : user_variable
cname : tIDENTIFIER cname : tIDENTIFIER
{ {
/*%%%*/ /*%%%*/
yyerror0("class/module name must be CONSTANT"); yyerror1(&@1, "class/module name must be CONSTANT");
/*% /*%
$$ = dispatch1(class_name_error, $1); $$ = dispatch1(class_name_error, $1);
ripper_error(); ripper_error();
@ -2975,8 +2976,12 @@ primary : literal
} }
| k_class cpath superclass | k_class cpath superclass
{ {
if (in_def) if (in_def) {
yyerror0("class definition in method body"); YYLTYPE location;
location.first_loc = @1.first_loc;
location.last_loc = @2.last_loc;
yyerror1(&location, "class definition in method body");
}
$<num>1 = in_class; $<num>1 = in_class;
in_class = 1; in_class = 1;
local_push(0); local_push(0);
@ -3026,8 +3031,12 @@ primary : literal
} }
| k_module cpath | k_module cpath
{ {
if (in_def) if (in_def) {
yyerror0("module definition in method body"); YYLTYPE location;
location.first_loc = @1.first_loc;
location.last_loc = @2.last_loc;
yyerror1(&location, "module definition in method body");
}
$<num>1 = in_class; $<num>1 = in_class;
in_class = 1; in_class = 1;
local_push(0); local_push(0);
@ -3235,7 +3244,7 @@ k_end : keyword_end
k_return : keyword_return k_return : keyword_return
{ {
if (in_class && !in_def && !dyna_in_block()) if (in_class && !in_def && !dyna_in_block())
yyerror0("Invalid return in class/module body"); yyerror1(&@1, "Invalid return in class/module body");
} }
; ;
@ -4591,7 +4600,7 @@ f_args : f_arg ',' f_optarg ',' f_rest_arg opt_args_tail
f_bad_arg : tCONSTANT f_bad_arg : tCONSTANT
{ {
/*%%%*/ /*%%%*/
yyerror0("formal argument cannot be a constant"); yyerror1(&@1, "formal argument cannot be a constant");
$$ = 0; $$ = 0;
/*% /*%
$$ = dispatch1(param_error, $1); $$ = dispatch1(param_error, $1);
@ -4601,7 +4610,7 @@ f_bad_arg : tCONSTANT
| tIVAR | tIVAR
{ {
/*%%%*/ /*%%%*/
yyerror0("formal argument cannot be an instance variable"); yyerror1(&@1, "formal argument cannot be an instance variable");
$$ = 0; $$ = 0;
/*% /*%
$$ = dispatch1(param_error, $1); $$ = dispatch1(param_error, $1);
@ -4611,7 +4620,7 @@ f_bad_arg : tCONSTANT
| tGVAR | tGVAR
{ {
/*%%%*/ /*%%%*/
yyerror0("formal argument cannot be a global variable"); yyerror1(&@1, "formal argument cannot be a global variable");
$$ = 0; $$ = 0;
/*% /*%
$$ = dispatch1(param_error, $1); $$ = dispatch1(param_error, $1);
@ -4621,7 +4630,7 @@ f_bad_arg : tCONSTANT
| tCVAR | tCVAR
{ {
/*%%%*/ /*%%%*/
yyerror0("formal argument cannot be a class variable"); yyerror1(&@1, "formal argument cannot be a class variable");
$$ = 0; $$ = 0;
/*% /*%
$$ = dispatch1(param_error, $1); $$ = dispatch1(param_error, $1);
@ -4884,7 +4893,7 @@ f_rest_arg : restarg_mark tIDENTIFIER
{ {
/*%%%*/ /*%%%*/
if (!is_local_id($2)) if (!is_local_id($2))
yyerror0("rest argument must be local variable"); yyerror1(&@2, "rest argument must be local variable");
/*% %*/ /*% %*/
arg_var(shadowing_lvar(get_id($2))); arg_var(shadowing_lvar(get_id($2)));
/*%%%*/ /*%%%*/
@ -4912,9 +4921,9 @@ f_block_arg : blkarg_mark tIDENTIFIER
{ {
/*%%%*/ /*%%%*/
if (!is_local_id($2)) if (!is_local_id($2))
yyerror0("block argument must be local variable"); yyerror1(&@2, "block argument must be local variable");
else if (!dyna_in_block() && local_id($2)) else if (!dyna_in_block() && local_id($2))
yyerror0("duplicated block argument name"); yyerror1(&@2, "duplicated block argument name");
/*% %*/ /*% %*/
arg_var(shadowing_lvar(get_id($2))); arg_var(shadowing_lvar(get_id($2)));
/*%%%*/ /*%%%*/
@ -4953,7 +4962,7 @@ singleton : var_ref
{ {
/*%%%*/ /*%%%*/
if ($3 == 0) { if ($3 == 0) {
yyerror0("can't define singleton method for ()."); yyerror1(&@2, "can't define singleton method for ().");
} }
else { else {
switch (nd_type($3)) { switch (nd_type($3)) {
@ -4965,7 +4974,7 @@ singleton : var_ref
case NODE_LIT: case NODE_LIT:
case NODE_ARRAY: case NODE_ARRAY:
case NODE_ZARRAY: case NODE_ZARRAY:
yyerror0("can't define singleton method for literals"); yyerror1(&@2, "can't define singleton method for literals");
break; break;
default: default:
value_expr($3); value_expr($3);
@ -9985,25 +9994,25 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val, const YYLTYPE *lo
if (!id) return assignable_error(); if (!id) return assignable_error();
switch (id) { switch (id) {
case keyword_self: case keyword_self:
yyerror0("Can't change the value of self"); yyerror1(location, "Can't change the value of self");
goto error; goto error;
case keyword_nil: case keyword_nil:
yyerror0("Can't assign to nil"); yyerror1(location, "Can't assign to nil");
goto error; goto error;
case keyword_true: case keyword_true:
yyerror0("Can't assign to true"); yyerror1(location, "Can't assign to true");
goto error; goto error;
case keyword_false: case keyword_false:
yyerror0("Can't assign to false"); yyerror1(location, "Can't assign to false");
goto error; goto error;
case keyword__FILE__: case keyword__FILE__:
yyerror0("Can't assign to __FILE__"); yyerror1(location, "Can't assign to __FILE__");
goto error; goto error;
case keyword__LINE__: case keyword__LINE__:
yyerror0("Can't assign to __LINE__"); yyerror1(location, "Can't assign to __LINE__");
goto error; goto error;
case keyword__ENCODING__: case keyword__ENCODING__:
yyerror0("Can't assign to __ENCODING__"); yyerror1(location, "Can't assign to __ENCODING__");
goto error; goto error;
} }
switch (id_type(id)) { switch (id_type(id)) {
@ -10037,7 +10046,7 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val, const YYLTYPE *lo
case ID_CONST: case ID_CONST:
if (!in_def) if (!in_def)
return assignable_result(new_cdecl(id, val, 0, location)); return assignable_result(new_cdecl(id, val, 0, location));
yyerror0("dynamic constant assignment"); yyerror1(location, "dynamic constant assignment");
break; break;
case ID_CLASS: case ID_CLASS:
return assignable_result(NEW_CVASGN(id, val)); return assignable_result(NEW_CVASGN(id, val));
@ -10280,7 +10289,7 @@ value_expr_gen(struct parser_params *parser, NODE *node)
case NODE_NEXT: case NODE_NEXT:
case NODE_REDO: case NODE_REDO:
case NODE_RETRY: case NODE_RETRY:
if (!cond) yyerror0("void value expression"); if (!cond) yyerror1(&node->nd_loc, "void value expression");
/* or "control never reach"? */ /* or "control never reach"? */
return FALSE; return FALSE;
@ -11093,7 +11102,7 @@ static NODE *
const_decl_gen(struct parser_params *parser, NODE *path, const YYLTYPE *location) const_decl_gen(struct parser_params *parser, NODE *path, const YYLTYPE *location)
{ {
if (in_def) { if (in_def) {
yyerror0("dynamic constant assignment"); yyerror1(location, "dynamic constant assignment");
} }
return new_cdecl(0, 0, (path), location); return new_cdecl(0, 0, (path), location);
} }