Revert "Converter star slash improvements (#1478)"

This reverts commit 2ff3e06.

Author: germa89

src/ansys/mapdl/core/convert.py

@@ -84,7 +84,6 @@ def convert_script(
     cleanup_output=True,
     header=True,
     print_com=True,
-    only_commands=False,
 ):
     """Converts an ANSYS input file to a python PyMAPDL script.
 
@@ -145,12 +144,6 @@ def convert_script(
         Print command ``/COM`` arguments to python console.
         Defaults to ``True``.
 
-    only_commands : bool, optional
-        If ``True``, it converts only the commands, meaning that header
-        (``header=False``), imports (``add_imports=False``),
-        and exit commands are NOT included (``auto_exit=False``).
-        Overrides ``header``, ``add_imports`` and ``auto_exit``.
-
     Returns
     -------
     list
@@ -197,7 +190,6 @@ def convert_script(
         cleanup_output=cleanup_output,
         header=header,
         print_com=print_com,
-        only_commands=only_commands,
     )
 
     translator.save(filename_out)
@@ -218,7 +210,6 @@ def convert_apdl_block(
     cleanup_output=True,
     header=True,
     print_com=True,
-    only_commands=False,
 ):
     """Converts an ANSYS input string to a python PyMAPDL string.
 
@@ -282,12 +273,6 @@ def convert_apdl_block(
         Print command ``/COM`` arguments to python console.
         Defaults to ``True``.
 
-    only_commands : bool, optional
-        If ``True``, it converts only the commands, meaning that header
-        (``header=False``), imports (``add_imports=False``),
-        and exit commands are NOT included (``auto_exit=False``).
-        Overrides ``header``, ``add_imports`` and ``auto_exit``.
-
     Returns
     -------
     list
@@ -323,7 +308,6 @@ def convert_apdl_block(
         cleanup_output=cleanup_output,
         header=header,
         print_com=print_com,
-        only_commands=only_commands,
     )
 
     if isinstance(apdl_strings, str):
@@ -345,14 +329,8 @@ def _convert(
     cleanup_output=True,
     header=True,
     print_com=True,
-    only_commands=False,
 ):
 
-    if only_commands:
-        auto_exit = False
-        add_imports = False
-        header = False
-
     translator = FileTranslator(
         loglevel,
         line_ending,
@@ -608,40 +586,36 @@ def translate_line(self, line):
         # Cleaning ending empty arguments.
         # Because of an extra comma added to toffst command when generating ds.dat.
         line_ = line.split(",")[::-1]  # inverting order
-
         for ind, each in enumerate(line_):
-            if each.strip():  # strip to remove spaces in empty arguments
+            if each:
                 break
-
-        line = ",".join(line_[ind:][::-1])
+            else:
+                line_.pop(ind)
+        line = ",".join(line_[::-1])
 
         # remove trailing comma
         line = line[:-1] if line[-1] == "," else line
-        line_upper = line.upper()
 
-        cmd_caps = line.split(",")[0].upper()
-        cmd_caps_short = cmd_caps[:4]
+        cmd_ = line.split(",")[0].upper()
 
-        items = line.split(",")
-
-        if cmd_caps_short in ["SOLV", "LSSO"] and self._comment_solve:
+        if cmd_[:4] in ["SOLV", "LSSO"] and self._comment_solve:
             self.store_command(
                 "com", ["The following line has been commented due to `comment_solve`:"]
             )
             self.store_command("com", [line])
             return
 
-        if cmd_caps_short == "/COM":
+        if cmd_[:4] == "/COM":
             # It is a comment
             self.store_command("com", [line[5:]])
             return
 
-        if cmd_caps == "*DO":
+        if cmd_ == "*DO":
             self.start_non_interactive()
             self.store_run_command(line)
             return
 
-        if cmd_caps in ["*ENDDO", "*ENDIF"]:
+        if cmd_ in ["*ENDDO", "*ENDIF"]:
             self.store_run_command(line)
             self.end_non_interactive()
             return
@@ -657,13 +631,13 @@ def translate_line(self, line):
             self.end_non_interactive()
             return
 
-        if cmd_caps == "/VERIFY":
+        if cmd_ == "/VERIFY":
             self.store_run_command("FINISH")
             self.store_run_command(line)
             self.store_run_command("/PREP7")
             return
 
-        if cmd_caps_short == "*REP":
+        if line[:4].upper() == "*REP":
             if not self.non_interactive:
                 prev_cmd = self.lines.pop(-1)
                 self.start_non_interactive()
@@ -677,40 +651,33 @@ def translate_line(self, line):
                 self.end_non_interactive()
                 return
 
-        if cmd_caps_short in COMMANDS_TO_NOT_BE_CONVERTED:
+        if line[:4].upper() in COMMANDS_TO_NOT_BE_CONVERTED:
             self.store_run_command(line)
             return
 
-        if cmd_caps_short == "/TIT":  # /TITLE
+        if line[:4].upper() == "/TIT":  # /TITLE
             parameters = line.split(",")[1:]
             return self.store_command("title", ["".join(parameters).strip()])
 
-        if cmd_caps_short == "*GET":
+        if line[:4].upper() == "*GET":
             if self.non_interactive:  # gives error
                 self.store_run_command(line)
                 return
             else:
                 parameters = line.split(",")[1:]
                 return self.store_command("get", parameters)
 
-        if cmd_caps_short == "/NOP":
+        if line[:4].upper() == "/NOP":
             self.comment = (
                 "It is not recommended to use '/NOPR' in a normal PyMAPDL session."
             )
             self.store_under_scored_run_command(line)
             return
 
-        if cmd_caps_short == "*CRE":  # creating a function
-            if self.macros_as_functions:
-                self.start_function(items[1].strip())
-                return
-            else:
-                self.start_non_interactive()
-
-        if cmd_caps == "/PREP7":
+        if line[:6].upper() == "/PREP7":
             return self.store_command("prep7", [])
 
-        if "*END" in line_upper:
+        if "*END" in line:
             if self.macros_as_functions:
                 self.store_empty_line()
                 self.store_empty_line()
@@ -726,7 +693,7 @@ def translate_line(self, line):
                 return
 
         # check for if statement
-        if cmd_caps[:3] == "*IF" or "*IF" in line_upper:
+        if line[:3].upper() == "*IF" or "*IF" in line.upper():
             self.start_non_interactive()
             self.store_run_command(line)
             return
@@ -745,14 +712,16 @@ def translate_line(self, line):
             ):  # To escape cmds that require (XX) but they are not in block
                 self.end_non_interactive()
             return
-        elif cmd_caps_short == "*USE" and self.macros_as_functions:
+        elif line[:4] == "*USE" and self.macros_as_functions:
+            items = line.split(",")
             func_name = items[1].strip()
             if func_name in self._functions:
                 args = ", ".join(items[2:])
                 self.lines.append(f"{func_name}({args})")
                 return
 
         # check if a line is setting a variable
+        items = line.split(",")
         if "=" in items[0]:  # line sets a variable:
             self.store_run_command(line)
             return
@@ -763,67 +732,54 @@ def translate_line(self, line):
             self.store_empty_line()
             return
 
-        if line == "-1" or line_upper == "END PREAD":  # End of block commands
+        if line == "-1" or line == "END PREAD":  # End of block commands
             self.store_run_command(line)
             self._in_block = False
             self.end_non_interactive()
             return
 
         # check valid command
-        if (
-            self._pymapdl_command(command) not in self._valid_commands
-            or cmd_caps_short in self._non_interactive_commands
-        ):
-            if cmd_caps_short in self._non_interactive_commands:
-                if cmd_caps_short in self._block_commands:
+        if command not in self._valid_commands:
+            cmd = line[:4].upper()
+            if cmd == "*CRE":  # creating a function
+                if self.macros_as_functions:
+                    self.start_function(items[1].strip())
+                    return
+                else:
+                    self.start_non_interactive()
+
+            elif cmd in self._non_interactive_commands:
+                if cmd in self._block_commands:
                     self._in_block = True
                     self._block_count = 0
                     self._block_count_target = 0
 
-                elif cmd_caps_short in self._enum_block_commands:
+                elif cmd in self._enum_block_commands:
                     self._in_block = True
                     self._block_count = 0
-                    if cmd_caps_short == "CMBL":  # In cmblock
+                    if cmd == "CMBL":  # In cmblock
                         # CMBLOCK,Cname,Entity,NUMITEMS,,,,,KOPT
                         numitems = int(line.split(",")[3])
                         _block_count_target = (
                             numitems // 8 + 1 if numitems % 8 != 0 else numitems // 8
                         )
                         self._block_count_target = (
                             _block_count_target + 2
-                        )  # because the cmd_caps_short line and option line.
+                        )  # because the cmd line and option line.
 
