Skip to content

Add support for 3.6+ default arguments #391

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
ptrstr wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add support for 3.6+ default arguments #391

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44a847f
Add support for 3.6+ default arguments
ptrstr Oct 18, 2023
0ab4f8a
Fix free-var closure default argument for 3.6+
ptrstr Oct 18, 2023
bde5464
Better version check. Better LOAD_CLOSURE handling
ptrstr Oct 19, 2023
7f4564e
Fix test_functions_py3 tests
ptrstr Oct 19, 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
46 changes: 37 additions & 9 deletions ASTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,6 +1469,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
break;
case Pyc::LOAD_CLOSURE_A:
/* Ignore this */
stack.push(new ASTNode());
Comment thread
ptrstr marked this conversation as resolved.
Outdated
break;
case Pyc::LOAD_CONST_A:
{
Expand Down Expand Up @@ -1545,15 +1546,42 @@ 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();
}
for (int i = 0; i < kwDefCount; ++i) {
kwDefArgs.push_front(stack.top());
stack.pop();

if (mod->minorVer() <= 5) {
Comment thread
ptrstr marked this conversation as resolved.
Outdated
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();
}
for (int i = 0; i < kwDefCount; ++i) {
kwDefArgs.push_front(stack.top());
stack.pop();
}
} else {
if (operand & 0x08) {
stack.pop();
}

if (operand & 0x04) {
stack.pop();
}

if (operand & 0x02) {
PycRef<ASTConstMap> defaultsDict = stack.top().cast<ASTConstMap>();
stack.pop();

for (PycRef<ASTNode> value : defaultsDict->values())
kwDefArgs.push_front(value);
}

if (operand & 0x01) {
PycRef<PycTuple> defaultsTuple = stack.top().cast<ASTObject>()->object().cast<PycTuple>();
stack.pop();

for (PycRef<PycObject> value : defaultsTuple->values())
defArgs.push_back(new ASTObject(value));
}
}
stack.push(new ASTFunction(fun_code, defArgs, kwDefArgs));
}
Expand Down