Skip to content

Commit 2e1d5f6

Browse files
Change name for anonymous namespaces from <namespace> to anonymous
1 parent 3fec4e9 commit 2e1d5f6

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstCreatorHelper.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ trait AstCreatorHelper { this: AstCreator =>
6868

6969
protected def scopeLocalUniqueNamespaceFullName(fullName: String): String = {
7070
val newFullName = fullName match {
71-
case "" => "<namespace>"
72-
case s"$p." => s"$p.<namespace>"
71+
case "" => "<anonymous>"
72+
case s"$p." => s"$p.<anonymous>"
7373
case other => other
7474
}
7575
scopeLocalUniqueNames.get(newFullName) match {

joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/FullNameProvider.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ object FullNameProvider {
2626
"<global>",
2727
"<iterator>",
2828
"<lambda>",
29-
"<namespace>",
3029
"<param>",
3130
"<tmp>",
3231
"<type>"

joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/TypeNameProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ trait TypeNameProvider { this: AstCreator =>
180180
TypeFullNameInfo(uniqueName, uniqueNameFullName)
181181
case n: ICPPASTNamespaceDefinition =>
182182
val name = shortName(n) match {
183-
case "" => "<namespace>"
183+
case "" => "<anonymous>"
184184
case other => other
185185
}
186186
val fullName_ = fullName(n)

joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/cpp/features17/Cpp17FeaturesTests.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ class Cpp17FeaturesTests extends AstC2CpgSuite(fileSuffix = FileDefaults.CppExt)
386386
cpg.namespaceBlock.nameNot("<global>").name.sorted shouldBe Seq(
387387
// Within a translation unit each unnamed namespace definition maps to the same unique name:
388388
// multiple unnamed namespace definitions in the same scope denote the same unnamed namespace
389-
"<namespace>",
390-
"<namespace>",
389+
"<anonymous>",
390+
"<anonymous>",
391391
"A",
392392
"A",
393393
"B",
@@ -398,8 +398,8 @@ class Cpp17FeaturesTests extends AstC2CpgSuite(fileSuffix = FileDefaults.CppExt)
398398
"X"
399399
)
400400
cpg.namespaceBlock.nameNot("<global>").fullName.sorted shouldBe Seq(
401-
"Test0.cpp:<namespace>",
402-
"Test0.cpp:<namespace><extension>0",
401+
"Test0.cpp:<anonymous>",
402+
"Test0.cpp:<anonymous><extension>0",
403403
"Test0.cpp:A",
404404
"Test0.cpp:A.B",
405405
"Test0.cpp:A.B.C",

joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/passes/types/NamespaceTypeTests.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ class NamespaceTypeTests extends C2CpgSuite(fileSuffix = FileDefaults.CppExt) {
127127
| j++; // ok, increments ::A::(unique)::j
128128
|}""".stripMargin)
129129
inside(cpg.namespaceBlock.nameNot("<global>").sortBy(_.fullName).l) { case List(unnamed1, namespaceA, unnamed2) =>
130-
unnamed1.name shouldBe "<namespace>"
131-
unnamed1.fullName shouldBe "Test0.cpp:<namespace>"
130+
unnamed1.name shouldBe "<anonymous>"
131+
unnamed1.fullName shouldBe "Test0.cpp:<anonymous>"
132132
unnamed1.filename shouldBe "Test0.cpp"
133133
namespaceA.name shouldBe "A"
134134
namespaceA.fullName shouldBe "Test0.cpp:A"
135135
namespaceA.filename shouldBe "Test0.cpp"
136-
unnamed2.name shouldBe "<namespace>"
137-
unnamed2.fullName shouldBe "Test0.cpp:A.<namespace>"
136+
unnamed2.name shouldBe "<anonymous>"
137+
unnamed2.fullName shouldBe "Test0.cpp:A.<anonymous>"
138138
unnamed2.filename shouldBe "Test0.cpp"
139139
}
140140

0 commit comments

Comments
 (0)