Skip to content

fix: Fix nested function definitions in Python 3.12 #1064

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 2 commits into from
Jun 30, 2025
Merged

fix: Fix nested function definitions in Python 3.12 #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1198615
fix: Fix nested functions in Python 3.12
mark-koch Jun 30, 2025
d385acc
ci: Check Python 3.12 in CI
mark-koch Jun 30, 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
8 changes: 6 additions & 2 deletions .github/workflows/pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@ env:

jobs:
check:
name: Check Python (3.10)
name: Check Python (${{ matrix.python-version }})
runs-on: ubuntu-latest
env:
PYTHON_VERSION: '3.10'
PYTHON_VERSION: ${{ matrix.python-version }}

strategy:
matrix:
python-version: [ '3.10', '3.12' ]
Copy link
Contributor

@acl-cqc acl-cqc Jun 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC this was previously working on 3.10 and 3.13 but failing on 3.12? So 3.13 clearly changes something important in this area - should you include 3.13 also?

Copy link
Collaborator Author

@mark-koch mark-koch Jun 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Python 3.13 is already used for coverage, so all tests are run: https://github.com/CQCL/guppylang/actions/runs/15969900959/job/45038555192?pr=1064


steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 1 addition & 6 deletions guppylang/cfg/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,7 @@ def visit_FunctionDef(
cfg,
func_ty,
docstring=docstring,
name=node.name,
args=node.args,
body=node.body,
decorator_list=node.decorator_list,
returns=node.returns,
type_comment=node.type_comment,
**dict(ast.iter_fields(node)),
Copy link
Contributor

@acl-cqc acl-cqc Jun 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems legit to me, NestedFunctionDef extends ast.FunctionDef so can support all the same fields

)
set_location_from(new_node, node)
bb.statements.append(new_node)
Expand Down
Loading