Generic setCodeAndRegion

Fraunhofer-AISEC · Jul 19, 2023 · 81ec46b · 81ec46b
1 parent 6ca5511
commit 81ec46b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 21 deletions.
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/Handler.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/Handler.kt
@@ -50,7 +50,12 @@ abstract class Handler<ResultNode : Node, HandlerNode, L : LanguageFrontend<Hand
     protected val configConstructor: Supplier<ResultNode>,
     /** Returns the frontend which used this handler. */
     var frontend: L
-) : LanguageProvider, CodeAndLocationProvider, ScopeProvider, NamespaceProvider, ContextProvider {
+) :
+    LanguageProvider,
+    CodeAndLocationProvider<HandlerNode>,
+    ScopeProvider,
+    NamespaceProvider,
+    ContextProvider {
     protected val map = HashMap<Class<out HandlerNode>, HandlerInterface<ResultNode, HandlerNode>>()
     private val typeOfT: Class<*>?
 
@@ -159,7 +164,7 @@ abstract class Handler<ResultNode : Node, HandlerNode, L : LanguageFrontend<Hand
     override val language: Language<L>
         get() = frontend.language as Language<L>
 
-    override fun setCodeAndLocation(cpgNode: Node?, astNode: Any?) {
+    override fun setCodeAndLocation(cpgNode: Node, astNode: HandlerNode) {
         frontend.setCodeAndLocation(cpgNode, astNode)
     }
 

diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/LanguageFrontend.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/LanguageFrontend.kt
@@ -60,7 +60,7 @@ abstract class LanguageFrontend<in AstNode, TypeNode>(
     final override var ctx: TranslationContext,
 ) :
     ProcessedListener(),
-    CodeAndLocationProvider,
+    CodeAndLocationProvider<AstNode>,
     LanguageProvider,
     ScopeProvider,
     NamespaceProvider,
@@ -127,19 +127,17 @@ abstract class LanguageFrontend<in AstNode, TypeNode>(
      */
     abstract fun locationOf(astNode: AstNode): PhysicalLocation?
 
-    override fun setCodeAndLocation(cpgNode: Node?, astNode: Any?) {
-        if (cpgNode != null && astNode != null) {
-            if (config.codeInNodes) {
-                // only set code, if it's not already set or empty
-                val code = codeOf(astNode as AstNode)
-                if (code != null) {
-                    cpgNode.code = code
-                } else {
-                    log.warn("Unexpected: No code for node {}", astNode)
-                }
+    override fun setCodeAndLocation(cpgNode: Node, astNode: AstNode) {
+        if (config.codeInNodes) {
+            // only set code, if it's not already set or empty
+            val code = codeOf(astNode)
+            if (code != null) {
+                cpgNode.code = code
+            } else {
+                log.warn("Unexpected: No code for node {}", astNode)
             }
-            cpgNode.location = locationOf(astNode as AstNode)
         }
+        cpgNode.location = locationOf(astNode)
     }
 
     /**

diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/NodeBuilder.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/NodeBuilder.kt
@@ -63,8 +63,8 @@ interface LanguageProvider : MetadataProvider {
  * This interface denotes that the class is able to provide source code and location information for
  * a specific node and set it using the [setCodeAndLocation] function.
  */
-interface CodeAndLocationProvider : MetadataProvider {
-    fun setCodeAndLocation(cpgNode: Node?, astNode: Any?)
+interface CodeAndLocationProvider<in AstNode> : MetadataProvider {
+    fun setCodeAndLocation(cpgNode: Node, astNode: AstNode)
 }
 
 /**
@@ -103,8 +103,8 @@ fun Node.applyMetadata(
     localNameOnly: Boolean = false,
     defaultNamespace: Name? = null,
 ) {
-    if (provider is CodeAndLocationProvider) {
-        provider.setCodeAndLocation(this, rawNode)
+    if (provider is CodeAndLocationProvider<*> && rawNode != null) {
+        (provider as CodeAndLocationProvider<Any>).setCodeAndLocation(this, rawNode)
     }
 
     if (provider is LanguageProvider) {

diff --git a/cpg-language-java/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/java/StatementHandler.kt b/cpg-language-java/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/java/StatementHandler.kt
@@ -60,7 +60,10 @@ class StatementHandler(lang: JavaLanguageFrontend?) :
         val expression = frontend.expressionHandler.handle(stmt.asExpressionStmt().expression)
 
         // update expression's code and location to match the statement
-        frontend.setCodeAndLocation(expression, stmt)
+        if (expression != null) {
+            frontend.setCodeAndLocation(expression, stmt)
+        }
+
         return expression
     }
 
@@ -188,7 +191,9 @@ class StatementHandler(lang: JavaLanguageFrontend?) :
                 val s = frontend.expressionHandler.handle(initExpr)
 
                 // make sure location is set
-                frontend.setCodeAndLocation(s, initExpr)
+                if (s != null) {
+                    frontend.setCodeAndLocation(s, initExpr)
+                }
                 s?.let { initExprList.addExpression(it) }
 
                 // can not update location
@@ -241,7 +246,9 @@ class StatementHandler(lang: JavaLanguageFrontend?) :
                 val s = frontend.expressionHandler.handle(updateExpr)
 
                 // make sure location is set
-                frontend.setCodeAndLocation(s, updateExpr)
+                if (s != null) {
+                    frontend.setCodeAndLocation(s, updateExpr)
+                }
                 s?.let { iterationExprList.addExpression(it) }
 
                 // can not update location