Fixed python test

Fraunhofer-AISEC · Oct 3, 2024 · ada1c2b · ada1c2b
1 parent e9877ab
commit ada1c2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/...nguage-python/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/PythonAddDeclarationsPass.kt b/...nguage-python/src/main/kotlin/de/fraunhofer/aisec/cpg/passes/PythonAddDeclarationsPass.kt
@@ -32,6 +32,7 @@ import de.fraunhofer.aisec.cpg.graph.declarations.Declaration
 import de.fraunhofer.aisec.cpg.graph.declarations.FieldDeclaration
 import de.fraunhofer.aisec.cpg.graph.declarations.MethodDeclaration
 import de.fraunhofer.aisec.cpg.graph.declarations.VariableDeclaration
+import de.fraunhofer.aisec.cpg.graph.scopes.RecordScope
 import de.fraunhofer.aisec.cpg.graph.statements.ForEachStatement
 import de.fraunhofer.aisec.cpg.graph.statements.expressions.AssignExpression
 import de.fraunhofer.aisec.cpg.graph.statements.expressions.CallExpression
@@ -102,22 +103,18 @@ class PythonAddDeclarationsPass(ctx: TranslationContext) : ComponentPass(ctx) {
                                 (scopeManager.currentFunction as? MethodDeclaration)?.receiver?.name
                     ) {
                         // We need to temporarily jump into the scope of the current record to
-                        // add the field
-                        val field =
-                            scopeManager.withScope(scopeManager.currentRecord?.scope) {
-                                newFieldDeclaration(node.name)
-                            }
-                        field
+                        // add the field. These are instance attributes
+                        scopeManager.withScope(
+                            scopeManager.firstScopeIsInstanceOrNull<RecordScope>()
+                        ) {
+                            newFieldDeclaration(node.name)
+                        }
                     } else {
                         val v = newVariableDeclaration(node.name)
                         v
                     }
                 } else {
-                    val field =
-                        scopeManager.withScope(scopeManager.currentRecord?.scope) {
-                            newFieldDeclaration(node.name)
-                        }
-                    field
+                    newFieldDeclaration(node.name)
                 }
             } else {
                 newVariableDeclaration(node.name)
@@ -127,14 +124,8 @@ class PythonAddDeclarationsPass(ctx: TranslationContext) : ComponentPass(ctx) {
         decl.location = node.location
         decl.isImplicit = true
 
-        if (decl is FieldDeclaration) {
-            scopeManager.currentRecord?.addField(decl)
-            scopeManager.withScope(scopeManager.currentRecord?.scope) {
-                scopeManager.addDeclaration(decl)
-            }
-        } else {
-            scopeManager.addDeclaration(decl)
-        }
+        scopeManager.withScope(decl.scope) { scopeManager.addDeclaration(decl) }
+
         return decl
     }
 

diff --git a/...age-python/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/python/PythonFrontendTest.kt b/...age-python/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/python/PythonFrontendTest.kt
@@ -1336,10 +1336,8 @@ class PythonFrontendTest : BaseTest() {
                 it.registerLanguage<PythonLanguage>()
             }
         assertNotNull(result)
-        assertEquals(2, result.variables.size)
-        // Note, that "pi" is incorrectly inferred as a field declaration. This is a known bug in
-        // the inference system (and not in the python module) and will be handled separately.
-        assertEquals(listOf("mypi", "pi"), result.variables.map { it.name.localName })
+        assertEquals(1, result.variables.size)
+        assertEquals(listOf("mypi"), result.variables.map { it.name.localName })
     }
 
     @Test