averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

C++ parser: support borrowing and consuming modifiers.

Browse Source 
And adjust contextual parameter modifier parsing in general to be more
properly contextual, so we don't have to reserve `__shared` or `__owned`,
or their successor spellings, as argument labels anymore.
This commit is contained in:
Joe Groff
2023-01-23 15:17:53 -08:00
parent 655e9e681d
commit 704a4363d7
10 changed files with 87 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Parse/ParsePattern.cpp
View File

@@ -159,11 +159,15 @@ bool Parser::startsParameterName(bool isClosure) {
// If the next token can be an argument label, we might have a name.
if (nextTok.canBeArgumentLabel()) {
// If the first name wasn't "isolated", we're done.
// If the first name wasn't a contextual keyword, we're done.
if (!Tok.isContextualKeyword("isolated") &&
!Tok.isContextualKeyword("some") &&
!Tok.isContextualKeyword("any") &&
!Tok.isContextualKeyword("each") &&
!Tok.isContextualKeyword("__shared") &&
!Tok.isContextualKeyword("__owned") &&
!Tok.isContextualKeyword("borrowing") &&
!Tok.isContextualKeyword("consuming") &&
!Tok.is(tok::kw_repeat))
return true;
@@ -250,13 +254,14 @@ Parser::parseParameterClause(SourceLoc &leftParenLoc,
{
// ('inout' | '__shared' | '__owned' | isolated)?
bool hasSpecifier = false;
while (Tok.is(tok::kw_inout) ||
Tok.isContextualKeyword("__shared") ||
Tok.isContextualKeyword("__owned") ||
Tok.isContextualKeyword("borrowing") ||
Tok.isContextualKeyword("consuming") ||
Tok.isContextualKeyword("isolated") ||
Tok.isContextualKeyword("_const")) {
while (Tok.is(tok::kw_inout)
|| (canHaveParameterSpecifierContextualKeyword()
&& (Tok.isContextualKeyword("__shared")
|| Tok.isContextualKeyword("__owned")
|| Tok.isContextualKeyword("borrowing")
|| Tok.isContextualKeyword("consuming")
|| Tok.isContextualKeyword("isolated")
|| Tok.isContextualKeyword("_const")))) {
if (Tok.isContextualKeyword("isolated")) {
// did we already find an 'isolated' type modifier?
if (param.IsolatedLoc.isValid()) {