Skip to content

Commit 965671d

Browse files
committed
latest fg: set the default edge accessor name
1 parent 0e3048f commit 965671d

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name := "codepropertygraph"
22

33
// parsed by project/Versions.scala, updated by updateDependencies.sh
4-
val flatgraphVersion = "0.1.24"
4+
val flatgraphVersion = "0.1.24+3-441a43e7"
55

66
inThisBuild(
77
List(

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Call.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal {
335335

336336
/** Traverse to METHOD via CALL OUT edge.
337337
*/
338-
def staticCallOut: Iterator[nodes.Method] = callOut.collectAll[nodes.Method]
338+
def staticCallOut: Iterator[nodes.Method] = staticCallOut.collectAll[nodes.Method]
339339

340340
/** Traverse to METHOD via CONTAINS IN edge.
341341
*/
@@ -573,8 +573,6 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal {
573573

574574
def astOut: Iterator[nodes.Expression] = node._astOut.cast[nodes.Expression]
575575

576-
def callOut: Iterator[nodes.Method] = node._callOut.cast[nodes.Method]
577-
578576
def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode]
579577

580578
def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode]
@@ -609,6 +607,8 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal {
609607

610608
def refOut: Iterator[nodes.Member] = node._refOut.cast[nodes.Member]
611609

610+
def staticCallOut: Iterator[nodes.Method] = node._callOut.cast[nodes.Method]
611+
612612
def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag]
613613
}
614614

@@ -1180,8 +1180,6 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call])
11801180

11811181
def astOut: Iterator[nodes.Expression] = traversal.flatMap(_.astOut)
11821182

1183-
def callOut: Iterator[nodes.Method] = traversal.flatMap(_.callOut)
1184-
11851183
def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn)
11861184

11871185
def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut)
@@ -1216,5 +1214,7 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call])
12161214

12171215
def refOut: Iterator[nodes.Member] = traversal.flatMap(_.refOut)
12181216

1217+
def staticCallOut: Iterator[nodes.Method] = traversal.flatMap(_.staticCallOut)
1218+
12191219
def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut)
12201220
}

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Method.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class AccessNeighborsForMethod(val node: nodes.Method) extends AnyVal {
3232

3333
/** Traverse to CALL via CALL IN edge.
3434
*/
35-
def staticCallIn: Iterator[nodes.Call] = callIn.collectAll[nodes.Call]
35+
def staticCallIn: Iterator[nodes.Call] = staticCallIn.collectAll[nodes.Call]
3636

3737
/** Traverse to CALL via CONTAINS OUT edge.
3838
*/
@@ -311,8 +311,6 @@ final class AccessNeighborsForMethod(val node: nodes.Method) extends AnyVal {
311311

312312
def astOut: Iterator[nodes.AstNode] = node._astOut.cast[nodes.AstNode]
313313

314-
def callIn: Iterator[nodes.Call] = node._callIn.cast[nodes.Call]
315-
316314
def cfgOut: Iterator[nodes.AstNode] = node._cfgOut.cast[nodes.AstNode]
317315

318316
def containsIn: Iterator[nodes.AstNode] = node._containsIn.cast[nodes.AstNode]
@@ -329,6 +327,8 @@ final class AccessNeighborsForMethod(val node: nodes.Method) extends AnyVal {
329327

330328
def sourceFileOut: Iterator[nodes.File] = node._sourceFileOut.cast[nodes.File]
331329

330+
def staticCallIn: Iterator[nodes.Call] = node._callIn.cast[nodes.Call]
331+
332332
def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag]
333333
}
334334

@@ -624,8 +624,6 @@ final class AccessNeighborsForMethodTraversal(val traversal: Iterator[nodes.Meth
624624

625625
def astOut: Iterator[nodes.AstNode] = traversal.flatMap(_.astOut)
626626

627-
def callIn: Iterator[nodes.Call] = traversal.flatMap(_.callIn)
628-
629627
def cfgOut: Iterator[nodes.AstNode] = traversal.flatMap(_.cfgOut)
630628

631629
def containsIn: Iterator[nodes.AstNode] = traversal.flatMap(_.containsIn)
@@ -642,5 +640,7 @@ final class AccessNeighborsForMethodTraversal(val traversal: Iterator[nodes.Meth
642640

643641
def sourceFileOut: Iterator[nodes.File] = traversal.flatMap(_.sourceFileOut)
644642

643+
def staticCallIn: Iterator[nodes.Call] = traversal.flatMap(_.staticCallIn)
644+
645645
def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut)
646646
}

schema/src/main/scala/io/shiftleft/codepropertygraph/schema/CallGraph.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ object CallGraph extends SchemaBase {
131131
|automatically as the CPG is first loaded.
132132
|""".stripMargin
133133
)
134+
.withDefaultAccessorName("STATIC_CALL")
134135
.protoId(ProtoIds.CallEdge)
135136

136137
val argument = builder

0 commit comments

Comments
 (0)