Repository navigation
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I am opening this PR to preserve duplicate-key checks and evaluation order across multiple keyword expansions. These two functions currently decompile to the same call even though their semantics differ:
The incorrect output for
directis:Direct call expansions reject duplicate keywords. Dictionary displays overwrite duplicate keys before the final expansion. Flattening the first call into a single dictionary therefore removes its duplicate-key checks.
That distinction also controls side effects:
If
get_first()returns a mapping containingfixed, the source raises before evaluatingget_second(). The dictionary-display reconstruction evaluates both producers and silently replaces the earlier value.The decompiler now retains ordered expansion entries for
DICT_MERGEcalls, keepsDICT_UPDATEdictionary boundaries, and validates named keyword spellings and uniqueness before decomposition. The printer emits**for unnamed keyword entries. This preserves interleaved forms such asfn(1, **first, fixed=2, **second)as well as intentionally constructed dictionaries with keys such as"my col","class", or repeated literal keys.Multiple unpacking begins in Python 3.5. The repaired
DICT_MERGE/DICT_UPDATEinstruction layout begins in Python 3.9; the olderBUILD_MAP_UNPACK_WITH_CALLpath is outside this repair.