abstract nonvoid formatted template

Author: kguzek

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "leetcode-project-generator"
-version = "1.5.0"
+version = "1.5.1"
 authors = [
   { name = "Konrad Guzek", email = "[email protected]" },
 ]

src/lpg/interfaces/lang/base.py

@@ -2,7 +2,7 @@
 
 import re
 from abc import ABCMeta, abstractmethod
-from typing import Any, Match, Pattern
+from typing import Any, Callable, Match, Pattern
 
 from ...constants import OUTPUT_RESULT_PREFIX
 
@@ -74,6 +74,20 @@ def get_supplemental_code(self, template: str) -> str | None:
             if match is not None
         )
 
+    def get_formatted_nonvoid_template(
+        self, template: str, nonvoid_callback: Callable[[], str]
+    ) -> str:
+        """Adjusts the return type and method call when the return type is void.
+        Useful for C-style languages where assigning to a void variable is not allowed.
+        """
+        if self.groups["returnType"] == "void":
+            self.groups["result_var_declaration"] = ""
+            self.groups["result_var"] = "0"
+            return template
+        self.groups["result_var_declaration"] = f"{self.groups['returnType']} result = "
+        self.groups["result_var"] = "result"
+        return nonvoid_callback()
+
     def add_newline(
         self, value: str | None, num_newlines: int = 1, prefix: str = ""
     ) -> str:

src/lpg/interfaces/lang/c.py

@@ -49,18 +49,12 @@ def prepare_project_files(self, template: str):
         if headers != "":
             headers += "\n"
 
-        if self.groups["returnType"] == "void":
-            self.groups["result_var_declaration"] = ""
-            self.groups["result_var"] = "0"
-            formatted_template = template
-        else:
-            self.groups["result_var_declaration"] = (
-                f"{self.groups['returnType']} result = "
-            )
-            self.groups["result_var"] = "result"
-            formatted_template = re.sub(
+        formatted_template = self.get_formatted_nonvoid_template(
+            template,
+            lambda: re.sub(
                 SOLUTION_REPLACEMENT_PATTERN, SOLUTION_REPLACEMENT_TEMPLATE, template
-            )
+            ),
+        )
 
         return {
             "solution.c": f"{headers}{formatted_template}\n",

src/lpg/interfaces/lang/java.py

@@ -66,20 +66,14 @@ def prepare_project_files(self, template: str):
         )
         self.groups["params_call"] = ", ".join(param.split()[-1] for param in params)
 
-        if self.groups["returnType"] == "void":
-            self.groups["result_var_declaration"] = ""
-            self.groups["result_var"] = "0"
-            formatted_template = template
-        else:
-            self.groups["result_var_declaration"] = (
-                f"{self.groups['returnType']} result = "
-            )
-            self.groups["result_var"] = "result"
-            formatted_template = re.sub(
+        formatted_template = self.get_formatted_nonvoid_template(
+            template,
+            lambda: re.sub(
                 SOLUTION_REPLACEMENT_PATTERN,
                 SOLUTION_REPLACEMENT_TEMPLATE.format(return_value=self.default_output),
                 template,
-            )
+            ),
+        )
 
         project_files = {
             "Solution.java": f"{UTIL_IMPORT_TEMPLATE}{formatted_template}\n",