From 91e150d54c8c442469ecb2aa4d4de09214ec1337 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 19 Mar 2019 22:09:55 +0000 Subject: Replace tok::angle_string_literal with new tok::header_name. Use the new kind for both angled header-name tokens and for double-quoted header-name tokens. This is in preparation for C++20's context-sensitive header-name token formation rules. llvm-svn: 356530 --- clang/lib/Lex/Pragma.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'clang/lib/Lex/Pragma.cpp') diff --git a/clang/lib/Lex/Pragma.cpp b/clang/lib/Lex/Pragma.cpp index 369fd92dd61..286b863b354 100644 --- a/clang/lib/Lex/Pragma.cpp +++ b/clang/lib/Lex/Pragma.cpp @@ -486,7 +486,7 @@ void Preprocessor::HandlePragmaDependency(Token &DependencyTok) { return; // If the next token wasn't a header-name, diagnose the error. - if (!FilenameTok.isOneOf(tok::angle_string_literal, tok::string_literal)) { + if (FilenameTok.isNot(tok::header_name)) { Diag(FilenameTok.getLocation(), diag::err_pp_expects_filename); return; } @@ -670,8 +670,7 @@ void Preprocessor::HandlePragmaIncludeAlias(Token &Tok) { StringRef SourceFileName; SmallString<128> FileNameBuffer; - if (SourceFilenameTok.is(tok::string_literal) || - SourceFilenameTok.is(tok::angle_string_literal)) { + if (SourceFilenameTok.is(tok::header_name)) { SourceFileName = getSpelling(SourceFilenameTok, FileNameBuffer); } else { Diag(Tok, diag::warn_pragma_include_alias_expected_filename); @@ -691,8 +690,7 @@ void Preprocessor::HandlePragmaIncludeAlias(Token &Tok) { return; StringRef ReplaceFileName; - if (ReplaceFilenameTok.is(tok::string_literal) || - ReplaceFilenameTok.is(tok::angle_string_literal)) { + if (ReplaceFilenameTok.is(tok::header_name)) { ReplaceFileName = getSpelling(ReplaceFilenameTok, FileNameBuffer); } else { Diag(Tok, diag::warn_pragma_include_alias_expected_filename); -- cgit v1.2.3