8000 gh-105017: Include CRLF lines in strings and column numbers by mgmacias95 · Pull Request #105030 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content
8000

gh-105017: Include CRLF lines in strings and column numbers #105030

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

Merged
merged 10 commits into from
May 28, 2023
Merged

gh-105017: Include CRLF lines in strings and column numbers #105030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad130da
fix(tokenizer): Include CRLF lines in strings and column numbers
mgmacias95 May 27, 2023
6688c36
Merge branch 'main' into crlf_strings
mgmacias95 May 27, 2023
e5293bc
📜🤖 Added by blurb_it.
blurb-it[bot] May 27, 2023
37f77ad
Only preserve crlf in the Python-tokenize extension
pablogsal May 27, 2023
68e7b36
Handle \r\n in continuation lines
pablogsal May 28, 2023
969060f
fixup! Handle \r\n in continuation lines
pablogsal May 28, 2023
559487c
fixup! fixup! Handle \r\n in continuation lines
pablogsal May 28, 2023
363de28
fixup! fixup! fixup! Handle \r\n in continuation lines
pablogsal May 28, 2023
67b3a9c
Update Lib/test/test_tokenize.py
mgmacias95 May 28, 2023
d3d4ff5
Prevent leak
mgmacias95 May 28, 2023
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
Prev Previous commit
Next Next commit
fixup! fixup! fixup! Handle \r\n in continuation lines
  • Loading branch information
@pablogsal
pablogsal committed May 28, 2023
commit 363de2890385979c70a784a6971cef26d54e4f0c
10 changes: 10 additions & 0 deletions Lib/test/test_tokenize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,6 +2104,10 @@ def test_string(self):
b\
c"""', """\
STRING 'rb"\""a\\\\\\nb\\\\\\nc"\""' (1, 0) (3, 4)
""")

self.check_tokenize(r'"hola\\\r\ndfgf"', """\
STRING \'"hola\\\\\\\\\\\\r\\\\ndfgf"\' (1, 0) (1, 16)
""")

self.check_tokenize('f"abc"', """\
Expand Down Expand Up @@ -2140,6 +2144,12 @@ def test_string(self):
FSTRING_START 'Rf"' (1, 0) (1, 3)
FSTRING_MIDDLE 'abc\\\\\\ndef' (1, 3) (2, 3)
FSTRING_END '"' (2, 3) (2, 4)
""")

self.check_tokenize(r'f"hola\\\r\ndfgf"', """\
FSTRING_START \'f"\' (1, 0) (1, 2)
FSTRING_MIDDLE 'hola\\\\\\\\\\\\r\\\\ndfgf' (1, 2) (1, 16)
FSTRING_END \'"\' (1, 16) (1, 17)
""")

def test_function(self):
Expand Down
3 changes: 3 additions & 0 deletions Parser/tokenizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2707,6 +2707,9 @@ tok_get_fstring_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct
return MAKE_TOKEN(FSTRING_MIDDLE);
} else if (c == '\\') {
int peek = tok_nextc(tok);
if (peek == '\r') {
peek = tok_nextc(tok);
}
// Special case when the backslash is right before a curly
// brace. We have to restore and return the control back
// to the loop for the next iteration.
Expand Down
0