update cpg2 (#134)

call signature improvements

Signed-off-by: Prabhu Subramanian <[email protected]>

Author: prabhu

build.sbt

@@ -1,9 +1,9 @@
 name                     := "chen"
 ThisBuild / organization := "io.appthreat"
-ThisBuild / version      := "2.5.3"
+ThisBuild / version      := "2.5.4"
 ThisBuild / scalaVersion := "3.6.2"
 
-val cpgVersion = "2.0.0"
+val cpgVersion = "2.0.1"
 
 lazy val platform          = Projects.platform
 lazy val console           = Projects.console

codemeta.json

@@ -7,7 +7,7 @@
   "downloadUrl": "https://github.com/AppThreat/chen",
   "issueTracker": "https://github.com/AppThreat/chen/issues",
   "name": "chen",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "Code Hierarchy Exploration Net (chen) is an advanced exploration toolkit for your application source code and its dependency hierarchy.",
   "applicationCategory": "code-analysis",
   "keywords": [

console/src/main/scala/io/appthreat/console/Help.scala

@@ -1,8 +1,8 @@
 package io.appthreat.console
 
-import org.apache.commons.lang.WordUtils
 import overflowdb.traversal.help.DocFinder.*
 import overflowdb.traversal.help.{Table, DocFinder}
+import io.appthreat.x2cpg.utils.{StringUtils, WordUtils}
 
 object Help:
 

console/src/test/scala/io/appthreat/console/ConsoleTests.scala

@@ -43,7 +43,7 @@ class ConsoleTests extends AnyWordSpec with Matchers {
     }
 
     "provide overview of available language modules" in ConsoleFixture() { (console, _) =>
-      console.importCode.toString.contains("| C") shouldBe true
+      console.importCode.toString.contains("C") shouldBe true
     }
 
     "allow importing code with specific module (c2cpg)" in ConsoleFixture() { (console, codeDir) =>

console/src/test/scala/io/appthreat/console/HelpTests.scala

@@ -9,7 +9,7 @@ class HelpTests extends AnyWordSpec with Matchers {
 
   "Help" should {
     "provide overview of commands as table" in {
-      Help.overview(classOf[Console[Project]]).contains("| CPG") shouldBe true
+      Help.overview(classOf[Console[Project]]).contains("CPG") shouldBe true
     }
   }
 

console/src/test/scala/io/appthreat/console/workspacehandling/WorkspaceTests.scala

@@ -27,10 +27,10 @@ class WorkspaceTests extends AnyWordSpec with Matchers {
         val workspace   = new Workspace(projects)
         val output      = workspace.toString
         val lines       = output.split("\n")
-        lines.length shouldBe 5
-        lines(4).contains(project.name) shouldBe true
-        lines(4).contains(inputPath)
-        lines(4).contains("foo,bar")
+        lines.length shouldBe 4
+        lines(3).contains(project.name) shouldBe true
+        lines(3).contains(inputPath)
+        lines(3).contains("foo,bar")
       }
 
     }

dataflowengineoss/src/main/scala/io/appthreat/dataflowengineoss/language/Path.scala

@@ -3,8 +3,7 @@ package io.appthreat.dataflowengineoss.language
 import io.shiftleft.codepropertygraph.generated.nodes.*
 import io.shiftleft.semanticcpg.language.*
 import me.shadaj.scalapy.py
-import org.apache.commons.lang.StringUtils
-
+import io.appthreat.x2cpg.utils.StringUtils
 import scala.collection.mutable.{ArrayBuffer, Set}
 
 case class Path(elements: List[AstNode]):

meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "2.5.3" %}
+{% set version = "2.5.4" %}
 
 package:
   name: chen

platform/frontends/c2cpg/src/main/scala/io/appthreat/c2cpg/astcreation/AstCreatorHelper.scala

@@ -3,11 +3,11 @@ package io.appthreat.c2cpg.astcreation
 import io.appthreat.c2cpg.datastructures.CGlobal
 import io.appthreat.x2cpg.utils.NodeBuilders.newDependencyNode
 import io.appthreat.x2cpg.Defines as X2CpgDefines
+import io.appthreat.x2cpg.utils.StringUtils
 import io.appthreat.x2cpg.{Ast, SourceFiles, ValidationMode}
 import io.shiftleft.codepropertygraph.generated.nodes.{ExpressionNew, NewCall, NewNode}
 import io.shiftleft.codepropertygraph.generated.{DispatchTypes, EdgeTypes, Operators}
 import io.shiftleft.utils.IOUtils
-import org.apache.commons.lang.StringUtils
 import org.eclipse.cdt.core.dom.ast.*
 import org.eclipse.cdt.core.dom.ast.c.{
     ICASTArrayDesignator,

platform/frontends/c2cpg/src/main/scala/io/appthreat/c2cpg/astcreation/AstForExpressionsCreator.scala

@@ -331,11 +331,21 @@ trait AstForExpressionsCreator(implicit withSchemaValidation: ValidationMode):
     idExpr: CASTIdExpression,
     callTypeFullName: String
   ): Ast =
-    val name      = idExpr.getName.getLastName.toString
-    val signature = ""
+    val name = idExpr.getName.getLastName.toString
+    val (signature: String, fullName: String) =
+        idExpr.getName.getBinding match
+          case function: IFunction =>
+              val functionType: IFunctionType = function.getType
+              val derivedSignature            = functionTypeToSignature(functionType)
+              val nameFromBinding             = function.getName
+              val constructedFullName         = s"$nameFromBinding:$derivedSignature"
+              (derivedSignature, constructedFullName)
+
+          case _ =>
+              val fallbackSignature = ""
+              (fallbackSignature, s"$name:$fallbackSignature")
 
     val dispatchType = DispatchTypes.STATIC_DISPATCH
-
     val callCpgNode = callNode(
       call,
       code(call),