Fix nim to work with the default indent setting & Fix a bug on a unit test where a wrong execution file can be potentially executed on compile failure (kyuridenamida#151)

kyuridenamida · web-flow · commit 30793e6f054d · 2019-08-20T01:59:43.000+09:00
diff --git a/atcodertools/codegen/code_style_config.py b/atcodertools/codegen/code_style_config.py
@@ -20,13 +20,13 @@ class CodeStyleConfig:
 
     def __init__(self,
                  indent_type: str = INDENT_TYPE_SPACE,
-                 indent_width: int = 4,
+                 indent_width: Optional[int] = None,
                  code_generator_file: Optional[str] = None,
                  template_file: Optional[str] = None,
                  workspace_dir: Optional[str] = None,
                  lang: str = "cpp",
                  ):
-        from atcodertools.common.language import Language, LanguageNotFoundError, ALL_LANGUAGE_NAMES
+        from atcodertools.common.language import Language, LanguageNotFoundError, ALL_LANGUAGE_NAMES, NIM
 
         code_generator_file = normalize_path(code_generator_file)
         template_file = normalize_path(template_file)
@@ -41,7 +41,7 @@ def __init__(self,
             raise CodeStyleConfigInitError(
                 "indent_type must be 'space' or 'tab'")
 
-        if indent_width < 0:
+        if indent_width is not None and indent_width < 0:
             raise CodeStyleConfigInitError(
                 "indent_width must be a positive integer")
 
@@ -56,7 +56,12 @@ def __init__(self,
             )
 
         self.indent_type = indent_type
-        self.indent_width = indent_width
+
+        if indent_width is not None:
+            self.indent_width = indent_width
+        else:
+            # nim has a special default value
+            self.indent_width = 2 if lang == NIM else 4
 
         if code_generator_file is not None:
             try:
diff --git a/tests/test_codegen.py b/tests/test_codegen.py
@@ -201,6 +201,22 @@ def _exec_file_and_args(self, lang: Language) -> Tuple[str, List[str]]:
         else:
             raise NotImplementedError()
 
+    def _clean_up(self, lang: Language):
+        if lang == CPP:
+            os.remove(os.path.join(self.temp_dir, "a.out"))
+        elif lang == JAVA:
+            return
+        elif lang == RUST:
+            os.remove(os.path.join(self.temp_dir, "main"))
+        elif lang == PYTHON:
+            return
+        elif lang == NIM:
+            os.remove(os.path.join(self.temp_dir, "main"))
+        elif lang == DLANG:
+            os.remove(os.path.join(self.temp_dir, "main"))
+        else:
+            raise NotImplementedError()
+
     def _compile_and_run(self, lang, format, template_file, expected_generated_code_file, input_file):
         code_file = os.path.join(self.temp_dir, lang.source_code_name("main"))
         exec_file, exec_args = self._exec_file_and_args(lang)
@@ -215,16 +231,22 @@ def _compile_and_run(self, lang, format, template_file, expected_generated_code_
             constants=ProblemConstantSet(123, "yes", "NO"),
             config=cfg
         )
-
         code = lang.default_code_generator(args)
         # to remove version strings from test resources
         code = re.sub(r'Generated by \d+.\d+.\d+', 'Generated by x.y.z', code)
         self.compare_two_texts_ignoring_trailing_spaces(
             load_text_file(expected_generated_code_file), code)
         create_code(code, code_file)
-        print(run_command(compile_cmd, self.temp_dir))
-        exec_result = run_program(
-            exec_file, input_file, 2, exec_args, self.temp_dir)
+        try:
+            print("Executing:", compile_cmd)
+            print(run_command(compile_cmd, self.temp_dir))
+
+            print("Run program:", [exec_file] + exec_args)
+            exec_result = run_program(
+                exec_file, input_file, 2, exec_args, self.temp_dir)
+        finally:
+            self._clean_up(lang)
+
         print("== stdout ==")
         print(exec_result.output)
         print("== stderr ==")
@@ -255,10 +277,6 @@ def verify(self,
         self.assertEqual(
             load_intermediate_types(py_test_name),
             str(response.types))
-        if lang == NIM:
-            cfg = CodeStyleConfig(indent_width=2)
-        else:
-            cfg = CodeStyleConfig()
 
         self.assertEqual(
             load_generated_code(py_test_name, lang),
@@ -267,7 +285,7 @@ def verify(self,
                     self.get_template(lang, template_type),
                     response.original_result.format,
                     constants,
-                    cfg)
+                    CodeStyleConfig(lang=lang.name))
             ))
 
     def get_template(self, lang: Language, template_type: str) -> str:
