diff options
author | David Blaikie <dblaikie@gmail.com> | 2016-01-15 23:43:25 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2016-01-15 23:43:25 +0000 |
commit | 0403cb11a1ed1ebbc56eb66567bbc686c755a51a (patch) | |
tree | 5962987a30a16dba216520348d716c7b2ed499b4 /clang/lib/Parse/ParseDeclCXX.cpp | |
parent | 62d4a253f71efaec82314ab52033f2678f5d0f7b (diff) | |
download | bcm5719-llvm-0403cb11a1ed1ebbc56eb66567bbc686c755a51a.tar.gz bcm5719-llvm-0403cb11a1ed1ebbc56eb66567bbc686c755a51a.zip |
OpaquePtr: Use nullptr construction for DeclGroupPtrTy OpaquePtr typedef
llvm-svn: 257956
Diffstat (limited to 'clang/lib/Parse/ParseDeclCXX.cpp')
-rw-r--r-- | clang/lib/Parse/ParseDeclCXX.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index 3f22ad4ddab..82fde7a2afc 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -65,7 +65,7 @@ Parser::DeclGroupPtrTy Parser::ParseNamespace(unsigned Context, if (Tok.is(tok::code_completion)) { Actions.CodeCompleteNamespaceDecl(getCurScope()); cutOffParsing(); - return DeclGroupPtrTy(); + return nullptr; } SourceLocation IdentLoc; @@ -109,7 +109,7 @@ Parser::DeclGroupPtrTy Parser::ParseNamespace(unsigned Context, Diag(Tok, diag::err_expected) << tok::identifier; // Skip to end of the definition and eat the ';'. SkipUntil(tok::semi); - return DeclGroupPtrTy(); + return nullptr; } if (attrLoc.isValid()) Diag(attrLoc, diag::err_unexpected_namespace_attributes_alias); @@ -126,7 +126,7 @@ Parser::DeclGroupPtrTy Parser::ParseNamespace(unsigned Context, Diag(Tok, diag::err_expected) << tok::l_brace; else Diag(Tok, diag::err_expected_either) << tok::identifier << tok::l_brace; - return DeclGroupPtrTy(); + return nullptr; } if (getCurScope()->isClassScope() || getCurScope()->isTemplateParamScope() || @@ -134,7 +134,7 @@ Parser::DeclGroupPtrTy Parser::ParseNamespace(unsigned Context, getCurScope()->getFnParent()) { Diag(T.getOpenLocation(), diag::err_namespace_nonnamespace_scope); SkipUntil(tok::r_brace); - return DeclGroupPtrTy(); + return nullptr; } if (ExtraIdent.empty()) { @@ -2253,7 +2253,7 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, ConsumeToken(); SkipUntil(tok::r_brace, StopAtSemi); - return DeclGroupPtrTy(); + return nullptr; } // Turn on colon protection early, while parsing declspec, although there is @@ -2287,7 +2287,7 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, if (SS.isInvalid()) { SkipUntil(tok::semi); - return DeclGroupPtrTy(); + return nullptr; } // Try to parse an unqualified-id. @@ -2296,14 +2296,14 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, if (ParseUnqualifiedId(SS, false, true, true, ParsedType(), TemplateKWLoc, Name)) { SkipUntil(tok::semi); - return DeclGroupPtrTy(); + return nullptr; } // TODO: recover from mistakenly-qualified operator declarations. if (ExpectAndConsume(tok::semi, diag::err_expected_after, "access declaration")) { SkipUntil(tok::semi); - return DeclGroupPtrTy(); + return nullptr; } return DeclGroupPtrTy::make(DeclGroupRef(Actions.ActOnUsingDeclaration( @@ -2361,7 +2361,7 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, if (Tok.is(tok::kw_namespace)) { Diag(UsingLoc, diag::err_using_namespace_in_class); SkipUntil(tok::semi, StopBeforeMatch); - return DeclGroupPtrTy(); + return nullptr; } SourceLocation DeclEnd; // Otherwise, it must be a using-declaration or an alias-declaration. @@ -2391,7 +2391,7 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, TemplateInfo.Kind == ParsedTemplateInfo::NonTemplate && DiagnoseMissingSemiAfterTagDefinition(DS, AS, DSC_class, &CommonLateParsedAttrs)) - return DeclGroupPtrTy(); + return nullptr; MultiTemplateParamsArg TemplateParams( TemplateInfo.TemplateParams? TemplateInfo.TemplateParams->data() @@ -2446,7 +2446,7 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, if (ParseCXXMemberDeclaratorBeforeInitializer( DeclaratorInfo, VS, BitfieldSize, LateParsedAttrs)) { TryConsumeToken(tok::semi); - return DeclGroupPtrTy(); + return nullptr; } // Check for a member function definition. @@ -2495,7 +2495,7 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, // Consume the optional ';' TryConsumeToken(tok::semi); - return DeclGroupPtrTy(); + return nullptr; } if (DS.getStorageClassSpec() == DeclSpec::SCS_typedef) { @@ -2698,7 +2698,7 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, SkipUntil(tok::r_brace, StopAtSemi | StopBeforeMatch); // If we stopped at a ';', eat it. TryConsumeToken(tok::semi); - return DeclGroupPtrTy(); + return nullptr; } return Actions.FinalizeDeclaratorGroup(getCurScope(), DS, DeclsInGroup); @@ -2825,49 +2825,49 @@ Parser::DeclGroupPtrTy Parser::ParseCXXClassMemberDeclarationWithPragmas( if (getLangOpts().MicrosoftExt && Tok.isOneOf(tok::kw___if_exists, tok::kw___if_not_exists)) { ParseMicrosoftIfExistsClassDeclaration(TagType, AS); - return DeclGroupPtrTy(); + return nullptr; } // Check for extraneous top-level semicolon. if (Tok.is(tok::semi)) { ConsumeExtraSemi(InsideStruct, TagType); - return DeclGroupPtrTy(); + return nullptr; } if (Tok.is(tok::annot_pragma_vis)) { HandlePragmaVisibility(); - return DeclGroupPtrTy(); + return nullptr; } if (Tok.is(tok::annot_pragma_pack)) { HandlePragmaPack(); - return DeclGroupPtrTy(); + return nullptr; } if (Tok.is(tok::annot_pragma_align)) { HandlePragmaAlign(); - return DeclGroupPtrTy(); + return nullptr; } if (Tok.is(tok::annot_pragma_ms_pointers_to_members)) { HandlePragmaMSPointersToMembers(); - return DeclGroupPtrTy(); + return nullptr; } if (Tok.is(tok::annot_pragma_ms_pragma)) { HandlePragmaMSPragma(); - return DeclGroupPtrTy(); + return nullptr; } if (Tok.is(tok::annot_pragma_ms_vtordisp)) { HandlePragmaMSVtorDisp(); - return DeclGroupPtrTy(); + return nullptr; } // If we see a namespace here, a close brace was missing somewhere. if (Tok.is(tok::kw_namespace)) { DiagnoseUnexpectedNamespace(cast<NamedDecl>(TagDecl)); - return DeclGroupPtrTy(); + return nullptr; } AccessSpecifier NewAS = getAccessSpecifierIfPresent(); @@ -2903,7 +2903,7 @@ Parser::DeclGroupPtrTy Parser::ParseCXXClassMemberDeclarationWithPragmas( AccessAttrs.clear(); } - return DeclGroupPtrTy(); + return nullptr; } if (Tok.is(tok::annot_pragma_openmp)) |