From ca50c9300e62412012609ef391d15662c109e14c Mon Sep 17 00:00:00 2001 From: Louis van der Walt Date: Mon, 16 Mar 2026 14:57:42 +0200 Subject: [PATCH 1/2] Explicit control-structure schema edges --- .../io/shiftleft/passes/CpgPassNewTests.scala | 25 +- .../generated/EdgeTypes.java | 36 + .../generated/GraphSchema.scala | 35 +- .../generated/edges/EdgeTypes.scala | 104 +- .../generated/neighboraccessors/Block.scala | 117 +++ .../generated/neighboraccessors/Call.scala | 117 +++ .../neighboraccessors/ControlStructure.scala | 886 ++++++++++++++++++ .../neighboraccessors/Identifier.scala | 117 +++ .../neighboraccessors/JumpTarget.scala | 117 +++ .../generated/neighboraccessors/Literal.scala | 117 +++ .../neighboraccessors/MethodRef.scala | 117 +++ .../generated/neighboraccessors/Return.scala | 117 +++ .../generated/neighboraccessors/TypeRef.scala | 117 +++ .../generated/neighboraccessors/Unknown.scala | 117 +++ .../generated/nodes/NewAnnotation.scala | 740 ++++++++++++++- .../nodes/NewAnnotationLiteral.scala | 740 ++++++++++++++- .../nodes/NewAnnotationParameter.scala | 740 ++++++++++++++- .../nodes/NewAnnotationParameterAssign.scala | 740 ++++++++++++++- .../generated/nodes/NewArrayInitializer.scala | 740 ++++++++++++++- .../generated/nodes/NewBlock.scala | 740 ++++++++++++++- .../generated/nodes/NewCall.scala | 740 ++++++++++++++- .../generated/nodes/NewComment.scala | 740 ++++++++++++++- .../generated/nodes/NewControlStructure.scala | 740 ++++++++++++++- .../generated/nodes/NewFieldIdentifier.scala | 740 ++++++++++++++- .../generated/nodes/NewFile.scala | 740 ++++++++++++++- .../generated/nodes/NewIdentifier.scala | 740 ++++++++++++++- .../generated/nodes/NewImport.scala | 740 ++++++++++++++- .../generated/nodes/NewJumpLabel.scala | 740 ++++++++++++++- .../generated/nodes/NewJumpTarget.scala | 740 ++++++++++++++- .../generated/nodes/NewLiteral.scala | 740 ++++++++++++++- .../generated/nodes/NewLocal.scala | 740 ++++++++++++++- .../generated/nodes/NewMember.scala | 740 ++++++++++++++- .../generated/nodes/NewMethod.scala | 740 ++++++++++++++- .../nodes/NewMethodParameterIn.scala | 740 ++++++++++++++- .../nodes/NewMethodParameterOut.scala | 740 ++++++++++++++- .../generated/nodes/NewMethodRef.scala | 740 ++++++++++++++- .../generated/nodes/NewMethodReturn.scala | 740 ++++++++++++++- .../generated/nodes/NewModifier.scala | 740 ++++++++++++++- .../generated/nodes/NewNamespace.scala | 740 ++++++++++++++- .../generated/nodes/NewNamespaceBlock.scala | 740 ++++++++++++++- .../generated/nodes/NewReturn.scala | 740 ++++++++++++++- .../generated/nodes/NewTemplateDom.scala | 740 ++++++++++++++- .../generated/nodes/NewTypeArgument.scala | 740 ++++++++++++++- .../generated/nodes/NewTypeDecl.scala | 740 ++++++++++++++- .../generated/nodes/NewTypeParameter.scala | 740 ++++++++++++++- .../generated/nodes/NewTypeRef.scala | 740 ++++++++++++++- .../generated/nodes/NewUnknown.scala | 740 ++++++++++++++- .../generated/nodes/RootTypes.scala | 163 +++- .../generated/nodes/RootTypesTraversals.scala | 27 + .../codepropertygraph/schema/Ast.scala | 159 ++++ .../codepropertygraph/schema/ProtoIds.scala | 9 + 51 files changed, 25940 insertions(+), 977 deletions(-) diff --git a/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala b/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala index db353d542..a5840bbe9 100644 --- a/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala +++ b/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala @@ -2,8 +2,9 @@ package io.shiftleft.passes import flatgraph.SchemaViolationException import io.shiftleft.codepropertygraph.generated.Cpg +import io.shiftleft.codepropertygraph.generated.ControlStructureTypes import io.shiftleft.codepropertygraph.generated.language.* -import io.shiftleft.codepropertygraph.generated.nodes.NewFile +import io.shiftleft.codepropertygraph.generated.nodes.{NewBlock, NewControlStructure, NewFile} import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec @@ -53,6 +54,28 @@ class CpgPassNewTests extends AnyWordSpec with Matchers { } } + "accept explicit control-structure body edges" in { + val cpg = Cpg.empty + val pass = new CpgPass(cpg, "pass1-control-structure-edges") { + override def run(dst: DiffGraphBuilder): Unit = { + val controlStructure = NewControlStructure().controlStructureType(ControlStructureTypes.IF) + val trueBody = NewBlock() + val falseBody = NewBlock() + + dst + .addNode(controlStructure) + .addNode(trueBody) + .addNode(falseBody) + .addEdge(controlStructure, trueBody, "TRUE_BODY") + .addEdge(controlStructure, falseBody, "FALSE_BODY") + } + } + + noException shouldBe thrownBy { + pass.createAndApply() + } + } + "call init and finish once around run" in { val cpg = Cpg.empty val events = ArrayBuffer.empty[String] diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/EdgeTypes.java b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/EdgeTypes.java index 5de3dfe23..91845bcb4 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/EdgeTypes.java +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/EdgeTypes.java @@ -41,6 +41,9 @@ other words, there is a (name, signature) pair that can be resolved for the type /** Connection between a captured LOCAL and the corresponding CLOSURE_BINDING */ public static final String CAPTURED_BY = "CAPTURED_BY"; +/** The edge connects try control structure nodes to catch/handler bodies. */ +public static final String CATCH_BODY = "CATCH_BODY"; + /** A CDG edge expresses that the destination node is control dependent on the source node. */ public static final String CDG = "CDG"; @@ -53,12 +56,30 @@ other words, there is a (name, signature) pair that can be resolved for the type /** This edge connects a node to the method that contains it. */ public static final String CONTAINS = "CONTAINS"; +/** The edge connects do-while control structure nodes to their body. */ +public static final String DO_BODY = "DO_BODY"; + /** This edge indicates that the source node immediately dominates the destination node. */ public static final String DOMINATE = "DOMINATE"; /** This edge connects a node to its evaluation type. */ public static final String EVAL_TYPE = "EVAL_TYPE"; +/** The edge connects control structure nodes to their false branch/body. */ +public static final String FALSE_BODY = "FALSE_BODY"; + +/** The edge connects try control structure nodes to their finally body. */ +public static final String FINALLY_BODY = "FINALLY_BODY"; + +/** The edge connects for-loop control structure nodes to their body. */ +public static final String FOR_BODY = "FOR_BODY"; + +/** The edge connects for-loop control structure nodes to their initialization expression(s). */ +public static final String FOR_INIT = "FOR_INIT"; + +/** The edge connects for-loop control structure nodes to their update/step expression(s). */ +public static final String FOR_UPDATE = "FOR_UPDATE"; + /** Edge from imports to dependencies */ public static final String IMPORTS = "IMPORTS"; @@ -104,6 +125,12 @@ other words, there is a (name, signature) pair that can be resolved for the type /** Edges from nodes to the tags they are tagged by. */ public static final String TAGGED_BY = "TAGGED_BY"; +/** The edge connects control structure nodes to their true branch/body. */ +public static final String TRUE_BODY = "TRUE_BODY"; + +/** The edge connects try control structure nodes to their try body. */ +public static final String TRY_BODY = "TRY_BODY"; + public static Set ALL = new HashSet() {{ add(ALIAS_OF); add(ARGUMENT); @@ -113,12 +140,19 @@ other words, there is a (name, signature) pair that can be resolved for the type add(CALL); add(CAPTURE); add(CAPTURED_BY); +add(CATCH_BODY); add(CDG); add(CFG); add(CONDITION); add(CONTAINS); +add(DO_BODY); add(DOMINATE); add(EVAL_TYPE); +add(FALSE_BODY); +add(FINALLY_BODY); +add(FOR_BODY); +add(FOR_INIT); +add(FOR_UPDATE); add(IMPORTS); add(INHERITS_FROM); add(IS_CALL_FOR_IMPORT); @@ -129,6 +163,8 @@ other words, there is a (name, signature) pair that can be resolved for the type add(REF); add(SOURCE_FILE); add(TAGGED_BY); +add(TRUE_BODY); +add(TRY_BODY); }}; } \ No newline at end of file diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/GraphSchema.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/GraphSchema.scala index 38fcda7c0..7ad8da56c 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/GraphSchema.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/GraphSchema.scala @@ -58,12 +58,19 @@ object GraphSchema extends flatgraph.Schema { "CALL", "CAPTURE", "CAPTURED_BY", + "CATCH_BODY", "CDG", "CFG", "CONDITION", "CONTAINS", "DOMINATE", + "DO_BODY", "EVAL_TYPE", + "FALSE_BODY", + "FINALLY_BODY", + "FOR_BODY", + "FOR_INIT", + "FOR_UPDATE", "IMPORTS", "INHERITS_FROM", "IS_CALL_FOR_IMPORT", @@ -73,7 +80,9 @@ object GraphSchema extends flatgraph.Schema { "RECEIVER", "REF", "SOURCE_FILE", - "TAGGED_BY" + "TAGGED_BY", + "TRUE_BODY", + "TRY_BODY" ) val edgeKindByLabel = edgeLabels.zipWithIndex.toMap val edgePropertyAllocators: Array[Int => Array[?]] = Array( @@ -96,7 +105,16 @@ object GraphSchema extends flatgraph.Schema { size => null, size => null, size => null, - size => Array.fill(size)("") /* label = REACHING_DEF, id = 19 */, + size => null, + size => null, + size => null, + size => null, + size => null, + size => null, + size => null, + size => Array.fill(size)("") /* label = REACHING_DEF, id = 26 */, + size => null, + size => null, size => null, size => null, size => null, @@ -156,12 +174,19 @@ object GraphSchema extends flatgraph.Schema { (s, d, subseq, p) => new edges.Call(s, d, subseq, p), (s, d, subseq, p) => new edges.Capture(s, d, subseq, p), (s, d, subseq, p) => new edges.CapturedBy(s, d, subseq, p), + (s, d, subseq, p) => new edges.CatchBody(s, d, subseq, p), (s, d, subseq, p) => new edges.Cdg(s, d, subseq, p), (s, d, subseq, p) => new edges.Cfg(s, d, subseq, p), (s, d, subseq, p) => new edges.Condition(s, d, subseq, p), (s, d, subseq, p) => new edges.Contains(s, d, subseq, p), (s, d, subseq, p) => new edges.Dominate(s, d, subseq, p), + (s, d, subseq, p) => new edges.DoBody(s, d, subseq, p), (s, d, subseq, p) => new edges.EvalType(s, d, subseq, p), + (s, d, subseq, p) => new edges.FalseBody(s, d, subseq, p), + (s, d, subseq, p) => new edges.FinallyBody(s, d, subseq, p), + (s, d, subseq, p) => new edges.ForBody(s, d, subseq, p), + (s, d, subseq, p) => new edges.ForInit(s, d, subseq, p), + (s, d, subseq, p) => new edges.ForUpdate(s, d, subseq, p), (s, d, subseq, p) => new edges.Imports(s, d, subseq, p), (s, d, subseq, p) => new edges.InheritsFrom(s, d, subseq, p), (s, d, subseq, p) => new edges.IsCallForImport(s, d, subseq, p), @@ -171,7 +196,9 @@ object GraphSchema extends flatgraph.Schema { (s, d, subseq, p) => new edges.Receiver(s, d, subseq, p), (s, d, subseq, p) => new edges.Ref(s, d, subseq, p), (s, d, subseq, p) => new edges.SourceFile(s, d, subseq, p), - (s, d, subseq, p) => new edges.TaggedBy(s, d, subseq, p) + (s, d, subseq, p) => new edges.TaggedBy(s, d, subseq, p), + (s, d, subseq, p) => new edges.TrueBody(s, d, subseq, p), + (s, d, subseq, p) => new edges.TryBody(s, d, subseq, p) ) val nodePropertyAllocators: Array[Int => Array[?]] = Array( size => new Array[String](size), @@ -1450,7 +1477,7 @@ object GraphSchema extends flatgraph.Schema { _newNodeInserters } override def getNumberOfNodeKinds: Int = 43 - override def getNumberOfEdgeKinds: Int = 24 + override def getNumberOfEdgeKinds: Int = 33 override def getNodeLabel(nodeKind: Int): String = nodeLabels(nodeKind) override def getNodeKindByLabel(label: String): Int = nodeKindByLabel.getOrElse(label, flatgraph.Schema.UndefinedKind) override def getEdgeLabel(nodeKind: Int, edgeKind: Int): String = edgeLabels(edgeKind) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/EdgeTypes.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/EdgeTypes.scala index 3ecf2dd61..a044c2c58 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/EdgeTypes.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/edges/EdgeTypes.scala @@ -64,13 +64,21 @@ object CapturedBy { class CapturedBy(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) extends flatgraph.Edge(src_4762, dst_4762, 7, subSeq_4862, property_4862) {} +object CatchBody { + val Label = "CATCH_BODY" + +} + +class CatchBody(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 8, subSeq_4862, property_4862) {} + object Cdg { val Label = "CDG" } class Cdg(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 8, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 9, subSeq_4862, property_4862) {} object Cfg { val Label = "CFG" @@ -78,7 +86,7 @@ object Cfg { } class Cfg(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 9, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 10, subSeq_4862, property_4862) {} object Condition { val Label = "CONDITION" @@ -86,7 +94,7 @@ object Condition { } class Condition(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 10, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 11, subSeq_4862, property_4862) {} object Contains { val Label = "CONTAINS" @@ -94,7 +102,7 @@ object Contains { } class Contains(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 11, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 12, subSeq_4862, property_4862) {} object Dominate { val Label = "DOMINATE" @@ -102,7 +110,15 @@ object Dominate { } class Dominate(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 12, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 13, subSeq_4862, property_4862) {} + +object DoBody { + val Label = "DO_BODY" + +} + +class DoBody(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 14, subSeq_4862, property_4862) {} object EvalType { val Label = "EVAL_TYPE" @@ -110,7 +126,47 @@ object EvalType { } class EvalType(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 13, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 15, subSeq_4862, property_4862) {} + +object FalseBody { + val Label = "FALSE_BODY" + +} + +class FalseBody(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 16, subSeq_4862, property_4862) {} + +object FinallyBody { + val Label = "FINALLY_BODY" + +} + +class FinallyBody(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 17, subSeq_4862, property_4862) {} + +object ForBody { + val Label = "FOR_BODY" + +} + +class ForBody(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 18, subSeq_4862, property_4862) {} + +object ForInit { + val Label = "FOR_INIT" + +} + +class ForInit(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 19, subSeq_4862, property_4862) {} + +object ForUpdate { + val Label = "FOR_UPDATE" + +} + +class ForUpdate(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 20, subSeq_4862, property_4862) {} object Imports { val Label = "IMPORTS" @@ -118,7 +174,7 @@ object Imports { } class Imports(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 14, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 21, subSeq_4862, property_4862) {} object InheritsFrom { val Label = "INHERITS_FROM" @@ -126,7 +182,7 @@ object InheritsFrom { } class InheritsFrom(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 15, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 22, subSeq_4862, property_4862) {} object IsCallForImport { val Label = "IS_CALL_FOR_IMPORT" @@ -134,7 +190,7 @@ object IsCallForImport { } class IsCallForImport(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 16, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 23, subSeq_4862, property_4862) {} object ParameterLink { val Label = "PARAMETER_LINK" @@ -142,7 +198,7 @@ object ParameterLink { } class ParameterLink(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 17, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 24, subSeq_4862, property_4862) {} object PostDominate { val Label = "POST_DOMINATE" @@ -150,7 +206,7 @@ object PostDominate { } class PostDominate(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 18, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 25, subSeq_4862, property_4862) {} object ReachingDef { val Label = "REACHING_DEF" @@ -158,7 +214,7 @@ object ReachingDef { } class ReachingDef(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 19, subSeq_4862, property_4862) { + extends flatgraph.Edge(src_4762, dst_4762, 26, subSeq_4862, property_4862) { override def propertyName: Option[String] = ReachingDef.propertyName } @@ -168,7 +224,7 @@ object Receiver { } class Receiver(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 20, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 27, subSeq_4862, property_4862) {} object Ref { val Label = "REF" @@ -176,7 +232,7 @@ object Ref { } class Ref(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 21, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 28, subSeq_4862, property_4862) {} object SourceFile { val Label = "SOURCE_FILE" @@ -184,7 +240,7 @@ object SourceFile { } class SourceFile(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 22, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 29, subSeq_4862, property_4862) {} object TaggedBy { val Label = "TAGGED_BY" @@ -192,4 +248,20 @@ object TaggedBy { } class TaggedBy(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) - extends flatgraph.Edge(src_4762, dst_4762, 23, subSeq_4862, property_4862) {} + extends flatgraph.Edge(src_4762, dst_4762, 30, subSeq_4862, property_4862) {} + +object TrueBody { + val Label = "TRUE_BODY" + +} + +class TrueBody(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 31, subSeq_4862, property_4862) {} + +object TryBody { + val Label = "TRY_BODY" + +} + +class TryBody(src_4762: flatgraph.GNode, dst_4762: flatgraph.GNode, subSeq_4862: Int, property_4862: Any) + extends flatgraph.Edge(src_4762, dst_4762, 32, subSeq_4862, property_4862) {} diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Block.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Block.scala index 63e3bd591..5ca91ea5a 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Block.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Block.scala @@ -111,6 +111,10 @@ final class AccessNeighborsForBlock(val node: nodes.Block) extends AnyVal { */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = astOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -131,6 +135,31 @@ final class AccessNeighborsForBlock(val node: nodes.Block) extends AnyVal { */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -141,6 +170,14 @@ final class AccessNeighborsForBlock(val node: nodes.Block) extends AnyVal { def _controlStructureViaPostDominateOut: Iterator[nodes.ControlStructure] = postDominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = cdgIn.collectAll[nodes.FieldIdentifier] @@ -461,6 +498,8 @@ final class AccessNeighborsForBlock(val node: nodes.Block) extends AnyVal { def astOut: Iterator[nodes.AstNode] = node._astOut.cast[nodes.AstNode] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -471,12 +510,24 @@ final class AccessNeighborsForBlock(val node: nodes.Block) extends AnyVal { def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] def evalTypeOut: Iterator[nodes.Type] = node._evalTypeOut.cast[nodes.Type] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] @@ -488,6 +539,10 @@ final class AccessNeighborsForBlock(val node: nodes.Block) extends AnyVal { def receiverIn: Iterator[nodes.Call] = node._receiverIn.cast[nodes.Call] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForBlockTraversal(val traversal: Iterator[nodes.Block]) extends AnyVal { @@ -588,6 +643,11 @@ final class AccessNeighborsForBlockTraversal(val traversal: Iterator[nodes.Block */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaAstOut) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -611,6 +671,35 @@ final class AccessNeighborsForBlockTraversal(val traversal: Iterator[nodes.Block def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -621,6 +710,16 @@ final class AccessNeighborsForBlockTraversal(val traversal: Iterator[nodes.Block def _controlStructureViaPostDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaPostDominateOut) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaCdgIn) @@ -933,6 +1032,8 @@ final class AccessNeighborsForBlockTraversal(val traversal: Iterator[nodes.Block def astOut: Iterator[nodes.AstNode] = traversal.flatMap(_.astOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -943,12 +1044,24 @@ final class AccessNeighborsForBlockTraversal(val traversal: Iterator[nodes.Block def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) def evalTypeOut: Iterator[nodes.Type] = traversal.flatMap(_.evalTypeOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) @@ -960,4 +1073,8 @@ final class AccessNeighborsForBlockTraversal(val traversal: Iterator[nodes.Block def receiverIn: Iterator[nodes.Call] = traversal.flatMap(_.receiverIn) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Call.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Call.scala index 63f084367..f89e26380 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Call.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Call.scala @@ -131,6 +131,10 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal { */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = astOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -151,6 +155,31 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal { */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -170,6 +199,14 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal { */ def _controlStructureViaReceiverOut: Iterator[nodes.ControlStructure] = receiverOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via ARGUMENT OUT edge. */ def _fieldIdentifierViaArgumentOut: Iterator[nodes.FieldIdentifier] = argumentOut.collectAll[nodes.FieldIdentifier] @@ -568,6 +605,8 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal { def astOut: Iterator[nodes.Expression] = node._astOut.cast[nodes.Expression] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -580,12 +619,24 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal { def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] def evalTypeOut: Iterator[nodes.Type] = node._evalTypeOut.cast[nodes.Type] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def isCallForImportOut: Iterator[nodes.Import] = node._isCallForImportOut.cast[nodes.Import] def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] @@ -605,6 +656,10 @@ final class AccessNeighborsForCall(val node: nodes.Call) extends AnyVal { def staticCallOut: Iterator[nodes.Method] = node._callOut.cast[nodes.Method] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call]) extends AnyVal { @@ -726,6 +781,11 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call]) */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaAstOut) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -749,6 +809,35 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call]) def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -769,6 +858,16 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call]) def _controlStructureViaReceiverOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaReceiverOut) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via ARGUMENT OUT edge. */ def _fieldIdentifierViaArgumentOut: Iterator[nodes.FieldIdentifier] = @@ -1170,6 +1269,8 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call]) def astOut: Iterator[nodes.Expression] = traversal.flatMap(_.astOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -1182,12 +1283,24 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call]) def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) def evalTypeOut: Iterator[nodes.Type] = traversal.flatMap(_.evalTypeOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def isCallForImportOut: Iterator[nodes.Import] = traversal.flatMap(_.isCallForImportOut) def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) @@ -1207,4 +1320,8 @@ final class AccessNeighborsForCallTraversal(val traversal: Iterator[nodes.Call]) def staticCallOut: Iterator[nodes.Method] = traversal.flatMap(_.staticCallOut) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/ControlStructure.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/ControlStructure.scala index 1c5e12588..8a53c8255 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/ControlStructure.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/ControlStructure.scala @@ -13,6 +13,10 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _blockViaAstOut: Iterator[nodes.Block] = astOut.collectAll[nodes.Block] + /** Traverse to BLOCK via CATCH_BODY OUT edge. + */ + def _blockViaCatchBodyOut: Iterator[nodes.Block] = catchBodyOut.collectAll[nodes.Block] + /** Traverse to BLOCK via CDG IN edge. */ def _blockViaCdgIn: Iterator[nodes.Block] = cdgIn.collectAll[nodes.Block] @@ -33,6 +37,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _blockViaDominateOut: Iterator[nodes.Block] = dominateOut.collectAll[nodes.Block] + /** Traverse to BLOCK via DO_BODY OUT edge. + */ + def _blockViaDoBodyOut: Iterator[nodes.Block] = doBodyOut.collectAll[nodes.Block] + + /** Traverse to BLOCK via FALSE_BODY OUT edge. + */ + def _blockViaFalseBodyOut: Iterator[nodes.Block] = falseBodyOut.collectAll[nodes.Block] + + /** Traverse to BLOCK via FINALLY_BODY OUT edge. + */ + def _blockViaFinallyBodyOut: Iterator[nodes.Block] = finallyBodyOut.collectAll[nodes.Block] + + /** Traverse to BLOCK via FOR_BODY OUT edge. + */ + def _blockViaForBodyOut: Iterator[nodes.Block] = forBodyOut.collectAll[nodes.Block] + + /** Traverse to BLOCK via FOR_INIT OUT edge. + */ + def _blockViaForInitOut: Iterator[nodes.Block] = forInitOut.collectAll[nodes.Block] + + /** Traverse to BLOCK via FOR_UPDATE OUT edge. + */ + def _blockViaForUpdateOut: Iterator[nodes.Block] = forUpdateOut.collectAll[nodes.Block] + /** Traverse to BLOCK via POST_DOMINATE IN edge. */ def _blockViaPostDominateIn: Iterator[nodes.Block] = postDominateIn.collectAll[nodes.Block] @@ -41,6 +69,14 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _blockViaPostDominateOut: Iterator[nodes.Block] = postDominateOut.collectAll[nodes.Block] + /** Traverse to BLOCK via TRUE_BODY OUT edge. + */ + def _blockViaTrueBodyOut: Iterator[nodes.Block] = trueBodyOut.collectAll[nodes.Block] + + /** Traverse to BLOCK via TRY_BODY OUT edge. + */ + def _blockViaTryBodyOut: Iterator[nodes.Block] = tryBodyOut.collectAll[nodes.Block] + /** Traverse to CALL via ARGUMENT IN edge. */ def _callViaArgumentIn: Iterator[nodes.Call] = argumentIn.collectAll[nodes.Call] @@ -53,6 +89,10 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _callViaAstOut: Iterator[nodes.Call] = astOut.collectAll[nodes.Call] + /** Traverse to CALL via CATCH_BODY OUT edge. + */ + def _callViaCatchBodyOut: Iterator[nodes.Call] = catchBodyOut.collectAll[nodes.Call] + /** Traverse to CALL via CDG IN edge. */ def _callViaCdgIn: Iterator[nodes.Call] = cdgIn.collectAll[nodes.Call] @@ -73,6 +113,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _callViaDominateOut: Iterator[nodes.Call] = dominateOut.collectAll[nodes.Call] + /** Traverse to CALL via DO_BODY OUT edge. + */ + def _callViaDoBodyOut: Iterator[nodes.Call] = doBodyOut.collectAll[nodes.Call] + + /** Traverse to CALL via FALSE_BODY OUT edge. + */ + def _callViaFalseBodyOut: Iterator[nodes.Call] = falseBodyOut.collectAll[nodes.Call] + + /** Traverse to CALL via FINALLY_BODY OUT edge. + */ + def _callViaFinallyBodyOut: Iterator[nodes.Call] = finallyBodyOut.collectAll[nodes.Call] + + /** Traverse to CALL via FOR_BODY OUT edge. + */ + def _callViaForBodyOut: Iterator[nodes.Call] = forBodyOut.collectAll[nodes.Call] + + /** Traverse to CALL via FOR_INIT OUT edge. + */ + def _callViaForInitOut: Iterator[nodes.Call] = forInitOut.collectAll[nodes.Call] + + /** Traverse to CALL via FOR_UPDATE OUT edge. + */ + def _callViaForUpdateOut: Iterator[nodes.Call] = forUpdateOut.collectAll[nodes.Call] + /** Traverse to CALL via POST_DOMINATE IN edge. */ def _callViaPostDominateIn: Iterator[nodes.Call] = postDominateIn.collectAll[nodes.Call] @@ -89,6 +153,14 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _callViaReceiverIn: Iterator[nodes.Call] = receiverIn.collectAll[nodes.Call] + /** Traverse to CALL via TRUE_BODY OUT edge. + */ + def _callViaTrueBodyOut: Iterator[nodes.Call] = trueBodyOut.collectAll[nodes.Call] + + /** Traverse to CALL via TRY_BODY OUT edge. + */ + def _callViaTryBodyOut: Iterator[nodes.Call] = tryBodyOut.collectAll[nodes.Call] + /** Traverse to CFG_NODE via CFG OUT edge. */ def _cfgNodeViaCfgOut: Iterator[nodes.CfgNode] = cfgOut.collectAll[nodes.CfgNode] @@ -101,6 +173,15 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = astOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY OUT edge. + */ + def _controlStructureViaCatchBodyOut: Iterator[nodes.ControlStructure] = + catchBodyOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -126,6 +207,58 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via DO_BODY OUT edge. + */ + def _controlStructureViaDoBodyOut: Iterator[nodes.ControlStructure] = doBodyOut.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY OUT edge. + */ + def _controlStructureViaFalseBodyOut: Iterator[nodes.ControlStructure] = + falseBodyOut.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY OUT edge. + */ + def _controlStructureViaFinallyBodyOut: Iterator[nodes.ControlStructure] = + finallyBodyOut.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY OUT edge. + */ + def _controlStructureViaForBodyOut: Iterator[nodes.ControlStructure] = forBodyOut.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT OUT edge. + */ + def _controlStructureViaForInitOut: Iterator[nodes.ControlStructure] = forInitOut.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE OUT edge. + */ + def _controlStructureViaForUpdateOut: Iterator[nodes.ControlStructure] = + forUpdateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -136,6 +269,22 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) def _controlStructureViaPostDominateOut: Iterator[nodes.ControlStructure] = postDominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY OUT edge. + */ + def _controlStructureViaTrueBodyOut: Iterator[nodes.ControlStructure] = trueBodyOut.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY OUT edge. + */ + def _controlStructureViaTryBodyOut: Iterator[nodes.ControlStructure] = tryBodyOut.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = cdgIn.collectAll[nodes.FieldIdentifier] @@ -166,6 +315,10 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _identifierViaAstOut: Iterator[nodes.Identifier] = astOut.collectAll[nodes.Identifier] + /** Traverse to IDENTIFIER via CATCH_BODY OUT edge. + */ + def _identifierViaCatchBodyOut: Iterator[nodes.Identifier] = catchBodyOut.collectAll[nodes.Identifier] + /** Traverse to IDENTIFIER via CDG IN edge. */ def _identifierViaCdgIn: Iterator[nodes.Identifier] = cdgIn.collectAll[nodes.Identifier] @@ -186,6 +339,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _identifierViaDominateOut: Iterator[nodes.Identifier] = dominateOut.collectAll[nodes.Identifier] + /** Traverse to IDENTIFIER via DO_BODY OUT edge. + */ + def _identifierViaDoBodyOut: Iterator[nodes.Identifier] = doBodyOut.collectAll[nodes.Identifier] + + /** Traverse to IDENTIFIER via FALSE_BODY OUT edge. + */ + def _identifierViaFalseBodyOut: Iterator[nodes.Identifier] = falseBodyOut.collectAll[nodes.Identifier] + + /** Traverse to IDENTIFIER via FINALLY_BODY OUT edge. + */ + def _identifierViaFinallyBodyOut: Iterator[nodes.Identifier] = finallyBodyOut.collectAll[nodes.Identifier] + + /** Traverse to IDENTIFIER via FOR_BODY OUT edge. + */ + def _identifierViaForBodyOut: Iterator[nodes.Identifier] = forBodyOut.collectAll[nodes.Identifier] + + /** Traverse to IDENTIFIER via FOR_INIT OUT edge. + */ + def _identifierViaForInitOut: Iterator[nodes.Identifier] = forInitOut.collectAll[nodes.Identifier] + + /** Traverse to IDENTIFIER via FOR_UPDATE OUT edge. + */ + def _identifierViaForUpdateOut: Iterator[nodes.Identifier] = forUpdateOut.collectAll[nodes.Identifier] + /** Traverse to IDENTIFIER via POST_DOMINATE IN edge. */ def _identifierViaPostDominateIn: Iterator[nodes.Identifier] = postDominateIn.collectAll[nodes.Identifier] @@ -198,6 +375,14 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _identifierViaReachingDefOut: Iterator[nodes.Identifier] = reachingDefOut.collectAll[nodes.Identifier] + /** Traverse to IDENTIFIER via TRUE_BODY OUT edge. + */ + def _identifierViaTrueBodyOut: Iterator[nodes.Identifier] = trueBodyOut.collectAll[nodes.Identifier] + + /** Traverse to IDENTIFIER via TRY_BODY OUT edge. + */ + def _identifierViaTryBodyOut: Iterator[nodes.Identifier] = tryBodyOut.collectAll[nodes.Identifier] + /** Traverse to JUMP_LABEL via AST OUT edge. */ def _jumpLabelViaAstOut: Iterator[nodes.JumpLabel] = astOut.collectAll[nodes.JumpLabel] @@ -206,6 +391,10 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _jumpTargetViaAstOut: Iterator[nodes.JumpTarget] = astOut.collectAll[nodes.JumpTarget] + /** Traverse to JUMP_TARGET via CATCH_BODY OUT edge. + */ + def _jumpTargetViaCatchBodyOut: Iterator[nodes.JumpTarget] = catchBodyOut.collectAll[nodes.JumpTarget] + /** Traverse to JUMP_TARGET via CDG IN edge. */ def _jumpTargetViaCdgIn: Iterator[nodes.JumpTarget] = cdgIn.collectAll[nodes.JumpTarget] @@ -226,6 +415,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _jumpTargetViaDominateOut: Iterator[nodes.JumpTarget] = dominateOut.collectAll[nodes.JumpTarget] + /** Traverse to JUMP_TARGET via DO_BODY OUT edge. + */ + def _jumpTargetViaDoBodyOut: Iterator[nodes.JumpTarget] = doBodyOut.collectAll[nodes.JumpTarget] + + /** Traverse to JUMP_TARGET via FALSE_BODY OUT edge. + */ + def _jumpTargetViaFalseBodyOut: Iterator[nodes.JumpTarget] = falseBodyOut.collectAll[nodes.JumpTarget] + + /** Traverse to JUMP_TARGET via FINALLY_BODY OUT edge. + */ + def _jumpTargetViaFinallyBodyOut: Iterator[nodes.JumpTarget] = finallyBodyOut.collectAll[nodes.JumpTarget] + + /** Traverse to JUMP_TARGET via FOR_BODY OUT edge. + */ + def _jumpTargetViaForBodyOut: Iterator[nodes.JumpTarget] = forBodyOut.collectAll[nodes.JumpTarget] + + /** Traverse to JUMP_TARGET via FOR_INIT OUT edge. + */ + def _jumpTargetViaForInitOut: Iterator[nodes.JumpTarget] = forInitOut.collectAll[nodes.JumpTarget] + + /** Traverse to JUMP_TARGET via FOR_UPDATE OUT edge. + */ + def _jumpTargetViaForUpdateOut: Iterator[nodes.JumpTarget] = forUpdateOut.collectAll[nodes.JumpTarget] + /** Traverse to JUMP_TARGET via POST_DOMINATE IN edge. */ def _jumpTargetViaPostDominateIn: Iterator[nodes.JumpTarget] = postDominateIn.collectAll[nodes.JumpTarget] @@ -234,10 +447,22 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _jumpTargetViaPostDominateOut: Iterator[nodes.JumpTarget] = postDominateOut.collectAll[nodes.JumpTarget] + /** Traverse to JUMP_TARGET via TRUE_BODY OUT edge. + */ + def _jumpTargetViaTrueBodyOut: Iterator[nodes.JumpTarget] = trueBodyOut.collectAll[nodes.JumpTarget] + + /** Traverse to JUMP_TARGET via TRY_BODY OUT edge. + */ + def _jumpTargetViaTryBodyOut: Iterator[nodes.JumpTarget] = tryBodyOut.collectAll[nodes.JumpTarget] + /** Traverse to LITERAL via AST OUT edge. */ def _literalViaAstOut: Iterator[nodes.Literal] = astOut.collectAll[nodes.Literal] + /** Traverse to LITERAL via CATCH_BODY OUT edge. + */ + def _literalViaCatchBodyOut: Iterator[nodes.Literal] = catchBodyOut.collectAll[nodes.Literal] + /** Traverse to LITERAL via CDG IN edge. */ def _literalViaCdgIn: Iterator[nodes.Literal] = cdgIn.collectAll[nodes.Literal] @@ -258,6 +483,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _literalViaDominateOut: Iterator[nodes.Literal] = dominateOut.collectAll[nodes.Literal] + /** Traverse to LITERAL via DO_BODY OUT edge. + */ + def _literalViaDoBodyOut: Iterator[nodes.Literal] = doBodyOut.collectAll[nodes.Literal] + + /** Traverse to LITERAL via FALSE_BODY OUT edge. + */ + def _literalViaFalseBodyOut: Iterator[nodes.Literal] = falseBodyOut.collectAll[nodes.Literal] + + /** Traverse to LITERAL via FINALLY_BODY OUT edge. + */ + def _literalViaFinallyBodyOut: Iterator[nodes.Literal] = finallyBodyOut.collectAll[nodes.Literal] + + /** Traverse to LITERAL via FOR_BODY OUT edge. + */ + def _literalViaForBodyOut: Iterator[nodes.Literal] = forBodyOut.collectAll[nodes.Literal] + + /** Traverse to LITERAL via FOR_INIT OUT edge. + */ + def _literalViaForInitOut: Iterator[nodes.Literal] = forInitOut.collectAll[nodes.Literal] + + /** Traverse to LITERAL via FOR_UPDATE OUT edge. + */ + def _literalViaForUpdateOut: Iterator[nodes.Literal] = forUpdateOut.collectAll[nodes.Literal] + /** Traverse to LITERAL via POST_DOMINATE IN edge. */ def _literalViaPostDominateIn: Iterator[nodes.Literal] = postDominateIn.collectAll[nodes.Literal] @@ -270,6 +519,14 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _literalViaReachingDefOut: Iterator[nodes.Literal] = reachingDefOut.collectAll[nodes.Literal] + /** Traverse to LITERAL via TRUE_BODY OUT edge. + */ + def _literalViaTrueBodyOut: Iterator[nodes.Literal] = trueBodyOut.collectAll[nodes.Literal] + + /** Traverse to LITERAL via TRY_BODY OUT edge. + */ + def _literalViaTryBodyOut: Iterator[nodes.Literal] = tryBodyOut.collectAll[nodes.Literal] + /** Traverse to LOCAL via AST OUT edge. */ def _localViaAstOut: Iterator[nodes.Local] = astOut.collectAll[nodes.Local] @@ -291,6 +548,10 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _methodRefViaAstOut: Iterator[nodes.MethodRef] = astOut.collectAll[nodes.MethodRef] + /** Traverse to METHOD_REF via CATCH_BODY OUT edge. + */ + def _methodRefViaCatchBodyOut: Iterator[nodes.MethodRef] = catchBodyOut.collectAll[nodes.MethodRef] + /** Traverse to METHOD_REF via CDG IN edge. */ def _methodRefViaCdgIn: Iterator[nodes.MethodRef] = cdgIn.collectAll[nodes.MethodRef] @@ -311,6 +572,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _methodRefViaDominateOut: Iterator[nodes.MethodRef] = dominateOut.collectAll[nodes.MethodRef] + /** Traverse to METHOD_REF via DO_BODY OUT edge. + */ + def _methodRefViaDoBodyOut: Iterator[nodes.MethodRef] = doBodyOut.collectAll[nodes.MethodRef] + + /** Traverse to METHOD_REF via FALSE_BODY OUT edge. + */ + def _methodRefViaFalseBodyOut: Iterator[nodes.MethodRef] = falseBodyOut.collectAll[nodes.MethodRef] + + /** Traverse to METHOD_REF via FINALLY_BODY OUT edge. + */ + def _methodRefViaFinallyBodyOut: Iterator[nodes.MethodRef] = finallyBodyOut.collectAll[nodes.MethodRef] + + /** Traverse to METHOD_REF via FOR_BODY OUT edge. + */ + def _methodRefViaForBodyOut: Iterator[nodes.MethodRef] = forBodyOut.collectAll[nodes.MethodRef] + + /** Traverse to METHOD_REF via FOR_INIT OUT edge. + */ + def _methodRefViaForInitOut: Iterator[nodes.MethodRef] = forInitOut.collectAll[nodes.MethodRef] + + /** Traverse to METHOD_REF via FOR_UPDATE OUT edge. + */ + def _methodRefViaForUpdateOut: Iterator[nodes.MethodRef] = forUpdateOut.collectAll[nodes.MethodRef] + /** Traverse to METHOD_REF via POST_DOMINATE IN edge. */ def _methodRefViaPostDominateIn: Iterator[nodes.MethodRef] = postDominateIn.collectAll[nodes.MethodRef] @@ -323,6 +608,14 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _methodRefViaReachingDefOut: Iterator[nodes.MethodRef] = reachingDefOut.collectAll[nodes.MethodRef] + /** Traverse to METHOD_REF via TRUE_BODY OUT edge. + */ + def _methodRefViaTrueBodyOut: Iterator[nodes.MethodRef] = trueBodyOut.collectAll[nodes.MethodRef] + + /** Traverse to METHOD_REF via TRY_BODY OUT edge. + */ + def _methodRefViaTryBodyOut: Iterator[nodes.MethodRef] = tryBodyOut.collectAll[nodes.MethodRef] + /** Traverse to METHOD_RETURN via CDG OUT edge. */ def _methodReturnViaCdgOut: Iterator[nodes.MethodReturn] = cdgOut.collectAll[nodes.MethodReturn] @@ -351,6 +644,10 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _returnViaAstOut: Iterator[nodes.Return] = astOut.collectAll[nodes.Return] + /** Traverse to RETURN via CATCH_BODY OUT edge. + */ + def _returnViaCatchBodyOut: Iterator[nodes.Return] = catchBodyOut.collectAll[nodes.Return] + /** Traverse to RETURN via CDG OUT edge. */ def _returnViaCdgOut: Iterator[nodes.Return] = cdgOut.collectAll[nodes.Return] @@ -367,6 +664,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _returnViaDominateOut: Iterator[nodes.Return] = dominateOut.collectAll[nodes.Return] + /** Traverse to RETURN via DO_BODY OUT edge. + */ + def _returnViaDoBodyOut: Iterator[nodes.Return] = doBodyOut.collectAll[nodes.Return] + + /** Traverse to RETURN via FALSE_BODY OUT edge. + */ + def _returnViaFalseBodyOut: Iterator[nodes.Return] = falseBodyOut.collectAll[nodes.Return] + + /** Traverse to RETURN via FINALLY_BODY OUT edge. + */ + def _returnViaFinallyBodyOut: Iterator[nodes.Return] = finallyBodyOut.collectAll[nodes.Return] + + /** Traverse to RETURN via FOR_BODY OUT edge. + */ + def _returnViaForBodyOut: Iterator[nodes.Return] = forBodyOut.collectAll[nodes.Return] + + /** Traverse to RETURN via FOR_INIT OUT edge. + */ + def _returnViaForInitOut: Iterator[nodes.Return] = forInitOut.collectAll[nodes.Return] + + /** Traverse to RETURN via FOR_UPDATE OUT edge. + */ + def _returnViaForUpdateOut: Iterator[nodes.Return] = forUpdateOut.collectAll[nodes.Return] + /** Traverse to RETURN via POST_DOMINATE IN edge. */ def _returnViaPostDominateIn: Iterator[nodes.Return] = postDominateIn.collectAll[nodes.Return] @@ -379,6 +700,14 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _returnViaReachingDefOut: Iterator[nodes.Return] = reachingDefOut.collectAll[nodes.Return] + /** Traverse to RETURN via TRUE_BODY OUT edge. + */ + def _returnViaTrueBodyOut: Iterator[nodes.Return] = trueBodyOut.collectAll[nodes.Return] + + /** Traverse to RETURN via TRY_BODY OUT edge. + */ + def _returnViaTryBodyOut: Iterator[nodes.Return] = tryBodyOut.collectAll[nodes.Return] + /** Traverse to TAG via TAGGED_BY OUT edge. */ def _tagViaTaggedByOut: Iterator[nodes.Tag] = taggedByOut.collectAll[nodes.Tag] @@ -391,6 +720,10 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _typeRefViaAstOut: Iterator[nodes.TypeRef] = astOut.collectAll[nodes.TypeRef] + /** Traverse to TYPE_REF via CATCH_BODY OUT edge. + */ + def _typeRefViaCatchBodyOut: Iterator[nodes.TypeRef] = catchBodyOut.collectAll[nodes.TypeRef] + /** Traverse to TYPE_REF via CDG IN edge. */ def _typeRefViaCdgIn: Iterator[nodes.TypeRef] = cdgIn.collectAll[nodes.TypeRef] @@ -411,6 +744,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _typeRefViaDominateOut: Iterator[nodes.TypeRef] = dominateOut.collectAll[nodes.TypeRef] + /** Traverse to TYPE_REF via DO_BODY OUT edge. + */ + def _typeRefViaDoBodyOut: Iterator[nodes.TypeRef] = doBodyOut.collectAll[nodes.TypeRef] + + /** Traverse to TYPE_REF via FALSE_BODY OUT edge. + */ + def _typeRefViaFalseBodyOut: Iterator[nodes.TypeRef] = falseBodyOut.collectAll[nodes.TypeRef] + + /** Traverse to TYPE_REF via FINALLY_BODY OUT edge. + */ + def _typeRefViaFinallyBodyOut: Iterator[nodes.TypeRef] = finallyBodyOut.collectAll[nodes.TypeRef] + + /** Traverse to TYPE_REF via FOR_BODY OUT edge. + */ + def _typeRefViaForBodyOut: Iterator[nodes.TypeRef] = forBodyOut.collectAll[nodes.TypeRef] + + /** Traverse to TYPE_REF via FOR_INIT OUT edge. + */ + def _typeRefViaForInitOut: Iterator[nodes.TypeRef] = forInitOut.collectAll[nodes.TypeRef] + + /** Traverse to TYPE_REF via FOR_UPDATE OUT edge. + */ + def _typeRefViaForUpdateOut: Iterator[nodes.TypeRef] = forUpdateOut.collectAll[nodes.TypeRef] + /** Traverse to TYPE_REF via POST_DOMINATE IN edge. */ def _typeRefViaPostDominateIn: Iterator[nodes.TypeRef] = postDominateIn.collectAll[nodes.TypeRef] @@ -423,6 +780,14 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _typeRefViaReachingDefOut: Iterator[nodes.TypeRef] = reachingDefOut.collectAll[nodes.TypeRef] + /** Traverse to TYPE_REF via TRUE_BODY OUT edge. + */ + def _typeRefViaTrueBodyOut: Iterator[nodes.TypeRef] = trueBodyOut.collectAll[nodes.TypeRef] + + /** Traverse to TYPE_REF via TRY_BODY OUT edge. + */ + def _typeRefViaTryBodyOut: Iterator[nodes.TypeRef] = tryBodyOut.collectAll[nodes.TypeRef] + /** Traverse to UNKNOWN via AST IN edge. */ def _unknownViaAstIn: Iterator[nodes.Unknown] = astIn.collectAll[nodes.Unknown] @@ -431,6 +796,10 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _unknownViaAstOut: Iterator[nodes.Unknown] = astOut.collectAll[nodes.Unknown] + /** Traverse to UNKNOWN via CATCH_BODY OUT edge. + */ + def _unknownViaCatchBodyOut: Iterator[nodes.Unknown] = catchBodyOut.collectAll[nodes.Unknown] + /** Traverse to UNKNOWN via CDG IN edge. */ def _unknownViaCdgIn: Iterator[nodes.Unknown] = cdgIn.collectAll[nodes.Unknown] @@ -451,6 +820,30 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _unknownViaDominateOut: Iterator[nodes.Unknown] = dominateOut.collectAll[nodes.Unknown] + /** Traverse to UNKNOWN via DO_BODY OUT edge. + */ + def _unknownViaDoBodyOut: Iterator[nodes.Unknown] = doBodyOut.collectAll[nodes.Unknown] + + /** Traverse to UNKNOWN via FALSE_BODY OUT edge. + */ + def _unknownViaFalseBodyOut: Iterator[nodes.Unknown] = falseBodyOut.collectAll[nodes.Unknown] + + /** Traverse to UNKNOWN via FINALLY_BODY OUT edge. + */ + def _unknownViaFinallyBodyOut: Iterator[nodes.Unknown] = finallyBodyOut.collectAll[nodes.Unknown] + + /** Traverse to UNKNOWN via FOR_BODY OUT edge. + */ + def _unknownViaForBodyOut: Iterator[nodes.Unknown] = forBodyOut.collectAll[nodes.Unknown] + + /** Traverse to UNKNOWN via FOR_INIT OUT edge. + */ + def _unknownViaForInitOut: Iterator[nodes.Unknown] = forInitOut.collectAll[nodes.Unknown] + + /** Traverse to UNKNOWN via FOR_UPDATE OUT edge. + */ + def _unknownViaForUpdateOut: Iterator[nodes.Unknown] = forUpdateOut.collectAll[nodes.Unknown] + /** Traverse to UNKNOWN via POST_DOMINATE IN edge. */ def _unknownViaPostDominateIn: Iterator[nodes.Unknown] = postDominateIn.collectAll[nodes.Unknown] @@ -459,12 +852,24 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) */ def _unknownViaPostDominateOut: Iterator[nodes.Unknown] = postDominateOut.collectAll[nodes.Unknown] + /** Traverse to UNKNOWN via TRUE_BODY OUT edge. + */ + def _unknownViaTrueBodyOut: Iterator[nodes.Unknown] = trueBodyOut.collectAll[nodes.Unknown] + + /** Traverse to UNKNOWN via TRY_BODY OUT edge. + */ + def _unknownViaTryBodyOut: Iterator[nodes.Unknown] = tryBodyOut.collectAll[nodes.Unknown] + def argumentIn: Iterator[nodes.Expression] = node._argumentIn.cast[nodes.Expression] def astIn: Iterator[nodes.Expression] = node._astIn.cast[nodes.Expression] def astOut: Iterator[nodes.AstNode] = node._astOut.cast[nodes.AstNode] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + + def catchBodyOut: Iterator[nodes.CfgNode] = node._catchBodyOut.cast[nodes.CfgNode] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -477,12 +882,36 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + + def doBodyOut: Iterator[nodes.CfgNode] = node._doBodyOut.cast[nodes.CfgNode] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] def evalTypeOut: Iterator[nodes.Type] = node._evalTypeOut.cast[nodes.Type] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def falseBodyOut: Iterator[nodes.CfgNode] = node._falseBodyOut.cast[nodes.CfgNode] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def finallyBodyOut: Iterator[nodes.CfgNode] = node._finallyBodyOut.cast[nodes.CfgNode] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forBodyOut: Iterator[nodes.CfgNode] = node._forBodyOut.cast[nodes.CfgNode] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forInitOut: Iterator[nodes.CfgNode] = node._forInitOut.cast[nodes.CfgNode] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + + def forUpdateOut: Iterator[nodes.CfgNode] = node._forUpdateOut.cast[nodes.CfgNode] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] @@ -492,6 +921,14 @@ final class AccessNeighborsForControlStructure(val node: nodes.ControlStructure) def receiverIn: Iterator[nodes.Call] = node._receiverIn.cast[nodes.Call] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def trueBodyOut: Iterator[nodes.CfgNode] = node._trueBodyOut.cast[nodes.CfgNode] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] + + def tryBodyOut: Iterator[nodes.CfgNode] = node._tryBodyOut.cast[nodes.CfgNode] } final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[nodes.ControlStructure]) @@ -505,6 +942,10 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _blockViaAstOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaAstOut) + /** Traverse to BLOCK via CATCH_BODY OUT edge. + */ + def _blockViaCatchBodyOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaCatchBodyOut) + /** Traverse to BLOCK via CDG IN edge. */ def _blockViaCdgIn: Iterator[nodes.Block] = traversal.flatMap(_._blockViaCdgIn) @@ -525,6 +966,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _blockViaDominateOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaDominateOut) + /** Traverse to BLOCK via DO_BODY OUT edge. + */ + def _blockViaDoBodyOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaDoBodyOut) + + /** Traverse to BLOCK via FALSE_BODY OUT edge. + */ + def _blockViaFalseBodyOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaFalseBodyOut) + + /** Traverse to BLOCK via FINALLY_BODY OUT edge. + */ + def _blockViaFinallyBodyOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaFinallyBodyOut) + + /** Traverse to BLOCK via FOR_BODY OUT edge. + */ + def _blockViaForBodyOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaForBodyOut) + + /** Traverse to BLOCK via FOR_INIT OUT edge. + */ + def _blockViaForInitOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaForInitOut) + + /** Traverse to BLOCK via FOR_UPDATE OUT edge. + */ + def _blockViaForUpdateOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaForUpdateOut) + /** Traverse to BLOCK via POST_DOMINATE IN edge. */ def _blockViaPostDominateIn: Iterator[nodes.Block] = traversal.flatMap(_._blockViaPostDominateIn) @@ -533,6 +998,14 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _blockViaPostDominateOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaPostDominateOut) + /** Traverse to BLOCK via TRUE_BODY OUT edge. + */ + def _blockViaTrueBodyOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaTrueBodyOut) + + /** Traverse to BLOCK via TRY_BODY OUT edge. + */ + def _blockViaTryBodyOut: Iterator[nodes.Block] = traversal.flatMap(_._blockViaTryBodyOut) + /** Traverse to CALL via ARGUMENT IN edge. */ def _callViaArgumentIn: Iterator[nodes.Call] = traversal.flatMap(_._callViaArgumentIn) @@ -545,6 +1018,10 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _callViaAstOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaAstOut) + /** Traverse to CALL via CATCH_BODY OUT edge. + */ + def _callViaCatchBodyOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaCatchBodyOut) + /** Traverse to CALL via CDG IN edge. */ def _callViaCdgIn: Iterator[nodes.Call] = traversal.flatMap(_._callViaCdgIn) @@ -565,6 +1042,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _callViaDominateOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaDominateOut) + /** Traverse to CALL via DO_BODY OUT edge. + */ + def _callViaDoBodyOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaDoBodyOut) + + /** Traverse to CALL via FALSE_BODY OUT edge. + */ + def _callViaFalseBodyOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaFalseBodyOut) + + /** Traverse to CALL via FINALLY_BODY OUT edge. + */ + def _callViaFinallyBodyOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaFinallyBodyOut) + + /** Traverse to CALL via FOR_BODY OUT edge. + */ + def _callViaForBodyOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaForBodyOut) + + /** Traverse to CALL via FOR_INIT OUT edge. + */ + def _callViaForInitOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaForInitOut) + + /** Traverse to CALL via FOR_UPDATE OUT edge. + */ + def _callViaForUpdateOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaForUpdateOut) + /** Traverse to CALL via POST_DOMINATE IN edge. */ def _callViaPostDominateIn: Iterator[nodes.Call] = traversal.flatMap(_._callViaPostDominateIn) @@ -581,6 +1082,14 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _callViaReceiverIn: Iterator[nodes.Call] = traversal.flatMap(_._callViaReceiverIn) + /** Traverse to CALL via TRUE_BODY OUT edge. + */ + def _callViaTrueBodyOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaTrueBodyOut) + + /** Traverse to CALL via TRY_BODY OUT edge. + */ + def _callViaTryBodyOut: Iterator[nodes.Call] = traversal.flatMap(_._callViaTryBodyOut) + /** Traverse to CFG_NODE via CFG OUT edge. */ def _cfgNodeViaCfgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_._cfgNodeViaCfgOut) @@ -593,6 +1102,16 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaAstOut) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY OUT edge. + */ + def _controlStructureViaCatchBodyOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyOut) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -621,6 +1140,65 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via DO_BODY OUT edge. + */ + def _controlStructureViaDoBodyOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaDoBodyOut) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY OUT edge. + */ + def _controlStructureViaFalseBodyOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyOut) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY OUT edge. + */ + def _controlStructureViaFinallyBodyOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyOut) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY OUT edge. + */ + def _controlStructureViaForBodyOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyOut) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT OUT edge. + */ + def _controlStructureViaForInitOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitOut) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE OUT edge. + */ + def _controlStructureViaForUpdateOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateOut) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -631,6 +1209,26 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ def _controlStructureViaPostDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaPostDominateOut) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY OUT edge. + */ + def _controlStructureViaTrueBodyOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyOut) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY OUT edge. + */ + def _controlStructureViaTryBodyOut: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyOut) + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaCdgIn) @@ -663,6 +1261,10 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _identifierViaAstOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaAstOut) + /** Traverse to IDENTIFIER via CATCH_BODY OUT edge. + */ + def _identifierViaCatchBodyOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaCatchBodyOut) + /** Traverse to IDENTIFIER via CDG IN edge. */ def _identifierViaCdgIn: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaCdgIn) @@ -683,6 +1285,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _identifierViaDominateOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaDominateOut) + /** Traverse to IDENTIFIER via DO_BODY OUT edge. + */ + def _identifierViaDoBodyOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaDoBodyOut) + + /** Traverse to IDENTIFIER via FALSE_BODY OUT edge. + */ + def _identifierViaFalseBodyOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaFalseBodyOut) + + /** Traverse to IDENTIFIER via FINALLY_BODY OUT edge. + */ + def _identifierViaFinallyBodyOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaFinallyBodyOut) + + /** Traverse to IDENTIFIER via FOR_BODY OUT edge. + */ + def _identifierViaForBodyOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaForBodyOut) + + /** Traverse to IDENTIFIER via FOR_INIT OUT edge. + */ + def _identifierViaForInitOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaForInitOut) + + /** Traverse to IDENTIFIER via FOR_UPDATE OUT edge. + */ + def _identifierViaForUpdateOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaForUpdateOut) + /** Traverse to IDENTIFIER via POST_DOMINATE IN edge. */ def _identifierViaPostDominateIn: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaPostDominateIn) @@ -695,6 +1321,14 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _identifierViaReachingDefOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaReachingDefOut) + /** Traverse to IDENTIFIER via TRUE_BODY OUT edge. + */ + def _identifierViaTrueBodyOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaTrueBodyOut) + + /** Traverse to IDENTIFIER via TRY_BODY OUT edge. + */ + def _identifierViaTryBodyOut: Iterator[nodes.Identifier] = traversal.flatMap(_._identifierViaTryBodyOut) + /** Traverse to JUMP_LABEL via AST OUT edge. */ def _jumpLabelViaAstOut: Iterator[nodes.JumpLabel] = traversal.flatMap(_._jumpLabelViaAstOut) @@ -703,6 +1337,10 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _jumpTargetViaAstOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaAstOut) + /** Traverse to JUMP_TARGET via CATCH_BODY OUT edge. + */ + def _jumpTargetViaCatchBodyOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaCatchBodyOut) + /** Traverse to JUMP_TARGET via CDG IN edge. */ def _jumpTargetViaCdgIn: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaCdgIn) @@ -723,6 +1361,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _jumpTargetViaDominateOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaDominateOut) + /** Traverse to JUMP_TARGET via DO_BODY OUT edge. + */ + def _jumpTargetViaDoBodyOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaDoBodyOut) + + /** Traverse to JUMP_TARGET via FALSE_BODY OUT edge. + */ + def _jumpTargetViaFalseBodyOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaFalseBodyOut) + + /** Traverse to JUMP_TARGET via FINALLY_BODY OUT edge. + */ + def _jumpTargetViaFinallyBodyOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaFinallyBodyOut) + + /** Traverse to JUMP_TARGET via FOR_BODY OUT edge. + */ + def _jumpTargetViaForBodyOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaForBodyOut) + + /** Traverse to JUMP_TARGET via FOR_INIT OUT edge. + */ + def _jumpTargetViaForInitOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaForInitOut) + + /** Traverse to JUMP_TARGET via FOR_UPDATE OUT edge. + */ + def _jumpTargetViaForUpdateOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaForUpdateOut) + /** Traverse to JUMP_TARGET via POST_DOMINATE IN edge. */ def _jumpTargetViaPostDominateIn: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaPostDominateIn) @@ -731,10 +1393,22 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _jumpTargetViaPostDominateOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaPostDominateOut) + /** Traverse to JUMP_TARGET via TRUE_BODY OUT edge. + */ + def _jumpTargetViaTrueBodyOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaTrueBodyOut) + + /** Traverse to JUMP_TARGET via TRY_BODY OUT edge. + */ + def _jumpTargetViaTryBodyOut: Iterator[nodes.JumpTarget] = traversal.flatMap(_._jumpTargetViaTryBodyOut) + /** Traverse to LITERAL via AST OUT edge. */ def _literalViaAstOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaAstOut) + /** Traverse to LITERAL via CATCH_BODY OUT edge. + */ + def _literalViaCatchBodyOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaCatchBodyOut) + /** Traverse to LITERAL via CDG IN edge. */ def _literalViaCdgIn: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaCdgIn) @@ -755,6 +1429,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _literalViaDominateOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaDominateOut) + /** Traverse to LITERAL via DO_BODY OUT edge. + */ + def _literalViaDoBodyOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaDoBodyOut) + + /** Traverse to LITERAL via FALSE_BODY OUT edge. + */ + def _literalViaFalseBodyOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaFalseBodyOut) + + /** Traverse to LITERAL via FINALLY_BODY OUT edge. + */ + def _literalViaFinallyBodyOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaFinallyBodyOut) + + /** Traverse to LITERAL via FOR_BODY OUT edge. + */ + def _literalViaForBodyOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaForBodyOut) + + /** Traverse to LITERAL via FOR_INIT OUT edge. + */ + def _literalViaForInitOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaForInitOut) + + /** Traverse to LITERAL via FOR_UPDATE OUT edge. + */ + def _literalViaForUpdateOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaForUpdateOut) + /** Traverse to LITERAL via POST_DOMINATE IN edge. */ def _literalViaPostDominateIn: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaPostDominateIn) @@ -767,6 +1465,14 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _literalViaReachingDefOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaReachingDefOut) + /** Traverse to LITERAL via TRUE_BODY OUT edge. + */ + def _literalViaTrueBodyOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaTrueBodyOut) + + /** Traverse to LITERAL via TRY_BODY OUT edge. + */ + def _literalViaTryBodyOut: Iterator[nodes.Literal] = traversal.flatMap(_._literalViaTryBodyOut) + /** Traverse to LOCAL via AST OUT edge. */ def _localViaAstOut: Iterator[nodes.Local] = traversal.flatMap(_._localViaAstOut) @@ -788,6 +1494,10 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _methodRefViaAstOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaAstOut) + /** Traverse to METHOD_REF via CATCH_BODY OUT edge. + */ + def _methodRefViaCatchBodyOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaCatchBodyOut) + /** Traverse to METHOD_REF via CDG IN edge. */ def _methodRefViaCdgIn: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaCdgIn) @@ -808,6 +1518,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _methodRefViaDominateOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaDominateOut) + /** Traverse to METHOD_REF via DO_BODY OUT edge. + */ + def _methodRefViaDoBodyOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaDoBodyOut) + + /** Traverse to METHOD_REF via FALSE_BODY OUT edge. + */ + def _methodRefViaFalseBodyOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaFalseBodyOut) + + /** Traverse to METHOD_REF via FINALLY_BODY OUT edge. + */ + def _methodRefViaFinallyBodyOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaFinallyBodyOut) + + /** Traverse to METHOD_REF via FOR_BODY OUT edge. + */ + def _methodRefViaForBodyOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaForBodyOut) + + /** Traverse to METHOD_REF via FOR_INIT OUT edge. + */ + def _methodRefViaForInitOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaForInitOut) + + /** Traverse to METHOD_REF via FOR_UPDATE OUT edge. + */ + def _methodRefViaForUpdateOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaForUpdateOut) + /** Traverse to METHOD_REF via POST_DOMINATE IN edge. */ def _methodRefViaPostDominateIn: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaPostDominateIn) @@ -820,6 +1554,14 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _methodRefViaReachingDefOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaReachingDefOut) + /** Traverse to METHOD_REF via TRUE_BODY OUT edge. + */ + def _methodRefViaTrueBodyOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaTrueBodyOut) + + /** Traverse to METHOD_REF via TRY_BODY OUT edge. + */ + def _methodRefViaTryBodyOut: Iterator[nodes.MethodRef] = traversal.flatMap(_._methodRefViaTryBodyOut) + /** Traverse to METHOD_RETURN via CDG OUT edge. */ def _methodReturnViaCdgOut: Iterator[nodes.MethodReturn] = traversal.flatMap(_._methodReturnViaCdgOut) @@ -848,6 +1590,10 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _returnViaAstOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaAstOut) + /** Traverse to RETURN via CATCH_BODY OUT edge. + */ + def _returnViaCatchBodyOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaCatchBodyOut) + /** Traverse to RETURN via CDG OUT edge. */ def _returnViaCdgOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaCdgOut) @@ -864,6 +1610,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _returnViaDominateOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaDominateOut) + /** Traverse to RETURN via DO_BODY OUT edge. + */ + def _returnViaDoBodyOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaDoBodyOut) + + /** Traverse to RETURN via FALSE_BODY OUT edge. + */ + def _returnViaFalseBodyOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaFalseBodyOut) + + /** Traverse to RETURN via FINALLY_BODY OUT edge. + */ + def _returnViaFinallyBodyOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaFinallyBodyOut) + + /** Traverse to RETURN via FOR_BODY OUT edge. + */ + def _returnViaForBodyOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaForBodyOut) + + /** Traverse to RETURN via FOR_INIT OUT edge. + */ + def _returnViaForInitOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaForInitOut) + + /** Traverse to RETURN via FOR_UPDATE OUT edge. + */ + def _returnViaForUpdateOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaForUpdateOut) + /** Traverse to RETURN via POST_DOMINATE IN edge. */ def _returnViaPostDominateIn: Iterator[nodes.Return] = traversal.flatMap(_._returnViaPostDominateIn) @@ -876,6 +1646,14 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _returnViaReachingDefOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaReachingDefOut) + /** Traverse to RETURN via TRUE_BODY OUT edge. + */ + def _returnViaTrueBodyOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaTrueBodyOut) + + /** Traverse to RETURN via TRY_BODY OUT edge. + */ + def _returnViaTryBodyOut: Iterator[nodes.Return] = traversal.flatMap(_._returnViaTryBodyOut) + /** Traverse to TAG via TAGGED_BY OUT edge. */ def _tagViaTaggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_._tagViaTaggedByOut) @@ -888,6 +1666,10 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _typeRefViaAstOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaAstOut) + /** Traverse to TYPE_REF via CATCH_BODY OUT edge. + */ + def _typeRefViaCatchBodyOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaCatchBodyOut) + /** Traverse to TYPE_REF via CDG IN edge. */ def _typeRefViaCdgIn: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaCdgIn) @@ -908,6 +1690,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _typeRefViaDominateOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaDominateOut) + /** Traverse to TYPE_REF via DO_BODY OUT edge. + */ + def _typeRefViaDoBodyOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaDoBodyOut) + + /** Traverse to TYPE_REF via FALSE_BODY OUT edge. + */ + def _typeRefViaFalseBodyOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaFalseBodyOut) + + /** Traverse to TYPE_REF via FINALLY_BODY OUT edge. + */ + def _typeRefViaFinallyBodyOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaFinallyBodyOut) + + /** Traverse to TYPE_REF via FOR_BODY OUT edge. + */ + def _typeRefViaForBodyOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaForBodyOut) + + /** Traverse to TYPE_REF via FOR_INIT OUT edge. + */ + def _typeRefViaForInitOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaForInitOut) + + /** Traverse to TYPE_REF via FOR_UPDATE OUT edge. + */ + def _typeRefViaForUpdateOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaForUpdateOut) + /** Traverse to TYPE_REF via POST_DOMINATE IN edge. */ def _typeRefViaPostDominateIn: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaPostDominateIn) @@ -920,6 +1726,14 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _typeRefViaReachingDefOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaReachingDefOut) + /** Traverse to TYPE_REF via TRUE_BODY OUT edge. + */ + def _typeRefViaTrueBodyOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaTrueBodyOut) + + /** Traverse to TYPE_REF via TRY_BODY OUT edge. + */ + def _typeRefViaTryBodyOut: Iterator[nodes.TypeRef] = traversal.flatMap(_._typeRefViaTryBodyOut) + /** Traverse to UNKNOWN via AST IN edge. */ def _unknownViaAstIn: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaAstIn) @@ -928,6 +1742,10 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _unknownViaAstOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaAstOut) + /** Traverse to UNKNOWN via CATCH_BODY OUT edge. + */ + def _unknownViaCatchBodyOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaCatchBodyOut) + /** Traverse to UNKNOWN via CDG IN edge. */ def _unknownViaCdgIn: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaCdgIn) @@ -948,6 +1766,30 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _unknownViaDominateOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaDominateOut) + /** Traverse to UNKNOWN via DO_BODY OUT edge. + */ + def _unknownViaDoBodyOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaDoBodyOut) + + /** Traverse to UNKNOWN via FALSE_BODY OUT edge. + */ + def _unknownViaFalseBodyOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaFalseBodyOut) + + /** Traverse to UNKNOWN via FINALLY_BODY OUT edge. + */ + def _unknownViaFinallyBodyOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaFinallyBodyOut) + + /** Traverse to UNKNOWN via FOR_BODY OUT edge. + */ + def _unknownViaForBodyOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaForBodyOut) + + /** Traverse to UNKNOWN via FOR_INIT OUT edge. + */ + def _unknownViaForInitOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaForInitOut) + + /** Traverse to UNKNOWN via FOR_UPDATE OUT edge. + */ + def _unknownViaForUpdateOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaForUpdateOut) + /** Traverse to UNKNOWN via POST_DOMINATE IN edge. */ def _unknownViaPostDominateIn: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaPostDominateIn) @@ -956,12 +1798,24 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ */ def _unknownViaPostDominateOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaPostDominateOut) + /** Traverse to UNKNOWN via TRUE_BODY OUT edge. + */ + def _unknownViaTrueBodyOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaTrueBodyOut) + + /** Traverse to UNKNOWN via TRY_BODY OUT edge. + */ + def _unknownViaTryBodyOut: Iterator[nodes.Unknown] = traversal.flatMap(_._unknownViaTryBodyOut) + def argumentIn: Iterator[nodes.Expression] = traversal.flatMap(_.argumentIn) def astIn: Iterator[nodes.Expression] = traversal.flatMap(_.astIn) def astOut: Iterator[nodes.AstNode] = traversal.flatMap(_.astOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + + def catchBodyOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.catchBodyOut) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -974,12 +1828,36 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + + def doBodyOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.doBodyOut) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) def evalTypeOut: Iterator[nodes.Type] = traversal.flatMap(_.evalTypeOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def falseBodyOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.falseBodyOut) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def finallyBodyOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.finallyBodyOut) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forBodyOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.forBodyOut) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forInitOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.forInitOut) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + + def forUpdateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.forUpdateOut) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) @@ -989,4 +1867,12 @@ final class AccessNeighborsForControlStructureTraversal(val traversal: Iterator[ def receiverIn: Iterator[nodes.Call] = traversal.flatMap(_.receiverIn) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def trueBodyOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.trueBodyOut) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) + + def tryBodyOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.tryBodyOut) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Identifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Identifier.scala index 28eb57c60..0edaf1c00 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Identifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Identifier.scala @@ -93,6 +93,10 @@ final class AccessNeighborsForIdentifier(val node: nodes.Identifier) extends Any */ def _controlStructureViaAstIn: Option[nodes.ControlStructure] = astIn.collectAll[nodes.ControlStructure].nextOption() + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -113,6 +117,31 @@ final class AccessNeighborsForIdentifier(val node: nodes.Identifier) extends Any */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -128,6 +157,14 @@ final class AccessNeighborsForIdentifier(val node: nodes.Identifier) extends Any def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = reachingDefIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = cdgIn.collectAll[nodes.FieldIdentifier] @@ -440,6 +477,8 @@ final class AccessNeighborsForIdentifier(val node: nodes.Identifier) extends Any def astOut: Iterator[nodes.Annotation] = node._astOut.cast[nodes.Annotation] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -450,12 +489,24 @@ final class AccessNeighborsForIdentifier(val node: nodes.Identifier) extends Any def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] def evalTypeOut: Iterator[nodes.Type] = node._evalTypeOut.cast[nodes.Type] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] @@ -469,6 +520,10 @@ final class AccessNeighborsForIdentifier(val node: nodes.Identifier) extends Any def refOut: Iterator[nodes.AstNode] = node._refOut.cast[nodes.AstNode] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForIdentifierTraversal(val traversal: Iterator[nodes.Identifier]) extends AnyVal { @@ -561,6 +616,11 @@ final class AccessNeighborsForIdentifierTraversal(val traversal: Iterator[nodes. */ def _controlStructureViaAstIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaAstIn) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -584,6 +644,35 @@ final class AccessNeighborsForIdentifierTraversal(val traversal: Iterator[nodes. def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -599,6 +688,16 @@ final class AccessNeighborsForIdentifierTraversal(val traversal: Iterator[nodes. def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaReachingDefIn) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaCdgIn) @@ -912,6 +1011,8 @@ final class AccessNeighborsForIdentifierTraversal(val traversal: Iterator[nodes. def astOut: Iterator[nodes.Annotation] = traversal.flatMap(_.astOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -922,12 +1023,24 @@ final class AccessNeighborsForIdentifierTraversal(val traversal: Iterator[nodes. def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) def evalTypeOut: Iterator[nodes.Type] = traversal.flatMap(_.evalTypeOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) @@ -941,4 +1054,8 @@ final class AccessNeighborsForIdentifierTraversal(val traversal: Iterator[nodes. def refOut: Iterator[nodes.AstNode] = traversal.flatMap(_.refOut) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/JumpTarget.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/JumpTarget.scala index 17de4e978..82671dc78 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/JumpTarget.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/JumpTarget.scala @@ -69,6 +69,10 @@ final class AccessNeighborsForJumpTarget(val node: nodes.JumpTarget) extends Any */ def _controlStructureViaAstIn: Iterator[nodes.ControlStructure] = astIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -89,6 +93,31 @@ final class AccessNeighborsForJumpTarget(val node: nodes.JumpTarget) extends Any */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -99,6 +128,14 @@ final class AccessNeighborsForJumpTarget(val node: nodes.JumpTarget) extends Any def _controlStructureViaPostDominateOut: Iterator[nodes.ControlStructure] = postDominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = cdgIn.collectAll[nodes.FieldIdentifier] @@ -321,6 +358,8 @@ final class AccessNeighborsForJumpTarget(val node: nodes.JumpTarget) extends Any def astIn: Iterator[nodes.Expression] = node._astIn.cast[nodes.Expression] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -331,15 +370,31 @@ final class AccessNeighborsForJumpTarget(val node: nodes.JumpTarget) extends Any def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForJumpTargetTraversal(val traversal: Iterator[nodes.JumpTarget]) extends AnyVal { @@ -408,6 +463,11 @@ final class AccessNeighborsForJumpTargetTraversal(val traversal: Iterator[nodes. */ def _controlStructureViaAstIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaAstIn) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -431,6 +491,35 @@ final class AccessNeighborsForJumpTargetTraversal(val traversal: Iterator[nodes. def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -441,6 +530,16 @@ final class AccessNeighborsForJumpTargetTraversal(val traversal: Iterator[nodes. def _controlStructureViaPostDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaPostDominateOut) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaCdgIn) @@ -665,6 +764,8 @@ final class AccessNeighborsForJumpTargetTraversal(val traversal: Iterator[nodes. def astIn: Iterator[nodes.Expression] = traversal.flatMap(_.astIn) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -675,13 +776,29 @@ final class AccessNeighborsForJumpTargetTraversal(val traversal: Iterator[nodes. def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Literal.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Literal.scala index 84b733e1e..d67c963f4 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Literal.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Literal.scala @@ -107,6 +107,10 @@ final class AccessNeighborsForLiteral(val node: nodes.Literal) extends AnyVal { } } + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -127,6 +131,31 @@ final class AccessNeighborsForLiteral(val node: nodes.Literal) extends AnyVal { */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -142,6 +171,14 @@ final class AccessNeighborsForLiteral(val node: nodes.Literal) extends AnyVal { def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = reachingDefIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = cdgIn.collectAll[nodes.FieldIdentifier] @@ -441,6 +478,8 @@ final class AccessNeighborsForLiteral(val node: nodes.Literal) extends AnyVal { def astOut: Iterator[nodes.Annotation] = node._astOut.cast[nodes.Annotation] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -451,12 +490,24 @@ final class AccessNeighborsForLiteral(val node: nodes.Literal) extends AnyVal { def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] def evalTypeOut: Iterator[nodes.Type] = node._evalTypeOut.cast[nodes.Type] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] @@ -468,6 +519,10 @@ final class AccessNeighborsForLiteral(val node: nodes.Literal) extends AnyVal { def receiverIn: Iterator[nodes.Call] = node._receiverIn.cast[nodes.Call] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForLiteralTraversal(val traversal: Iterator[nodes.Literal]) extends AnyVal { @@ -564,6 +619,11 @@ final class AccessNeighborsForLiteralTraversal(val traversal: Iterator[nodes.Lit */ def _controlStructureViaAstIn: Iterator[nodes.ControlStructure] = traversal.map(_._controlStructureViaAstIn) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -587,6 +647,35 @@ final class AccessNeighborsForLiteralTraversal(val traversal: Iterator[nodes.Lit def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -602,6 +691,16 @@ final class AccessNeighborsForLiteralTraversal(val traversal: Iterator[nodes.Lit def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaReachingDefIn) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaCdgIn) @@ -903,6 +1002,8 @@ final class AccessNeighborsForLiteralTraversal(val traversal: Iterator[nodes.Lit def astOut: Iterator[nodes.Annotation] = traversal.flatMap(_.astOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -913,12 +1014,24 @@ final class AccessNeighborsForLiteralTraversal(val traversal: Iterator[nodes.Lit def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) def evalTypeOut: Iterator[nodes.Type] = traversal.flatMap(_.evalTypeOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) @@ -930,4 +1043,8 @@ final class AccessNeighborsForLiteralTraversal(val traversal: Iterator[nodes.Lit def receiverIn: Iterator[nodes.Call] = traversal.flatMap(_.receiverIn) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/MethodRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/MethodRef.scala index 7f9dd5c51..4643efd31 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/MethodRef.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/MethodRef.scala @@ -107,6 +107,10 @@ final class AccessNeighborsForMethodRef(val node: nodes.MethodRef) extends AnyVa } } + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -127,6 +131,31 @@ final class AccessNeighborsForMethodRef(val node: nodes.MethodRef) extends AnyVa */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -142,6 +171,14 @@ final class AccessNeighborsForMethodRef(val node: nodes.MethodRef) extends AnyVa def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = reachingDefIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = cdgIn.collectAll[nodes.FieldIdentifier] @@ -466,6 +503,8 @@ final class AccessNeighborsForMethodRef(val node: nodes.MethodRef) extends AnyVa def captureOut: Iterator[nodes.ClosureBinding] = node._captureOut.cast[nodes.ClosureBinding] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -476,12 +515,24 @@ final class AccessNeighborsForMethodRef(val node: nodes.MethodRef) extends AnyVa def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] def evalTypeOut: Iterator[nodes.Type] = node._evalTypeOut.cast[nodes.Type] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] @@ -495,6 +546,10 @@ final class AccessNeighborsForMethodRef(val node: nodes.MethodRef) extends AnyVa def refOut: Iterator[nodes.Method] = node._refOut.cast[nodes.Method] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForMethodRefTraversal(val traversal: Iterator[nodes.MethodRef]) extends AnyVal { @@ -591,6 +646,11 @@ final class AccessNeighborsForMethodRefTraversal(val traversal: Iterator[nodes.M */ def _controlStructureViaAstIn: Iterator[nodes.ControlStructure] = traversal.map(_._controlStructureViaAstIn) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -614,6 +674,35 @@ final class AccessNeighborsForMethodRefTraversal(val traversal: Iterator[nodes.M def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -629,6 +718,16 @@ final class AccessNeighborsForMethodRefTraversal(val traversal: Iterator[nodes.M def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaReachingDefIn) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaCdgIn) @@ -945,6 +1044,8 @@ final class AccessNeighborsForMethodRefTraversal(val traversal: Iterator[nodes.M def captureOut: Iterator[nodes.ClosureBinding] = traversal.flatMap(_.captureOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -955,12 +1056,24 @@ final class AccessNeighborsForMethodRefTraversal(val traversal: Iterator[nodes.M def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) def evalTypeOut: Iterator[nodes.Type] = traversal.flatMap(_.evalTypeOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) @@ -974,4 +1087,8 @@ final class AccessNeighborsForMethodRefTraversal(val traversal: Iterator[nodes.M def refOut: Iterator[nodes.Method] = traversal.flatMap(_.refOut) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Return.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Return.scala index 7a58913dc..c515bb898 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Return.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Return.scala @@ -89,6 +89,10 @@ final class AccessNeighborsForReturn(val node: nodes.Return) extends AnyVal { */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = astOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -105,6 +109,31 @@ final class AccessNeighborsForReturn(val node: nodes.Return) extends AnyVal { */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -120,6 +149,14 @@ final class AccessNeighborsForReturn(val node: nodes.Return) extends AnyVal { def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = reachingDefIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = cdgIn.collectAll[nodes.FieldIdentifier] @@ -447,6 +484,8 @@ final class AccessNeighborsForReturn(val node: nodes.Return) extends AnyVal { def astOut: Iterator[nodes.CfgNode] = node._astOut.cast[nodes.CfgNode] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cfgOut: Iterator[nodes.MethodReturn] = node._cfgOut.cast[nodes.MethodReturn] @@ -455,10 +494,22 @@ final class AccessNeighborsForReturn(val node: nodes.Return) extends AnyVal { def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] @@ -468,6 +519,10 @@ final class AccessNeighborsForReturn(val node: nodes.Return) extends AnyVal { def reachingDefOut: Iterator[nodes.CfgNode] = node._reachingDefOut.cast[nodes.CfgNode] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForReturnTraversal(val traversal: Iterator[nodes.Return]) extends AnyVal { @@ -557,6 +612,11 @@ final class AccessNeighborsForReturnTraversal(val traversal: Iterator[nodes.Retu */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaAstOut) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -576,6 +636,35 @@ final class AccessNeighborsForReturnTraversal(val traversal: Iterator[nodes.Retu def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -591,6 +680,16 @@ final class AccessNeighborsForReturnTraversal(val traversal: Iterator[nodes.Retu def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaReachingDefIn) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaCdgIn) @@ -910,6 +1009,8 @@ final class AccessNeighborsForReturnTraversal(val traversal: Iterator[nodes.Retu def astOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.astOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cfgOut: Iterator[nodes.MethodReturn] = traversal.flatMap(_.cfgOut) @@ -918,10 +1019,22 @@ final class AccessNeighborsForReturnTraversal(val traversal: Iterator[nodes.Retu def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) @@ -931,4 +1044,8 @@ final class AccessNeighborsForReturnTraversal(val traversal: Iterator[nodes.Retu def reachingDefOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.reachingDefOut) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/TypeRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/TypeRef.scala index 99f7f7092..a3b2be3ce 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/TypeRef.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/TypeRef.scala @@ -93,6 +93,10 @@ final class AccessNeighborsForTypeRef(val node: nodes.TypeRef) extends AnyVal { */ def _controlStructureViaAstIn: Iterator[nodes.ControlStructure] = astIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -113,6 +117,31 @@ final class AccessNeighborsForTypeRef(val node: nodes.TypeRef) extends AnyVal { */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -128,6 +157,14 @@ final class AccessNeighborsForTypeRef(val node: nodes.TypeRef) extends AnyVal { def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = reachingDefIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = cdgIn.collectAll[nodes.FieldIdentifier] @@ -431,6 +468,8 @@ final class AccessNeighborsForTypeRef(val node: nodes.TypeRef) extends AnyVal { def captureOut: Iterator[nodes.ClosureBinding] = node._captureOut.cast[nodes.ClosureBinding] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -441,12 +480,24 @@ final class AccessNeighborsForTypeRef(val node: nodes.TypeRef) extends AnyVal { def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] def evalTypeOut: Iterator[nodes.Type] = node._evalTypeOut.cast[nodes.Type] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] @@ -458,6 +509,10 @@ final class AccessNeighborsForTypeRef(val node: nodes.TypeRef) extends AnyVal { def receiverIn: Iterator[nodes.Call] = node._receiverIn.cast[nodes.Call] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForTypeRefTraversal(val traversal: Iterator[nodes.TypeRef]) extends AnyVal { @@ -550,6 +605,11 @@ final class AccessNeighborsForTypeRefTraversal(val traversal: Iterator[nodes.Typ */ def _controlStructureViaAstIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaAstIn) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -573,6 +633,35 @@ final class AccessNeighborsForTypeRefTraversal(val traversal: Iterator[nodes.Typ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -588,6 +677,16 @@ final class AccessNeighborsForTypeRefTraversal(val traversal: Iterator[nodes.Typ def _controlStructureViaReachingDefIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaReachingDefIn) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via CDG IN edge. */ def _fieldIdentifierViaCdgIn: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaCdgIn) @@ -893,6 +992,8 @@ final class AccessNeighborsForTypeRefTraversal(val traversal: Iterator[nodes.Typ def captureOut: Iterator[nodes.ClosureBinding] = traversal.flatMap(_.captureOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -903,12 +1004,24 @@ final class AccessNeighborsForTypeRefTraversal(val traversal: Iterator[nodes.Typ def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) def evalTypeOut: Iterator[nodes.Type] = traversal.flatMap(_.evalTypeOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) @@ -920,4 +1033,8 @@ final class AccessNeighborsForTypeRefTraversal(val traversal: Iterator[nodes.Typ def receiverIn: Iterator[nodes.Call] = traversal.flatMap(_.receiverIn) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Unknown.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Unknown.scala index 19aab833a..5261e5546 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Unknown.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/neighboraccessors/Unknown.scala @@ -93,6 +93,10 @@ final class AccessNeighborsForUnknown(val node: nodes.Unknown) extends AnyVal { */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = astOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = catchBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = cdgIn.collectAll[nodes.ControlStructure] @@ -113,6 +117,31 @@ final class AccessNeighborsForUnknown(val node: nodes.Unknown) extends AnyVal { */ def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = dominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = doBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = falseBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + finallyBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = forBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = forInitIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = forUpdateIn.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -123,6 +152,14 @@ final class AccessNeighborsForUnknown(val node: nodes.Unknown) extends AnyVal { def _controlStructureViaPostDominateOut: Iterator[nodes.ControlStructure] = postDominateOut.collectAll[nodes.ControlStructure] + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = trueBodyIn.collectAll[nodes.ControlStructure] + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = tryBodyIn.collectAll[nodes.ControlStructure] + /** Traverse to FIELD_IDENTIFIER via AST OUT edge. */ def _fieldIdentifierViaAstOut: Iterator[nodes.FieldIdentifier] = astOut.collectAll[nodes.FieldIdentifier] @@ -428,6 +465,8 @@ final class AccessNeighborsForUnknown(val node: nodes.Unknown) extends AnyVal { def astOut: Iterator[nodes.AstNode] = node._astOut.cast[nodes.AstNode] + def catchBodyIn: Iterator[nodes.ControlStructure] = node._catchBodyIn.cast[nodes.ControlStructure] + def cdgIn: Iterator[nodes.CfgNode] = node._cdgIn.cast[nodes.CfgNode] def cdgOut: Iterator[nodes.CfgNode] = node._cdgOut.cast[nodes.CfgNode] @@ -438,12 +477,24 @@ final class AccessNeighborsForUnknown(val node: nodes.Unknown) extends AnyVal { def containsIn: Iterator[nodes.Method] = node._containsIn.cast[nodes.Method] + def doBodyIn: Iterator[nodes.ControlStructure] = node._doBodyIn.cast[nodes.ControlStructure] + def dominateIn: Iterator[nodes.CfgNode] = node._dominateIn.cast[nodes.CfgNode] def dominateOut: Iterator[nodes.CfgNode] = node._dominateOut.cast[nodes.CfgNode] def evalTypeOut: Iterator[nodes.Type] = node._evalTypeOut.cast[nodes.Type] + def falseBodyIn: Iterator[nodes.ControlStructure] = node._falseBodyIn.cast[nodes.ControlStructure] + + def finallyBodyIn: Iterator[nodes.ControlStructure] = node._finallyBodyIn.cast[nodes.ControlStructure] + + def forBodyIn: Iterator[nodes.ControlStructure] = node._forBodyIn.cast[nodes.ControlStructure] + + def forInitIn: Iterator[nodes.ControlStructure] = node._forInitIn.cast[nodes.ControlStructure] + + def forUpdateIn: Iterator[nodes.ControlStructure] = node._forUpdateIn.cast[nodes.ControlStructure] + def postDominateIn: Iterator[nodes.CfgNode] = node._postDominateIn.cast[nodes.CfgNode] def postDominateOut: Iterator[nodes.CfgNode] = node._postDominateOut.cast[nodes.CfgNode] @@ -453,6 +504,10 @@ final class AccessNeighborsForUnknown(val node: nodes.Unknown) extends AnyVal { def receiverIn: Iterator[nodes.Call] = node._receiverIn.cast[nodes.Call] def taggedByOut: Iterator[nodes.Tag] = node._taggedByOut.cast[nodes.Tag] + + def trueBodyIn: Iterator[nodes.ControlStructure] = node._trueBodyIn.cast[nodes.ControlStructure] + + def tryBodyIn: Iterator[nodes.ControlStructure] = node._tryBodyIn.cast[nodes.ControlStructure] } final class AccessNeighborsForUnknownTraversal(val traversal: Iterator[nodes.Unknown]) extends AnyVal { @@ -545,6 +600,11 @@ final class AccessNeighborsForUnknownTraversal(val traversal: Iterator[nodes.Unk */ def _controlStructureViaAstOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaAstOut) + /** Traverse to CONTROL_STRUCTURE via CATCH_BODY IN edge. + */ + def _controlStructureViaCatchBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaCatchBodyIn) + /** Traverse to CONTROL_STRUCTURE via CDG IN edge. */ def _controlStructureViaCdgIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaCdgIn) @@ -568,6 +628,35 @@ final class AccessNeighborsForUnknownTraversal(val traversal: Iterator[nodes.Unk def _controlStructureViaDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDominateOut) + /** Traverse to CONTROL_STRUCTURE via DO_BODY IN edge. + */ + def _controlStructureViaDoBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaDoBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FALSE_BODY IN edge. + */ + def _controlStructureViaFalseBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFalseBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FINALLY_BODY IN edge. + */ + def _controlStructureViaFinallyBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaFinallyBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_BODY IN edge. + */ + def _controlStructureViaForBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForBodyIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_INIT IN edge. + */ + def _controlStructureViaForInitIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForInitIn) + + /** Traverse to CONTROL_STRUCTURE via FOR_UPDATE IN edge. + */ + def _controlStructureViaForUpdateIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaForUpdateIn) + /** Traverse to CONTROL_STRUCTURE via POST_DOMINATE IN edge. */ def _controlStructureViaPostDominateIn: Iterator[nodes.ControlStructure] = @@ -578,6 +667,16 @@ final class AccessNeighborsForUnknownTraversal(val traversal: Iterator[nodes.Unk def _controlStructureViaPostDominateOut: Iterator[nodes.ControlStructure] = traversal.flatMap(_._controlStructureViaPostDominateOut) + /** Traverse to CONTROL_STRUCTURE via TRUE_BODY IN edge. + */ + def _controlStructureViaTrueBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTrueBodyIn) + + /** Traverse to CONTROL_STRUCTURE via TRY_BODY IN edge. + */ + def _controlStructureViaTryBodyIn: Iterator[nodes.ControlStructure] = + traversal.flatMap(_._controlStructureViaTryBodyIn) + /** Traverse to FIELD_IDENTIFIER via AST OUT edge. */ def _fieldIdentifierViaAstOut: Iterator[nodes.FieldIdentifier] = traversal.flatMap(_._fieldIdentifierViaAstOut) @@ -885,6 +984,8 @@ final class AccessNeighborsForUnknownTraversal(val traversal: Iterator[nodes.Unk def astOut: Iterator[nodes.AstNode] = traversal.flatMap(_.astOut) + def catchBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.catchBodyIn) + def cdgIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgIn) def cdgOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.cdgOut) @@ -895,12 +996,24 @@ final class AccessNeighborsForUnknownTraversal(val traversal: Iterator[nodes.Unk def containsIn: Iterator[nodes.Method] = traversal.flatMap(_.containsIn) + def doBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.doBodyIn) + def dominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateIn) def dominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.dominateOut) def evalTypeOut: Iterator[nodes.Type] = traversal.flatMap(_.evalTypeOut) + def falseBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.falseBodyIn) + + def finallyBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.finallyBodyIn) + + def forBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forBodyIn) + + def forInitIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forInitIn) + + def forUpdateIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.forUpdateIn) + def postDominateIn: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateIn) def postDominateOut: Iterator[nodes.CfgNode] = traversal.flatMap(_.postDominateOut) @@ -910,4 +1023,8 @@ final class AccessNeighborsForUnknownTraversal(val traversal: Iterator[nodes.Unk def receiverIn: Iterator[nodes.Call] = traversal.flatMap(_.receiverIn) def taggedByOut: Iterator[nodes.Tag] = traversal.flatMap(_.taggedByOut) + + def trueBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.trueBodyIn) + + def tryBodyIn: Iterator[nodes.ControlStructure] = traversal.flatMap(_.tryBodyIn) } diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotation.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotation.scala index 6dab9977b..af9f676db 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotation.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotation.scala @@ -163,6 +163,44 @@ object NewAnnotation { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewAnnotation { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewAnnotation { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewAnnotation { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewAnnotation { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewAnnotation { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewAnnotation { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationLiteral.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationLiteral.scala index eb4ba91f3..2570f37da 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationLiteral.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationLiteral.scala @@ -163,6 +163,44 @@ object NewAnnotationLiteral { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewAnnotationLiteral { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewAnnotationLiteral { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewAnnotationLiteral { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewAnnotationLiteral { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewAnnotationLiteral { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewAnnotationLiteral { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationParameter.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationParameter.scala index 870052c9d..ebebe8ef0 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationParameter.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationParameter.scala @@ -163,6 +163,44 @@ object NewAnnotationParameter { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewAnnotationParameter { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewAnnotationParameter { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewAnnotationParameter { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewAnnotationParameter { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewAnnotationParameter { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewAnnotationParameter { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationParameterAssign.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationParameterAssign.scala index a9ce65f1b..7f855be33 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationParameterAssign.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewAnnotationParameterAssign.scala @@ -163,6 +163,44 @@ object NewAnnotationParameterAssign { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewAnnotationParameterAssign { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewAnnotationParameterAssign { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewAnnotationParameterAssign { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewAnnotationParameterAssign { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewAnnotationParameterAssign { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewAnnotationParameterAssign { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewArrayInitializer.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewArrayInitializer.scala index f53fce958..f9a388675 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewArrayInitializer.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewArrayInitializer.scala @@ -163,6 +163,44 @@ object NewArrayInitializer { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewArrayInitializer { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewArrayInitializer { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewArrayInitializer { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewArrayInitializer { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewArrayInitializer { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewArrayInitializer { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewBlock.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewBlock.scala index 7d337a2e4..b5d549add 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewBlock.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewBlock.scala @@ -163,6 +163,44 @@ object NewBlock { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewBlock { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewBlock { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewBlock { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewBlock { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewBlock { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewBlock { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewCall.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewCall.scala index a1393e748..f88caceb3 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewCall.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewCall.scala @@ -163,6 +163,44 @@ object NewCall { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewCall { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewCall { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewCall { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewCall { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewCall { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewCall { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewComment.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewComment.scala index 827dcbd23..48a88dd57 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewComment.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewComment.scala @@ -163,6 +163,44 @@ object NewComment { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewComment { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewComment { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewComment { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewComment { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewComment { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewComment { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewControlStructure.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewControlStructure.scala index f9622551e..4c0e392ed 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewControlStructure.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewControlStructure.scala @@ -163,6 +163,44 @@ object NewControlStructure { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewControlStructure { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewControlStructure { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewControlStructure { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewControlStructure { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewControlStructure { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewControlStructure { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewFieldIdentifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewFieldIdentifier.scala index 3b0f7d489..b3eaa9c92 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewFieldIdentifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewFieldIdentifier.scala @@ -163,6 +163,44 @@ object NewFieldIdentifier { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewFieldIdentifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewFieldIdentifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewFieldIdentifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewFieldIdentifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewFieldIdentifier { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewFieldIdentifier { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewFile.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewFile.scala index 7c5aa3bfd..7fc7b946e 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewFile.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewFile.scala @@ -163,6 +163,44 @@ object NewFile { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewFile { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewFile { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewFile { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewFile { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewFile { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewFile { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewIdentifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewIdentifier.scala index 05105e1a4..bf3ed07e1 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewIdentifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewIdentifier.scala @@ -163,6 +163,44 @@ object NewIdentifier { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewIdentifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewIdentifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewIdentifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewIdentifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewIdentifier { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewIdentifier { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewImport.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewImport.scala index ad9c09454..58e204f92 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewImport.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewImport.scala @@ -163,6 +163,44 @@ object NewImport { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewImport { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewImport { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewImport { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewImport { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewImport { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewImport { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewJumpLabel.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewJumpLabel.scala index 1560a444e..2fdf72fa2 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewJumpLabel.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewJumpLabel.scala @@ -163,6 +163,44 @@ object NewJumpLabel { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewJumpLabel { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewJumpLabel { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewJumpLabel { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewJumpLabel { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewJumpLabel { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewJumpLabel { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewJumpTarget.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewJumpTarget.scala index 869d05bb7..63c928a83 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewJumpTarget.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewJumpTarget.scala @@ -163,6 +163,44 @@ object NewJumpTarget { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewJumpTarget { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewJumpTarget { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewJumpTarget { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewJumpTarget { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewJumpTarget { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewJumpTarget { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewLiteral.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewLiteral.scala index 0ede8023d..edfe83220 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewLiteral.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewLiteral.scala @@ -163,6 +163,44 @@ object NewLiteral { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewLiteral { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewLiteral { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewLiteral { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewLiteral { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewLiteral { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewLiteral { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewLocal.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewLocal.scala index 1127a2091..6e109df74 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewLocal.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewLocal.scala @@ -163,6 +163,44 @@ object NewLocal { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewLocal { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewLocal { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewLocal { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewLocal { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewLocal { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewLocal { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMember.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMember.scala index 318a66715..0e718988a 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMember.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMember.scala @@ -163,6 +163,44 @@ object NewMember { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewMember { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewMember { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewMember { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewMember { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewMember { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewMember { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethod.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethod.scala index de0bdb848..94650b9fd 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethod.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethod.scala @@ -163,6 +163,44 @@ object NewMethod { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewMethod { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewMethod { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewMethod { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewMethod { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewMethod { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewMethod { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodParameterIn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodParameterIn.scala index 6604316da..39b12bae9 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodParameterIn.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodParameterIn.scala @@ -163,6 +163,44 @@ object NewMethodParameterIn { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewMethodParameterIn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewMethodParameterIn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewMethodParameterIn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewMethodParameterIn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewMethodParameterIn { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewMethodParameterIn { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodParameterOut.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodParameterOut.scala index ff280a242..3d6521fb5 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodParameterOut.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodParameterOut.scala @@ -163,6 +163,44 @@ object NewMethodParameterOut { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewMethodParameterOut { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewMethodParameterOut { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewMethodParameterOut { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewMethodParameterOut { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewMethodParameterOut { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewMethodParameterOut { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodRef.scala index fe38ed839..fc5ec361a 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodRef.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodRef.scala @@ -163,6 +163,44 @@ object NewMethodRef { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewMethodRef { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewMethodRef { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewMethodRef { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewMethodRef { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewMethodRef { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewMethodRef { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodReturn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodReturn.scala index 430097a4c..0188f94ef 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodReturn.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewMethodReturn.scala @@ -163,6 +163,44 @@ object NewMethodReturn { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewMethodReturn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewMethodReturn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewMethodReturn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewMethodReturn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewMethodReturn { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewMethodReturn { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewModifier.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewModifier.scala index 560bbc188..7cfea1447 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewModifier.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewModifier.scala @@ -163,6 +163,44 @@ object NewModifier { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewModifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewModifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewModifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewModifier { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewModifier { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewModifier { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNamespace.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNamespace.scala index 05134f979..0a69825c5 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNamespace.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNamespace.scala @@ -163,6 +163,44 @@ object NewNamespace { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewNamespace { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewNamespace { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewNamespace { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewNamespace { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewNamespace { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewNamespace { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNamespaceBlock.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNamespaceBlock.scala index 97cf812dc..dc30cf2ef 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNamespaceBlock.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewNamespaceBlock.scala @@ -163,6 +163,44 @@ object NewNamespaceBlock { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewNamespaceBlock { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewNamespaceBlock { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewNamespaceBlock { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewNamespaceBlock { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewNamespaceBlock { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewNamespaceBlock { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewReturn.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewReturn.scala index 587d5af6c..e32ce7ddc 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewReturn.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewReturn.scala @@ -163,6 +163,44 @@ object NewReturn { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewReturn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewReturn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewReturn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewReturn { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewReturn { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewReturn { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTemplateDom.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTemplateDom.scala index 12d7ba9ec..f8aca5152 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTemplateDom.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTemplateDom.scala @@ -163,6 +163,44 @@ object NewTemplateDom { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewTemplateDom { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewTemplateDom { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewTemplateDom { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewTemplateDom { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewTemplateDom { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewTemplateDom { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeArgument.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeArgument.scala index 908e01f9d..d5e7ccb67 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeArgument.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeArgument.scala @@ -163,6 +163,44 @@ object NewTypeArgument { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewTypeArgument { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewTypeArgument { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewTypeArgument { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewTypeArgument { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewTypeArgument { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewTypeArgument { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeDecl.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeDecl.scala index 2ad1c734b..51f10d55f 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeDecl.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeDecl.scala @@ -163,6 +163,44 @@ object NewTypeDecl { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewTypeDecl { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewTypeDecl { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewTypeDecl { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewTypeDecl { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewTypeDecl { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewTypeDecl { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeParameter.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeParameter.scala index 2b14ef442..850afd478 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeParameter.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeParameter.scala @@ -163,6 +163,44 @@ object NewTypeParameter { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewTypeParameter { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewTypeParameter { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewTypeParameter { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewTypeParameter { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewTypeParameter { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewTypeParameter { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeRef.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeRef.scala index 01e7bd395..49cbc57c9 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeRef.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewTypeRef.scala @@ -163,6 +163,44 @@ object NewTypeRef { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewTypeRef { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewTypeRef { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewTypeRef { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewTypeRef { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewTypeRef { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewTypeRef { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewUnknown.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewUnknown.scala index c12d8626c..127709398 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewUnknown.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/NewUnknown.scala @@ -163,6 +163,44 @@ object NewUnknown { ), "CAPTURE" -> Set("CLOSURE_BINDING"), "CAPTURED_BY" -> Set("CLOSURE_BINDING"), + "CATCH_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", @@ -201,7 +239,466 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "CFG" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONDITION" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "CONTAINS" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DOMINATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "DO_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "EVAL_TYPE" -> Set("TYPE"), + "FALSE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FINALLY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "IMPORTS" -> Set("DEPENDENCY"), + "INHERITS_FROM" -> Set("TYPE"), + "IS_CALL_FOR_IMPORT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "PARAMETER_LINK" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "POST_DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -239,7 +736,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "REACHING_DEF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -277,7 +774,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "RECEIVER" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -315,7 +812,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "REF" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -347,16 +844,14 @@ object NewUnknown { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "EVAL_TYPE" -> Set("TYPE"), - "IMPORTS" -> Set("DEPENDENCY"), - "INHERITS_FROM" -> Set("TYPE"), - "IS_CALL_FOR_IMPORT" -> Set( + "SOURCE_FILE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -394,7 +889,8 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "PARAMETER_LINK" -> Set( + "TAGGED_BY" -> Set("TAG"), + "TRUE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -432,7 +928,47 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "POST_DOMINATE" -> Set( + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ) + ) + private val inNeighbors: Map[String, Set[String]] = Map( + "ARGUMENT" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -470,7 +1006,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "REACHING_DEF" -> Set( + "AST" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -502,13 +1038,14 @@ object NewUnknown { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", + "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "RECEIVER" -> Set( + "BINDS_TO" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -546,7 +1083,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "REF" -> Set( + "CALL" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -578,14 +1115,13 @@ object NewUnknown { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "SOURCE_FILE" -> Set( + "CATCH_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -623,10 +1159,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "TAGGED_BY" -> Set("TAG") - ) - private val inNeighbors: Map[String, Set[String]] = Map( - "ARGUMENT" -> Set( + "CDG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -664,7 +1197,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "AST" -> Set( + "CFG" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -696,14 +1229,13 @@ object NewUnknown { "NAMESPACE_BLOCK", "RETURN", "TEMPLATE_DOM", - "TYPE", "TYPE_ARGUMENT", "TYPE_DECL", "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" ), - "BINDS_TO" -> Set( + "CONDITION" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -741,7 +1273,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "CALL" -> Set( + "CONTAINS" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -779,7 +1311,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "CDG" -> Set( + "DOMINATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -817,7 +1349,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "CFG" -> Set( + "DO_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -855,7 +1387,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "CONDITION" -> Set( + "FALSE_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -893,7 +1425,7 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "CONTAINS" -> Set( + "FINALLY_BODY" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -931,7 +1463,83 @@ object NewUnknown { "TYPE_REF", "UNKNOWN" ), - "DOMINATE" -> Set( + "FOR_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_INIT" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "FOR_UPDATE" -> Set( "ANNOTATION", "ANNOTATION_LITERAL", "ANNOTATION_PARAMETER", @@ -1237,6 +1845,82 @@ object NewUnknown { "TYPE_PARAMETER", "TYPE_REF", "UNKNOWN" + ), + "TRUE_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" + ), + "TRY_BODY" -> Set( + "ANNOTATION", + "ANNOTATION_LITERAL", + "ANNOTATION_PARAMETER", + "ANNOTATION_PARAMETER_ASSIGN", + "ARRAY_INITIALIZER", + "BLOCK", + "CALL", + "CALL_REPR", + "CFG_NODE", + "COMMENT", + "CONTROL_STRUCTURE", + "EXPRESSION", + "FIELD_IDENTIFIER", + "FILE", + "IDENTIFIER", + "IMPORT", + "JUMP_LABEL", + "JUMP_TARGET", + "LITERAL", + "LOCAL", + "MEMBER", + "METHOD", + "METHOD_PARAMETER_IN", + "METHOD_PARAMETER_OUT", + "METHOD_REF", + "METHOD_RETURN", + "MODIFIER", + "NAMESPACE", + "NAMESPACE_BLOCK", + "RETURN", + "TEMPLATE_DOM", + "TYPE_ARGUMENT", + "TYPE_DECL", + "TYPE_PARAMETER", + "TYPE_REF", + "UNKNOWN" ) ) diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/RootTypes.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/RootTypes.scala index ec0b55689..752481e53 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/RootTypes.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/RootTypes.scala @@ -105,182 +105,281 @@ abstract class StoredNode(graph_4762: flatgraph.Graph, kind_4762: Short, seq_476 .asInstanceOf[Iterator[StoredNode]] } - final def _cdgOut: Iterator[StoredNode] = { + final def _catchBodyOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 8) .asInstanceOf[Iterator[StoredNode]] } - final def _cdgIn: Iterator[StoredNode] = { + final def _catchBodyIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 8) .asInstanceOf[Iterator[StoredNode]] } - final def _cfgOut: Iterator[StoredNode] = { + final def _cdgOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 9) .asInstanceOf[Iterator[StoredNode]] } - final def _cfgIn: Iterator[StoredNode] = { + final def _cdgIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 9) .asInstanceOf[Iterator[StoredNode]] } - final def _conditionOut: Iterator[StoredNode] = { + final def _cfgOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 10) .asInstanceOf[Iterator[StoredNode]] } - final def _conditionIn: Iterator[StoredNode] = { + final def _cfgIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 10) .asInstanceOf[Iterator[StoredNode]] } - final def _containsOut: Iterator[StoredNode] = { + final def _conditionOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 11) .asInstanceOf[Iterator[StoredNode]] } - final def _containsIn: Iterator[StoredNode] = { + final def _conditionIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 11) .asInstanceOf[Iterator[StoredNode]] } - final def _dominateOut: Iterator[StoredNode] = { + final def _containsOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 12) .asInstanceOf[Iterator[StoredNode]] } - final def _dominateIn: Iterator[StoredNode] = { + final def _containsIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 12) .asInstanceOf[Iterator[StoredNode]] } - final def _evalTypeOut: Iterator[StoredNode] = { + final def _dominateOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 13) .asInstanceOf[Iterator[StoredNode]] } - final def _evalTypeIn: Iterator[StoredNode] = { + final def _dominateIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 13) .asInstanceOf[Iterator[StoredNode]] } - final def _importsOut: Iterator[StoredNode] = { + final def _doBodyOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 14) .asInstanceOf[Iterator[StoredNode]] } - final def _importsIn: Iterator[StoredNode] = { + final def _doBodyIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 14) .asInstanceOf[Iterator[StoredNode]] } - final def _inheritsFromOut: Iterator[StoredNode] = { + final def _evalTypeOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 15) .asInstanceOf[Iterator[StoredNode]] } - final def _inheritsFromIn: Iterator[StoredNode] = { + final def _evalTypeIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 15) .asInstanceOf[Iterator[StoredNode]] } - final def _isCallForImportOut: Iterator[StoredNode] = { + final def _falseBodyOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 16) .asInstanceOf[Iterator[StoredNode]] } - final def _isCallForImportIn: Iterator[StoredNode] = { + final def _falseBodyIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 16) .asInstanceOf[Iterator[StoredNode]] } - final def _parameterLinkOut: Iterator[StoredNode] = { + final def _finallyBodyOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 17) .asInstanceOf[Iterator[StoredNode]] } - final def _parameterLinkIn: Iterator[StoredNode] = { + final def _finallyBodyIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 17) .asInstanceOf[Iterator[StoredNode]] } - final def _postDominateOut: Iterator[StoredNode] = { + final def _forBodyOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 18) .asInstanceOf[Iterator[StoredNode]] } - final def _postDominateIn: Iterator[StoredNode] = { + final def _forBodyIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 18) .asInstanceOf[Iterator[StoredNode]] } - final def _reachingDefOut: Iterator[StoredNode] = { + final def _forInitOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 19) .asInstanceOf[Iterator[StoredNode]] } - final def _reachingDefIn: Iterator[StoredNode] = { + final def _forInitIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 19) .asInstanceOf[Iterator[StoredNode]] } - final def _receiverOut: Iterator[StoredNode] = { + final def _forUpdateOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 20) .asInstanceOf[Iterator[StoredNode]] } - final def _receiverIn: Iterator[StoredNode] = { + final def _forUpdateIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 20) .asInstanceOf[Iterator[StoredNode]] } - final def _refOut: Iterator[StoredNode] = { + final def _importsOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 21) .asInstanceOf[Iterator[StoredNode]] } - final def _refIn: Iterator[StoredNode] = { + final def _importsIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 21) .asInstanceOf[Iterator[StoredNode]] } - final def _sourceFileOut: Iterator[StoredNode] = { + final def _inheritsFromOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 22) .asInstanceOf[Iterator[StoredNode]] } - final def _sourceFileIn: Iterator[StoredNode] = { + final def _inheritsFromIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 22) .asInstanceOf[Iterator[StoredNode]] } - final def _taggedByOut: Iterator[StoredNode] = { + final def _isCallForImportOut: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 23) .asInstanceOf[Iterator[StoredNode]] } - final def _taggedByIn: Iterator[StoredNode] = { + final def _isCallForImportIn: Iterator[StoredNode] = { flatgraph.Accessors .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 23) .asInstanceOf[Iterator[StoredNode]] } + final def _parameterLinkOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 24) + .asInstanceOf[Iterator[StoredNode]] + } + final def _parameterLinkIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 24) + .asInstanceOf[Iterator[StoredNode]] + } + + final def _postDominateOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 25) + .asInstanceOf[Iterator[StoredNode]] + } + final def _postDominateIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 25) + .asInstanceOf[Iterator[StoredNode]] + } + + final def _reachingDefOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 26) + .asInstanceOf[Iterator[StoredNode]] + } + final def _reachingDefIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 26) + .asInstanceOf[Iterator[StoredNode]] + } + + final def _receiverOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 27) + .asInstanceOf[Iterator[StoredNode]] + } + final def _receiverIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 27) + .asInstanceOf[Iterator[StoredNode]] + } + + final def _refOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 28) + .asInstanceOf[Iterator[StoredNode]] + } + final def _refIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 28) + .asInstanceOf[Iterator[StoredNode]] + } + + final def _sourceFileOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 29) + .asInstanceOf[Iterator[StoredNode]] + } + final def _sourceFileIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 29) + .asInstanceOf[Iterator[StoredNode]] + } + + final def _taggedByOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 30) + .asInstanceOf[Iterator[StoredNode]] + } + final def _taggedByIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 30) + .asInstanceOf[Iterator[StoredNode]] + } + + final def _trueBodyOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 31) + .asInstanceOf[Iterator[StoredNode]] + } + final def _trueBodyIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 31) + .asInstanceOf[Iterator[StoredNode]] + } + + final def _tryBodyOut: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsOut(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 32) + .asInstanceOf[Iterator[StoredNode]] + } + final def _tryBodyIn: Iterator[StoredNode] = { + flatgraph.Accessors + .getNeighborsIn(this.graph, nodeKind = this.nodeKind, seq = this.seq, edgeKind = 32) + .asInstanceOf[Iterator[StoredNode]] + } + } abstract class NewNode(val nodeKind: Short) extends AbstractNode with flatgraph.DNode { diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/RootTypesTraversals.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/RootTypesTraversals.scala index cdbbb455b..8798e8728 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/RootTypesTraversals.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/nodes/RootTypesTraversals.scala @@ -26,6 +26,9 @@ extension (iterator: Iterator[StoredNode]) { final def _capturedByOut: Iterator[StoredNode] = iterator.flatMap(_._capturedByOut) final def _capturedByIn: Iterator[StoredNode] = iterator.flatMap(_._capturedByIn) + final def _catchBodyOut: Iterator[StoredNode] = iterator.flatMap(_._catchBodyOut) + final def _catchBodyIn: Iterator[StoredNode] = iterator.flatMap(_._catchBodyIn) + final def _cdgOut: Iterator[StoredNode] = iterator.flatMap(_._cdgOut) final def _cdgIn: Iterator[StoredNode] = iterator.flatMap(_._cdgIn) @@ -38,12 +41,30 @@ extension (iterator: Iterator[StoredNode]) { final def _containsOut: Iterator[StoredNode] = iterator.flatMap(_._containsOut) final def _containsIn: Iterator[StoredNode] = iterator.flatMap(_._containsIn) + final def _doBodyOut: Iterator[StoredNode] = iterator.flatMap(_._doBodyOut) + final def _doBodyIn: Iterator[StoredNode] = iterator.flatMap(_._doBodyIn) + final def _dominateOut: Iterator[StoredNode] = iterator.flatMap(_._dominateOut) final def _dominateIn: Iterator[StoredNode] = iterator.flatMap(_._dominateIn) final def _evalTypeOut: Iterator[StoredNode] = iterator.flatMap(_._evalTypeOut) final def _evalTypeIn: Iterator[StoredNode] = iterator.flatMap(_._evalTypeIn) + final def _falseBodyOut: Iterator[StoredNode] = iterator.flatMap(_._falseBodyOut) + final def _falseBodyIn: Iterator[StoredNode] = iterator.flatMap(_._falseBodyIn) + + final def _finallyBodyOut: Iterator[StoredNode] = iterator.flatMap(_._finallyBodyOut) + final def _finallyBodyIn: Iterator[StoredNode] = iterator.flatMap(_._finallyBodyIn) + + final def _forBodyOut: Iterator[StoredNode] = iterator.flatMap(_._forBodyOut) + final def _forBodyIn: Iterator[StoredNode] = iterator.flatMap(_._forBodyIn) + + final def _forInitOut: Iterator[StoredNode] = iterator.flatMap(_._forInitOut) + final def _forInitIn: Iterator[StoredNode] = iterator.flatMap(_._forInitIn) + + final def _forUpdateOut: Iterator[StoredNode] = iterator.flatMap(_._forUpdateOut) + final def _forUpdateIn: Iterator[StoredNode] = iterator.flatMap(_._forUpdateIn) + final def _importsOut: Iterator[StoredNode] = iterator.flatMap(_._importsOut) final def _importsIn: Iterator[StoredNode] = iterator.flatMap(_._importsIn) @@ -74,4 +95,10 @@ extension (iterator: Iterator[StoredNode]) { final def _taggedByOut: Iterator[StoredNode] = iterator.flatMap(_._taggedByOut) final def _taggedByIn: Iterator[StoredNode] = iterator.flatMap(_._taggedByIn) + final def _trueBodyOut: Iterator[StoredNode] = iterator.flatMap(_._trueBodyOut) + final def _trueBodyIn: Iterator[StoredNode] = iterator.flatMap(_._trueBodyIn) + + final def _tryBodyOut: Iterator[StoredNode] = iterator.flatMap(_._tryBodyOut) + final def _tryBodyIn: Iterator[StoredNode] = iterator.flatMap(_._tryBodyIn) + } diff --git a/schema/src/main/scala/io/shiftleft/codepropertygraph/schema/Ast.scala b/schema/src/main/scala/io/shiftleft/codepropertygraph/schema/Ast.scala index ad717448d..886af5325 100644 --- a/schema/src/main/scala/io/shiftleft/codepropertygraph/schema/Ast.scala +++ b/schema/src/main/scala/io/shiftleft/codepropertygraph/schema/Ast.scala @@ -430,6 +430,57 @@ object Ast extends SchemaBase { ) .protoId(ProtoIds.Condition) + val trueBody = builder + .addEdgeType(name = "TRUE_BODY", comment = "The edge connects control structure nodes to their true branch/body.") + .protoId(ProtoIds.TrueBody) + + val falseBody = builder + .addEdgeType( + name = "FALSE_BODY", + comment = "The edge connects control structure nodes to their false branch/body." + ) + .protoId(ProtoIds.FalseBody) + + val doBody = builder + .addEdgeType(name = "DO_BODY", comment = "The edge connects do-while control structure nodes to their body.") + .protoId(ProtoIds.DoBody) + + val forInit = builder + .addEdgeType( + name = "FOR_INIT", + comment = "The edge connects for-loop control structure nodes to their initialization expression(s)." + ) + .protoId(ProtoIds.ForInit) + + val forUpdate = builder + .addEdgeType( + name = "FOR_UPDATE", + comment = "The edge connects for-loop control structure nodes to their update/step expression(s)." + ) + .protoId(ProtoIds.ForUpdate) + + val forBody = builder + .addEdgeType(name = "FOR_BODY", comment = "The edge connects for-loop control structure nodes to their body.") + .protoId(ProtoIds.ForBody) + + val tryBody = builder + .addEdgeType(name = "TRY_BODY", comment = "The edge connects try control structure nodes to their try body.") + .protoId(ProtoIds.TryBody) + + val catchBody = builder + .addEdgeType( + name = "CATCH_BODY", + comment = "The edge connects try control structure nodes to catch/handler bodies." + ) + .protoId(ProtoIds.CatchBody) + + val finallyBody = builder + .addEdgeType( + name = "FINALLY_BODY", + comment = "The edge connects try control structure nodes to their finally body." + ) + .protoId(ProtoIds.FinallyBody) + file.addOutEdge(edge = ast, inNode = namespaceBlock, cardinalityIn = Cardinality.ZeroOrOne) member.addOutEdge(edge = ast, inNode = modifier) @@ -552,6 +603,105 @@ object Ast extends SchemaBase { .addOutEdge(edge = condition, inNode = unknown) .addOutEdge(edge = condition, inNode = controlStructure) + controlStructure + .addOutEdge(edge = trueBody, inNode = literal) + .addOutEdge(edge = trueBody, inNode = identifier) + .addOutEdge(edge = trueBody, inNode = ret) + .addOutEdge(edge = trueBody, inNode = block) + .addOutEdge(edge = trueBody, inNode = methodRef) + .addOutEdge(edge = trueBody, inNode = typeRef) + .addOutEdge(edge = trueBody, inNode = controlStructure) + .addOutEdge(edge = trueBody, inNode = jumpTarget) + .addOutEdge(edge = trueBody, inNode = unknown) + + controlStructure + .addOutEdge(edge = falseBody, inNode = literal) + .addOutEdge(edge = falseBody, inNode = identifier) + .addOutEdge(edge = falseBody, inNode = ret) + .addOutEdge(edge = falseBody, inNode = block) + .addOutEdge(edge = falseBody, inNode = methodRef) + .addOutEdge(edge = falseBody, inNode = typeRef) + .addOutEdge(edge = falseBody, inNode = controlStructure) + .addOutEdge(edge = falseBody, inNode = jumpTarget) + .addOutEdge(edge = falseBody, inNode = unknown) + + controlStructure + .addOutEdge(edge = doBody, inNode = literal) + .addOutEdge(edge = doBody, inNode = identifier) + .addOutEdge(edge = doBody, inNode = ret) + .addOutEdge(edge = doBody, inNode = block) + .addOutEdge(edge = doBody, inNode = methodRef) + .addOutEdge(edge = doBody, inNode = typeRef) + .addOutEdge(edge = doBody, inNode = controlStructure) + .addOutEdge(edge = doBody, inNode = jumpTarget) + .addOutEdge(edge = doBody, inNode = unknown) + + controlStructure + .addOutEdge(edge = forInit, inNode = literal) + .addOutEdge(edge = forInit, inNode = identifier) + .addOutEdge(edge = forInit, inNode = ret) + .addOutEdge(edge = forInit, inNode = block) + .addOutEdge(edge = forInit, inNode = methodRef) + .addOutEdge(edge = forInit, inNode = typeRef) + .addOutEdge(edge = forInit, inNode = controlStructure) + .addOutEdge(edge = forInit, inNode = jumpTarget) + .addOutEdge(edge = forInit, inNode = unknown) + + controlStructure + .addOutEdge(edge = forUpdate, inNode = literal) + .addOutEdge(edge = forUpdate, inNode = identifier) + .addOutEdge(edge = forUpdate, inNode = ret) + .addOutEdge(edge = forUpdate, inNode = block) + .addOutEdge(edge = forUpdate, inNode = methodRef) + .addOutEdge(edge = forUpdate, inNode = typeRef) + .addOutEdge(edge = forUpdate, inNode = controlStructure) + .addOutEdge(edge = forUpdate, inNode = jumpTarget) + .addOutEdge(edge = forUpdate, inNode = unknown) + + controlStructure + .addOutEdge(edge = forBody, inNode = literal) + .addOutEdge(edge = forBody, inNode = identifier) + .addOutEdge(edge = forBody, inNode = ret) + .addOutEdge(edge = forBody, inNode = block) + .addOutEdge(edge = forBody, inNode = methodRef) + .addOutEdge(edge = forBody, inNode = typeRef) + .addOutEdge(edge = forBody, inNode = controlStructure) + .addOutEdge(edge = forBody, inNode = jumpTarget) + .addOutEdge(edge = forBody, inNode = unknown) + + controlStructure + .addOutEdge(edge = tryBody, inNode = literal) + .addOutEdge(edge = tryBody, inNode = identifier) + .addOutEdge(edge = tryBody, inNode = ret) + .addOutEdge(edge = tryBody, inNode = block) + .addOutEdge(edge = tryBody, inNode = methodRef) + .addOutEdge(edge = tryBody, inNode = typeRef) + .addOutEdge(edge = tryBody, inNode = controlStructure) + .addOutEdge(edge = tryBody, inNode = jumpTarget) + .addOutEdge(edge = tryBody, inNode = unknown) + + controlStructure + .addOutEdge(edge = catchBody, inNode = literal) + .addOutEdge(edge = catchBody, inNode = identifier) + .addOutEdge(edge = catchBody, inNode = ret) + .addOutEdge(edge = catchBody, inNode = block) + .addOutEdge(edge = catchBody, inNode = methodRef) + .addOutEdge(edge = catchBody, inNode = typeRef) + .addOutEdge(edge = catchBody, inNode = controlStructure) + .addOutEdge(edge = catchBody, inNode = jumpTarget) + .addOutEdge(edge = catchBody, inNode = unknown) + + controlStructure + .addOutEdge(edge = finallyBody, inNode = literal) + .addOutEdge(edge = finallyBody, inNode = identifier) + .addOutEdge(edge = finallyBody, inNode = ret) + .addOutEdge(edge = finallyBody, inNode = block) + .addOutEdge(edge = finallyBody, inNode = methodRef) + .addOutEdge(edge = finallyBody, inNode = typeRef) + .addOutEdge(edge = finallyBody, inNode = controlStructure) + .addOutEdge(edge = finallyBody, inNode = jumpTarget) + .addOutEdge(edge = finallyBody, inNode = unknown) + typeDecl .addOutEdge(edge = ast, inNode = typeDecl, cardinalityIn = Cardinality.ZeroOrOne) .addOutEdge(edge = ast, inNode = method, cardinalityIn = Cardinality.ZeroOrOne) @@ -628,6 +778,15 @@ object Ast extends SchemaBase { controlStructure.addOutEdge(edge = ast, inNode = callNode, cardinalityIn = Cardinality.One) unknown.addOutEdge(edge = ast, inNode = callNode) controlStructure.addOutEdge(edge = condition, inNode = callNode) + controlStructure.addOutEdge(edge = trueBody, inNode = callNode) + controlStructure.addOutEdge(edge = falseBody, inNode = callNode) + controlStructure.addOutEdge(edge = doBody, inNode = callNode) + controlStructure.addOutEdge(edge = forInit, inNode = callNode) + controlStructure.addOutEdge(edge = forUpdate, inNode = callNode) + controlStructure.addOutEdge(edge = forBody, inNode = callNode) + controlStructure.addOutEdge(edge = tryBody, inNode = callNode) + controlStructure.addOutEdge(edge = catchBody, inNode = callNode) + controlStructure.addOutEdge(edge = finallyBody, inNode = callNode) block.addOutEdge(edge = ast, inNode = callNode) diff --git a/schema/src/main/scala/io/shiftleft/codepropertygraph/schema/ProtoIds.scala b/schema/src/main/scala/io/shiftleft/codepropertygraph/schema/ProtoIds.scala index 256f87ad0..5c179774b 100644 --- a/schema/src/main/scala/io/shiftleft/codepropertygraph/schema/ProtoIds.scala +++ b/schema/src/main/scala/io/shiftleft/codepropertygraph/schema/ProtoIds.scala @@ -127,6 +127,15 @@ object ProtoIds { val AstParentFullName = 57 val DependencyGroupId = 58 val StaticReceiver = 59 + val TrueBody = 60 + val FalseBody = 61 + val DoBody = 62 + val ForInit = 63 + val ForUpdate = 64 + val ForBody = 65 + val TryBody = 66 + val CatchBody = 67 + val FinallyBody = 68 val Symbol = 100 val MethodShortName = 102 val PackageName = 103 From eab2833d3bff09a74f2be0028cd556e2530be1a3 Mon Sep 17 00:00:00 2001 From: Louis van der Walt Date: Wed, 18 Mar 2026 09:54:31 +0200 Subject: [PATCH 2/2] Remove test --- .../io/shiftleft/passes/CpgPassNewTests.scala | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala b/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala index a5840bbe9..db353d542 100644 --- a/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala +++ b/codepropertygraph/src/test/scala/io/shiftleft/passes/CpgPassNewTests.scala @@ -2,9 +2,8 @@ package io.shiftleft.passes import flatgraph.SchemaViolationException import io.shiftleft.codepropertygraph.generated.Cpg -import io.shiftleft.codepropertygraph.generated.ControlStructureTypes import io.shiftleft.codepropertygraph.generated.language.* -import io.shiftleft.codepropertygraph.generated.nodes.{NewBlock, NewControlStructure, NewFile} +import io.shiftleft.codepropertygraph.generated.nodes.NewFile import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec @@ -54,28 +53,6 @@ class CpgPassNewTests extends AnyWordSpec with Matchers { } } - "accept explicit control-structure body edges" in { - val cpg = Cpg.empty - val pass = new CpgPass(cpg, "pass1-control-structure-edges") { - override def run(dst: DiffGraphBuilder): Unit = { - val controlStructure = NewControlStructure().controlStructureType(ControlStructureTypes.IF) - val trueBody = NewBlock() - val falseBody = NewBlock() - - dst - .addNode(controlStructure) - .addNode(trueBody) - .addNode(falseBody) - .addEdge(controlStructure, trueBody, "TRUE_BODY") - .addEdge(controlStructure, falseBody, "FALSE_BODY") - } - } - - noException shouldBe thrownBy { - pass.createAndApply() - } - } - "call init and finish once around run" in { val cpg = Cpg.empty val events = ArrayBuffer.empty[String]