Fancy C++ types

Fraunhofer-AISEC · Aug 7, 2023 · 45fd258 · 45fd258
1 parent c0b54ae
commit 45fd258
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/Name.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/graph/Name.kt
@@ -135,10 +135,7 @@ internal fun parseName(fqn: CharSequence, delimiter: String, vararg splitDelimit
 
     var name: Name? = null
     for (part in parts) {
-        val localName = part.replace(")", "").replace("*", "")
-        if (localName.isNotEmpty()) {
-            name = Name(localName, name, delimiter)
-        }
+        name = Name(part, name, delimiter)
     }
 
     // Actually this should not occur, but otherwise the compiler won't let us return a

diff --git a/...language-cxx/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/cxx/CXXLanguageFrontend.kt b/...language-cxx/src/main/kotlin/de/fraunhofer/aisec/cpg/frontends/cxx/CXXLanguageFrontend.kt
@@ -206,6 +206,7 @@ class CXXLanguageFrontend(language: Language<CXXLanguageFrontend>, ctx: Translat
 
         val symbols: HashMap<String, String> = HashMap()
         symbols.putAll(config.symbols)
+
         includePaths.addAll(config.includePaths.map { it.toAbsolutePath().toString() })
 
         config.compilationDatabase?.getIncludePaths(file)?.let { includePaths.addAll(it) }

diff --git a/...uage-cxx/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/cxx/CXXLanguageFrontendTest.kt b/...uage-cxx/src/test/kotlin/de/fraunhofer/aisec/cpg/frontends/cxx/CXXLanguageFrontendTest.kt
@@ -1590,6 +1590,6 @@ internal class CXXLanguageFrontendTest : BaseTest() {
 
         val ptr = tu.variables["ptr"]
         assertNotNull(ptr)
-        assertLocalName("__decltype(nullptr)", ptr.type)
+        assertLocalName("decltype(nullptr)", ptr.type)
     }
 }
diff --git a/cpg-language-cxx/src/test/resources/cxx/fancy_types.cpp b/cpg-language-cxx/src/test/resources/cxx/fancy_types.cpp
@@ -1,3 +1,3 @@
-typedef __decltype(nullptr) nullptr_t
+typedef __decltype(nullptr) nullptr_t;
 
-nullptr_t ptr;
+nullptr_t ptr;