Skip to content

Commit d0a627a

Browse files
authored
call edge: staticCall In|Out accessor names (#1831)
* call: staticCall In|Out accessor names * latest fg: set the default edge accessor name * released fg version * trigger ci * remove stepNameOut|In definition, apparently not needed
1 parent 05a7a7c commit d0a627a

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.25"
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
@@ -330,7 +330,7 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal {
330330

331331
/** Traverse to METHOD via CALL OUT edge.
332332
*/
333-
def _methodViaCallOut: Iterator[nodes.Method] = callOut.collectAll[nodes.Method]
333+
def _methodViaCallOut: Iterator[nodes.Method] = staticCallOut.collectAll[nodes.Method]
334334

335335
/** Traverse to METHOD via CONTAINS IN edge.
336336
*/
@@ -568,8 +568,6 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal {
568568

569569
def astOut: Iterator[nodes.Expression] = node._astOut.cast[nodes.Expression]
570570

571-
def callOut: Iterator[nodes.Method] = node._callOut.cast[nodes.Method]
572-
573571
def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode]
574572

575573
def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode]
@@ -604,6 +602,8 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal {
604602

605603
def refOut: Iterator[nodes.Member] = node._refOut.cast[nodes.Member]
606604

605+
def staticCallOut: Iterator[nodes.Method] = node._callOut.cast[nodes.Method]
606+
607607
def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag]
608608
}
609609

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

11711171
def astOut: Iterator[nodes.Expression] = traversal.flatMap(_.astOut)
11721172

1173-
def callOut: Iterator[nodes.Method] = traversal.flatMap(_.callOut)
1174-
11751173
def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn)
11761174

11771175
def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut)
@@ -1206,5 +1204,7 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call])
12061204

12071205
def refOut: Iterator[nodes.Member] = traversal.flatMap(_.refOut)
12081206

1207+
def staticCallOut: Iterator[nodes.Method] = traversal.flatMap(_.staticCallOut)
1208+
12091209
def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut)
12101210
}

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
@@ -27,7 +27,7 @@ final class AccessNeighborsForMethod(val node: nodes.Method) extends AnyVal {
2727

2828
/** Traverse to CALL via CALL IN edge.
2929
*/
30-
def _callViaCallIn: Iterator[nodes.Call] = callIn.collectAll[nodes.Call]
30+
def _callViaCallIn: Iterator[nodes.Call] = staticCallIn.collectAll[nodes.Call]
3131

3232
/** Traverse to CALL via CONTAINS OUT edge.
3333
*/
@@ -306,8 +306,6 @@ final class AccessNeighborsForMethod(val node: nodes.Method) extends AnyVal {
306306

307307
def astOut: Iterator[nodes.AstNode] = node._astOut.cast[nodes.AstNode]
308308

309-
def callIn: Iterator[nodes.Call] = node._callIn.cast[nodes.Call]
310-
311309
def cfgOut: Iterator[nodes.AstNode] = node._cfgOut.cast[nodes.AstNode]
312310

313311
def containsIn: Iterator[nodes.AstNode] = node._containsIn.cast[nodes.AstNode]
@@ -324,6 +322,8 @@ final class AccessNeighborsForMethod(val node: nodes.Method) extends AnyVal {
324322

325323
def sourceFileOut: Iterator[nodes.File] = node._sourceFileOut.cast[nodes.File]
326324

325+
def staticCallIn: Iterator[nodes.Call] = node._callIn.cast[nodes.Call]
326+
327327
def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag]
328328
}
329329

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

615615
def astOut: Iterator[nodes.AstNode] = traversal.flatMap(_.astOut)
616616

617-
def callIn: Iterator[nodes.Call] = traversal.flatMap(_.callIn)
618-
619617
def cfgOut: Iterator[nodes.AstNode] = traversal.flatMap(_.cfgOut)
620618

621619
def containsIn: Iterator[nodes.AstNode] = traversal.flatMap(_.containsIn)
@@ -632,5 +630,7 @@ final class AccessNeighborsForMethodTraversal(val traversal: Iterator[nodes.Meth
632630

633631
def sourceFileOut: Iterator[nodes.File] = traversal.flatMap(_.sourceFileOut)
634632

633+
def staticCallIn: Iterator[nodes.Call] = traversal.flatMap(_.staticCallIn)
634+
635635
def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut)
636636
}

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)