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

parse.y: set location of string/literals in the lexer instead of actions

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2018-01-16 02:00:16 +00:00
parent cf924a05e0
commit 6fe72f294d
1 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
parse.y
View File

@ -3489,12 +3489,6 @@ strings : string
; ;
string : tCHAR string : tCHAR
{
/*%%%*/
nd_set_loc($$, &@$);
/*%
%*/
}
| string1 | string1
| string string1 | string string1
{ {
@ -3633,7 +3627,6 @@ qword_list : /* none */
| qword_list tSTRING_CONTENT ' ' | qword_list tSTRING_CONTENT ' '
{ {
/*%%%*/ /*%%%*/
nd_set_loc($2, &@2);
$$ = list_append(p, $1, $2); $$ = list_append(p, $1, $2);
/*% /*%
$$ = dispatch2(qwords_add, $1, $2); $$ = dispatch2(qwords_add, $1, $2);
@ -3652,7 +3645,6 @@ qsym_list : /* none */
| qsym_list tSTRING_CONTENT ' ' | qsym_list tSTRING_CONTENT ' '
{ {
/*%%%*/ /*%%%*/
nd_set_loc($2, &@2);
$$ = symbol_append(p, $1, $2); $$ = symbol_append(p, $1, $2);
/*% /*%
$$ = dispatch2(qsymbols_add, $1, $2); $$ = dispatch2(qsymbols_add, $1, $2);
@ -3746,12 +3738,6 @@ regexp_contents: /* none */
; ;
string_content : tSTRING_CONTENT string_content : tSTRING_CONTENT
{
/*%%%*/
nd_set_loc($$, &@$);
/*%
%*/
}
| tSTRING_DVAR | tSTRING_DVAR
{ {
/* need to backup p->lex.strterm so that a string literal `%&foo,#$&,bar&` can be parsed */ /* need to backup p->lex.strterm so that a string literal `%&foo,#$&,bar&` can be parsed */
@ -3879,33 +3865,9 @@ numeric : simple_numeric
; ;
simple_numeric : tINTEGER simple_numeric : tINTEGER
{
/*%%%*/
nd_set_loc($$, &@$);
/*%
%*/
}
| tFLOAT | tFLOAT
{
/*%%%*/
nd_set_loc($$, &@$);
/*%
%*/
}
| tRATIONAL | tRATIONAL
{
/*%%%*/
nd_set_loc($$, &@$);
/*%
%*/
}
| tIMAGINARY | tIMAGINARY
{
/*%%%*/
nd_set_loc($$, &@$);
/*%
%*/
}
; ;
user_variable : tIDENTIFIER user_variable : tIDENTIFIER
@ -4664,11 +4626,19 @@ static enum yytokentype parser_here_document(struct parser_params*,rb_strterm_he
# define set_integer_literal(v, f) parser_set_integer_literal(p, (v), (f)) # define set_integer_literal(v, f) parser_set_integer_literal(p, (v), (f))
#ifndef RIPPER #ifndef RIPPER
# define set_yylval_str(x) (yylval.node = NEW_STR(x, &NULL_LOC)) # define set_yylval_str(x) { \
YYLTYPE loc; \
rb_parser_set_location(p, &loc); \
yylval.node = NEW_STR(x, &loc); \
}
# define set_yylval_literal(x) { \
YYLTYPE loc; \
rb_parser_set_location(p, &loc); \
yylval.node = NEW_LIT(x, &loc); \
}
# define set_yylval_num(x) (yylval.num = (x)) # define set_yylval_num(x) (yylval.num = (x))
# define set_yylval_id(x) (yylval.id = (x)) # define set_yylval_id(x) (yylval.id = (x))
# define set_yylval_name(x) (yylval.id = (x)) # define set_yylval_name(x) (yylval.id = (x))
# define set_yylval_literal(x) (yylval.node = NEW_LIT(x, &NULL_LOC))
# define set_yylval_node(x) (yylval.node = (x)) # define set_yylval_node(x) (yylval.node = (x))
# define yylval_id() (yylval.id) # define yylval_id() (yylval.id)
#else #else