Skip to content

Version-aware MAKE_FUNCTION_A and MAKE_CLOSURE_A support #581

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

Open
plfj wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Version-aware MAKE_FUNCTION_A and MAKE_CLOSURE_A support #581

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db3a539
Extend MAKE_FUNCTION_A/MAKE_CLOSURE_A handling to support Python 3.0–…
plfj Sep 6, 2025
a86095d
Update ASTree.cpp
plfj Sep 16, 2025
fc518e2
fix
Sep 16, 2025
ccab182
Add tests for python 3.13
Sep 16, 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
119 changes: 111 additions & 8 deletions ASTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,8 +1564,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
{
PycRef<ASTNode> fun_code = stack.top();
stack.pop();

/* Test for the qualified name of the function (at TOS) */
// Test for the qualified name of the function (at TOS)
int tos_type = fun_code.cast<ASTObject>()->object().type();
if (tos_type != PycObject::TYPE_CODE &&
tos_type != PycObject::TYPE_CODE2) {
Expand All @@ -1576,14 +1575,118 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
ASTFunction::defarg_t defArgs, kwDefArgs;
const int defCount = operand & 0xFF;
const int kwDefCount = (operand >> 8) & 0xFF;
for (int i = 0; i < defCount; ++i) {
defArgs.push_front(stack.top());
stack.pop();
const int annotationCount = (operand >> 16) & 0x7FFF;

// Python 3.3 and below
if (mod->verCompare(3, 3) <= 0) {
for (int i = 0; i < defCount; ++i) {
defArgs.push_front(stack.top());
stack.pop();
}
// KW Defaults not mentioned in docs, but they come after the positional args
for (int i = 0; i < kwDefCount; ++i) {
kwDefArgs.push_front(stack.top());
stack.pop(); // KW Pair object
stack.pop(); // KW Pair name
}
}
for (int i = 0; i < kwDefCount; ++i) {
kwDefArgs.push_front(stack.top());
stack.pop();
// Python 3.4-3.5
else if (mod->verCompare(3, 5) <= 0) {
// From Py 3.4: annotations and order change (kw first)
if (annotationCount) {
stack.pop(); // Tuple of param names for annotations
for (int i = 0; i < annotationCount; ++i) {
stack.pop(); // Pop annotation objects and ignore
}
}
for (int i = 0; i < kwDefCount; ++i) {
kwDefArgs.push_front(stack.top());
stack.pop(); // KW Pair object
stack.pop(); // KW Pair name
}
for (int i = 0; i < defCount; ++i) {
defArgs.push_front(stack.top());
stack.pop();
}
}
// Python 3.6-3.9 (flag mask, annotation dict)
else if (mod->verCompare(3, 9) <= 0) {
if (operand & 0x08) { // Cells for free vars to create a closure
stack.pop(); // Ignore these for syntax generation
}
if (operand & 0x04) { // Annotation dict (3.6-9)
stack.pop(); // Ignore annotations
}
if (operand & 0x02) { // Kwarg Defaults
PycRef<ASTNode> kw_tuple = stack.top();
stack.pop();
std::vector<PycRef<ASTNode>> kw_values = kw_tuple.cast<ASTConstMap>()->values();
for (const PycRef<ASTNode>& kw : kw_values) {
kwDefArgs.push_front(kw);
}
}
if (operand & 0x01) { // Positional Defaults (including positional-or-KW args)
PycRef<ASTNode> pos_tuple = stack.top();
stack.pop();
std::vector<PycRef<PycObject>> pos_values = pos_tuple.cast<ASTObject>()->object().cast<PycTuple>()->values();
for (const PycRef<PycObject>& pos : pos_values) {
defArgs.push_back(new ASTObject(pos));
}
}
}
// Python 3.10-3.13 (annotation can be dict or string, otherwise same)
else if (mod->verCompare(3, 13) <= 0) {
if (operand & 0x08) { // Cells for free vars to create a closure
stack.pop(); // Ignore these for syntax generation
}
if (operand & 0x04) { // Annotation dict (3.10-13) or string (PEP 563)
stack.pop(); // Ignore annotations
}
if (operand & 0x02) { // Kwarg Defaults
PycRef<ASTNode> kw_tuple = stack.top();
stack.pop();
std::vector<PycRef<ASTNode>> kw_values = kw_tuple.cast<ASTConstMap>()->values();
for (const PycRef<ASTNode>& kw : kw_values) {
kwDefArgs.push_front(kw);
}
}
if (operand & 0x01) { // Positional Defaults (including positional-or-KW args)
PycRef<ASTNode> pos_tuple = stack.top();
stack.pop();
std::vector<PycRef<PycObject>> pos_values = pos_tuple.cast<ASTObject>()->object().cast<PycTuple>()->values();
for (const PycRef<PycObject>& pos : pos_values) {
defArgs.push_back(new ASTObject(pos));
}
}
}
else {
if (operand & 0x10) {
Comment thread
plfj marked this conversation as resolved.
stack.pop();
}
if (operand & 0x08) {
stack.pop();
}
if (operand & 0x04) {
stack.pop();
}
if (operand & 0x02) {
PycRef<ASTNode> kw_tuple = stack.top();
stack.pop();
std::vector<PycRef<ASTNode>> kw_values = kw_tuple.cast<ASTConstMap>()->values();
for (const PycRef<ASTNode>& kw : kw_values) {
kwDefArgs.push_front(kw);
}
}
if (operand & 0x01) {
PycRef<ASTNode> pos_tuple = stack.top();
stack.pop();
std::vector<PycRef<PycObject>> pos_values = pos_tuple.cast<ASTObject>()->object().cast<PycTuple>()->values();
for (const PycRef<PycObject>& pos : pos_values) {
defArgs.push_back(new ASTObject(pos));
}
}
}

Comment thread
plfj marked this conversation as resolved.
stack.push(new ASTFunction(fun_code, defArgs, kwDefArgs));
}
break;
Expand Down
Loading