Skip to content

Commit b416f7b

Browse files
bbrehmbbrehm
authored
upgrade deps + generated code (#1808)
1 parent 46f985d commit b416f7b

File tree

71 files changed

+1639
-586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1639
-586
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.7"
4+
val flatgraphVersion = "0.1.9"
55

66
inThisBuild(
77
List(

‎codepropertygraph/src/test/resources/cpg.fg‎

20 Bytes
Binary file not shown.

‎domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalAnnotationBase.scala‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,21 @@ final class TraversalAnnotationBase[NodeType <: nodes.AnnotationBase](val traver
4040

4141
/** Traverse to nodes where fullName matches one of the elements in `values` exactly.
4242
*/
43-
def fullNameExact(values: String*): Iterator[NodeType] =
44-
if (values.length == 1) fullNameExact(values.head)
45-
else {
46-
val valueSet = values.toSet
47-
traversal.filter { item => valueSet.contains(item.fullName) }
43+
def fullNameExact(values: String*): Iterator[NodeType] = {
44+
if (values.length == 1) return fullNameExact(values.head)
45+
traversal match {
46+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
47+
val someNode = init.next
48+
values.iterator.flatMap { value =>
49+
flatgraph.Accessors
50+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 22, value)
51+
.asInstanceOf[Iterator[NodeType]]
52+
}
53+
case _ =>
54+
val valueSet = values.toSet
55+
traversal.filter { item => valueSet.contains(item.fullName) }
4856
}
57+
}
4958

5059
/** Traverse to nodes where fullName does not match the regular expression `value`.
5160
*/
@@ -99,12 +108,21 @@ final class TraversalAnnotationBase[NodeType <: nodes.AnnotationBase](val traver
99108

100109
/** Traverse to nodes where name matches one of the elements in `values` exactly.
101110
*/
102-
def nameExact(values: String*): Iterator[NodeType] =
103-
if (values.length == 1) nameExact(values.head)
104-
else {
105-
val valueSet = values.toSet
106-
traversal.filter { item => valueSet.contains(item.name) }
111+
def nameExact(values: String*): Iterator[NodeType] = {
112+
if (values.length == 1) return nameExact(values.head)
113+
traversal match {
114+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
115+
val someNode = init.next
116+
values.iterator.flatMap { value =>
117+
flatgraph.Accessors
118+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 40, value)
119+
.asInstanceOf[Iterator[NodeType]]
120+
}
121+
case _ =>
122+
val valueSet = values.toSet
123+
traversal.filter { item => valueSet.contains(item.name) }
107124
}
125+
}
108126

109127
/** Traverse to nodes where name does not match the regular expression `value`.
110128
*/

‎domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalAnnotationliteralBase.scala‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,21 @@ final class TraversalAnnotationliteralBase[NodeType <: nodes.AnnotationLiteralBa
4040

4141
/** Traverse to nodes where name matches one of the elements in `values` exactly.
4242
*/
43-
def nameExact(values: String*): Iterator[NodeType] =
44-
if (values.length == 1) nameExact(values.head)
45-
else {
46-
val valueSet = values.toSet
47-
traversal.filter { item => valueSet.contains(item.name) }
43+
def nameExact(values: String*): Iterator[NodeType] = {
44+
if (values.length == 1) return nameExact(values.head)
45+
traversal match {
46+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
47+
val someNode = init.next
48+
values.iterator.flatMap { value =>
49+
flatgraph.Accessors
50+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 40, value)
51+
.asInstanceOf[Iterator[NodeType]]
52+
}
53+
case _ =>
54+
val valueSet = values.toSet
55+
traversal.filter { item => valueSet.contains(item.name) }
4856
}
57+
}
4958

5059
/** Traverse to nodes where name does not match the regular expression `value`.
5160
*/

‎domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalAstnodeBase.scala‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,21 @@ final class TraversalAstnodeBase[NodeType <: nodes.AstNodeBase](val traversal: I
3939

4040
/** Traverse to nodes where code matches one of the elements in `values` exactly.
4141
*/
42-
def codeExact(values: String*): Iterator[NodeType] =
43-
if (values.length == 1) codeExact(values.head)
44-
else {
45-
val valueSet = values.toSet
46-
traversal.filter { item => valueSet.contains(item.code) }
42+
def codeExact(values: String*): Iterator[NodeType] = {
43+
if (values.length == 1) return codeExact(values.head)
44+
traversal match {
45+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
46+
val someNode = init.next
47+
values.iterator.flatMap { value =>
48+
flatgraph.Accessors
49+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 10, value)
50+
.asInstanceOf[Iterator[NodeType]]
51+
}
52+
case _ =>
53+
val valueSet = values.toSet
54+
traversal.filter { item => valueSet.contains(item.code) }
4755
}
56+
}
4857

4958
/** Traverse to nodes where code does not match the regular expression `value`.
5059
*/

‎domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalBindingBase.scala‎

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,21 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
3939

4040
/** Traverse to nodes where methodFullName matches one of the elements in `values` exactly.
4141
*/
42-
def methodFullNameExact(values: String*): Iterator[NodeType] =
43-
if (values.length == 1) methodFullNameExact(values.head)
44-
else {
45-
val valueSet = values.toSet
46-
traversal.filter { item => valueSet.contains(item.methodFullName) }
42+
def methodFullNameExact(values: String*): Iterator[NodeType] = {
43+
if (values.length == 1) return methodFullNameExact(values.head)
44+
traversal match {
45+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
46+
val someNode = init.next
47+
values.iterator.flatMap { value =>
48+
flatgraph.Accessors
49+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 37, value)
50+
.asInstanceOf[Iterator[NodeType]]
51+
}
52+
case _ =>
53+
val valueSet = values.toSet
54+
traversal.filter { item => valueSet.contains(item.methodFullName) }
4755
}
56+
}
4857

4958
/** Traverse to nodes where methodFullName does not match the regular expression `value`.
5059
*/
@@ -98,12 +107,21 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
98107

99108
/** Traverse to nodes where name matches one of the elements in `values` exactly.
100109
*/
101-
def nameExact(values: String*): Iterator[NodeType] =
102-
if (values.length == 1) nameExact(values.head)
103-
else {
104-
val valueSet = values.toSet
105-
traversal.filter { item => valueSet.contains(item.name) }
110+
def nameExact(values: String*): Iterator[NodeType] = {
111+
if (values.length == 1) return nameExact(values.head)
112+
traversal match {
113+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
114+
val someNode = init.next
115+
values.iterator.flatMap { value =>
116+
flatgraph.Accessors
117+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 40, value)
118+
.asInstanceOf[Iterator[NodeType]]
119+
}
120+
case _ =>
121+
val valueSet = values.toSet
122+
traversal.filter { item => valueSet.contains(item.name) }
106123
}
124+
}
107125

108126
/** Traverse to nodes where name does not match the regular expression `value`.
109127
*/
@@ -157,12 +175,21 @@ final class TraversalBindingBase[NodeType <: nodes.BindingBase](val traversal: I
157175

158176
/** Traverse to nodes where signature matches one of the elements in `values` exactly.
159177
*/
160-
def signatureExact(values: String*): Iterator[NodeType] =
161-
if (values.length == 1) signatureExact(values.head)
162-
else {
163-
val valueSet = values.toSet
164-
traversal.filter { item => valueSet.contains(item.signature) }
178+
def signatureExact(values: String*): Iterator[NodeType] = {
179+
if (values.length == 1) return signatureExact(values.head)
180+
traversal match {
181+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
182+
val someNode = init.next
183+
values.iterator.flatMap { value =>
184+
flatgraph.Accessors
185+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 50, value)
186+
.asInstanceOf[Iterator[NodeType]]
187+
}
188+
case _ =>
189+
val valueSet = values.toSet
190+
traversal.filter { item => valueSet.contains(item.signature) }
165191
}
192+
}
166193

167194
/** Traverse to nodes where signature does not match the regular expression `value`.
168195
*/

‎domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalBlockBase.scala‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,21 @@ final class TraversalBlockBase[NodeType <: nodes.BlockBase](val traversal: Itera
4747

4848
/** Traverse to nodes where typeFullName matches one of the elements in `values` exactly.
4949
*/
50-
def typeFullNameExact(values: String*): Iterator[NodeType] =
51-
if (values.length == 1) typeFullNameExact(values.head)
52-
else {
53-
val valueSet = values.toSet
54-
traversal.filter { item => valueSet.contains(item.typeFullName) }
50+
def typeFullNameExact(values: String*): Iterator[NodeType] = {
51+
if (values.length == 1) return typeFullNameExact(values.head)
52+
traversal match {
53+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
54+
val someNode = init.next
55+
values.iterator.flatMap { value =>
56+
flatgraph.Accessors
57+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 53, value)
58+
.asInstanceOf[Iterator[NodeType]]
59+
}
60+
case _ =>
61+
val valueSet = values.toSet
62+
traversal.filter { item => valueSet.contains(item.typeFullName) }
5563
}
64+
}
5665

5766
/** Traverse to nodes where typeFullName does not match the regular expression `value`.
5867
*/

‎domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalCallBase.scala‎

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,21 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
3939

4040
/** Traverse to nodes where dispatchType matches one of the elements in `values` exactly.
4141
*/
42-
def dispatchTypeExact(values: String*): Iterator[NodeType] =
43-
if (values.length == 1) dispatchTypeExact(values.head)
44-
else {
45-
val valueSet = values.toSet
46-
traversal.filter { item => valueSet.contains(item.dispatchType) }
42+
def dispatchTypeExact(values: String*): Iterator[NodeType] = {
43+
if (values.length == 1) return dispatchTypeExact(values.head)
44+
traversal match {
45+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
46+
val someNode = init.next
47+
values.iterator.flatMap { value =>
48+
flatgraph.Accessors
49+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 17, value)
50+
.asInstanceOf[Iterator[NodeType]]
51+
}
52+
case _ =>
53+
val valueSet = values.toSet
54+
traversal.filter { item => valueSet.contains(item.dispatchType) }
4755
}
56+
}
4857

4958
/** Traverse to nodes where dispatchType does not match the regular expression `value`.
5059
*/
@@ -102,12 +111,21 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
102111

103112
/** Traverse to nodes where methodFullName matches one of the elements in `values` exactly.
104113
*/
105-
def methodFullNameExact(values: String*): Iterator[NodeType] =
106-
if (values.length == 1) methodFullNameExact(values.head)
107-
else {
108-
val valueSet = values.toSet
109-
traversal.filter { item => valueSet.contains(item.methodFullName) }
114+
def methodFullNameExact(values: String*): Iterator[NodeType] = {
115+
if (values.length == 1) return methodFullNameExact(values.head)
116+
traversal match {
117+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
118+
val someNode = init.next
119+
values.iterator.flatMap { value =>
120+
flatgraph.Accessors
121+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 37, value)
122+
.asInstanceOf[Iterator[NodeType]]
123+
}
124+
case _ =>
125+
val valueSet = values.toSet
126+
traversal.filter { item => valueSet.contains(item.methodFullName) }
110127
}
128+
}
111129

112130
/** Traverse to nodes where methodFullName does not match the regular expression `value`.
113131
*/
@@ -165,12 +183,21 @@ final class TraversalCallBase[NodeType <: nodes.CallBase](val traversal: Iterato
165183

166184
/** Traverse to nodes where typeFullName matches one of the elements in `values` exactly.
167185
*/
168-
def typeFullNameExact(values: String*): Iterator[NodeType] =
169-
if (values.length == 1) typeFullNameExact(values.head)
170-
else {
171-
val valueSet = values.toSet
172-
traversal.filter { item => valueSet.contains(item.typeFullName) }
186+
def typeFullNameExact(values: String*): Iterator[NodeType] = {
187+
if (values.length == 1) return typeFullNameExact(values.head)
188+
traversal match {
189+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
190+
val someNode = init.next
191+
values.iterator.flatMap { value =>
192+
flatgraph.Accessors
193+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 53, value)
194+
.asInstanceOf[Iterator[NodeType]]
195+
}
196+
case _ =>
197+
val valueSet = values.toSet
198+
traversal.filter { item => valueSet.contains(item.typeFullName) }
173199
}
200+
}
174201

175202
/** Traverse to nodes where typeFullName does not match the regular expression `value`.
176203
*/

‎domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalCallreprBase.scala‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,21 @@ final class TraversalCallreprBase[NodeType <: nodes.CallReprBase](val traversal:
3939

4040
/** Traverse to nodes where name matches one of the elements in `values` exactly.
4141
*/
42-
def nameExact(values: String*): Iterator[NodeType] =
43-
if (values.length == 1) nameExact(values.head)
44-
else {
45-
val valueSet = values.toSet
46-
traversal.filter { item => valueSet.contains(item.name) }
42+
def nameExact(values: String*): Iterator[NodeType] = {
43+
if (values.length == 1) return nameExact(values.head)
44+
traversal match {
45+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
46+
val someNode = init.next
47+
values.iterator.flatMap { value =>
48+
flatgraph.Accessors
49+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 40, value)
50+
.asInstanceOf[Iterator[NodeType]]
51+
}
52+
case _ =>
53+
val valueSet = values.toSet
54+
traversal.filter { item => valueSet.contains(item.name) }
4755
}
56+
}
4857

4958
/** Traverse to nodes where name does not match the regular expression `value`.
5059
*/
@@ -98,12 +107,21 @@ final class TraversalCallreprBase[NodeType <: nodes.CallReprBase](val traversal:
98107

99108
/** Traverse to nodes where signature matches one of the elements in `values` exactly.
100109
*/
101-
def signatureExact(values: String*): Iterator[NodeType] =
102-
if (values.length == 1) signatureExact(values.head)
103-
else {
104-
val valueSet = values.toSet
105-
traversal.filter { item => valueSet.contains(item.signature) }
110+
def signatureExact(values: String*): Iterator[NodeType] = {
111+
if (values.length == 1) return signatureExact(values.head)
112+
traversal match {
113+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
114+
val someNode = init.next
115+
values.iterator.flatMap { value =>
116+
flatgraph.Accessors
117+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 50, value)
118+
.asInstanceOf[Iterator[NodeType]]
119+
}
120+
case _ =>
121+
val valueSet = values.toSet
122+
traversal.filter { item => valueSet.contains(item.signature) }
106123
}
124+
}
107125

108126
/** Traverse to nodes where signature does not match the regular expression `value`.
109127
*/

‎domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/traversals/TraversalClosurebindingBase.scala‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,21 @@ final class TraversalClosurebindingBase[NodeType <: nodes.ClosureBindingBase](va
186186

187187
/** Traverse to nodes where evaluationStrategy matches one of the elements in `values` exactly.
188188
*/
189-
def evaluationStrategyExact(values: String*): Iterator[NodeType] =
190-
if (values.length == 1) evaluationStrategyExact(values.head)
191-
else {
192-
val valueSet = values.toSet
193-
traversal.filter { item => valueSet.contains(item.evaluationStrategy) }
189+
def evaluationStrategyExact(values: String*): Iterator[NodeType] = {
190+
if (values.length == 1) return evaluationStrategyExact(values.head)
191+
traversal match {
192+
case init: flatgraph.misc.InitNodeIterator[flatgraph.GNode @unchecked] if init.isVirgin && init.hasNext =>
193+
val someNode = init.next
194+
values.iterator.flatMap { value =>
195+
flatgraph.Accessors
196+
.getWithInverseIndex(someNode.graph, someNode.nodeKind, 19, value)
197+
.asInstanceOf[Iterator[NodeType]]
198+
}
199+
case _ =>
200+
val valueSet = values.toSet
201+
traversal.filter { item => valueSet.contains(item.evaluationStrategy) }
194202
}
203+
}
195204

196205
/** Traverse to nodes where evaluationStrategy does not match the regular expression `value`.
197206
*/

0 commit comments

Comments
 (0)