Skip to content

Remove long list of if/elif, use dict #48

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

Closed
wants to merge 3 commits into from
Closed

Remove long list of if/elif, use dict #48

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10a44a0
Remove long list of if/elif, use dict
flomnes Aug 13, 2024
393ad23
Black is the new orange
flomnes Aug 13, 2024
2cbe4d8
Apply black
tbittar Apr 11, 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
64 changes: 25 additions & 39 deletions src/andromede/expression/visitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,45 +133,31 @@ def visit(root: ExpressionNode, visitor: ExpressionVisitor[T]) -> T:
"""
Utility method to dispatch calls to the right method of a visitor.
"""
if isinstance(root, LiteralNode):
return visitor.literal(root)
elif isinstance(root, NegationNode):
return visitor.negation(root)
elif isinstance(root, VariableNode):
return visitor.variable(root)
elif isinstance(root, ParameterNode):
return visitor.parameter(root)
elif isinstance(root, ComponentParameterNode):
return visitor.comp_parameter(root)
elif isinstance(root, ComponentVariableNode):
return visitor.comp_variable(root)
elif isinstance(root, ProblemParameterNode):
return visitor.pb_parameter(root)
elif isinstance(root, ProblemVariableNode):
return visitor.pb_variable(root)
elif isinstance(root, AdditionNode):
return visitor.addition(root)
elif isinstance(root, MultiplicationNode):
return visitor.multiplication(root)
elif isinstance(root, DivisionNode):
return visitor.division(root)
elif isinstance(root, ComparisonNode):
return visitor.comparison(root)
elif isinstance(root, TimeShiftNode):
return visitor.time_shift(root)
elif isinstance(root, TimeEvalNode):
return visitor.time_eval(root)
elif isinstance(root, TimeSumNode):
return visitor.time_sum(root)
elif isinstance(root, AllTimeSumNode):
return visitor.all_time_sum(root)
elif isinstance(root, ScenarioOperatorNode):
return visitor.scenario_operator(root)
elif isinstance(root, PortFieldNode):
return visitor.port_field(root)
elif isinstance(root, PortFieldAggregatorNode):
return visitor.port_field_aggregator(root)
raise ValueError(f"Unknown expression node type {root.__class__}")
TYPES = {
Copy link
Member

Choose a reason for hiding this comment

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

Not sure of the added value:
it weakens the type checking and possibilities of refactoring, without bringing much clarity or brevity.
Would be better with a mapping to the actual method, probably:

methods = {
    LiteralNode: visitor.literal,
    NegationNode: visitor.negation,
...
}
return methods[type(root)](root)

We could also use a match in python 3.10+

Copy link
Collaborator

Choose a reason for hiding this comment

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

Mypy is not happy with methods[type(root)](root) as it does not know the type of the function it calls

LiteralNode: "literal",
NegationNode: "negation",
VariableNode: "variable",
ParameterNode: "parameter",
ComponentParameterNode: "comp_parameter",
ComponentVariableNode: "comp_variable",
ProblemParameterNode: "pb_parameter",
ProblemVariableNode: "pb_variable",
AdditionNode: "addition",
MultiplicationNode: "multiplication",
DivisionNode: "division",
ComparisonNode: "comparison",
TimeShiftNode: "time_shift",
TimeEvalNode: "time_eval",
TimeSumNode: "time_sum",
AllTimeSumNode: "all_time_sum",
ScenarioOperatorNode: "scenario_operator",
PortFieldNode: "port_field",
PortFieldAggregatorNode: "port_field_aggregator",
}
if type(root) in TYPES:
return getattr(visitor, TYPES[type(root)])(root)
else:
raise ValueError(f"Unknown expression node type {root.__class__}")


class SupportsOperations(Protocol[T]):
Expand Down
Loading