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

[Bug #19312] Return end-of-input at __END__

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-01-06 20:26:11 +09:00 committed by Benoit Daloze
parent d9520bf2de
commit cee5beab1d
Notes: git 2025-04-09 13:49:37 +00:00 
Merged: https://github.com/ruby/ruby/pull/7077
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
parse.y
View File

@ -9813,7 +9813,7 @@ parser_yylex(struct parser_params *p)
#endif #endif
/* Set location for end-of-input because dispatch_scan_event is not called. */ /* Set location for end-of-input because dispatch_scan_event is not called. */
RUBY_SET_YYLLOC(*p->yylloc); RUBY_SET_YYLLOC(*p->yylloc);
return 0; return END_OF_INPUT;
/* white spaces */ /* white spaces */
case '\r': case '\r':
@ -9986,7 +9986,7 @@ parser_yylex(struct parser_params *p)
c = nextc(p); c = nextc(p);
if (c == -1) { if (c == -1) {
compile_error(p, "embedded document meets end of file"); compile_error(p, "embedded document meets end of file");
return 0; return END_OF_INPUT;
} }
if (c == '=' && word_match_p(p, "end", 3)) { if (c == '=' && word_match_p(p, "end", 3)) {
break; break;
@ -10466,13 +10466,11 @@ parser_yylex(struct parser_params *p)
if (was_bol(p) && whole_match_p(p, "__END__", 7, 0)) { if (was_bol(p) && whole_match_p(p, "__END__", 7, 0)) {
p->ruby__end__seen = 1; p->ruby__end__seen = 1;
p->eofp = 1; p->eofp = 1;
#ifndef RIPPER #ifdef RIPPER
return -1;
#else
lex_goto_eol(p); lex_goto_eol(p);
dispatch_scan_event(p, k__END__); dispatch_scan_event(p, k__END__);
return 0;
#endif #endif
return END_OF_INPUT;
} }
newtok(p); newtok(p);
break; break;
@ -10504,7 +10502,7 @@ yylex(YYSTYPE *lval, YYLTYPE *yylloc, struct parser_params *p)
if (has_delayed_token(p)) if (has_delayed_token(p))
dispatch_delayed_token(p, t); dispatch_delayed_token(p, t);
else if (t != 0) else if (t != END_OF_INPUT)
dispatch_scan_event(p, t); dispatch_scan_event(p, t);
return t; return t;

21
test/ruby/test_ast.rb
View File

@ -624,6 +624,27 @@ dummy
assert_equal("def test_keep_script_lines_for_of\n", node_method.source.lines.first) assert_equal("def test_keep_script_lines_for_of\n", node_method.source.lines.first)
end end
def test_keep_tokens_for_parse
node = RubyVM::AbstractSyntaxTree.parse(<<~END, keep_tokens: true)
1.times do
end
__END__
dummy
END
expected = [
[:tINTEGER, "1"],
[:".", "."],
[:tIDENTIFIER, "times"],
[:tSP, " "],
[:keyword_do, "do"],
[:tIGNORED_NL, "\n"],
[:keyword_end, "end"],
[:nl, "\n"],
]
assert_equal(expected, node.all_tokens.map { [_2, _3]})
end
def test_encoding_with_keep_script_lines def test_encoding_with_keep_script_lines
# Stop a warning "possibly useless use of a literal in void context" # Stop a warning "possibly useless use of a literal in void context"
verbose_bak, $VERBOSE = $VERBOSE, nil verbose_bak, $VERBOSE = $VERBOSE, nil