Skip to content

Dev fix ast v5 #126

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

Merged
da-h merged 7 commits into from
Dec 22, 2022
Merged

Dev fix ast v5 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fa66aa
Add parsing test for multilevel variable slices.
sbrodehl Dec 21, 2022
119d784
Check if alternative exists / is necessary.
sbrodehl Dec 21, 2022
443afba
Return unique and sorted variable names.
sbrodehl Dec 21, 2022
2405f7d
Add search for all slices variables and compared variables with 'in' …
sbrodehl Dec 21, 2022
c69ffed
Fix over-indented lines.
sbrodehl Dec 21, 2022
6c42e65
Use set comprehension.
sbrodehl Dec 21, 2022
be6b039
Use set comprehension.
sbrodehl Dec 21, 2022
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
28 changes: 16 additions & 12 deletions src/miniflask/state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,8 @@ def __init__(self, varid, mf, caller_traceback, cliargs=False, parsefn=False, is
if isinstance(node, ast.IfExp):
rvs = self._find_var_names(node.orelse, lcl_variables=self.local_arguments)
for lv in self._find_comp_names(node.test, self.local_arguments):
self.depends_alternatives[lv] = rvs
if len(rvs):
self.depends_alternatives[lv] = rvs

def str(self):
return str(self.varid)
Expand All @@ -457,27 +458,30 @@ def __repr__(self):
@staticmethod
def _find_var_names(tree: ast.AST, lcl_variables=None):
lcl_variables = set([]) if lcl_variables is None else set(lcl_variables)
return sorted([
return sorted({
node.slice.value
for node in ast.walk(tree)
if hasattr(node, "value") and isinstance(node.value, ast.Name) and node.value.id in lcl_variables
])
})

@staticmethod
def _find_comp_names(tree: ast.AST, lcl_variables):
ret = []
# find all regular loaded local variables with slices
ret = {
n.slice.value for n in ast.walk(tree) if (
hasattr(n, "value") and isinstance(n.value, ast.Name) and n.value.id in lcl_variables
and hasattr(n, "ctx") and isinstance(n.ctx, ast.Load)
and hasattr(n, "slice")
)
}
# add all 'x in var' cases
for node in ast.walk(tree):
if isinstance(node, ast.Compare):
if isinstance(node, ast.Compare) and hasattr(node, "left") and isinstance(node.left, ast.Constant):
_args = [nc.id for c in node.comparators for nc in ast.walk(c) if
isinstance(nc, ast.Name) and nc.id in lcl_variables]
_names = sorted([
node.value
for node in ast.walk(tree)
if hasattr(node, "value") and isinstance(node, ast.Constant)
])
if len(_args):
ret += _names
return ret
ret.add(node.left.value)
return sorted(ret)

# ------------------- #
# dependency routines #
Expand Down
2 changes: 2 additions & 0 deletions tests/state/dependencies/modules/lambdaarguments_module1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ def __init__(self, state):

def register(mf):
mf.register_defaults({
"multilevelindex": lambda state: "cuda:" + str(state["gpu"][0]) if state["gpu"][0] >= 0 else "cpu",
"multileveltag": lambda state: state["var1"]["other"],
"test_multiple_inline_I": lambda: 1 * 42,
"test_multiple_inline_II": lambda: 2 * 42,
"test_lambda_def": lambda_definition,
Expand Down