codegen refactoring: split up massive Traversals.scala, move to corre…

…ct directory (#219)
joernio · Jul 4, 2024 · 5e4528c · 5e4528c
1 parent 51e505f
commit 5e4528c
Show file tree

Hide file tree

Showing 27 changed files with 1,413 additions and 1,335 deletions.
diff --git a/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala b/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala
@@ -757,9 +757,9 @@ class DomainClassesGenerator(schema: Schema) {
     val accessorsForBaseNodes           = mutable.ArrayBuffer.empty[String]
     val baseConvert                     = Seq.fill(prioStages.length + 1)(mutable.ArrayBuffer.empty[String])
 
-    val accessorsForConcreteNodeTraversals = mutable.ArrayBuffer.empty[String]
+    val accessorsForConcreteNodeTraversals = mutable.ArrayBuffer.empty[ClassnameAndSource]
     val concreteStoredConvTrav             = mutable.ArrayBuffer.empty[String]
-    val accessorsForBaseNodeTraversals     = mutable.ArrayBuffer.empty[String]
+    val accessorsForBaseNodeTraversals     = mutable.ArrayBuffer.empty[ClassnameAndSource]
     val baseConvertTrav                    = Seq.fill(prioStages.length + 1)(mutable.ArrayBuffer.empty[String])
 
     for (p <- relevantProperties) {
@@ -779,9 +779,14 @@ class DomainClassesGenerator(schema: Schema) {
       concreteStoredConv.addOne(
         s"""implicit def accessProperty${p.className}(node: nodes.StoredNode & nodes.StaticType[nodes.Has${p.className}EMT]): Access_Property_${p.name} = new Access_Property_${p.name}(node)""".stripMargin
       )
+
+      val concreteNodeTravClassname = s"Traversal_Property_${p.name}"
       accessorsForConcreteNodeTraversals.addOne(
-        s"""final class Traversal_Property_${p.name}[NodeType <: nodes.StoredNode & nodes.StaticType[nodes.Has${p.className}EMT]](val traversal: Iterator[NodeType]) extends AnyVal {""".stripMargin +
-          generatePropertyTraversals(p, propertyKindByProperty(p)) + "}"
+        ClassnameAndSource(
+          concreteNodeTravClassname,
+          s"""final class $concreteNodeTravClassname[NodeType <: nodes.StoredNode & nodes.StaticType[nodes.Has${p.className}EMT]](val traversal: Iterator[NodeType]) extends AnyVal {""".stripMargin +
+            generatePropertyTraversals(p, propertyKindByProperty(p)) + "}"
+        )
       )
       concreteStoredConvTrav.addOne(
         s"""implicit def accessProperty${p.className}Traversal[NodeType <: nodes.StoredNode & nodes.StaticType[nodes.Has${p.className}EMT]](traversal: IterableOnce[NodeType]): Traversal_Property_${p.name}[NodeType] = new Traversal_Property_${p.name}(traversal.iterator)""".stripMargin
@@ -821,10 +826,13 @@ class DomainClassesGenerator(schema: Schema) {
           elems.addOne(generatePropertyTraversals(p, propertyKindByProperty(p)))
         }
         accessorsForBaseNodeTraversals.addOne(
-          elems.mkString(
-            s"final class $extensionClass[NodeType <: nodes.${baseType.className}Base](val traversal: Iterator[NodeType]) extends AnyVal { ",
-            "\n",
-            "}"
+          ClassnameAndSource(
+            extensionClass,
+            elems.mkString(
+              s"final class $extensionClass[NodeType <: nodes.${baseType.className}Base](val traversal: Iterator[NodeType]) extends AnyVal { ",
+              "\n",
+              "}"
+            )
           )
         )
       }
@@ -843,11 +851,9 @@ class DomainClassesGenerator(schema: Schema) {
           (s"AbstractBaseConversions${idx - 2}", if (idx < baseConvert.length) Some(s"AbstractBaseConversions${idx - 1}") else None)
       }
       conversionsForProperties.addOne(s"""trait $tname ${tparent.map { p => s" extends $p" }.getOrElse("")} {
-           |import Accessors.*
            |${convBuffer(idx).mkString("\n")}
            |}""".stripMargin)
       conversionsForTraversals.addOne(s"""trait $tname ${tparent.map { p => s" extends $p" }.getOrElse("")} {
-           |import Accessors.*
            |${convBufferTrav(idx).mkString("\n")}
            |}""".stripMargin)
     }
@@ -870,32 +876,42 @@ class DomainClassesGenerator(schema: Schema) {
          |  /* accessors for base nodes end */
          |}
          |
+         |import Accessors.*
          |${conversionsForProperties.mkString("\n\n")}
          |""".stripMargin
 
     os.write(outputDir0 / "Accessors.scala", accessors)
 
-    val traversals =
-      s"""package $basePackage.traversals
-         |import $basePackage.nodes
-         |
-         |/** not supposed to be used directly by users, hence the `bootstrap` in the name */
-         |object languagebootstrap extends ConcreteStoredConversions
-         |
-         |object Accessors {
-         |  import $basePackage.accessors.languagebootstrap.*
+    val traversalsOutputDir = outputDir0 / "traversals"
+    os.makeDir(traversalsOutputDir)
+    os.write(
+      traversalsOutputDir / "package.scala",
+      s"""package $basePackage
          |
-         |  /* accessors for concrete stored nodes start */
-         |  ${accessorsForConcreteNodeTraversals.mkString("\n")}
-         |  /* accessors for concrete stored nodes end */
+         |import $basePackage.nodes
          |
-         |  /* accessors for base nodes start */
-         |  ${accessorsForBaseNodeTraversals.mkString("\n")}
-         |  /* accessors for base nodes end */
+         |package object traversals {
+         |  
+         |  /** not supposed to be used directly by users, hence the `bootstrap` in the name */
+         |  object languagebootstrap extends ConcreteStoredConversions
+         |  
+         |  ${conversionsForTraversals.mkString("\n\n")}
          |}
-         |${conversionsForTraversals.mkString("\n\n")}
          |""".stripMargin
-    os.write(outputDir0 / "Traversals.scala", traversals)
+    )
+
+    (accessorsForConcreteNodeTraversals ++ accessorsForBaseNodeTraversals).foreach { case ClassnameAndSource(classname, source) =>
+      os.write(
+        traversalsOutputDir / s"$classname.scala",
+        s"""package $basePackage.traversals
+           |
+           |import $basePackage.nodes
+           |import $basePackage.accessors.languagebootstrap.*
+           |
+           |$source
+           |""".stripMargin
+      )
+    }
 
     writeNeighborAccessors(outputDir0, basePackage)
     // Accessors and traversals: end
@@ -1466,6 +1482,8 @@ class DomainClassesGenerator(schema: Schema) {
        |val ${camelCaseCaps(property.name)} = $propertyKeyImpl""".stripMargin.trim
   }
 
+  private case class ClassnameAndSource(classname: String, source: String)
+
   private case class PropertyContexts(properties: Array[Property[?]], containedNodesByName: Map[String, mutable.HashSet[NodeType]])
 
   private case class KindContexts(

diff --git a/test-schemas-domain-classes/src/main/scala/testdomains/generic/Accessors.scala b/test-schemas-domain-classes/src/main/scala/testdomains/generic/Accessors.scala
@@ -63,8 +63,8 @@ object Accessors {
   /* accessors for base nodes end */
 }
 
+import Accessors.*
 trait ConcreteStoredConversions extends ConcreteBaseConversions {
-  import Accessors.*
   implicit def accessPropertyIntList(node: nodes.StoredNode & nodes.StaticType[nodes.HasIntListEMT]): Access_Property_int_list =
     new Access_Property_int_list(node)
   implicit def accessPropertyIntMandatory(
@@ -83,7 +83,6 @@ trait ConcreteStoredConversions extends ConcreteBaseConversions {
 }
 
 trait ConcreteBaseConversions {
-  import Accessors.*
   implicit def access_NodeABase(node: nodes.NodeABase): Access_NodeABase = new Access_NodeABase(node)
   implicit def access_NodeBBase(node: nodes.NodeBBase): Access_NodeBBase = new Access_NodeBBase(node)
 }