Skip to content
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.

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

Remove lists as default arguments in functions #716

Merged
merged 1 commit into from
Feb 12, 2024
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
7 changes: 4 additions & 3 deletions compiler/definitions/ir/dfg_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ class DFGNode:
def __init__(
self,
cmd_invocation_with_io_vars,
com_redirs=[],
com_assignments=[],
com_redirs=None,
com_assignments=None,
parallelizer_list=None,
cmd_related_properties=None,
):
# TODO []: default parameters!
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments

## @KK: can this be deleted? Was there another id in the member attributes before?
## Add a unique identifier to each DFGNode since id() is not guaranteed to be unique for objects that have different lifetimes.
Expand Down
10 changes: 7 additions & 3 deletions compiler/definitions/ir/nodes/dfs_split_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ def __init__(
outputs,
com_name,
com_category,
com_options=[],
com_redirs=[],
com_assignments=[],
com_options=None,
com_redirs=None,
com_assignments=None,
):
com_options = [] if com_options is None else com_options
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments

super().__init__(
inputs,
outputs,
Expand Down
5 changes: 3 additions & 2 deletions compiler/definitions/ir/nodes/dgsh_tee.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@


class DGSHTee(DFGNode):
def __init__(self, cmd_invocation_with_io_vars, com_redirs=[], com_assignments=[]):
# TODO []: default
def __init__(self, cmd_invocation_with_io_vars, com_redirs=None, com_assignments=None):
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments
super().__init__(
cmd_invocation_with_io_vars,
com_redirs=com_redirs,
Expand Down
6 changes: 4 additions & 2 deletions compiler/definitions/ir/nodes/eager.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@


class Eager(DFGNode):
def __init__(self, cmd_invocation_with_io_vars, com_redirs=[], com_assignments=[]):
# TODO []: default
def __init__(self, cmd_invocation_with_io_vars, com_redirs=None, com_assignments=None):
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments

super().__init__(
cmd_invocation_with_io_vars,
com_redirs=com_redirs,
Expand Down
10 changes: 7 additions & 3 deletions compiler/definitions/ir/nodes/hdfs_cat.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ def __init__(
outputs,
com_name,
com_category,
com_options=[],
com_redirs=[],
com_assignments=[],
com_options=None,
com_redirs=None,
com_assignments=None,
):
com_options = [] if com_options is None else com_options
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments

assert str(com_name) == "hdfs"
assert str(com_options[0][1]) == "dfs" and str(com_options[1][1]) == "-cat"
super().__init__(
Expand Down
7 changes: 4 additions & 3 deletions compiler/definitions/ir/nodes/pash_split.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ class Split(DFGNode):
def __init__(
self,
cmd_invocation_with_io_vars,
com_redirs=[],
com_assignments=[],
com_redirs=None,
com_assignments=None,
parallelizer_list=None,
cmd_related_properties=None,
):
# TODO []: default arguments!
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments
super().__init__(
cmd_invocation_with_io_vars=cmd_invocation_with_io_vars,
com_redirs=com_redirs,
Expand Down
7 changes: 4 additions & 3 deletions compiler/definitions/ir/nodes/r_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ class RMerge(DFGNode):
def __init__(
self,
cmd_invocation_with_io_vars,
com_redirs=[],
com_assignments=[],
com_redirs=None,
com_assignments=None,
parallelizer_list=None,
cmd_related_properties=None,
):
# TODO []: default arguments!
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments
super().__init__(
cmd_invocation_with_io_vars=cmd_invocation_with_io_vars,
com_redirs=com_redirs,
Expand Down
7 changes: 4 additions & 3 deletions compiler/definitions/ir/nodes/r_split.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ class RSplit(DFGNode):
def __init__(
self,
cmd_invocation_with_io_vars,
com_redirs=[],
com_assignments=[],
com_redirs=None,
com_assignments=None,
parallelizer_list=None,
cmd_related_properties=None,
):
# TODO []: default arguments!
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments
super().__init__(
cmd_invocation_with_io_vars=cmd_invocation_with_io_vars,
com_redirs=com_redirs,
Expand Down
7 changes: 4 additions & 3 deletions compiler/definitions/ir/nodes/r_unwrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ class RUnwrap(DFGNode):
def __init__(
self,
cmd_invocation_with_io_vars,
com_redirs=[],
com_assignments=[],
com_redirs=None,
com_assignments=None,
parallelizer_list=None,
cmd_related_properties=None,
):
# TODO []: default
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments
super().__init__(
cmd_invocation_with_io_vars,
com_redirs=com_redirs,
Expand Down
7 changes: 4 additions & 3 deletions compiler/definitions/ir/nodes/r_wrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ class RWrap(DFGNode):
def __init__(
self,
cmd_invocation_with_io_vars,
com_redirs=[],
com_assignments=[],
com_redirs=None,
com_assignments=None,
parallelizer_list=None,
cmd_related_properties=None,
wrapped_node_name=None,
):
# TODO []: default
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments
self.wrapped_node_name = wrapped_node_name
super().__init__(
cmd_invocation_with_io_vars,
Expand Down
10 changes: 7 additions & 3 deletions compiler/definitions/ir/nodes/remote_pipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ def __init__(
outputs,
com_name,
com_category,
com_options=[],
com_redirs=[],
com_assignments=[],
com_options=None,
com_redirs=None,
com_assignments=None,
):
com_options = [] if com_options is None else com_options
com_redirs = [] if com_redirs is None else com_redirs
com_assignments = [] if com_assignments is None else com_assignments

super().__init__(
inputs,
outputs,
Expand Down
4 changes: 2 additions & 2 deletions compiler/dspash/worker_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ def host(self):


class WorkersManager:
def __init__(self, workers: WorkerConnection = []):
self.workers = workers
def __init__(self, workers: WorkerConnection = None):
self.workers = [] if workers is None else workers
self.host = socket.gethostbyname(socket.gethostname())
self.args = copy.copy(config.pash_args)
# Required to create a correct multi sink graph
Expand Down
3 changes: 2 additions & 1 deletion compiler/ir.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ def add_var_for_descriptor(operand):
return command_invocation_with_io_vars, dfg_edges


def compile_command_to_DFG(fileIdGen, command, options, redirections=[]):
def compile_command_to_DFG(fileIdGen, command, options, redirections=None):
redirections = [] if redirections is None else redirections
command_invocation: CommandInvocationInitial = parse_arg_list_to_command_invocation(
command, options
)
Expand Down
10 changes: 7 additions & 3 deletions compiler/shell_ast/ast_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ def redir_file_to_stdin(arg):
return make_kv("File", ["From", 0, arg])


def make_background(body, redirections=[]):
def make_background(body, redirections=None):
redirections = [] if redirections is None else redirections
lineno = 0
node = make_kv("Background", [lineno, body, redirections])
return node
Expand All @@ -128,13 +129,16 @@ def make_backquote(node):
return node


def make_subshell(body, redirections=[]):
def make_subshell(body, redirections=None):
redirections = [] if redirections is None else redirections
lineno = 0
node = make_kv("Subshell", [lineno, body, redirections])
return node


def make_command(arguments, redirections=[], assignments=[]):
def make_command(arguments, redirections=None, assignments=None):
redirections = [] if redirections is None else redirections
assignments = [] if assignments is None else assignments
lineno = 0
node = make_kv("Command", [lineno, assignments, arguments, redirections])
return node
Expand Down
Loading