Define BUILTIN_TYPE_NAME_PREFIX constant in Strings.h

Delete redundant comment

Use upper case for constant

Author: kitasuke

include/swift/Strings.h

@@ -45,39 +45,41 @@ namespace swift {
   /// The name of the fake module used to hold synthesized ClangImporter things.
   static const char MANGLING_MODULE_CLANG_IMPORTER[] = "__C_Synthesized";
 
-  /// The name of the Builtin type name for Int
+  /// The name of the Builtin type prefix
+  static const char BUILTIN_TYPE_NAME_PREFIX[] = "Builtin.";
+  /// The name of the Builtin type for Int
   static const char BUILTIN_TYPE_NAME_INT[] = "Builtin.Int";
-  /// The name of the Builtin type name for Int8
+  /// The name of the Builtin type for Int8
   static const char BUILTIN_TYPE_NAME_INT8[] = "Builtin.Int8";
-  /// The name of the Builtin type name for Int16
+  /// The name of the Builtin type for Int16
   static const char BUILTIN_TYPE_NAME_INT16[] = "Builtin.Int16";
-  /// The name of the Builtin type name for Int32
+  /// The name of the Builtin type for Int32
   static const char BUILTIN_TYPE_NAME_INT32[] = "Builtin.Int32";
-  /// The name of the Builtin type name for Int64
+  /// The name of the Builtin type for Int64
   static const char BUILTIN_TYPE_NAME_INT64[] = "Builtin.Int64";
-  /// The name of the Builtin type name for Int128
+  /// The name of the Builtin type for Int128
   static const char BUILTIN_TYPE_NAME_INT128[] = "Builtin.Int128";
-  /// The name of the Builtin type name for Int256
+  /// The name of the Builtin type for Int256
   static const char BUILTIN_TYPE_NAME_INT256[] = "Builtin.Int256";
-  /// The name of the Builtin type name for Int512
+  /// The name of the Builtin type for Int512
   static const char BUILTIN_TYPE_NAME_INT512[] = "Builtin.Int512";
-  /// The name of the Builtin type name for Float
-  static const char BUILTIN_TYPE_NAME_Float[] = "Builtin.Float";
-  /// The name of the Builtin type name for NativeObject
+  /// The name of the Builtin type for Float
+  static const char BUILTIN_TYPE_NAME_FLOAT[] = "Builtin.Float";
+  /// The name of the Builtin type for NativeObject
   static const char BUILTIN_TYPE_NAME_NATIVEOBJECT[] = "Builtin.NativeObject";
-  /// The name of the Builtin type name for BridgeObject
+  /// The name of the Builtin type for BridgeObject
   static const char BUILTIN_TYPE_NAME_BRIDGEOBJECT[] = "Builtin.BridgeObject";
-  /// The name of the Builtin type name for RawPointer
+  /// The name of the Builtin type for RawPointer
   static const char BUILTIN_TYPE_NAME_RAWPOINTER[] = "Builtin.RawPointer";
-  /// The name of the Builtin type name for UnsafeValueBuffer
+  /// The name of the Builtin type for UnsafeValueBuffer
   static const char BUILTIN_TYPE_NAME_UNSAFEVALUEBUFFER[] = "Builtin.UnsafeValueBuffer";
-  /// The name of the Builtin type name for UnknownObject
+  /// The name of the Builtin type for UnknownObject
   static const char BUILTIN_TYPE_NAME_UNKNOWNOBJECT[] = "Builtin.UnknownObject";
-  /// The name of the Builtin type name for Vector
+  /// The name of the Builtin type for Vector
   static const char BUILTIN_TYPE_NAME_VEC[] = "Builtin.Vec";
-  /// The name of the Builtin type name for SILToken
+  /// The name of the Builtin type for SILToken
   static const char BUILTIN_TYPE_NAME_SILTOKEN[] = "Builtin.SILToken";
-  /// The name of the Builtin type name for Word
+  /// The name of the Builtin type for Word
   static const char BUILTIN_TYPE_NAME_WORD[] = "Builtin.Word";
 } // end namespace swift
 

lib/AST/ASTPrinter.cpp

@@ -3228,9 +3228,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
         llvm::raw_svector_ostream UnderlyingOS(UnderlyingStrVec);
         T->getElementType().print(UnderlyingOS);
       }
