Revert "Update master to build with Xcode 8 beta 3, OS X 10.12, iOS 10, tvOS 10, and watchOS 3 SDKs."

This reverts commit 62d1fa760c.
This commit is contained in:
Luke Larson
2016-07-19 15:18:17 -07:00
parent 4fa5877f4f
commit 74e0498015
92 changed files with 1253 additions and 1005 deletions

View File

@@ -147,27 +147,38 @@ getUnderlyingClangModuleForImport(ImportDecl *Import) {
return nullptr;
}
static void printTypeNameToString(Type Ty, std::string &Text) {
SmallString<128> Buffer;
llvm::raw_svector_ostream OS(Buffer);
Ty->print(OS);
Text = OS.str();
}
bool swift::ide::
printTypeInterface(ModuleDecl *M, Type Ty, ASTPrinter &Printer,
std::string &Error) {
if (!Ty)
return false;
std::string &TypeName, std::string &Error) {
if (!Ty) {
if (Error.empty())
Error = "type cannot be null.";
return true;
}
Ty = Ty->getRValueType();
if (auto ND = Ty->getNominalOrBoundGenericNominal()) {
PrintOptions Options = PrintOptions::printTypeInterface(Ty.getPointer(), M);
ND->print(Printer, Options);
return true;
printTypeNameToString(Ty, TypeName);
return false;
}
Error = "cannot find declaration of type.";
return false;
return true;
}
bool swift::ide::
printTypeInterface(ModuleDecl *M, StringRef TypeUSR, ASTPrinter &Printer,
std::string &Error) {
std::string &TypeName, std::string &Error) {
return printTypeInterface(M, getTypeFromMangledSymbolname(M->getASTContext(),
TypeUSR, Error),
Printer, Error);
Printer, TypeName, Error);
}
void swift::ide::printModuleInterface(Module *M, Optional<StringRef> Group,