Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.vscode/
__pycache__/

test.py
*.ipynb

build/
Expand Down
3 changes: 3 additions & 0 deletions personal_python_ast_optimizer/parser/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ class OptimizationsConfig(_Config):
"functions_safe_to_exclude_in_test_expr",
"remove_typing_cast",
"remove_unused_imports",
"collection_concat_to_unpack",
"fold_constants",
"assume_this_machine",
)
Expand All @@ -154,6 +155,7 @@ def __init__( # noqa: PLR0913
functions_safe_to_exclude_in_test_expr: set[str] | None = None,
remove_unused_imports: bool = True,
remove_typing_cast: bool = True,
collection_concat_to_unpack: bool = False,
fold_constants: bool = False,
assume_this_machine: bool = False,
) -> None:
Expand All @@ -171,6 +173,7 @@ def __init__( # noqa: PLR0913
)
self.remove_unused_imports: bool = remove_unused_imports
self.remove_typing_cast: bool = remove_typing_cast
self.collection_concat_to_unpack: bool = collection_concat_to_unpack
self.assume_this_machine: bool = assume_this_machine
self.fold_constants: bool = fold_constants

Expand Down
43 changes: 34 additions & 9 deletions personal_python_ast_optimizer/parser/skipper.py
Original file line number Diff line number Diff line change
Expand Up @@ -644,15 +644,40 @@ def visit_BinOp(self, node: ast.BinOp) -> ast.AST:
# and constants need to be folded depth first
parsed_node: ast.AST = self.generic_visit(node)

if (
self.optimizations_config.fold_constants
and isinstance(parsed_node, ast.BinOp)
and isinstance(parsed_node.left, ast.Constant)
and isinstance(parsed_node.right, ast.Constant)
):
return self._ast_constants_operation(
parsed_node.left, parsed_node.right, parsed_node.op
)
if isinstance(parsed_node, ast.BinOp):
if (
self.optimizations_config.fold_constants
and isinstance(parsed_node.left, ast.Constant)
and isinstance(parsed_node.right, ast.Constant)
):
return self._ast_constants_operation(
parsed_node.left, parsed_node.right, parsed_node.op
)

if (
self.optimizations_config.collection_concat_to_unpack
and isinstance(parsed_node.op, ast.Add)
and (
isinstance(parsed_node.left, (ast.Tuple, ast.List))
or isinstance(parsed_node.right, (ast.Tuple, ast.List))
)
):
if (
isinstance(parsed_node.left, ast.Tuple)
and isinstance(parsed_node.right, ast.Tuple)
or (
isinstance(parsed_node.left, ast.List)
and isinstance(parsed_node.right, ast.List)
)
): # noqa: E721
parsed_node.left.elts += parsed_node.right.elts
elif isinstance(parsed_node.left, (ast.Tuple, ast.List)):
parsed_node.left.elts.append(ast.Starred(parsed_node.right))
else:
parsed_node.right.elts.insert(0, ast.Starred(parsed_node.left)) # type: ignore[attr-defined]
return parsed_node.right

return parsed_node.left

return parsed_node

Expand Down
31 changes: 30 additions & 1 deletion tests/parser/test_collections.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import pytest

from personal_python_ast_optimizer.parser.config import TokenTypesConfig
from personal_python_ast_optimizer.parser.config import (
OptimizationsConfig,
TokenTypesConfig,
)
from tests.utils import BeforeAndAfter, run_minifier_and_assert_correct


Expand Down Expand Up @@ -92,3 +95,29 @@ class A(NamedTuple):
before_and_after,
token_types_config=TokenTypesConfig(simplify_named_tuples=True),
)


_collection_concat_to_unpack_test_cases: list[tuple[str, str]] = [
(
"a = (1,) + (0,0) + b",
"a=(1,0,0,*b)",
),
(
"a = [1] + b + [2]",
"a=[1,*b,2]",
),
(
"a = b + [2] + [3]",
"a=[*b,2,3]",
),
]


@pytest.mark.parametrize(("before", "after"), _collection_concat_to_unpack_test_cases)
def test_collection_concat_to_unpack(before: str, after: str):
before_and_after = BeforeAndAfter(before, after)

run_minifier_and_assert_correct(
before_and_after,
optimizations_config=OptimizationsConfig(collection_concat_to_unpack=True),
)
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.0
7.1.0