MarkupClassNames: refactored to match PrecompileStep API

kaitai-io · Aug 7, 2022 · 0a20d3b · 0a20d3b
1 parent 802b5d2
commit 0a20d3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/shared/src/main/scala/io/kaitai/struct/Main.scala b/shared/src/main/scala/io/kaitai/struct/Main.scala
@@ -56,7 +56,7 @@ object Main {
   def precompile(classSpecs: ClassSpecs, topClass: ClassSpec, conf: RuntimeConfig): Iterable[CompilationProblem] = {
     val config = updateConfigFromMeta(conf, topClass.meta)
 
-    classSpecs.foreach { case (_, curClass) => MarkupClassNames.markupClassNames(curClass) }
+    new MarkupClassNames(classSpecs).run()
     val resolveTypeProblems = new ResolveTypes(classSpecs, config.opaqueTypes).run()
 
     // For now, bail out early in case we have any type resolution problems

diff --git a/shared/src/main/scala/io/kaitai/struct/precompile/MarkupClassNames.scala b/shared/src/main/scala/io/kaitai/struct/precompile/MarkupClassNames.scala
@@ -1,8 +1,14 @@
 package io.kaitai.struct.precompile
 
-import io.kaitai.struct.format.ClassSpec
+import io.kaitai.struct.format.{ClassSpec, ClassSpecs}
+import io.kaitai.struct.problems.CompilationProblem
+
+class MarkupClassNames(classSpecs: ClassSpecs) extends PrecompileStep {
+  override def run(): Iterable[CompilationProblem] = {
+    classSpecs.foreach { case (_, curClass) => markupClassNames(curClass) }
+    None
+  }
 
-object MarkupClassNames {
   def markupClassNames(curClass: ClassSpec): Unit = {
     curClass.enums.foreach { case (enumName, enumSpec) =>
       enumSpec.name = curClass.name ::: List(enumName)