Allow lexer to handle string_view literals. Patch from Anton Bikineev.

This implements the compiler side of p0403r0. This patch was reviewed as
https://reviews.llvm.org/D26829.

llvm-svn: 290744
This commit is contained in:
Eric Fiselier 2016-12-30 04:51:10 +00:00
parent cf82486c90
commit cb2f326a75
5 changed files with 36 additions and 4 deletions

View File

@ -259,6 +259,8 @@ public:
return UDSuffixOffset;
}
static bool isValidUDSuffix(const LangOptions &LangOpts, StringRef Suffix);
private:
void init(ArrayRef<Token> StringToks);
bool CopyStringFragment(const Token &Tok, const char *TokBegin,

View File

@ -1713,9 +1713,9 @@ const char *Lexer::LexUDSuffix(Token &Result, const char *CurPtr,
getLangOpts());
if (!isIdentifierBody(Next)) {
// End of suffix. Check whether this is on the whitelist.
IsUDSuffix = (Chars == 1 && Buffer[0] == 's') ||
NumericLiteralParser::isValidUDSuffix(
getLangOpts(), StringRef(Buffer, Chars));
const StringRef CompleteSuffix(Buffer, Chars);
IsUDSuffix = StringLiteralParser::isValidUDSuffix(getLangOpts(),
CompleteSuffix);
break;
}

View File

@ -1708,3 +1708,12 @@ unsigned StringLiteralParser::getOffsetOfStringByte(const Token &Tok,
return SpellingPtr-SpellingStart;
}
/// Determine whether a suffix is a valid ud-suffix. We avoid treating reserved
/// suffixes as ud-suffixes, because the diagnostic experience is better if we
/// treat it as an invalid suffix.
bool StringLiteralParser::isValidUDSuffix(const LangOptions &LangOpts,
StringRef Suffix) {
return NumericLiteralParser::isValidUDSuffix(LangOpts, Suffix) ||
Suffix == "sv";
}

View File

@ -12913,7 +12913,7 @@ bool Sema::CheckLiteralOperatorDeclaration(FunctionDecl *FnDecl) {
// Literal suffix identifiers that do not start with an underscore
// are reserved for future standardization.
Diag(FnDecl->getLocation(), diag::warn_user_literal_reserved)
<< NumericLiteralParser::isValidUDSuffix(getLangOpts(), LiteralName);
<< StringLiteralParser::isValidUDSuffix(getLangOpts(), LiteralName);
}
return false;

View File

@ -0,0 +1,21 @@
// RUN: %clang_cc1 -std=c++1z %s -include %s -verify
#ifndef INCLUDED
#define INCLUDED
#pragma clang system_header
namespace std {
using size_t = decltype(sizeof(0));
struct string_view {};
string_view operator""sv(const char*, size_t);
}
#else
using namespace std;
string_view s = "foo"sv;
const char* p = "bar"sv; // expected-error {{no viable conversion}}
char error = 'x'sv; // expected-error {{invalid suffix}} expected-error {{expected ';'}}
#endif