Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

codegen refactoring: split up massive Traversals.scala, move to correct directory #219

Merged
merged 1 commit into from
Jul 4, 2024
+1,413 −1,335
Merged

codegen refactoring: split up massive Traversals.scala, move to correct directory #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 45 additions & 27 deletions domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand Down Expand Up @@ -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",
"}"
)
)
)
}
Expand All @@ -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)
}
Expand All @@ -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
Expand Down Expand Up @@ -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(
Expand Down
3 changes: 1 addition & 2 deletions test-schemas-domain-classes/src/main/scala/testdomains/generic/Accessors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
}
Loading
Loading