Skip to content

gh-127833: Use productionlist nodes to implement the grammar-snippet directive #130376

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
AA-Turner merged 18 commits into from
Mar 20, 2025
+486 −417
Merged

gh-127833: Use productionlist nodes to implement the grammar-snippet directive #130376

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
21d52e1
Extract `grammar_re` to class-level
AA-Turner Feb 20, 2025
e5624ed
Factor out `make_production()`
AA-Turner Feb 20, 2025
02210ca
Update to 8.2 `make_name_target()`
AA-Turner Feb 20, 2025
587c7f9
Use `productionlist` and `production` nodes
AA-Turner Feb 20, 2025
7ce49bf
Update topics.py
AA-Turner Feb 20, 2025
93d80df
Add highlighting back
encukou Feb 26, 2025
8c3f133
Merge each multi-line productions into a single production node
encukou Feb 26, 2025
9ad7e8f
Add Blaise as co-author
blaisep Feb 26, 2025
cde13e2
Run ruff format
encukou Feb 26, 2025
a9237dd
Fill in the rawsource lines
encukou Mar 5, 2025
c958165
Fix initial case
encukou Mar 5, 2025
e591450
Small tweaks
AA-Turner Mar 12, 2025
6b4ec3d
Extract production lines logic into `production_definitions()`
AA-Turner Mar 12, 2025
f5b5ff5
Dict → tuple
encukou Mar 17, 2025
be8f9e7
Provide more info on error
encukou Mar 17, 2025
8144750
Merge in the main branch
encukou Mar 19, 2025
5b39df3
Merge branch 'main' into docs/productionlist-grammar
AA-Turner Mar 19, 2025
1c793eb
Regenerate ``pydoc_data/topics.py``
AA-Turner Mar 19, 2025
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
Small tweaks
  • Loading branch information
@AA-Turner
AA-Turner committed Mar 12, 2025
commit e591450ed853e138b48e55883c183fe441f11b6e
24 changes: 15 additions & 9 deletions Doc/tools/extensions/grammar_snippet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,29 @@ def make_grammar_snippet(

group_name = options['group']
node_location = self.get_location()
production_nodes = []
production_node = None
current_lines = []
production_node = addnodes.production()
production_nodes = [production_node]
for source_line in content:
# Start a new production_node if there's text in the first
# column of the line. (That means a new rule is starting.)
if production_node is None or not source_line[:1].isspace():
production_node = addnodes.production(source_line)
if not source_line[:1].isspace():
# set the raw source of the previous production
production_node.rawsource = '\n'.join(current_lines)
current_lines.clear()
# start a new production_node
production_node = addnodes.production()
production_nodes.append(production_node)
else:
production_node.rawsource += '\n' + source_line
current_lines.append(source_line)
self.add_production_line(
production_node,
source_line,
group_name=group_name,
location=node_location,
)
# set the raw source of the final production
production_node.rawsource = '\n'.join(current_lines)

node = addnodes.productionlist(
'',
*production_nodes,
Expand All @@ -100,9 +107,8 @@ def add_production_line(
for match in self.grammar_re.finditer(source_line):
# Handle text between matches
if match.start() > last_pos:
production_node += nodes.Text(
source_line[last_pos : match.start()]
)
unmatched_text = source_line[last_pos : match.start()]
production_node += nodes.Text(unmatched_text)
last_pos = match.end()

# Handle matches
Expand Down