Incremental work on spec cleanup (#1104)

fabsx00 · web-flow · commit 2ded6773e425 · 2021-02-01T17:50:46.000+01:00
* Move BINDING nodes + BINDS edges into enhacements

* Move EVALUATION_STRATEGY out

* Move over DISPATCH_TYPE

* Move DYNAMIC_TYPE_HINT_FULL_NAME over

* Store code in `$MethodReturn.code` instead of just "RET"

* Finish tests for `MethodReturn`
diff --git a/console/src/test/scala/io/shiftleft/console/QueryDatabaseTests.scala b/console/src/test/scala/io/shiftleft/console/QueryDatabaseTests.scala
@@ -13,7 +13,9 @@ object TestBundle extends QueryBundle {
     title = "a-title",
     description = s"a-description $n",
     score = 2.0,
-    traversal = { cpg => cpg.method }
+    traversal = { cpg =>
+      cpg.method
+    }
   )
 }
 
@@ -42,11 +44,12 @@ class QueryDatabaseTests extends AnyWordSpec with should.Matchers {
         "an-author",
         "a-title",
         "a-description",
-        2.0,
-        { cpg: Cpg => cpg.method }
+        2.0, { cpg: Cpg =>
+          cpg.method
+        }
       )
       query.title shouldBe "a-title"
