Enum generation working

ifgen/common/__init__.py

@@ -3,7 +3,6 @@
 """
 
 # internal
-from ifgen.common.python import create_python_common
 from ifgen.generation.interface import GenerateTask
 from ifgen.generation.test import unit_test_boilerplate
 
@@ -12,7 +11,6 @@ def create_common_test(task: GenerateTask) -> None:
  """Create a unit test for the enum string-conversion methods."""
 
  if task.is_python:
- create_python_common(task)
  return
 
  with unit_test_boilerplate(task, declare_namespace=True) as writer:

ifgen/enum/python/__init__.py

@@ -3,19 +3,55 @@
 """
 
 # third-party
+from runtimepy.enum.registry import DEFAULT_ENUM_PRIMITIVE
 from vcorelib.io import IndentedFileWriter
 
 # internal
 from ifgen.generation.interface import GenerateTask
-from ifgen.generation.python import python_class, python_imports
+from ifgen.generation.python import (
+ python_class,
+ python_function,
+ python_imports,
+)
+
+
+def strip_t_suffix(data: str) -> str:
+ """Strip a possible '_t' suffix from a string."""
+ return data.replace("_t", "") if data.endswith("_t") else data
+
+
+def uses_auto(task: GenerateTask) -> bool:
+ """
+ Determine if a generation task will require 'auto' from the enum module.
+ """
+
+ result = False
+
+ for value in task.instance.get("enum", {}).values():
+ if not value or "value" not in value:
+ result = True
+ break
+
+ return result
+
+
+def to_enum_name(data: str) -> str:
+ """Ensure a candidate name string is suitable as an enumeration name."""
+ return data.upper()
 
 
 def python_enum_header(task: GenerateTask, writer: IndentedFileWriter) -> None:
  """Create a Python module for an enumeration."""
 
+ built_in = {}
+ if uses_auto(task):
+ built_in["enum"] = ["auto"]
+
  # Write imports.
  python_imports(
- writer, third_party={"runtimepy.enum.registry": ["RuntimeIntEnum"]}
+ writer,
+ third_party={"runtimepy.enum.registry": ["RuntimeIntEnum"]},
+ built_in=built_in,
  )
 
  with python_class(
@@ -25,4 +61,27 @@ def python_enum_header(task: GenerateTask, writer: IndentedFileWriter) -> None:
  parents=["RuntimeIntEnum"],
  final_empty=0,
  ):
- writer.write("# register members")
+ underlying = strip_t_suffix(task.instance["underlying"])
+
+ if underlying != DEFAULT_ENUM_PRIMITIVE:
+ with python_function(
+ writer,
+ "primitive",
+ "The underlying primitive type for this runtime enumeration.",
+ params="cls",
+ return_type="str",
+ final_empty=1,
+ decorators=["classmethod"],
+ ):
+ writer.write(f'return "{underlying}"')
+
+ for enum, value in task.instance.get("enum", {}).items():
+ final = "auto()"
+ if value:
+ final = value.get("value", final)
+
+ line = f"{to_enum_name(enum)} = {final}"
+ if value and "description" in value:
+ line += f" # {value['description']}"
+
+ writer.write(line)

ifgen/generation/python/__init__.py

@@ -4,7 +4,7 @@
 
 # built-in
 from contextlib import contextmanager
-from typing import Iterator
+from typing import Iterable, Iterator
 
 # third-party
 from vcorelib.io import IndentedFileWriter
@@ -27,11 +27,14 @@ def write_imports(
 
 def python_imports(
  writer: IndentedFileWriter,
+ built_in: PythonImports = None,
  third_party: PythonImports = None,
  final_empty: int = 2,
 ) -> None:
  """Write Python-module imports."""
 
+ if built_in:
+ write_imports(writer, "built-in", built_in)
  if third_party:
  write_imports(writer, "third-party", third_party)
 
@@ -70,9 +73,13 @@ def python_function(
  params: str = "",
  return_type: str = "None",
  final_empty: int = 2,
+ decorators: Iterable[str] = None,
 ) -> Iterator[None]:
  """Write a Python function."""
 
+ if decorators:
+ for decorator in decorators:
+ writer.write("@" + decorator)
  writer.write(f"def {name}({params}) -> {return_type}:")
 
  with writer.indented():