Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add rb_parser_set_pos function #5089

Merged
merged 4 commits into from
Dec 16, 2021
Merged

Add rb_parser_set_pos function #5089

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ac3aa6
Add rb_parser_set_pos function
S-H-GAMELINKS Nov 6, 2021
26b8293
Fix indent
S-H-GAMELINKS Nov 6, 2021
50d3774
Fix indents [ci skip]
nobu Nov 7, 2021
bb6eba4
Add static modifier
S-H-GAMELINKS Nov 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions parse.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10782,6 +10782,16 @@ rb_parser_fatal(struct parser_params *p, const char *fmt, ...)
p->debug = TRUE;
}

static YYLTYPE *
rb_parser_set_pos(YYLTYPE *yylloc, int sourceline, int beg_pos, int end_pos)
{
yylloc->beg_pos.lineno = sourceline;
yylloc->beg_pos.column = beg_pos;
yylloc->end_pos.lineno = sourceline;
yylloc->end_pos.column = end_pos;
return yylloc;
}

YYLTYPE *
rb_parser_set_location_from_strterm_heredoc(struct parser_params *p, rb_strterm_heredoc_t *here, YYLTYPE *yylloc)
{
Expand All @@ -10790,31 +10800,25 @@ rb_parser_set_location_from_strterm_heredoc(struct parser_params *p, rb_strterm_
- (rb_strlen_lit("<<-") - !(here->func & STR_FUNC_INDENT));
int end_pos = (int)here->offset + here->length + here->quote;

yylloc->beg_pos.lineno = sourceline;
yylloc->beg_pos.column = beg_pos;
yylloc->end_pos.lineno = sourceline;
yylloc->end_pos.column = end_pos;
return yylloc;
return rb_parser_set_pos(yylloc, sourceline, beg_pos, end_pos);
}

YYLTYPE *
rb_parser_set_location_of_none(struct parser_params *p, YYLTYPE *yylloc)
{
yylloc->beg_pos.lineno = p->ruby_sourceline;
yylloc->beg_pos.column = (int)(p->lex.ptok - p->lex.pbeg);
yylloc->end_pos.lineno = p->ruby_sourceline;
yylloc->end_pos.column = (int)(p->lex.ptok - p->lex.pbeg);
return yylloc;
int sourceline = p->ruby_sourceline;
int beg_pos = (int)(p->lex.ptok - p->lex.pbeg);
int end_pos = (int)(p->lex.ptok - p->lex.pbeg);
return rb_parser_set_pos(yylloc, sourceline, beg_pos, end_pos);
}

YYLTYPE *
rb_parser_set_location(struct parser_params *p, YYLTYPE *yylloc)
{
yylloc->beg_pos.lineno = p->ruby_sourceline;
yylloc->beg_pos.column = (int)(p->lex.ptok - p->lex.pbeg);
yylloc->end_pos.lineno = p->ruby_sourceline;
yylloc->end_pos.column = (int)(p->lex.pcur - p->lex.pbeg);
return yylloc;
int sourceline = p->ruby_sourceline;
int beg_pos = (int)(p->lex.ptok - p->lex.pbeg);
int end_pos = (int)(p->lex.pcur - p->lex.pbeg);
return rb_parser_set_pos(yylloc, sourceline, beg_pos, end_pos);
}
#endif /* !RIPPER */

Expand Down