-      query.traversalAsString shouldBe "cpg: Cpg => cpg.method"
+      query.traversalAsString.endsWith("cpg.method") shouldBe true
     }
   }
 }
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/querying/CDataFlowTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/querying/CDataFlowTests.scala
@@ -603,7 +603,7 @@ class CDataFlowTests17 extends DataFlowCodeToCpgSuite {
     sink.reachableByFlows(source).l.map(flowToResultPairs).toSet shouldBe Set(
       List(("source()", Some(4)),
            ("return source();", Some(4)),
-           ("RET", Some(3)),
+           ("int", Some(3)),
            ("bar()", Some(8)),
            ("y = bar()", Some(8)),
            ("sink(y)", Some(9)))
@@ -616,7 +616,7 @@ class CDataFlowTests17 extends DataFlowCodeToCpgSuite {
     sink.reachableByFlows(source).l.map(flowToResultPairs).toSet shouldBe Set(
       List(("source()", Some(4)),
            ("return source();", Some(4)),
-           ("RET", Some(3)),
+           ("int", Some(3)),
            ("bar()", Some(8)),
            ("y = bar()", Some(8)),
            ("sink(y)", Some(9)),
@@ -657,7 +657,7 @@ class CDataFlowTests18 extends DataFlowCodeToCpgSuite {
     val flows = sink.reachableByFlows(source).l
     flows.size shouldBe 1
     flows.map(flowToResultPairs).toSet shouldBe Set(
-      List(("RET", Some(7)),
+      List(("double", Some(7)),
            ("source(2)", Some(16)),
            ("k = source(2)", Some(16)),
            ("point.x = k", Some(18)),
@@ -698,7 +698,7 @@ class CDataFlowTests19 extends DataFlowCodeToCpgSuite {
 
     flows.size shouldBe 1
     flows.map(flowToResultPairs).toSet shouldBe Set(
-      List(("RET", Some(7)),
+      List(("struct Point", Some(7)),
            ("source(2)", Some(17)),
            ("point = source(2)", Some(17)),
            ("sink(point.x)", Some(18)),
@@ -879,8 +879,8 @@ class CDataFlowTests27 extends DataFlowCodeToCpgSuite {
     val flows = sink.reachableByFlows(source).l
 
     flows.map(flowToResultPairs).toSet shouldBe Set(
-      List(("free(x)", Some(4)), ("RET", Some(2))),
-      List(("free(y)", Some(3)), ("RET", Some(2)))
+      List(("free(x)", Some(4)), ("int", Some(2))),
+      List(("free(y)", Some(3)), ("int", Some(2)))
     )
   }
 }
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/querying/NewCDataFlowTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/querying/NewCDataFlowTests.scala
@@ -58,7 +58,7 @@ class NewCDataFlowTests3 extends DataFlowCodeToCpgSuite {
     val flows = sink.reachableByFlows(source).l
     flows.size shouldBe 1
     flows.map(flowToResultPairs).toSet shouldBe Set(
-      List(("woo(x)", Some(3)), ("RET", Some(2)))
+      List(("woo(x)", Some(3)), ("void", Some(2)))
     )
   }
 }
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/FileTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/FileTests.scala
@@ -1,10 +1,10 @@
-package io.shiftleft.fuzzyc2cpg.querying
+package io.shiftleft.fuzzyc2cpg.standard
 
 import io.shiftleft.fuzzyc2cpg.testfixtures.FuzzyCCodeToCpgSuite
 import io.shiftleft.semanticcpg.language._
 import io.shiftleft.semanticcpg.language.types.structure.File
 
-class FileNodeTests extends FuzzyCCodeToCpgSuite {
+class FileTests extends FuzzyCCodeToCpgSuite {
 
   override val code: String =
     """
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/MetaDataTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/MetaDataTests.scala
@@ -1,9 +1,9 @@
-package io.shiftleft.fuzzyc2cpg.querying
+package io.shiftleft.fuzzyc2cpg.standard
 
 import io.shiftleft.fuzzyc2cpg.testfixtures.FuzzyCCodeToCpgSuite
 import io.shiftleft.semanticcpg.language._
 
-class MetaDataNodeTests extends FuzzyCCodeToCpgSuite {
+class MetaDataTests extends FuzzyCCodeToCpgSuite {
 
   override val code: String =
     """
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/MethodReturnTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/MethodReturnTests.scala
@@ -0,0 +1,32 @@
+package io.shiftleft.fuzzyc2cpg.standard
+
+import io.shiftleft.semanticcpg.language._
+import io.shiftleft.fuzzyc2cpg.testfixtures.FuzzyCCodeToCpgSuite
+
+class MethodReturnTests extends FuzzyCCodeToCpgSuite {
+
+  override val code =
+    """
+      | int *foo() { return x; }
+      |""".stripMargin
+
+  "should have METHOD_RETURN node with correct fields" in {
+    cpg.methodReturn.l match {
+      case List(x) =>
+        x.code shouldBe "int *"
+        x.typeFullName shouldBe "int *"
+        x.lineNumber shouldBe Some(2)
+        x.columnNumber shouldBe Some(1)
+        // we expect the METHOD_RETURN node to be the right-most
+        // child so that when traversing the AST from left to
+        // right in CFG construction, we visit it last.
+        x.order shouldBe 2
+      case _ => fail()
+    }
+  }
+
+  "should allow traversing to method" in {
+    cpg.methodReturn.method.name.l shouldBe List("foo")
+  }
+
+}
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/MethodTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/MethodTests.scala
@@ -1,12 +1,12 @@
-package io.shiftleft.fuzzyc2cpg.querying
+package io.shiftleft.fuzzyc2cpg.standard
 
 import io.shiftleft.fuzzyc2cpg.testfixtures.FuzzyCCodeToCpgSuite
 import io.shiftleft.semanticcpg.language._
 
 /**
   * Language primitives for navigating method stubs
   * */
-class CMethodTests extends FuzzyCCodeToCpgSuite {
+class MethodTests extends FuzzyCCodeToCpgSuite {
 
   override val code =
     """
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/NamespaceBlockTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/NamespaceBlockTests.scala
@@ -1,4 +1,4 @@
-package io.shiftleft.fuzzyc2cpg.querying
+package io.shiftleft.fuzzyc2cpg.standard
 
 import io.shiftleft.fuzzyc2cpg.testfixtures.FuzzyCCodeToCpgSuite
 import io.shiftleft.semanticcpg.language._
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/ParameterTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/ParameterTests.scala
@@ -0,0 +1,3 @@
+package io.shiftleft.fuzzyc2cpg.standard
+
+class ParameterTests {}
diff --git a/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/TypeDeclTests.scala b/fuzzyc2cpg-tests/src/test/scala/io/shiftleft/fuzzyc2cpg/standard/TypeDeclTests.scala
@@ -1,4 +1,4 @@
-package io.shiftleft.fuzzyc2cpg.querying
+package io.shiftleft.fuzzyc2cpg.standard
 
 import io.shiftleft.fuzzyc2cpg.testfixtures.FuzzyCCodeToCpgSuite
 import io.shiftleft.semanticcpg.language._
diff --git a/fuzzyc2cpg/src/main/scala/io/shiftleft/fuzzyc2cpg/passes/astcreation/AstCreator.scala b/fuzzyc2cpg/src/main/scala/io/shiftleft/fuzzyc2cpg/passes/astcreation/AstCreator.scala
@@ -144,8 +144,12 @@ private[astcreation] class AstCreator(diffGraph: DiffGraph.Builder,
 
     astFunction.getContent.accept(this)
 
+    val retCode = Option(astFunction.getReturnType)
+      .map(_.getEscapedCodeStr)
+      .getOrElse("RET")
+
     val methodReturn = nodes.NewMethodReturn(
-      code = "RET",
+      code = retCode,
       evaluationStrategy = EvaluationStrategies.BY_VALUE.name(),
       typeFullName = registerType(returnType),
       lineNumber = methodReturnLocation.startLine,
diff --git a/fuzzyc2cpg/src/test/scala/io/shiftleft/fuzzyc2cpg/MethodHeaderTests.scala b/fuzzyc2cpg/src/test/scala/io/shiftleft/fuzzyc2cpg/MethodHeaderTests.scala
@@ -60,7 +60,7 @@ class MethodHeaderTests extends AnyWordSpec with Matchers {
         .l
 
       methodReturn.size shouldBe 1
-      methodReturn.head.property(NodeKeys.CODE) shouldBe "RET"
+      methodReturn.head.property(NodeKeys.CODE) shouldBe "int"
       methodReturn.head.property(NodeKeys.EVALUATION_STRATEGY) shouldBe EvaluationStrategies.BY_VALUE
       methodReturn.head.property(NodeKeys.LINE_NUMBER) shouldBe 1
       methodReturn.head.property(NodeKeys.COLUMN_NUMBER) shouldBe 0
diff --git a/fuzzyc2cpg/src/test/scala/io/shiftleft/fuzzyc2cpg/passes/CfgCreationPassTests.scala b/fuzzyc2cpg/src/test/scala/io/shiftleft/fuzzyc2cpg/passes/CfgCreationPassTests.scala
@@ -463,7 +463,7 @@ class CfgFixture(file1Code: String) {
 
   File.usingTemporaryDirectory("fuzzyctest") { dir =>
     val file1 = dir / "file1.c"
-    file1.write(s"int func() { $file1Code }")
+    file1.write(s"RET func() { $file1Code }")
     val keyPoolFile1 = new IntervalKeyPool(1001, 2000)
     val cfgKeyPool = new IntervalKeyPool(2001, 3000)
     val filenames = List(file1.path.toAbsolutePath.toString)
diff --git a/schema/src/main/resources/schemas/base.json b/schema/src/main/resources/schemas/base.json
@@ -32,12 +32,6 @@
         {"id": 21, "name": "CODE", "comment": "The code snippet the node represents", "valueType" : "string", "cardinality" : "one"},
         {"id": 22, "name": "SIGNATURE", "comment": "Method signature. The format is defined by the language front-end, and the backend simply compares strings to resolve function overloading, i.e. match call-sites to METHODs. In theory, consecutive integers would be valid, but in practice this should be human readable", "valueType" : "string", "cardinality" : "one"},
         {"id": 26, "name" : "MODIFIER_TYPE", "comment" : "Indicates the modifier which is represented by a MODIFIER node. See modifierTypes", "valueType" : "string", "cardinality" : "one"},
-
-        // Properties to characterize call-sites
-
-        {"id": 25, "name": "DISPATCH_TYPE", "comment": "The dispatch type of a call, which is either static or dynamic. See dispatchTypes", "valueType" : "string", "cardinality" : "one"},
-        {"id": 15, "name" : "EVALUATION_STRATEGY", "comment" : "Evaluation strategy for function parameters and return values. One of the values in \"evaluationStrategies\"", "valueType" : "string", "cardinality" : "one"},
-
         // Properties used to link nodes in the backend
         {"id": 51, "name" : "TYPE_FULL_NAME", "comment" : "The static type of an entity. E.g. expressions, local, parameters etc. This property is matched against the FULL_NAME of TYPE nodes and thus it is required to have at least one TYPE node for each TYPE_FULL_NAME", "valueType" : "string", "cardinality" : "one"},
         {"id": 52, "name" : "TYPE_DECL_FULL_NAME", "comment" : "The static type decl of a TYPE. This property is matched against the FULL_NAME of TYPE_DECL nodes. It is required to have exactly one TYPE_DECL for each different TYPE_DECL_FULL_NAME", "valueType" : "string", "cardinality" : "one"},
@@ -47,7 +41,6 @@
         {"id": 56, "name" : "AST_PARENT_TYPE", "comment" : "The type of the AST parent. Since this is only used in some parts of the graph the list does not include all possible parents by intention. Possible parents: METHOD, TYPE_DECL, NAMESPACE_BLOCK", "valueType" : "string", "cardinality" : "one"},
         {"id": 57, "name" : "AST_PARENT_FULL_NAME", "comment" : "The FULL_NAME of a the AST parent of an entity", "valueType" : "string", "cardinality" : "one"},
         {"id": 158, "name" : "ALIAS_TYPE_FULL_NAME", "comment" : "Type full name of which a TYPE_DECL is an alias of", "valueType" : "string", "cardinality" : "zeroOrOne"},
-        {"id": 1591, "name" : "DYNAMIC_TYPE_HINT_FULL_NAME", "comment" : "Type hint for the dynamic type", "valueType" : "string", "cardinality" : "list"},
         {"id" : 106, "name" : "FILENAME", "comment" : "Full path of canonical file that contained this node; will be linked into corresponding FILE nodes. Possible for METHOD, TYPE_DECL and NAMESPACE_BLOCK", "valueType" : "string", "cardinality" : "one"},
         
         // special properties
@@ -118,13 +111,13 @@
         },
 
         {"id" : 34, "name" : "METHOD_PARAMETER_IN",
-         "keys": ["CODE", "ORDER", "NAME", "EVALUATION_STRATEGY", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
+         "keys": ["CODE", "ORDER", "NAME", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
          "comment" : "This node represents a formal parameter going towards the callee side",
          "is": ["DECLARATION", "LOCAL_LIKE", "TRACKING_POINT", "AST_NODE"]
         },
 
         {"id" : 3, "name" : "METHOD_RETURN",
-         "keys": ["CODE", "EVALUATION_STRATEGY", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER", "ORDER"],
+         "keys": ["CODE", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER", "ORDER"],
          "comment" : "A formal method return",
          "is": ["CFG_NODE", "TRACKING_POINT"]
         },
@@ -153,20 +146,10 @@
              {"name": "MEMBER", "cardinality": "1:n"},
              {"name": "MODIFIER", "cardinality": "1:n"}
            ]},
-           {"edgeName": "BINDS", "inNodes": [{"name":"BINDING", "cardinality": "1:n"}]},
            {"edgeName": "VTABLE", "inNodes": [{"name":"METHOD"}]}
          ],
          "is" : ["AST_NODE"]
         },
-        {"id" : 146, "name" : "BINDING",
-         "keys" : ["NAME", "SIGNATURE"],
-         "comment" : "A binding of a METHOD into a TYPE_DECL",
-         "outEdges" : [
-           {"edgeName": "REF", "inNodes": [
-            {"name":"METHOD", "cardinality": "n:1"}
-           ]}
-         ]
-        },
         {"id" : 47, "name" : "TYPE_PARAMETER",
          "keys" : ["NAME", "ORDER"],
          "comment" : "Type parameter of TYPE_DECL or METHOD",
@@ -184,7 +167,7 @@
         },
 
         {"id" : 9, "name" : "MEMBER",
-         "keys" : [ "CODE", "NAME", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "ORDER"],
+         "keys" : [ "CODE", "NAME", "TYPE_FULL_NAME", "ORDER"],
          "comment" : "Member of a class struct or union",
          "is": ["DECLARATION", "AST_NODE"]
         },
@@ -200,7 +183,7 @@
         // Nodes that describe method content
 
         {"id" : 8, "name" : "LITERAL",
-         "keys" : ["CODE", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
+         "keys" : ["CODE", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
          "comment" : "Literal/Constant",
          "is": ["EXPRESSION"],
          "outEdges" : [
@@ -222,7 +205,7 @@
          ]
         },
         {"id": 15, "name" : "CALL",
-         "keys": ["CODE", "NAME", "ORDER", "METHOD_INST_FULL_NAME", "METHOD_FULL_NAME", "ARGUMENT_INDEX", "DISPATCH_TYPE", "SIGNATURE", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
+         "keys": ["CODE", "NAME", "ORDER", "METHOD_INST_FULL_NAME", "METHOD_FULL_NAME", "ARGUMENT_INDEX", "SIGNATURE", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
          "comment" : "A (method)-call",
          "is": ["EXPRESSION", "CALL_REPR"],
          "outEdges" : [
@@ -275,12 +258,12 @@
          ]
         },
         {"id":23, "name" : "LOCAL",
-         "keys": ["CODE", "NAME", "CLOSURE_BINDING_ID", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER", "ORDER"],
+         "keys": ["CODE", "NAME", "CLOSURE_BINDING_ID", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER", "ORDER"],
          "comment": "A local variable",
          "is": ["DECLARATION", "LOCAL_LIKE", "AST_NODE"]
         },
         {"id":27, "name": "IDENTIFIER",
-         "keys": ["CODE", "NAME", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
+         "keys": ["CODE", "NAME", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
          "comment" : "An arbitrary identifier/reference",
          "is": ["EXPRESSION", "LOCAL_LIKE"],
          "outEdges" : [
@@ -359,7 +342,7 @@
          ]
         },
         {"id":31, "name": "BLOCK",
-         "keys": [ "CODE", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
+         "keys": [ "CODE", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
          "comment" : "A structuring block in the AST",
          "is": [ "EXPRESSION"],
          "outEdges" : [
@@ -408,7 +391,7 @@
         },
 
         {"id":333, "name":"METHOD_REF",
-          "keys": ["CODE", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "METHOD_INST_FULL_NAME", "METHOD_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
+          "keys": ["CODE", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "METHOD_INST_FULL_NAME", "METHOD_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
           "comment":"Reference to a method instance",
          "is": ["EXPRESSION"],
           "outEdges": [
@@ -429,7 +412,7 @@
           ]
         },
       {"id":335, "name":"TYPE_REF",
-        "keys": ["CODE", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
+        "keys": ["CODE", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
         "comment":"Reference to a type/class",
         "is": ["EXPRESSION"],
         "outEdges": [
@@ -564,7 +547,7 @@
         // This is the "catch-all-others" node type.
 
         {"id" : 44, "name": "UNKNOWN",
-         "keys" : ["CODE", "PARSER_TYPE_NAME", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "DYNAMIC_TYPE_HINT_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
+         "keys" : ["CODE", "PARSER_TYPE_NAME", "ORDER", "ARGUMENT_INDEX", "TYPE_FULL_NAME", "LINE_NUMBER", "COLUMN_NUMBER"],
          "comment" : "A language-specific node",
          "is": ["EXPRESSION"],
          "outEdges" : [
@@ -627,26 +610,14 @@
         // VTABLE edge is deprecated.
         {"id" : 30, "name": "VTABLE", "comment" : "Indicates that a method is part of the vtable of a certain type declaration", "keys": []},
         {"id" : 55, "name": "RECEIVER", "comment" : "The receiver of a method call which is either an object or a pointer", "keys": []},
-        {"id" : 56, "name": "CONDITION", "comment" : "Edge from control structure node to the expression that holds the condition", "keys" : []},
-        {"id" : 155, "name": "BINDS", "comment" : "Relation between TYPE_DECL and BINDING node", "keys": []},
+        {"id" : 56, "name": "CONDITION", "comment" : "Edge from control structure node to the expression that holds the condition", "keys" : []},        
         {"id" : 156, "name": "ARGUMENT", "comment" : "Relation between a CALL and its arguments and RETURN and the returned expression", "keys": []},
         {"id" : 157, "name" : "SOURCE_FILE", "comment" : "Source file of a node, in which its LINE_NUMBER and COLUMN_NUMBER are valid", "keys" : []}
 
     ],
 
     // Enums
 
-    "evaluationStrategies" : [
-        {"id" : 1, "name" : "BY_REFERENCE", "comment" : "A parameter or return of a function is passed by reference which means an address is used behind the scenes"},
-        {"id" : 2, "name" : "BY_SHARING", "comment" : "Only applicable to object parameter or return values. The pointer to the object is passed by value but the object itself is not copied and changes to it are thus propagated out of the method context"},
-        {"id" : 3, "name" : "BY_VALUE", "comment" : "A parameter or return of a function passed by value which means a flat copy is used"}
-    ],
-
-    "dispatchTypes" : [
-        {"id" : 1, "name" : "STATIC_DISPATCH", "comment": "For statically dispatched calls the call target is known before program execution"},
-        {"id" : 2, "name" : "DYNAMIC_DISPATCH", "comment": "For dynamically dispatched calls the target is determined during runtime"}
-    ],
-
     // TODO rename to "frontends"
     "languages" : [
         {"id" : 1, "name" : "JAVA", "comment" : ""},
diff --git a/schema/src/main/resources/schemas/enhancements.json b/schema/src/main/resources/schemas/enhancements.json

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ object TestBundle extends QueryBundle {`
`13`	`13`	`title = "a-title",`
`14`	`14`	`description = s"a-description $n",`
`15`	`15`	`score = 2.0,`
`16`		`- traversal = { cpg => cpg.method }`
	`16`	`+ traversal = { cpg =>`
	`17`	`+ cpg.method`
	`18`	`+ }`
`17`	`19`	`)`
`18`	`20`	`}`
`19`	`21`
`@@ -42,11 +44,12 @@ class QueryDatabaseTests extends AnyWordSpec with should.Matchers {`
`42`	`44`	`"an-author",`
`43`	`45`	`"a-title",`
`44`	`46`	`"a-description",`
`45`		`- 2.0,`
`46`		`- { cpg: Cpg => cpg.method }`
	`47`	`+ 2.0, { cpg: Cpg =>`
	`48`	`+ cpg.method`
	`49`	`+ }`
`47`	`50`	`)`
`48`	`51`	`query.title shouldBe "a-title"`
`49`		`- query.traversalAsString shouldBe "cpg: Cpg => cpg.method"`
	`52`	`+ query.traversalAsString.endsWith("cpg.method") shouldBe true`
`50`	`53`	`}`
`51`	`54`	`}`
`52`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class NewCDataFlowTests3 extends DataFlowCodeToCpgSuite {`
`58`	`58`	`val flows = sink.reachableByFlows(source).l`
`59`	`59`	`flows.size shouldBe 1`
`60`	`60`	`flows.map(flowToResultPairs).toSet shouldBe Set(`
`61`		`- List(("woo(x)", Some(3)), ("RET", Some(2)))`
	`61`	`+ List(("woo(x)", Some(3)), ("void", Some(2)))`
`62`	`62`	`)`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.shiftleft.fuzzyc2cpg.querying`
	`1`	`+package io.shiftleft.fuzzyc2cpg.standard`
`2`	`2`
`3`	`3`	`import io.shiftleft.fuzzyc2cpg.testfixtures.FuzzyCCodeToCpgSuite`
`4`	`4`	`import io.shiftleft.semanticcpg.language._`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package io.shiftleft.fuzzyc2cpg.standard`
	`2`	`+`
	`3`	`+class ParameterTests {}`