Rename swift::Demangle::archetypeName() to swift::Demangle::genericParameterName().

Author: adrian-prantl

include/swift/Demangling/Demangle.h

@@ -35,9 +35,9 @@ namespace Demangle {
 
 enum class SymbolicReferenceKind : uint8_t;
 
-/// A simple default implementation that assigns letters to archetypes in
+/// A simple default implementation that assigns letters to type parameters in
 /// alphabetic order.
-std::string archetypeName(uint64_t index, uint64_t depth);
+std::string genericParameterName(uint64_t depth, uint64_t index);
 
 /// Display style options for the demangler.
 struct DemangleOptions {
@@ -57,7 +57,8 @@ struct DemangleOptions {
   bool ShortenArchetype = false;
   bool ShowPrivateDiscriminators = true;
   bool ShowFunctionArgumentTypes = true;
-  std::function<std::string(uint64_t, uint64_t)> ArchetypeName = archetypeName;
+  std::function<std::string(uint64_t, uint64_t)> GenericParameterName =
+      genericParameterName;
 
   DemangleOptions() {}
 

lib/Demangling/NodePrinter.cpp

@@ -50,7 +50,7 @@ DemanglerPrinter &DemanglerPrinter::operator<<(long long n) & {
   return *this;
 }
 
-std::string Demangle::archetypeName(uint64_t index, uint64_t depth) {
+std::string Demangle::genericParameterName(uint64_t depth, uint64_t index) {
   DemanglerPrinter name;
   do {
     name << (char)('A' + (index % 26));
@@ -1958,7 +1958,7 @@ NodePointer NodePrinter::print(NodePointer Node, bool asPrefixContext) {
         }
         // FIXME: Depth won't match when a generic signature applies to a
         // method in generic type context.
-        Printer << Options.ArchetypeName(index, depth);
+        Printer << Options.GenericParameterName(depth, index);
       }
     }
 
@@ -2036,7 +2036,7 @@ NodePointer NodePrinter::print(NodePointer Node, bool asPrefixContext) {
   case Node::Kind::DependentGenericParamType: {
     unsigned index = Node->getChild(1)->getIndex();
     unsigned depth = Node->getChild(0)->getIndex();
-    Printer << Options.ArchetypeName(index, depth);
+    Printer << Options.GenericParameterName(depth, index);
     return nullptr;
   }
   case Node::Kind::DependentGenericType: {

lib/Demangling/OldDemangler.cpp

@@ -1374,7 +1374,7 @@ class OldDemangler {
 
   NodePointer getDependentGenericParamType(unsigned depth, unsigned index) {
     DemanglerPrinter PrintName;
-    PrintName << archetypeName(index, depth);
+    PrintName << genericParameterName(depth, index);
 
     auto paramTy = Factory.createNode(Node::Kind::DependentGenericParamType);
     paramTy->addChild(Factory.createNode(Node::Kind::Index, depth), Factory);

unittests/Basic/DemangleTest.cpp

@@ -32,12 +32,12 @@ TEST(Demangle, IsObjCSymbol) {
   EXPECT_EQ(true, isObjCSymbol(llvm::StringRef("_$sSC3fooyS2d_SdtFTO")));
 }
 
-TEST(Demangle, CustomArchetypes) {
+TEST(Demangle, CustomGenericParameterNames) {
   std::string SymbolName = "_$s1a1gyq_q__xt_tr0_lF";
   std::string DemangledName = "a.g<Q, U>((U, Q)) -> U";
 
   DemangleOptions Options;
-  Options.ArchetypeName = [](uint64_t index, uint64_t depth) {
+  Options.GenericParameterName = [](uint64_t depth, uint64_t index) {
     return index ? "U" : "Q";
   };
   std::string Result = demangleSymbolAsString(SymbolName, Options);