-                self._block_current_cmd = cmd_caps_short
+                self._block_current_cmd = cmd
                 self.start_non_interactive()
 
-            if self._in_block and cmd_caps_short not in self._non_interactive_commands:
+            if self._in_block and cmd not in self._non_interactive_commands:
                 self.store_run_command(original_line)
             else:
                 self.store_run_command(line)
 
         elif self.use_function_names:
-            if command[0] == "/":
-                slash_command = f"slash{command[1:]}"
-                if slash_command in dir(Commands):
-                    command = slash_command
-                else:
-                    command = command[1:]
-            elif command[0] == "*":
-                star_command = f"star{command[1:]}"
-                if star_command in dir(Commands):
-                    command = star_command
-                else:
-                    command = command[1:]
-
             self.store_command(command, parameters)
         else:
             self.store_run_command(line)
 
-    def _pymapdl_command(self, command):
-        if command[0] in ["/", "*"]:
-            command = command[1:]
-        return command
-
     def start_function(self, func_name):
         self._functions.append(func_name)
         self.store_empty_line()

tests/test_convert.py

@@ -244,11 +244,10 @@ def test_comment_solve():
 
 
 def test_macro_to_function():
-    output = convert_apdl_block(APDL_MACRO, macros_as_functions=True)
-    assert "def SLV(" in output
-    assert "SLV()" in output
-    assert "\n\n\ndef SLV" in output
-    assert "\n\n\nSLV" in output
+    assert "def SLV(" in convert_apdl_block(APDL_MACRO, macros_as_functions=True)
+    assert "SLV()" in convert_apdl_block(APDL_MACRO, macros_as_functions=True)
+    assert "\n\n\ndef SLV" in convert_apdl_block(APDL_MACRO, macros_as_functions=True)
+    assert "\n\n\nSLV" in convert_apdl_block(APDL_MACRO, macros_as_functions=True)
 
 
 def test_out():
