Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-104050: Argument Clinic: Annotate BlockParser #106750

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
erlend-aasland merged 6 commits into from
Jul 15, 2023
Merged

gh-104050: Argument Clinic: Annotate BlockParser #106750

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f5317b
Annotate BlockParser
erlend-aasland Jul 14, 2023
019edbf
Fix warnings
erlend-aasland Jul 14, 2023
0507ebb
Better type hint for the regex
erlend-aasland Jul 14, 2023
e61d231
Annotate __iter__
erlend-aasland Jul 14, 2023
924f2cf
Address review
erlend-aasland Jul 14, 2023
7251329
Merge branch 'main' into clinic/annotate-block-parser
erlend-aasland Jul 15, 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
30 changes: 19 additions & 11 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1712,7 +1712,13 @@ class BlockParser:
Iterator, yields Block objects.
"""

def __init__(self, input, language, *, verify=True):
def __init__(
self,
input: str,
language: Language,
*,
verify: bool = True
) -> None:
"""
"input" should be a str object
with embedded \n characters.
Expand All @@ -1730,15 +1736,15 @@ def __init__(self, input, language, *, verify=True):
self.find_start_re = create_regex(before, after, whole_line=False)
self.start_re = create_regex(before, after)
self.verify = verify
self.last_checksum_re = None
self.last_dsl_name = None
self.dsl_name = None
self.last_checksum_re: re.Pattern[str] | None = None
self.last_dsl_name: str | None = None
self.dsl_name: str | None = None
self.first_block = True

def __iter__(self):
def __iter__(self) -> BlockParser:
return self

def __next__(self):
def __next__(self) -> Block:
while True:
if not self.input:
raise StopIteration
Expand All @@ -1755,18 +1761,18 @@ def __next__(self):
return block


def is_start_line(self, line):
def is_start_line(self, line: str) -> str | None:
match = self.start_re.match(line.lstrip())
return match.group(1) if match else None

def _line(self, lookahead=False):
def _line(self, lookahead: bool = False) -> str:
self.line_number += 1
line = self.input.pop()
if not lookahead:
self.language.parse_line(line)
return line

def parse_verbatim_block(self):
def parse_verbatim_block(self) -> Block:
add, output = text_accumulator()
self.block_start_line_number = self.line_number

Expand All @@ -1780,13 +1786,13 @@ def parse_verbatim_block(self):

return Block(output())

def parse_clinic_block(self, dsl_name):
def parse_clinic_block(self, dsl_name: str) -> Block:
input_add, input_output = text_accumulator()
self.block_start_line_number = self.line_number + 1
stop_line = self.language.stop_line.format(dsl_name=dsl_name)
body_prefix = self.language.body_prefix.format(dsl_name=dsl_name)

def is_stop_line(line):
def is_stop_line(line: str) -> bool:
# make sure to recognize stop line even if it
# doesn't end with EOL (it could be the very end of the file)
if line.startswith(stop_line):
Expand Down Expand Up @@ -1820,6 +1826,7 @@ def is_stop_line(line):
checksum_re = create_regex(before, after, word=False)
self.last_dsl_name = dsl_name
self.last_checksum_re = checksum_re
assert checksum_re is not None

# scan forward for checksum line
output_add, output_output = text_accumulator()
Expand All @@ -1834,6 +1841,7 @@ def is_stop_line(line):
if self.is_start_line(line):
break

output: str | None
output = output_output()
if arguments:
d = {}
Expand Down