-      std::string builtin_name = BUILTIN_NAME;
-      std::string builtin_type_prefix = builtin_name + ".";
-      if (UnderlyingStrVec.startswith(builtin_type_prefix))
+      if (UnderlyingStrVec.startswith(BUILTIN_TYPE_NAME_PREFIX))
         UnderlyingStr = UnderlyingStrVec.substr(8);
       else
         UnderlyingStr = UnderlyingStrVec;

lib/Demangling/Demangler.cpp

@@ -934,7 +934,7 @@ NodePointer Demangler::demangleBuiltinType() {
       if (size <= 0)
         return nullptr;
       CharVector name;
-      name.append(BUILTIN_TYPE_NAME_Float, *this);
+      name.append(BUILTIN_TYPE_NAME_FLOAT, *this);
       name.append(size, *this);
       Ty = createNode(Node::Kind::BuiltinTypeName, name);
       break;
@@ -954,16 +954,14 @@ NodePointer Demangler::demangleBuiltinType() {
       if (elts <= 0)
         return nullptr;
       NodePointer EltType = popTypeAndGetChild();
-      std::string builtin_name = BUILTIN_NAME;
-      std::string builtin_type_prefix = builtin_name + ".";
       if (!EltType || EltType->getKind() != Node::Kind::BuiltinTypeName ||
-          !EltType->getText().startswith(builtin_type_prefix))
+          !EltType->getText().startswith(BUILTIN_TYPE_NAME_PREFIX))
         return nullptr;
       CharVector name;
       name.append(BUILTIN_TYPE_NAME_VEC, *this);
       name.append(elts, *this);
       name.push_back('x', *this);
-      name.append(EltType->getText().substr(strlen(builtin_type_prefix.c_str())), *this);
+      name.append(EltType->getText().substr(strlen(BUILTIN_TYPE_NAME_PREFIX)), *this);
       Ty = createNode(Node::Kind::BuiltinTypeName, name);
       break;
     }

lib/Demangling/Remangler.cpp

@@ -614,7 +614,7 @@ void Remangler::mangleBuiltinTypeName(Node *node) {
     Buffer << 'w';
   } else if (stripPrefix(text, BUILTIN_TYPE_NAME_INT)) {
     Buffer << 'i' << text << '_';
-  } else if (stripPrefix(text, BUILTIN_TYPE_NAME_Float)) {
+  } else if (stripPrefix(text, BUILTIN_TYPE_NAME_FLOAT)) {
     Buffer << 'f' << text << '_';
   } else if (stripPrefix(text, BUILTIN_TYPE_NAME_VEC)) {
     auto split = text.split('x');

lib/IDE/TypeReconstruction.cpp

@@ -798,11 +798,10 @@ static void VisitNodeBuiltinTypeName(
   std::string builtin_name = cur_node->getText();
 
   StringRef builtin_name_ref(builtin_name);
-  std::string builtin_type_prefix = stringWithFormat("%s.", BUILTIN_NAME);
 
-  if (builtin_name_ref.startswith(builtin_type_prefix)) {
+  if (builtin_name_ref.startswith(BUILTIN_TYPE_NAME_PREFIX)) {
     StringRef stripped_name_ref =
-        builtin_name_ref.drop_front(strlen(builtin_type_prefix.c_str()));
+        builtin_name_ref.drop_front(strlen(BUILTIN_TYPE_NAME_PREFIX));
     SmallVector<ValueDecl *, 1> builtin_decls;
 
     result._module =
@@ -815,7 +814,7 @@ static void VisitNodeBuiltinTypeName(
     }
   } else {
     result._error = stringWithFormat(
-        "BuiltinTypeName %s doesn't start with %s", builtin_name.c_str(), builtin_type_prefix.c_str());
+        "BuiltinTypeName %s doesn't start with %s", builtin_name.c_str(), BUILTIN_TYPE_NAME_PREFIX);
   }
 }
 

lib/Serialization/Serialization.cpp

@@ -3552,9 +3552,7 @@ static TypeAliasDecl *findTypeAliasForBuiltin(ASTContext &Ctx, Type T) {
   llvm::SmallString<32> FullName;
   llvm::raw_svector_ostream OS(FullName);
   T->print(OS);
-  std::string builtin_name = BUILTIN_NAME;
-  std::string builtin_type_prefix = builtin_name + ".";
-  assert(FullName.startswith(builtin_type_prefix));
+  assert(FullName.startswith(BUILTIN_TYPE_NAME_PREFIX));
   StringRef TypeName = FullName.substr(8);
 
   SmallVector<ValueDecl*, 4> CurModuleResults;