Skip to content

Avoid building typing generics at runtime in cast() calls #203

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
Shamsidinkhon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid building typing generics at runtime in cast() calls #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions src/celpy/evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ def operator_in(item: Result, container: Result) -> Result:
return container

result_value: Result = celpy.celtypes.BoolType(False)
for c in cast(Iterable[Result], container):
for c in cast("Iterable[Result]", container):
try:
if c == item:
return celpy.celtypes.BoolType(True)
Expand Down Expand Up @@ -1301,7 +1301,7 @@ def resolve_variable(
logger.debug("resolve_variable(%r)", name)
try:
referent = self.identifiers.resolve_name(self.package, name)
return cast(Union[Result, NameContainer], referent.value)
return cast("Union[Result, NameContainer]", referent.value)
except KeyError:
return self.functions[name]

Expand Down Expand Up @@ -1329,12 +1329,12 @@ def __getattr__(
referent = self.identifiers.resolve_name(self.package, name)
logger.debug("get/__getattr__(%r) ==> %r", name, referent)
if referent._value_set:
return cast(Union[Result, NameContainer], referent.value)
return cast("Union[Result, NameContainer]", referent.value)
else:
if referent.container:
return referent.container
elif referent.annotation:
return cast(Union[Result, NameContainer], referent.annotation)
return cast("Union[Result, NameContainer]", referent.annotation)
else:
raise RuntimeError(f"Corrupt {self!r}") # pragma: no cover
except KeyError:
Expand Down Expand Up @@ -1558,7 +1558,7 @@ def function_eval(
return exprlist

try:
list_exprlist = cast(List[Result], exprlist or [])
list_exprlist = cast("List[Result]", exprlist or [])
for expr in list_exprlist:
if isinstance(expr, CELEvalError):
return expr
Expand Down Expand Up @@ -1615,7 +1615,7 @@ def method_eval(
return exprlist

try:
list_exprlist = cast(List[Result], exprlist or [])
list_exprlist = cast("List[Result]", exprlist or [])
return function(object, *list_exprlist)
except ValueError as ex:
value = CELEvalError(
Expand Down Expand Up @@ -1733,7 +1733,7 @@ def conditionalor(self, tree: lark.Tree) -> Result:
elif len(tree.children) == 2:
# func = self.functions["_||_"] # Refactor ``self.functions`` into an Activation
func = self.activation.resolve_function("_||_")
left, right = cast(Tuple[Result, Result], self.visit_children(tree))
left, right = cast("Tuple[Result, Result]", self.visit_children(tree))
try:
return func(left, right)
except TypeError as ex:
Expand Down Expand Up @@ -1767,7 +1767,7 @@ def conditionaland(self, tree: lark.Tree) -> Result:
elif len(tree.children) == 2:
# func = self.functions["_&&_"] # Refactor ``self.functions`` into an Activation
func = self.activation.resolve_function("_&&_")
left, right = cast(Tuple[Result, Result], self.visit_children(tree))
left, right = cast("Tuple[Result, Result]", self.visit_children(tree))
try:
return func(left, right)
except TypeError as ex:
Expand Down Expand Up @@ -1831,7 +1831,7 @@ def relation(self, tree: lark.Tree) -> Result:
func = self.activation.resolve_function(op_name)
# NOTE: values have the structure [[left], right]
(left, *_), right = cast(
Tuple[List[Result], Result], self.visit_children(tree)
"Tuple[List[Result], Result]", self.visit_children(tree)
)
self.logger.debug("relation %r %s %r", left, op_name, right)
try:
Expand Down Expand Up @@ -1887,7 +1887,7 @@ def addition(self, tree: lark.Tree) -> Result:
func = self.activation.resolve_function(op_name)
# NOTE: values have the structure [[left], right]
(left, *_), right = cast(
Tuple[List[Result], Result], self.visit_children(tree)
"Tuple[List[Result], Result]", self.visit_children(tree)
)
self.logger.debug("addition %r %s %r", left, op_name, right)
try:
Expand Down Expand Up @@ -1952,7 +1952,7 @@ def multiplication(self, tree: lark.Tree) -> Result:
func = self.activation.resolve_function(op_name)
# NOTE: values have the structure [[left], right]
(left, *_), right = cast(
Tuple[List[Result], Result], self.visit_children(tree)
"Tuple[List[Result], Result]", self.visit_children(tree)
)
self.logger.debug("multiplication %r %s %r", left, op_name, right)
try:
Expand Down Expand Up @@ -2340,7 +2340,7 @@ def member_dot_arg(self, tree: lark.Tree) -> Result:
if method_name_token.value == "map":
sub_expr = self.build_macro_eval(tree)
mapping = cast(
Iterable[celpy.celtypes.Value], map(sub_expr, member_list)
"Iterable[celpy.celtypes.Value]", map(sub_expr, member_list)
)
result_value = celpy.celtypes.ListType(mapping)
return result_value
Expand Down Expand Up @@ -2412,13 +2412,13 @@ def member_dot_arg(self, tree: lark.Tree) -> Result:
# Evaluate member, method IDENT and (if present) exprlist and apply.
if len(tree.children) == 2:
member, ident = cast(
Tuple[Result, lark.Token], self.visit_children(tree)
"Tuple[Result, lark.Token]", self.visit_children(tree)
)
result_value = self.method_eval(member, ident)
else:
# assert len(tree.children) == 3
member, ident, expr_iter = cast(
Tuple[Result, lark.Token, Iterable[Result]],
"Tuple[Result, lark.Token, Iterable[Result]]",
self.visit_children(tree),
)
result_value = self.method_eval(member, ident, expr_iter)
Expand Down Expand Up @@ -2646,7 +2646,7 @@ def primary(self, tree: lark.Tree) -> Result:
# Ordinary function() evaluation.
values = self.visit_children(exprlist)
return self.function_eval(
name_token, cast(Iterable[celpy.celtypes.Value], values)
name_token, cast("Iterable[celpy.celtypes.Value]", values)
)

elif child.data == "ident":
Expand Down Expand Up @@ -2733,7 +2733,7 @@ def exprlist(self, tree: lark.Tree) -> Result:
except StopIteration:
pass
# There are no CELEvalError values in the result, so we can narrow the domain.
result_value = celpy.celtypes.ListType(cast(List[celpy.celtypes.Value], values))
result_value = celpy.celtypes.ListType(cast("List[celpy.celtypes.Value]", values))
return result_value

@trace
Expand Down Expand Up @@ -2781,7 +2781,7 @@ def mapinits(self, tree: lark.Tree) -> Result:

# Not sure if this cast is sensible. Should a CELEvalError propagate up from the
# sub-expressions? See the error check in :py:func:`exprlist`.
keys_values = cast(List[celpy.celtypes.Value], self.visit_children(tree))
keys_values = cast("List[celpy.celtypes.Value]", self.visit_children(tree))
pairs = zip(keys_values[0::2], keys_values[1::2])
for key, value in pairs:
if key in result_value:
Expand Down Expand Up @@ -2910,7 +2910,7 @@ def macro_exists(
return celpy.celtypes.BoolType(
reduce(
cast(
Callable[[celpy.celtypes.BoolType, Result], celpy.celtypes.BoolType],
"Callable[[celpy.celtypes.BoolType, Result], celpy.celtypes.BoolType]",
celpy.celtypes.logical_or,
),
(result(act, cel_expr) for act in activations),
Expand All @@ -2933,7 +2933,7 @@ def macro_all(
return celpy.celtypes.BoolType(
reduce(
cast(
Callable[[celpy.celtypes.BoolType, Result], celpy.celtypes.BoolType],
"Callable[[celpy.celtypes.BoolType, Result], celpy.celtypes.BoolType]",
celpy.celtypes.logical_and,
),
(result(act, cel_expr) for act in activations),
Expand Down