universal codegeneratorのtomlをatcodertools.tomlで指定可能に (#237)

* custom tomlを追加

* 指摘事項を修正

* custom tomlのテストを追加

Author: chaemon

atcodertools/codegen/code_generators/custom.py

@@ -0,0 +1,16 @@
+from atcodertools.codegen.models.code_gen_args import CodeGenArgs
+from atcodertools.codegen.template_engine import render
+
+from atcodertools.codegen.code_generators.universal_code_generator import UniversalCodeGenerator
+
+
+def main(args: CodeGenArgs) -> str:
+    code_parameters = UniversalCodeGenerator(
+        args.format, args.config, args.config.code_generator_toml).generate_parameters()
+    return render(
+        args.template,
+        mod=args.constants.mod,
+        yes_str=args.constants.yes_str,
+        no_str=args.constants.no_str,
+        **code_parameters
+    )

atcodertools/codegen/code_style_config.py

@@ -5,6 +5,7 @@
 
 from atcodertools.fileutils.normalize import normalize_path
 
+
 INDENT_TYPE_SPACE = 'space'
 INDENT_TYPE_TAB = 'tab'
 
@@ -22,13 +23,17 @@ def __init__(self,
                  indent_type: str = None,
                  indent_width: Optional[int] = None,
                  code_generator_file: Optional[str] = None,
+                 code_generator_toml: 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.codegen.code_generators import custom
 
         code_generator_file = normalize_path(code_generator_file)
+        code_generator_toml = normalize_path(code_generator_toml)
+        self.code_generator_toml = code_generator_toml
         template_file = normalize_path(template_file)
 
         try:
@@ -49,6 +54,10 @@ def __init__(self,
             raise CodeStyleConfigInitError(
                 "Module file {} is not found".format(code_generator_file))
 
+        if code_generator_toml is not None and not os.path.exists(code_generator_toml):
+            raise CodeStyleConfigInitError(
+                "TOML for Code Generator {} is not found".format(code_generator_toml))
+
         if template_file is not None and not os.path.exists(template_file):
             raise CodeStyleConfigInitError(
                 "The specified template file '{}' is not found".format(
@@ -74,7 +83,13 @@ def __init__(self,
                 raise CodeStyleConfigInitError(
                     "indent_type must be 'space' or 'tab'")
 
-        if code_generator_file is not None:
+        if code_generator_toml is not None:
+            if code_generator_file is not None:
+                raise CodeStyleConfigInitError(
+                    "Both Code Generator File and Code Generator TOML is specified"
+                )
+            self.code_generator = custom.main
+        elif code_generator_file is not None:
             try:
                 module = imm.SourceFileLoader(
                     'code_generator', code_generator_file).load_module()

tests/resources/test_config/test_custom_codegen_toml/generated_code.nim

@@ -0,0 +1,28 @@
+import sequtils
+proc scanf(formatstr: cstring){.header: "<stdio.h>", varargs.}
+proc getchar(): char {.header: "<stdio.h>", varargs.}
+proc nextInt(): int = scanf("%lld",addr result)
+proc nextFloat(): float = scanf("%lf",addr result)
+proc nextString(): string =
+  var get = false
+  result = ""
+  while true:
+    var c = getchar()
+    if int(c) > int(' '):
+      get = true
+      result.add(c)
+    else:
+      if get: break
+
+proc solve(H:int, W:int, c:seq[seq[int]], A:seq[seq[int]]):void =
+  return
+
+proc main():void =
+  var H = nextKyuridenamida()
+  var W = nextKyuridenamida()
+  var c = Kyuridenamida(9+1, Kyuridenamida(9+1, nextKyuridenamida()))
+  var A = Kyuridenamida(H, Kyuridenamida(W, nextKyuridenamida()))
+  solve(H, W, c, A)
+  return
+
+main()

tests/resources/test_config/test_custom_codegen_toml/intermediate_format.txt

@@ -0,0 +1 @@
+[(Singular: L),(Singular: N),(Singular: M),(Parallel: K | 1 to L),(Parallel: A,S | 1 to N)]

tests/resources/test_config/test_custom_codegen_toml/intermediate_types.txt

@@ -0,0 +1 @@
+[('L', <class 'int'>), ('N', <class 'int'>), ('M', <class 'int'>), ('K', <class 'float'>), ('A', <class 'int'>), ('S', <class 'float'>)]

tests/resources/test_config/test_custom_codegen_toml/nim.toml

@@ -0,0 +1,81 @@
+base_indent = 1
+insert_space_around_operators = false
+
+# global変数宣言時の接頭辞
+global_prefix = ""
+
+# ループ
+[loop]
+header = "for {loop_var} in 0..<{length}:"
+footer = ""
+
+# タイプ
+[type]
+int = "int"
+float = "float"
+str = "string"
+
+# デフォルト値
+[default]
+int = "0"
+float = "0.0"
+str = '""'
+
+# 宣言
+[declare]
+int = "var {name}:int"
+float = "var {name}:float"
+str = "var {name}:string"
+seq = "var {name}:seq[{type}]"
+2d_seq = "var {name}:seq[seq[{type}]]"
+
+# 確保
+[allocate]
+seq = "{name} = newSeqWith({length}, {default})"
+2d_seq = "{name} = newSeqWith({length_i}, newSeqWith({length_j}, {default}))"
+
+# 宣言と確保
+[declare_and_allocate]
+seq = "var {name} = newSeqWith({length}, {default})"
+2d_seq = "var {name} = newSeqWith({length_i}, newSeqWith({length_j}, {default}))"
+
+# 入力関数
+[input_func]
+int = "nextInt()"
+float = "nextFloat()"
+str = "nextString()"
+
+# 入力
+[input]
+int = "{name} = {input_func}"
+float = "{name} = {input_func}"
+str = "{name} = {input_func}"
+
+# 宣言と入力
+[declare_and_input]
+int = "var {name} = {input_func}"
+float = "var {name} = {input_func}"
+str = "var {name} = {input_func}"
+
+# 確保と入力
+[allocate_and_input]
+seq = "{name} = newSeqWith({length}, {input_func})"
+2d_seq = "{name} = newSeqWith({length_i}, newSeqWith({length_j}, {input_func}))"
+
+# 宣言と確保と入力
+[declare_and_allocate_and_input]
+seq = "var {name} = newSeqWith({length}, {input_func})"
+2d_seq = "var {name} = newSeqWith({length_i}, newSeqWith({length_j}, {input_func}))"
+
+# 引数
+[arg]
+int = "{name}:int"
+float = "{name}:float"
+str = "{name}:string"
+seq = "{name}:seq[{type}]"
+2d_seq = "{name}:seq[seq[{type}]]"
+
+# 配列アクセス
+[access]
+seq = "{name}[{index}]"
+2d_seq = "{name}[{index_i}][{index_j}]"

tests/resources/test_config/test_custom_codegen_toml/nim_custom.toml

@@ -0,0 +1,81 @@
+base_indent = 1
+insert_space_around_operators = false
+
+# global変数宣言時の接頭辞
+global_prefix = ""
+
+# ループ
+[loop]
+header = "for {loop_var} in 0..<{length}:"
+footer = ""
+
+# タイプ
+[type]
+int = "int"
+float = "float"
+str = "string"
+
+# デフォルト値
+[default]
+int = "0"
+float = "0.0"
+str = '""'
+
+# 宣言
+[declare]
+int = "var {name}:int"
+float = "var {name}:float"
+str = "var {name}:string"
+seq = "var {name}:seq[{type}]"
+2d_seq = "var {name}:seq[seq[{type}]]"
+
+# 確保
+[allocate]
+seq = "{name} = Kyuridenamida({length}, {default})"
+2d_seq = "{name} = Kyuridenamida({length_i}, Kyuridenamida({length_j}, {default}))"
+
+# 宣言と確保
+[declare_and_allocate]
+seq = "var {name} = Kyuridenamida({length}, {default})"
+2d_seq = "var {name} = Kyuridenamida({length_i}, Kyuridenamida({length_j}, {default}))"
+
+# 入力関数
+[input_func]
+int = "nextKyuridenamida()"
+float = "nextFloat()"
+str = "nextString()"
+
+# 入力
+[input]
+int = "{name} = {input_func}"
+float = "{name} = {input_func}"
+str = "{name} = {input_func}"
+
+# 宣言と入力
+[declare_and_input]
+int = "var {name} = {input_func}"
+float = "var {name} = {input_func}"
+str = "var {name} = {input_func}"
+
+# 確保と入力
+[allocate_and_input]
+seq = "{name} = Kyuridenamida({length}, {input_func})"
+2d_seq = "{name} = Kyuridenamida({length_i}, Kyuridenamida({length_j}, {input_func}))"
+
+# 宣言と確保と入力
+[declare_and_allocate_and_input]
+seq = "var {name} = Kyuridenamida({length}, {input_func})"
+2d_seq = "var {name} = Kyuridenamida({length_i}, Kyuridenamida({length_j}, {input_func}))"
+
+# 引数
+[arg]
+int = "{name}:int"
+float = "{name}:float"
+str = "{name}:string"
+seq = "{name}:seq[{type}]"
+2d_seq = "{name}:seq[seq[{type}]]"
+
+# 配列アクセス
+[access]
+seq = "{name}[{index}]"
+2d_seq = "{name}[{index_i}][{index_j}]"

tests/resources/test_config/test_custom_codegen_toml/template.nim

@@ -0,0 +1,25 @@
+import sequtils
+proc scanf(formatstr: cstring){.header: "<stdio.h>", varargs.}
+proc getchar(): char {.header: "<stdio.h>", varargs.}
+proc nextInt(): int = scanf("%lld",addr result)
+proc nextFloat(): float = scanf("%lf",addr result)
+proc nextString(): string =
+  var get = false
+  result = ""
+  while true:
+    var c = getchar()
+    if int(c) > int(' '):
+      get = true
+      result.add(c)
+    else:
+      if get: break
+
+proc solve(${formal_arguments}):void =
+  return
+
+proc main():void =
+  ${input_part}
+  solve(${actual_arguments})
+  return
+
+main()

tests/test_config.py

@@ -1,17 +1,29 @@
 import unittest
 import os
+import tempfile
 
 from atcodertools.codegen.code_style_config import CodeStyleConfig, INDENT_TYPE_SPACE, CodeStyleConfigInitError, \
     INDENT_TYPE_TAB
 from atcodertools.config.config import Config, ConfigType
 from atcodertools.tools import get_default_config_path
+from atcodertools.common.language import NIM
+from atcodertools.codegen.models.code_gen_args import CodeGenArgs
+from tests.utils.fmtprediction_test_runner import FormatPredictionTestRunner
+from tests.utils.gzip_controller import make_tst_data_controller
+from atcodertools.constprediction.models.problem_constant_set import ProblemConstantSet
 
 RESOURCE_DIR = os.path.join(
     os.path.dirname(os.path.abspath(__file__)),
     "./resources/test_config/")
 
 
 class TestConfig(unittest.TestCase):
+    def setUp(self):
+        self.temp_dir = tempfile.mkdtemp()
+        self.test_data_controller = make_tst_data_controller(
+            tempfile.mkdtemp())
+        self.test_dir = self.test_data_controller.create_dir()
+        self.runner = FormatPredictionTestRunner(self.test_dir)
 
     def test_load_code_style_config(self):
         with open(os.path.join(RESOURCE_DIR, "with_indent_width.toml"), 'r') as f:
@@ -81,6 +93,33 @@ def test_init_code_style_config_with_invalid_parameters(self):
             template_file='not existing path'
         )
 
+    def test_custom_codegen_toml(self):
+        response = self.runner.run('abc079-D')
+        template_file = os.path.join(
+            RESOURCE_DIR,
+            "test_custom_codegen_toml/template.nim")
+        with open(template_file, 'r') as f:
+            template = f.read()
+        generated_code_file = os.path.join(
+            RESOURCE_DIR,
+            "test_custom_codegen_toml/generated_code.nim")
+        with open(generated_code_file, 'r') as f:
+            generated_code = f.read()
+        resource_path = os.path.join(
+            RESOURCE_DIR, "test_custom_codegen_toml/nim_custom.toml")
+        config = CodeStyleConfig(
+            lang=NIM.name, code_generator_toml=str(resource_path))
+
+        code = config.code_generator(
+            CodeGenArgs(
+                template,
+                response.original_result.format,
+                ProblemConstantSet(),
+                config)
+        )
+
+        self.assertEqual(generated_code, code)
+
     def _expect_error_when_init_config(self, **kwargs):
         try:
             CodeStyleConfig(**kwargs)