@@ -362,42 +361,3 @@ def test_print_com_in_converter():
     assert "print_com=True" in convert_apdl_block("/prep7\nN,,,,")  # Default
     assert "print_com=True" in convert_apdl_block("/prep7\nN,,,,", print_com=True)
     assert "print_com=True" not in convert_apdl_block("/prep7\nN,,,,", print_com=False)
-
-
-def test_only_commands():
-    output = convert_apdl_block(
-        "/view,1,1,1",
-        only_commands=True,
-        add_imports=True,
-        auto_exit=True,
-        header="asdf",
-    )
-    assert "mapdl.view(1, 1, 1)" in output
-    assert "launch_mapdl" not in output
-    assert "import" not in output
-    assert "mapdl.exit" not in output
-
-
-@pytest.mark.parametrize(
-    "parameters",
-    [
-        ["/view,1,1,1", "mapdl.view(1, 1, 1)"],
-        ["/view,1,,1,1", 'mapdl.view(1, "", 1, 1)'],
-        ["/view,1,,1,  ,1", 'mapdl.view(1, "", 1, "", 1)'],
-        ["*get,1,1,1", "mapdl.get(1, 1, 1)"],
-        ["*get,1,asdf,,1,qwert", 'mapdl.get(1, "asdf", "", 1, "qwert")'],
-        ["*get,1,asdf,,1,qwert", 'mapdl.get(1, "asdf", "", 1, "qwert")'],
-        ["vget,1,,'asdf',", 'mapdl.vget(1, "", "asdf")'],
-        ["*vget,1,,'asdf',", 'mapdl.starvget(1, "", "asdf")'],
-        ["*vget,1,,'asdf',,,,,", 'mapdl.starvget(1, "", "asdf")'],
-        [
-            "*vget,1,,,,,,,'asdf',,,,,",
-            'mapdl.starvget(1, "", "", "", "", "", "", "asdf")',
-        ],
-        ["solve", "mapdl.solve()"],
-        ["/solu", "mapdl.slashsolu()"],
-        ["solu", "mapdl.solu()"],
-    ],
-)
-def test_convert_star_slash(parameters):
-    assert convert_apdl_block(parameters[0], only_commands=True) == parameters[1]