From b23b4992370221b27d64fa5b1da01a52aa271bef Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Sun, 8 Jun 2014 08:38:12 +0000 Subject: [C++11] Use 'nullptr'. Unittests edition. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@210423 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/AST/ASTVectorTest.cpp | 2 +- unittests/AST/CommentParser.cpp | 4 +- unittests/AST/StmtPrinterTest.cpp | 2 +- unittests/ASTMatchers/ASTMatchersTest.cpp | 22 +++---- unittests/ASTMatchers/ASTMatchersTest.h | 6 +- unittests/ASTMatchers/Dynamic/RegistryTest.cpp | 9 +-- unittests/Basic/FileManagerTest.cpp | 34 +++++------ unittests/Basic/SourceManagerTest.cpp | 10 ++-- unittests/Basic/VirtualFileSystemTest.cpp | 70 +++++++++++----------- unittests/Lex/LexerTest.cpp | 4 +- unittests/Lex/PPCallbacksTest.cpp | 6 +- unittests/Lex/PPConditionalDirectiveRecordTest.cpp | 4 +- unittests/Sema/ExternalSemaSourceTest.cpp | 16 ++--- unittests/Tooling/CommentHandlerTest.cpp | 2 +- unittests/Tooling/CompilationDatabaseTest.cpp | 6 +- unittests/Tooling/RefactoringTest.cpp | 4 +- unittests/Tooling/RewriterTestContext.h | 6 +- unittests/Tooling/ToolingTest.cpp | 6 +- unittests/libclang/LibclangTest.cpp | 13 ++-- 19 files changed, 115 insertions(+), 111 deletions(-) diff --git a/unittests/AST/ASTVectorTest.cpp b/unittests/AST/ASTVectorTest.cpp index a92e86b3cd..ce6d0a07ce 100644 --- a/unittests/AST/ASTVectorTest.cpp +++ b/unittests/AST/ASTVectorTest.cpp @@ -18,7 +18,7 @@ using namespace clang; LLVM_ATTRIBUTE_UNUSED void CompileTest() { - ASTContext *C = 0; + ASTContext *C = nullptr; ASTVector V; V.insert(*C, V.begin(), 0); } diff --git a/unittests/AST/CommentParser.cpp b/unittests/AST/CommentParser.cpp index 0064078d86..ae1410f377 100644 --- a/unittests/AST/CommentParser.cpp +++ b/unittests/AST/CommentParser.cpp @@ -60,7 +60,7 @@ FullComment *CommentParserTest::parseString(const char *Source) { Lexer L(Allocator, Diags, Traits, Begin, Source, Source + strlen(Source)); - Sema S(Allocator, SourceMgr, Diags, Traits, /*PP=*/ NULL); + Sema S(Allocator, SourceMgr, Diags, Traits, /*PP=*/ nullptr); Parser P(L, S, Allocator, SourceMgr, Diags, Traits); FullComment *FC = P.parseFullComment(); @@ -74,7 +74,7 @@ FullComment *CommentParserTest::parseString(const char *Source) { if (Tok.is(tok::eof)) return FC; else - return NULL; + return nullptr; } ::testing::AssertionResult HasChildCount(const Comment *C, size_t Count) { diff --git a/unittests/AST/StmtPrinterTest.cpp b/unittests/AST/StmtPrinterTest.cpp index d7265176d1..0b334e768f 100644 --- a/unittests/AST/StmtPrinterTest.cpp +++ b/unittests/AST/StmtPrinterTest.cpp @@ -33,7 +33,7 @@ namespace { void PrintStmt(raw_ostream &Out, const ASTContext *Context, const Stmt *S) { PrintingPolicy Policy = Context->getPrintingPolicy(); - S->printPretty(Out, /*Helper*/ 0, Policy); + S->printPretty(Out, /*Helper*/ nullptr, Policy); } class PrintMatch : public MatchFinder::MatchCallback { diff --git a/unittests/ASTMatchers/ASTMatchersTest.cpp b/unittests/ASTMatchers/ASTMatchersTest.cpp index bcdc10ab6c..03acfe3060 100644 --- a/unittests/ASTMatchers/ASTMatchersTest.cpp +++ b/unittests/ASTMatchers/ASTMatchersTest.cpp @@ -44,14 +44,15 @@ TEST(IsDerivedFromDeathTest, DiesOnEmptyBaseName) { TEST(Finder, DynamicOnlyAcceptsSomeMatchers) { MatchFinder Finder; - EXPECT_TRUE(Finder.addDynamicMatcher(decl(), NULL)); - EXPECT_TRUE(Finder.addDynamicMatcher(callExpr(), NULL)); - EXPECT_TRUE(Finder.addDynamicMatcher(constantArrayType(hasSize(42)), NULL)); + EXPECT_TRUE(Finder.addDynamicMatcher(decl(), nullptr)); + EXPECT_TRUE(Finder.addDynamicMatcher(callExpr(), nullptr)); + EXPECT_TRUE(Finder.addDynamicMatcher(constantArrayType(hasSize(42)), + nullptr)); // Do not accept non-toplevel matchers. - EXPECT_FALSE(Finder.addDynamicMatcher(isArrow(), NULL)); - EXPECT_FALSE(Finder.addDynamicMatcher(hasSize(2), NULL)); - EXPECT_FALSE(Finder.addDynamicMatcher(hasName("x"), NULL)); + EXPECT_FALSE(Finder.addDynamicMatcher(isArrow(), nullptr)); + EXPECT_FALSE(Finder.addDynamicMatcher(hasSize(2), nullptr)); + EXPECT_FALSE(Finder.addDynamicMatcher(hasName("x"), nullptr)); } TEST(Decl, MatchesDeclarations) { @@ -697,7 +698,8 @@ public: EXPECT_EQ(Nodes->getNodeAs(Id), I->second.get()); return true; } - EXPECT_TRUE(M.count(Id) == 0 || M.find(Id)->second.template get() == 0); + EXPECT_TRUE(M.count(Id) == 0 || + M.find(Id)->second.template get() == nullptr); return false; } @@ -4116,7 +4118,7 @@ public: virtual bool run(const BoundNodes *Nodes, ASTContext *Context) { const T *Node = Nodes->getNodeAs(Id); return selectFirst(InnerId, - match(InnerMatcher, *Node, *Context)) != NULL; + match(InnerMatcher, *Node, *Context)) !=nullptr; } private: std::string Id; @@ -4176,7 +4178,7 @@ public: return selectFirst( "", match(stmt(hasParent( stmt(has(stmt(equalsNode(TypedNode)))).bind(""))), - *Node, Context)) != NULL; + *Node, Context)) != nullptr; } bool verify(const BoundNodes &Nodes, ASTContext &Context, const Decl *Node) { // Use the original typed pointer to verify we can pass pointers to subtypes @@ -4185,7 +4187,7 @@ public: return selectFirst( "", match(decl(hasParent( decl(has(decl(equalsNode(TypedNode)))).bind(""))), - *Node, Context)) != NULL; + *Node, Context)) != nullptr; } }; diff --git a/unittests/ASTMatchers/ASTMatchersTest.h b/unittests/ASTMatchers/ASTMatchersTest.h index 8e243cf078..2e4ee2c5cb 100644 --- a/unittests/ASTMatchers/ASTMatchersTest.h +++ b/unittests/ASTMatchers/ASTMatchersTest.h @@ -40,7 +40,7 @@ public: : Verified(Verified), FindResultReviewer(FindResultVerifier) {} virtual void run(const MatchFinder::MatchResult &Result) { - if (FindResultReviewer != NULL) { + if (FindResultReviewer != nullptr) { *Verified |= FindResultReviewer->run(&Result.Nodes, Result.Context); } else { *Verified = true; @@ -64,9 +64,9 @@ testing::AssertionResult matchesConditionally(const std::string &Code, llvm::StringRef CompileArg) { bool Found = false, DynamicFound = false; MatchFinder Finder; - VerifyMatch VerifyFound(0, &Found); + VerifyMatch VerifyFound(nullptr, &Found); Finder.addMatcher(AMatcher, &VerifyFound); - VerifyMatch VerifyDynamicFound(0, &DynamicFound); + VerifyMatch VerifyDynamicFound(nullptr, &DynamicFound); if (!Finder.addDynamicMatcher(AMatcher, &VerifyDynamicFound)) return testing::AssertionFailure() << "Could not add dynamic matcher"; std::unique_ptr Factory( diff --git a/unittests/ASTMatchers/Dynamic/RegistryTest.cpp b/unittests/ASTMatchers/Dynamic/RegistryTest.cpp index abacb6fe7d..5d5392492d 100644 --- a/unittests/ASTMatchers/Dynamic/RegistryTest.cpp +++ b/unittests/ASTMatchers/Dynamic/RegistryTest.cpp @@ -40,7 +40,7 @@ public: } VariantMatcher constructMatcher(StringRef MatcherName, - Diagnostics *Error = NULL) { + Diagnostics *Error = nullptr) { Diagnostics DummyError; if (!Error) Error = &DummyError; llvm::Optional Ctor = lookupMatcherCtor(MatcherName); @@ -53,7 +53,7 @@ public: VariantMatcher constructMatcher(StringRef MatcherName, const VariantValue &Arg1, - Diagnostics *Error = NULL) { + Diagnostics *Error = nullptr) { Diagnostics DummyError; if (!Error) Error = &DummyError; llvm::Optional Ctor = lookupMatcherCtor(MatcherName); @@ -67,7 +67,7 @@ public: VariantMatcher constructMatcher(StringRef MatcherName, const VariantValue &Arg1, const VariantValue &Arg2, - Diagnostics *Error = NULL) { + Diagnostics *Error = nullptr) { Diagnostics DummyError; if (!Error) Error = &DummyError; llvm::Optional Ctor = lookupMatcherCtor(MatcherName); @@ -110,7 +110,8 @@ public: } bool hasCompletion(const CompVector &Comps, StringRef TypedText, - StringRef MatcherDecl = StringRef(), unsigned *Index = 0) { + StringRef MatcherDecl = StringRef(), + unsigned *Index = nullptr) { for (CompVector::const_iterator I = Comps.begin(), E = Comps.end(); I != E; ++I) { if (I->TypedText == TypedText && diff --git a/unittests/Basic/FileManagerTest.cpp b/unittests/Basic/FileManagerTest.cpp index ae89395f12..b5df814ba8 100644 --- a/unittests/Basic/FileManagerTest.cpp +++ b/unittests/Basic/FileManagerTest.cpp @@ -76,17 +76,17 @@ class FileManagerTest : public ::testing::Test { // (not NULL, correct name). TEST_F(FileManagerTest, getVirtualFileSetsTheDirFieldCorrectly) { const FileEntry *file = manager.getVirtualFile("foo.cpp", 42, 0); - ASSERT_TRUE(file != NULL); + ASSERT_TRUE(file != nullptr); const DirectoryEntry *dir = file->getDir(); - ASSERT_TRUE(dir != NULL); + ASSERT_TRUE(dir != nullptr); EXPECT_STREQ(".", dir->getName()); file = manager.getVirtualFile("x/y/z.cpp", 42, 0); - ASSERT_TRUE(file != NULL); + ASSERT_TRUE(file != nullptr); dir = file->getDir(); - ASSERT_TRUE(dir != NULL); + ASSERT_TRUE(dir != nullptr); EXPECT_STREQ("x/y", dir->getName()); } @@ -98,9 +98,9 @@ TEST_F(FileManagerTest, NoVirtualDirectoryExistsBeforeAVirtualFileIsAdded) { // by what's in the real file system. manager.addStatCache(new FakeStatCache); - EXPECT_EQ(NULL, manager.getDirectory("virtual/dir/foo")); - EXPECT_EQ(NULL, manager.getDirectory("virtual/dir")); - EXPECT_EQ(NULL, manager.getDirectory("virtual")); + EXPECT_EQ(nullptr, manager.getDirectory("virtual/dir/foo")); + EXPECT_EQ(nullptr, manager.getDirectory("virtual/dir")); + EXPECT_EQ(nullptr, manager.getDirectory("virtual")); } // When a virtual file is added, all of its ancestors should be created. @@ -109,14 +109,14 @@ TEST_F(FileManagerTest, getVirtualFileCreatesDirectoryEntriesForAncestors) { manager.addStatCache(new FakeStatCache); manager.getVirtualFile("virtual/dir/bar.h", 100, 0); - EXPECT_EQ(NULL, manager.getDirectory("virtual/dir/foo")); + EXPECT_EQ(nullptr, manager.getDirectory("virtual/dir/foo")); const DirectoryEntry *dir = manager.getDirectory("virtual/dir"); - ASSERT_TRUE(dir != NULL); + ASSERT_TRUE(dir != nullptr); EXPECT_STREQ("virtual/dir", dir->getName()); dir = manager.getDirectory("virtual"); - ASSERT_TRUE(dir != NULL); + ASSERT_TRUE(dir != nullptr); EXPECT_STREQ("virtual", dir->getName()); } @@ -137,11 +137,11 @@ TEST_F(FileManagerTest, getFileReturnsValidFileEntryForExistingRealFile) { manager.addStatCache(statCache); const FileEntry *file = manager.getFile("/tmp/test"); - ASSERT_TRUE(file != NULL); + ASSERT_TRUE(file != nullptr); EXPECT_STREQ("/tmp/test", file->getName()); const DirectoryEntry *dir = file->getDir(); - ASSERT_TRUE(dir != NULL); + ASSERT_TRUE(dir != nullptr); EXPECT_STREQ("/tmp", dir->getName()); #ifdef LLVM_ON_WIN32 @@ -161,11 +161,11 @@ TEST_F(FileManagerTest, getFileReturnsValidFileEntryForExistingVirtualFile) { manager.getVirtualFile("virtual/dir/bar.h", 100, 0); const FileEntry *file = manager.getFile("virtual/dir/bar.h"); - ASSERT_TRUE(file != NULL); + ASSERT_TRUE(file != nullptr); EXPECT_STREQ("virtual/dir/bar.h", file->getName()); const DirectoryEntry *dir = file->getDir(); - ASSERT_TRUE(dir != NULL); + ASSERT_TRUE(dir != nullptr); EXPECT_STREQ("virtual/dir", dir->getName()); } @@ -182,8 +182,8 @@ TEST_F(FileManagerTest, getFileReturnsDifferentFileEntriesForDifferentFiles) { const FileEntry *fileFoo = manager.getFile("foo.cpp"); const FileEntry *fileBar = manager.getFile("bar.cpp"); - ASSERT_TRUE(fileFoo != NULL); - ASSERT_TRUE(fileBar != NULL); + ASSERT_TRUE(fileFoo != nullptr); + ASSERT_TRUE(fileBar != nullptr); EXPECT_NE(fileFoo, fileBar); } @@ -200,7 +200,7 @@ TEST_F(FileManagerTest, getFileReturnsNULLForNonexistentFile) { manager.getVirtualFile("bar.cpp", 200, 0); const FileEntry *file = manager.getFile("xyz.txt"); - EXPECT_EQ(NULL, file); + EXPECT_EQ(nullptr, file); } // The following tests apply to Unix-like system only. diff --git a/unittests/Basic/SourceManagerTest.cpp b/unittests/Basic/SourceManagerTest.cpp index 3f12f4743c..5416ea7ef4 100644 --- a/unittests/Basic/SourceManagerTest.cpp +++ b/unittests/Basic/SourceManagerTest.cpp @@ -65,7 +65,7 @@ class VoidModuleLoader : public ModuleLoader { bool Complain) override { } GlobalModuleIndex *loadGlobalModuleIndex(SourceLocation TriggerLoc) override - { return 0; } + { return nullptr; } bool lookupMissingImports(StringRef Name, SourceLocation TriggerLoc) override { return 0; }; }; @@ -83,7 +83,7 @@ TEST_F(SourceManagerTest, isBeforeInTranslationUnit) { &*Target); Preprocessor PP(new PreprocessorOptions(), Diags, LangOpts, SourceMgr, HeaderInfo, ModLoader, - /*IILookup =*/0, + /*IILookup =*/nullptr, /*OwnsHeaderSearch =*/false); PP.Initialize(*Target); PP.EnterMainSourceFile(); @@ -168,7 +168,7 @@ TEST_F(SourceManagerTest, getColumnNumber) { EXPECT_TRUE(Invalid); // Test with no invalid flag. - EXPECT_EQ(1U, SourceMgr.getColumnNumber(MainFileID, 0, NULL)); + EXPECT_EQ(1U, SourceMgr.getColumnNumber(MainFileID, 0, nullptr)); } #if defined(LLVM_ON_UNIX) @@ -200,7 +200,7 @@ TEST_F(SourceManagerTest, getMacroArgExpandedLocation) { &*Target); Preprocessor PP(new PreprocessorOptions(), Diags, LangOpts, SourceMgr, HeaderInfo, ModLoader, - /*IILookup =*/0, + /*IILookup =*/nullptr, /*OwnsHeaderSearch =*/false); PP.Initialize(*Target); PP.EnterMainSourceFile(); @@ -298,7 +298,7 @@ TEST_F(SourceManagerTest, isBeforeInTranslationUnitWithMacroInInclude) { &*Target); Preprocessor PP(new PreprocessorOptions(), Diags, LangOpts, SourceMgr, HeaderInfo, ModLoader, - /*IILookup =*/0, + /*IILookup =*/nullptr, /*OwnsHeaderSearch =*/false); PP.Initialize(*Target); diff --git a/unittests/Basic/VirtualFileSystemTest.cpp b/unittests/Basic/VirtualFileSystemTest.cpp index bcee16a822..22e095a770 100644 --- a/unittests/Basic/VirtualFileSystemTest.cpp +++ b/unittests/Basic/VirtualFileSystemTest.cpp @@ -253,11 +253,11 @@ public: TEST_F(VFSFromYAMLTest, BasicVFSFromYAML) { IntrusiveRefCntPtr FS; FS = getFromYAMLString(""); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString("[]"); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString("'string'"); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); EXPECT_EQ(3, NumDiagnostics); } @@ -284,7 +284,7 @@ TEST_F(VFSFromYAMLTest, MappedFiles) { "]\n" "}", Lower); - ASSERT_TRUE(FS.getPtr() != NULL); + ASSERT_TRUE(FS.getPtr() != nullptr); IntrusiveRefCntPtr O( new vfs::OverlayFileSystem(Lower)); @@ -327,7 +327,7 @@ TEST_F(VFSFromYAMLTest, CaseInsensitive) { " ]\n" "}]}", Lower); - ASSERT_TRUE(FS.getPtr() != NULL); + ASSERT_TRUE(FS.getPtr() != nullptr); IntrusiveRefCntPtr O( new vfs::OverlayFileSystem(Lower)); @@ -363,7 +363,7 @@ TEST_F(VFSFromYAMLTest, CaseSensitive) { " ]\n" "}]}", Lower); - ASSERT_TRUE(FS.getPtr() != NULL); + ASSERT_TRUE(FS.getPtr() != nullptr); IntrusiveRefCntPtr O( new vfs::OverlayFileSystem(Lower)); @@ -383,89 +383,89 @@ TEST_F(VFSFromYAMLTest, IllegalVFSFile) { // invalid YAML at top-level IntrusiveRefCntPtr FS = getFromYAMLString("{]", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); // invalid YAML in roots FS = getFromYAMLString("{ 'roots':[}", Lower); // invalid YAML in directory FS = getFromYAMLString( "{ 'roots':[ { 'name': 'foo', 'type': 'directory', 'contents': [}", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); // invalid configuration FS = getFromYAMLString("{ 'knobular': 'true', 'roots':[] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString("{ 'case-sensitive': 'maybe', 'roots':[] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); // invalid roots FS = getFromYAMLString("{ 'roots':'' }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString("{ 'roots':{} }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); // invalid entries FS = getFromYAMLString( "{ 'roots':[ { 'type': 'other', 'name': 'me', 'contents': '' }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString("{ 'roots':[ { 'type': 'file', 'name': [], " "'external-contents': 'other' }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'file', 'name': 'me', 'external-contents': [] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'file', 'name': 'me', 'external-contents': {} }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'directory', 'name': 'me', 'contents': {} }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'directory', 'name': 'me', 'contents': '' }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString( "{ 'roots':[ { 'thingy': 'directory', 'name': 'me', 'contents': [] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); // missing mandatory fields FS = getFromYAMLString("{ 'roots':[ { 'type': 'file', 'name': 'me' }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString( "{ 'roots':[ { 'type': 'file', 'external-contents': 'other' }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString("{ 'roots':[ { 'name': 'me', 'contents': [] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); // duplicate keys FS = getFromYAMLString("{ 'roots':[], 'roots':[] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString( "{ 'case-sensitive':'true', 'case-sensitive':'true', 'roots':[] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLString("{ 'roots':[{'name':'me', 'name':'you', 'type':'file', " "'external-contents':'blah' } ] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); // missing version FS = getFromYAMLRawString("{ 'roots':[] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); // bad version number FS = getFromYAMLRawString("{ 'version':'foo', 'roots':[] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLRawString("{ 'version':-1, 'roots':[] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); FS = getFromYAMLRawString("{ 'version':100000, 'roots':[] }", Lower); - EXPECT_EQ(NULL, FS.getPtr()); + EXPECT_EQ(nullptr, FS.getPtr()); EXPECT_EQ(24, NumDiagnostics); } @@ -487,7 +487,7 @@ TEST_F(VFSFromYAMLTest, UseExternalName) { " 'external-contents': '//root/external/file'\n" " }\n" "] }", Lower); - ASSERT_TRUE(NULL != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.getPtr()); // default true EXPECT_EQ("//root/external/file", FS->status("//root/A")->getName()); @@ -511,7 +511,7 @@ TEST_F(VFSFromYAMLTest, UseExternalName) { " 'external-contents': '//root/external/file'\n" " }\n" "] }", Lower); - ASSERT_TRUE(NULL != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.getPtr()); // default EXPECT_EQ("//root/A", FS->status("//root/A")->getName()); @@ -530,7 +530,7 @@ TEST_F(VFSFromYAMLTest, MultiComponentPath) { " { 'type': 'file', 'name': '//root/path/to/file',\n" " 'external-contents': '//root/other' }]\n" "}", Lower); - ASSERT_TRUE(NULL != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.getPtr()); EXPECT_FALSE(FS->status("//root/path/to/file").getError()); EXPECT_FALSE(FS->status("//root/path/to").getError()); EXPECT_FALSE(FS->status("//root/path").getError()); @@ -543,7 +543,7 @@ TEST_F(VFSFromYAMLTest, MultiComponentPath) { " 'contents': [ { 'type': 'file', 'name': 'file',\n" " 'external-contents': '//root/other' }]}]\n" "}", Lower); - ASSERT_TRUE(NULL != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.getPtr()); EXPECT_FALSE(FS->status("//root/path/to/file").getError()); EXPECT_FALSE(FS->status("//root/path/to").getError()); EXPECT_FALSE(FS->status("//root/path").getError()); @@ -556,7 +556,7 @@ TEST_F(VFSFromYAMLTest, MultiComponentPath) { " 'contents': [ { 'type': 'file', 'name': 'path/to/file',\n" " 'external-contents': '//root/other' }]}]\n" "}", Lower); - ASSERT_TRUE(NULL != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.getPtr()); EXPECT_FALSE(FS->status("//root/path/to/file").getError()); EXPECT_FALSE(FS->status("//root/path/to").getError()); EXPECT_FALSE(FS->status("//root/path").getError()); @@ -574,7 +574,7 @@ TEST_F(VFSFromYAMLTest, TrailingSlashes) { " 'contents': [ { 'type': 'file', 'name': 'file',\n" " 'external-contents': '//root/other' }]}]\n" "}", Lower); - ASSERT_TRUE(NULL != FS.getPtr()); + ASSERT_TRUE(nullptr != FS.getPtr()); EXPECT_FALSE(FS->status("//root/path/to/file").getError()); EXPECT_FALSE(FS->status("//root/path/to").getError()); EXPECT_FALSE(FS->status("//root/path").getError()); diff --git a/unittests/Lex/LexerTest.cpp b/unittests/Lex/LexerTest.cpp index 2b42f9cb0e..2981de7e25 100644 --- a/unittests/Lex/LexerTest.cpp +++ b/unittests/Lex/LexerTest.cpp @@ -41,7 +41,7 @@ class VoidModuleLoader : public ModuleLoader { bool Complain) override { } GlobalModuleIndex *loadGlobalModuleIndex(SourceLocation TriggerLoc) override - { return 0; } + { return nullptr; } bool lookupMissingImports(StringRef Name, SourceLocation TriggerLoc) override { return 0; }; }; @@ -69,7 +69,7 @@ protected: HeaderSearch HeaderInfo(new HeaderSearchOptions, SourceMgr, Diags, LangOpts, Target.getPtr()); Preprocessor PP(new PreprocessorOptions(), Diags, LangOpts, SourceMgr, - HeaderInfo, ModLoader, /*IILookup =*/0, + HeaderInfo, ModLoader, /*IILookup =*/nullptr, /*OwnsHeaderSearch =*/false); PP.Initialize(*Target); PP.EnterMainSourceFile(); diff --git a/unittests/Lex/PPCallbacksTest.cpp b/unittests/Lex/PPCallbacksTest.cpp index cceebea6c1..5ca2013cd6 100644 --- a/unittests/Lex/PPCallbacksTest.cpp +++ b/unittests/Lex/PPCallbacksTest.cpp @@ -48,7 +48,7 @@ class VoidModuleLoader : public ModuleLoader { bool Complain) override { } GlobalModuleIndex *loadGlobalModuleIndex(SourceLocation TriggerLoc) override - { return 0; } + { return nullptr; } bool lookupMissingImports(StringRef Name, SourceLocation TriggerLoc) override { return 0; }; }; @@ -174,7 +174,7 @@ protected: IntrusiveRefCntPtr PPOpts = new PreprocessorOptions(); Preprocessor PP(PPOpts, Diags, LangOpts, SourceMgr, HeaderInfo, ModLoader, - /*IILookup =*/0, + /*IILookup =*/nullptr, /*OwnsHeaderSearch =*/false); PP.Initialize(*Target); InclusionDirectiveCallbacks* Callbacks = new InclusionDirectiveCallbacks; @@ -207,7 +207,7 @@ protected: OpenCLLangOpts, Target.getPtr()); Preprocessor PP(new PreprocessorOptions(), Diags, OpenCLLangOpts, SourceMgr, - HeaderInfo, ModLoader, /*IILookup =*/0, + HeaderInfo, ModLoader, /*IILookup =*/nullptr, /*OwnsHeaderSearch =*/false); PP.Initialize(*Target); diff --git a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp index 1be5ececa7..49f9d1c132 100644 --- a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp +++ b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp @@ -65,7 +65,7 @@ class VoidModuleLoader : public ModuleLoader { bool Complain) override { } GlobalModuleIndex *loadGlobalModuleIndex(SourceLocation TriggerLoc) override - { return 0; } + { return nullptr; } bool lookupMissingImports(StringRef Name, SourceLocation TriggerLoc) override { return 0; }; }; @@ -98,7 +98,7 @@ TEST_F(PPConditionalDirectiveRecordTest, PPRecAPI) { Target.getPtr()); Preprocessor PP(new PreprocessorOptions(), Diags, LangOpts, SourceMgr, HeaderInfo, ModLoader, - /*IILookup =*/0, + /*IILookup =*/nullptr, /*OwnsHeaderSearch =*/false); PP.Initialize(*Target); PPConditionalDirectiveRecord * diff --git a/unittests/Sema/ExternalSemaSourceTest.cpp b/unittests/Sema/ExternalSemaSourceTest.cpp index 7cb5af1f13..bc0d632cfd 100644 --- a/unittests/Sema/ExternalSemaSourceTest.cpp +++ b/unittests/Sema/ExternalSemaSourceTest.cpp @@ -49,7 +49,7 @@ class NamespaceDiagnosticWatcher : public clang::DiagnosticConsumer { public: NamespaceDiagnosticWatcher(StringRef From, StringRef To) - : Chained(NULL), FromNS(From), ToNS("'"), SeenCount(0) { + : Chained(nullptr), FromNS(From), ToNS("'"), SeenCount(0) { ToNS.append(To); ToNS.append("'"); } @@ -95,11 +95,11 @@ class NamespaceTypoProvider : public clang::ExternalSemaSource { public: NamespaceTypoProvider(StringRef From, StringRef To) - : CorrectFrom(From), CorrectTo(To), CurrentSema(NULL), CallCount(0) {} + : CorrectFrom(From), CorrectTo(To), CurrentSema(nullptr), CallCount(0) {} virtual void InitializeSema(Sema &S) { CurrentSema = &S; } - virtual void ForgetSema() { CurrentSema = NULL; } + virtual void ForgetSema() { CurrentSema = nullptr; } virtual TypoCorrection CorrectTypo(const DeclarationNameInfo &Typo, int LookupKind, Scope *S, CXXScopeSpec *SS, @@ -109,17 +109,17 @@ public: const ObjCObjectPointerType *OPT) { ++CallCount; if (CurrentSema && Typo.getName().getAsString() == CorrectFrom) { - DeclContext *DestContext = NULL; + DeclContext *DestContext = nullptr; ASTContext &Context = CurrentSema->getASTContext(); - if (SS != NULL) + if (SS) DestContext = CurrentSema->computeDeclContext(*SS, EnteringContext); - if (DestContext == NULL) + if (!DestContext) DestContext = Context.getTranslationUnitDecl(); IdentifierInfo *ToIdent = CurrentSema->getPreprocessor().getIdentifierInfo(CorrectTo); NamespaceDecl *NewNamespace = NamespaceDecl::Create(Context, DestContext, false, Typo.getBeginLoc(), - Typo.getLoc(), ToIdent, NULL); + Typo.getLoc(), ToIdent, nullptr); DestContext->addDecl(NewNamespace); TypoCorrection Correction(ToIdent); Correction.addCorrectionDecl(NewNamespace); @@ -149,7 +149,7 @@ protected: virtual void ExecuteAction() { CompilerInstance &CI = getCompilerInstance(); ASSERT_FALSE(CI.hasSema()); - CI.createSema(getTranslationUnitKind(), NULL); + CI.createSema(getTranslationUnitKind(), nullptr); ASSERT_TRUE(CI.hasDiagnostics()); DiagnosticsEngine &Diagnostics = CI.getDiagnostics(); DiagnosticConsumer *Client = Diagnostics.getClient(); diff --git a/unittests/Tooling/CommentHandlerTest.cpp b/unittests/Tooling/CommentHandlerTest.cpp index f0f7797d57..117dfc36fe 100644 --- a/unittests/Tooling/CommentHandlerTest.cpp +++ b/unittests/Tooling/CommentHandlerTest.cpp @@ -28,7 +28,7 @@ class CommentHandlerVisitor : public TestVisitor, typedef TestVisitor base; public: - CommentHandlerVisitor() : base(), PP(0), Verified(false) { } + CommentHandlerVisitor() : base(), PP(nullptr), Verified(false) {} ~CommentHandlerVisitor() { EXPECT_TRUE(Verified) << "CommentVerifier not accessed"; diff --git a/unittests/Tooling/CompilationDatabaseTest.cpp b/unittests/Tooling/CompilationDatabaseTest.cpp index 9f078f4103..8866e751fc 100644 --- a/unittests/Tooling/CompilationDatabaseTest.cpp +++ b/unittests/Tooling/CompilationDatabaseTest.cpp @@ -22,8 +22,8 @@ namespace tooling { static void expectFailure(StringRef JSONDatabase, StringRef Explanation) { std::string ErrorMessage; - EXPECT_EQ(NULL, JSONCompilationDatabase::loadFromBuffer(JSONDatabase, - ErrorMessage)) + EXPECT_EQ(nullptr, JSONCompilationDatabase::loadFromBuffer(JSONDatabase, + ErrorMessage)) << "Expected an error because of: " << Explanation.str(); } @@ -434,7 +434,7 @@ TEST(FixedCompilationDatabase, GetAllCompileCommands) { TEST(ParseFixedCompilationDatabase, ReturnsNullOnEmptyArgumentList) { int Argc = 0; std::unique_ptr Database( - FixedCompilationDatabase::loadFromCommandLine(Argc, NULL)); + FixedCompilationDatabase::loadFromCommandLine(Argc, nullptr)); EXPECT_FALSE(Database); EXPECT_EQ(0, Argc); } diff --git a/unittests/Tooling/RefactoringTest.cpp b/unittests/Tooling/RefactoringTest.cpp index b1ed3c72be..d600880efb 100644 --- a/unittests/Tooling/RefactoringTest.cpp +++ b/unittests/Tooling/RefactoringTest.cpp @@ -236,7 +236,7 @@ public: OutStream << Content; OutStream.close(); const FileEntry *File = Context.Files.getFile(Path); - assert(File != NULL); + assert(File != nullptr); StringRef Found = TemporaryFiles.GetOrCreateValue(Name, Path.str()).second; assert(Found == Path); @@ -253,7 +253,7 @@ public: // FIXME: Figure out whether there is a way to get the SourceManger to // reopen the file. std::unique_ptr FileBuffer( - Context.Files.getBufferForFile(Path, NULL)); + Context.Files.getBufferForFile(Path, nullptr)); return FileBuffer->getBuffer(); } diff --git a/unittests/Tooling/RewriterTestContext.h b/unittests/Tooling/RewriterTestContext.h index f02ba1a9ff..6353cec596 100644 --- a/unittests/Tooling/RewriterTestContext.h +++ b/unittests/Tooling/RewriterTestContext.h @@ -53,7 +53,7 @@ class RewriterTestContext { const FileEntry *Entry = Files.getVirtualFile(Name, Source->getBufferSize(), 0); Sources.overrideFileContents(Entry, Source); - assert(Entry != NULL); + assert(Entry != nullptr); return Sources.createFileID(Entry, SourceLocation(), SrcMgr::C_User); } @@ -71,7 +71,7 @@ class RewriterTestContext { OutStream << Content; OutStream.close(); const FileEntry *File = Files.getFile(Path); - assert(File != NULL); + assert(File != nullptr); StringRef Found = TemporaryFiles.GetOrCreateValue(Name, Path.str()).second; assert(Found == Path); @@ -103,7 +103,7 @@ class RewriterTestContext { // FIXME: Figure out whether there is a way to get the SourceManger to // reopen the file. std::unique_ptr FileBuffer( - Files.getBufferForFile(Path, NULL)); + Files.getBufferForFile(Path, nullptr)); return FileBuffer->getBuffer(); } diff --git a/unittests/Tooling/ToolingTest.cpp b/unittests/Tooling/ToolingTest.cpp index f277728ea8..2b57c16ac5 100644 --- a/unittests/Tooling/ToolingTest.cpp +++ b/unittests/Tooling/ToolingTest.cpp @@ -121,12 +121,12 @@ TEST(newFrontendActionFactory, CreatesFrontendActionFactoryFromType) { std::unique_ptr Factory( newFrontendActionFactory()); std::unique_ptr Action(Factory->create()); - EXPECT_TRUE(Action.get() != NULL); + EXPECT_TRUE(Action.get() != nullptr); } struct IndependentFrontendActionCreator { ASTConsumer *newASTConsumer() { - return new FindTopLevelDeclConsumer(NULL); + return new FindTopLevelDeclConsumer(nullptr); } }; @@ -135,7 +135,7 @@ TEST(newFrontendActionFactory, CreatesFrontendActionFactoryFromFactoryType) { std::unique_ptr Factory( newFrontendActionFactory(&Creator)); std::unique_ptr Action(Factory->create()); - EXPECT_TRUE(Action.get() != NULL); + EXPECT_TRUE(Action.get() != nullptr); } TEST(ToolInvocation, TestMapVirtualFile) { diff --git a/unittests/libclang/LibclangTest.cpp b/unittests/libclang/LibclangTest.cpp index 213222c6cf..b69b2ac11f 100644 --- a/unittests/libclang/LibclangTest.cpp +++ b/unittests/libclang/LibclangTest.cpp @@ -12,21 +12,22 @@ TEST(libclang, clang_parseTranslationUnit2_InvalidArgs) { EXPECT_EQ(CXError_InvalidArguments, - clang_parseTranslationUnit2(0, 0, 0, 0, 0, 0, 0, 0)); + clang_parseTranslationUnit2(nullptr, nullptr, nullptr, 0, nullptr, + 0, 0, nullptr)); } TEST(libclang, clang_createTranslationUnit_InvalidArgs) { - EXPECT_EQ(0, clang_createTranslationUnit(0, 0)); + EXPECT_EQ(nullptr, clang_createTranslationUnit(nullptr, nullptr)); } TEST(libclang, clang_createTranslationUnit2_InvalidArgs) { EXPECT_EQ(CXError_InvalidArguments, - clang_createTranslationUnit2(0, 0, 0)); + clang_createTranslationUnit2(nullptr, nullptr, nullptr)); CXTranslationUnit TU = reinterpret_cast(1); EXPECT_EQ(CXError_InvalidArguments, - clang_createTranslationUnit2(0, 0, &TU)); - EXPECT_EQ(0, TU); + clang_createTranslationUnit2(nullptr, nullptr, &TU)); + EXPECT_EQ(nullptr, TU); } namespace { @@ -107,7 +108,7 @@ TEST(libclang, VirtualFileOverlay_Unicode) { } TEST(libclang, VirtualFileOverlay_InvalidArgs) { - TestVFO T(NULL); + TestVFO T(nullptr); T.mapError("/path/./virtual/../foo.h", "/real/foo.h", CXError_InvalidArguments); } -- cgit v1.2.3