Skip to content

Commit

Permalink
fix: fname indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@clatapie
clatapie committed Dec 23, 2024
1 parent 2778bc0 commit d157471
Showing 1 changed file with 49 additions and 11 deletions.
60 changes: 49 additions & 11 deletions src/pyconverter/xml2py/ast_tree.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2267,6 +2267,7 @@ class Argument:

def __init__(
self,
terms,
element: str | Element,
initial_arguments: List,
description: Element | str | None = None,
Expand All @@ -2286,6 +2287,7 @@ def __init__(
else:
name = element
self._name = name
self._terms = terms
self._description = description
self._initial_arguments = initial_arguments

Expand Down Expand Up @@ -2314,7 +2316,9 @@ def multiple_args(self):
if not self.is_arg_elipsis:
for item_name in split_name:
arg_name = item_name.strip()
new_arg = Argument(arg_name, self._initial_arguments, self._description)
new_arg = Argument(
self._terms, arg_name, self._initial_arguments, self._description
)
additional_args.append(new_arg)
else:

Expand All @@ -2324,15 +2328,19 @@ def multiple_args(self):

if len(complete_args) > 0:
for item in complete_args:
new_arg = Argument(item, self._initial_arguments, self._description)
new_arg = Argument(
self._terms, item, self._initial_arguments, self._description
)
additional_args.append(new_arg)

else:

for i, item_name in enumerate(split_name):
item_name = item_name.strip()
if item_name == "":
new_arg = Argument(arg_name, self._initial_arguments, self._description)
new_arg = Argument(
self._terms, arg_name, self._initial_arguments, self._description
)
additional_args.append(new_arg)
elif is_elipsis(item_name):

Expand All @@ -2353,7 +2361,10 @@ def multiple_args(self):
arg_name = split_name[i + 1].strip()
arg_name = f"{arg_name[:initial_pos_final]}{j}{arg_name[end_pos_final:]}" # noqa : E501
new_arg = Argument(
arg_name, self._initial_arguments, self._description
self._terms,
arg_name,
self._initial_arguments,
self._description,
)
if new_arg.py_arg_name != "":
additional_args.append(new_arg)
Expand Down Expand Up @@ -2385,12 +2396,16 @@ def multiple_args(self):
for j in range(number_iter_prev + 1, number_iter_next):
arg_name = f"{name_iter_prev}{j}"
new_arg = Argument(
arg_name, self._initial_arguments, self._description
self._terms,
arg_name,
self._initial_arguments,
self._description,
)
additional_args.append(new_arg)
else:
additional_args.append(
Argument(
self._terms,
name_iter_next,
self._initial_arguments,
self._description,
Expand Down Expand Up @@ -2453,6 +2468,14 @@ def to_py_docstring(self, max_length=100, links=None, base_url=None, fcache=None
base_url=base_url,
fcache=fcache,
)

# Replacing terms with their definitions
special_terms = re.findall(r"\&(\S+)\;", rst_description)
if len(special_terms) > 0:
for term in special_terms:
if term in self._terms:
rst_description = rst_description.replace(f"&{term};", self._terms[term])

description_indent = " " * 4
if not "* " in rst_description:
list_description = self.resized_description(
Expand All @@ -2472,10 +2495,13 @@ def to_py_docstring(self, max_length=100, links=None, base_url=None, fcache=None


class ArgumentList:
def __init__(self, py_name: str, url: str, list_entry: VarlistEntry, args: List) -> None:
def __init__(
self, py_name: str, url: str, terms: dict, list_entry: VarlistEntry, args: List
) -> None:

self._py_name = py_name
self._url = url
self._terms = terms
self._list_entry = list_entry
self._arguments = []
self._additional_args = []
Expand All @@ -2487,7 +2513,7 @@ def _parse_list_entry(self):
temp_args = {}
for item in self._list_entry:
if isinstance(item, VarlistEntry):
argument_obj = Argument(item, self._initial_args)
argument_obj = Argument(self._terms, item, self._initial_args)
additional_args = argument_obj.multiple_args
if len(additional_args) > 0:
for arg in additional_args:
Expand All @@ -2506,6 +2532,7 @@ def _parse_list_entry(self):
else:
self._arguments.append(
Argument(
self._terms,
initial_arg,
self._initial_args,
MISSING_ARGUMENT_DESCRIPTION.replace("url", f"{self._url}"),
Expand All @@ -2522,6 +2549,7 @@ def _parse_list_entry(self):
if is_additional_arg and "addional_command_arg" not in self.py_arg_names:
self._arguments.append(
Argument(
self._terms,
"addional_command_arg",
self._initial_args,
ADDITIONAL_ARGUMENT_DESCRIPTION.replace("url", f"{self._url}"),
Expand All @@ -2547,6 +2575,7 @@ def __iadd__(self, argument_list):
if initial_arg not in self.py_arg_names:
self._arguments.append(
Argument(
self._terms,
initial_arg,
self._initial_args,
MISSING_ARGUMENT_DESCRIPTION.replace("url", f"{self._url}"),
Expand All @@ -2563,6 +2592,7 @@ def __iadd__(self, argument_list):
if is_additional_arg and "addional_command_arg" not in self.py_arg_names:
self._arguments.append(
Argument(
self._terms,
"addional_command_arg",
self._initial_args,
ADDITIONAL_ARGUMENT_DESCRIPTION.replace("url", f"{self._url}"),
Expand Down Expand Up @@ -2660,17 +2690,25 @@ def arg_desc(self) -> List[Argument]:
for child in elem:
if isinstance(child, Variablelist):
if arguments is None:
arguments = ArgumentList(self.py_name, self.url, child, self.args)
arguments = ArgumentList(
self.py_name, self.url, self._terms, child, self.args
)
else:
arguments += ArgumentList(self.py_name, self.url, child, self.args)
arguments += ArgumentList(
self.py_name, self.url, self._terms, child, self.args
)

else:
for elem in refsyn:
if isinstance(elem, Variablelist):
if arguments is None:
arguments = ArgumentList(self.py_name, self.url, elem, self.args)
arguments = ArgumentList(
self.py_name, self.url, self._terms, elem, self.args
)
else:
arguments += ArgumentList(self.py_name, self.url, elem, self.args)
arguments += ArgumentList(
self.py_name, self.url, self._terms, elem, self.args
)

arg_file = Path("args.txt")

Expand Down

0 comments on commit d157471

Please sign in to comment.