From fdf72dcf9a6a9ced3efc2e2a0e73ad3417fabe72 Mon Sep 17 00:00:00 2001 From: Bernhard Date: Wed, 14 Feb 2024 16:15:06 +0100 Subject: [PATCH] remove allocateNodeProperty --- .../codegen/DomainClassesGenerator.scala | 1 - .../codepropertygraph/generated/Cpg.scala | 17 +++++++++-------- .../generated/GraphSchema.scala | 2 -- 3 files changed, 9 insertions(+), 11 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 index a7d7bd00..5c537093 100644 --- a/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala +++ b/domain-classes-generator/src/main/scala/flatgraph/codegen/DomainClassesGenerator.scala @@ -627,7 +627,6 @@ class DomainClassesGenerator(schema: Schema) { | override def allocateEdgeProperty(nodeKind: Int, direction: flatgraph.Edge.Direction, edgeKind: Int, size: Int): Array[?] = edgePropertyAllocators(edgeKind)(size) | override def getNodePropertyFormalType(nodeKind: Int, propertyKind: Int): FormalQtyType.FormalType = nodePropertyDescriptors(propertyOffsetArrayIndex(nodeKind, propertyKind)).asInstanceOf[FormalQtyType.FormalType] | override def getNodePropertyFormalQuantity(nodeKind: Int, propertyKind: Int): FormalQtyType.FormalQuantity = nodePropertyDescriptors(1 + propertyOffsetArrayIndex(nodeKind, propertyKind)).asInstanceOf[FormalQtyType.FormalQuantity] - | override def allocateNodeProperty(nodeKind: Int, propertyKind: Int, size: Int): Array[?] = nodePropertyAllocators(propertyKind)(size) |}""".stripMargin } os.write(outputDir0 / "GraphSchema.scala", schemaFile) diff --git a/joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/Cpg.scala b/joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/Cpg.scala index ef86f907..a70f8047 100644 --- a/joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/Cpg.scala +++ b/joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/Cpg.scala @@ -1,17 +1,18 @@ package io.shiftleft.codepropertygraph.generated import flatgraph.DiffGraphBuilder +import flatgraph.help.DocSearchPackages +import flatgraph.help.Table.AvailableWidthProvider import Language.* object Cpg { - val defaultDocSearchPackage = - flatgraph.help.DocSearchPackages.default.withAdditionalPackage(getClass.getPackage.getName) + val defaultDocSearchPackage = DocSearchPackages.default.withAdditionalPackage(getClass.getPackage.getName) @scala.annotation.implicitNotFound("""If you're using flatgraph purely without a schema and associated generated domain classes, you can |start with `given DocSearchPackages = DocSearchPackages.default`. |If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`. |If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"` |""".stripMargin) - def help(implicit searchPackageNames: flatgraph.help.DocSearchPackages) = + def help(implicit searchPackageNames: DocSearchPackages, availableWidthProvider: AvailableWidthProvider) = flatgraph.help.TraversalHelp(searchPackageNames).forTraversalSources(verbose = false) @scala.annotation.implicitNotFound("""If you're using flatgraph purely without a schema and associated generated domain classes, you can @@ -19,7 +20,7 @@ object Cpg { |If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`. |If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"` |""".stripMargin) - def helpVerbose(implicit searchPackageNames: flatgraph.help.DocSearchPackages) = + def helpVerbose(implicit searchPackageNames: DocSearchPackages, availableWidthProvider: AvailableWidthProvider) = flatgraph.help.TraversalHelp(searchPackageNames).forTraversalSources(verbose = true) def empty: Cpg = new Cpg(new flatgraph.Graph(GraphSchema)) @@ -39,10 +40,10 @@ object Cpg { class Cpg(private val _graph: flatgraph.Graph = new flatgraph.Graph(GraphSchema)) extends AutoCloseable { def graph: flatgraph.Graph = _graph - def help(implicit searchPackageNames: flatgraph.help.DocSearchPackages) = - Cpg.help(searchPackageNames) - def helpVerbose(implicit searchPackageNames: flatgraph.help.DocSearchPackages) = - Cpg.helpVerbose(searchPackageNames) + def help(implicit searchPackageNames: DocSearchPackages, availableWidthProvider: AvailableWidthProvider) = + Cpg.help + def helpVerbose(implicit searchPackageNames: DocSearchPackages, availableWidthProvider: AvailableWidthProvider) = + Cpg.helpVerbose override def close(): Unit = _graph.close() diff --git a/joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/GraphSchema.scala b/joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/GraphSchema.scala index 4d123a12..82b5e8d7 100644 --- a/joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/GraphSchema.scala +++ b/joern-generated/src/main/scala/io/shiftleft/codepropertygraph/generated/GraphSchema.scala @@ -5532,6 +5532,4 @@ object GraphSchema extends flatgraph.Schema { override def getNodePropertyFormalQuantity(nodeKind: Int, propertyKind: Int): FormalQtyType.FormalQuantity = nodePropertyDescriptors(1 + propertyOffsetArrayIndex(nodeKind, propertyKind)) .asInstanceOf[FormalQtyType.FormalQuantity] - override def allocateNodeProperty(nodeKind: Int, propertyKind: Int, size: Int): Array[?] = - nodePropertyAllocators(propertyKind)(size) }