ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpo-40176: Improve error messages for unclosed string literals (GH-19346)

Browse source 
Automerge-Triggered-By: GH:isidentical
This commit is contained in:
Batuhan Taskaya 2021-01-21 00:38:47 +03:00 • committed by GitHub
parent c3f167d7b2
commit a698d52c39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Parser/pegen.c
View file

@ -327,12 +327,6 @@ tokenizer_error(Parser *p)
case E_TOKEN:
msg = "invalid token";
break;
case E_EOFS:
RAISE_SYNTAX_ERROR("EOF while scanning triple-quoted string literal");
return -1;
case E_EOLS:
RAISE_SYNTAX_ERROR("EOL while scanning string literal");
return -1;
case E_EOF:
if (p->tok->level) {
raise_unclosed_parentheses_error(p);

26
Parser/tokenizer.c
View file

@ -1739,20 +1739,26 @@ tok_get(struct tok_state *tok, const char **p_start, const char **p_end)
/* Get rest of string */
while (end_quote_size != quote_size) {
c = tok_nextc(tok);
if (c == EOF) {
if (c == EOF || (quote_size == 1 && c == '\n')) {
// shift the tok_state's location into
// the start of string, and report the error
// from the initial quote character
tok->cur = (char *)tok->start;
tok->cur++;
tok->line_start = tok->multi_line_start;
int start = tok->lineno;
tok->lineno = tok->first_lineno;
if (quote_size == 3) {
tok->done = E_EOFS;
return syntaxerror(tok,
"unterminated triple-quoted string literal"
" (detected at line %d)", start);
}
else {
tok->done = E_EOLS;
return syntaxerror(tok,
"unterminated string literal (detected at"
" line %d)", start);
}
tok->cur = tok->inp;
return ERRORTOKEN;
}
if (quote_size == 1 && c == '\n') {
tok->done = E_EOLS;
tok->cur = tok->inp;
return ERRORTOKEN;
}
if (c == quote) {
end_quote_size += 1;