Skip to content

[Syntax] Fix tuple type element parsing #25843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2019
+288 −2
Merged

[Syntax] Fix tuple type element parsing #25843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/Parse/ParseType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,7 @@ ParserResult<TupleTypeRepr> Parser::parseTypeTupleBody() {

// Parse optional '...'.
if (Tok.isEllipsis()) {
Tok.setKind(tok::ellipsis);
auto ElementEllipsisLoc = consumeToken();
if (EllipsisLoc.isInvalid()) {
EllipsisLoc = ElementEllipsisLoc;
Expand Down
4 changes: 4 additions & 0 deletions test/Syntax/serialize_tupletype.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// RUN: %swift-syntax-test -input-source-filename %s -serialize-raw-tree > %t.result
// RUN: diff %t.result %s.result

typealias x = (_ b: Int, _: String)
281 changes: 281 additions & 0 deletions test/Syntax/serialize_tupletype.swift.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,281 @@
{
"id": 24,
"kind": "SourceFile",
"layout": [
{
"id": 23,
"kind": "CodeBlockItemList",
"layout": [
{
"id": 21,
"kind": "CodeBlockItem",
"layout": [
{
"id": 20,
"kind": "TypealiasDecl",
"layout": [
null,
null,
{
"id": 1,
"tokenKind": {
"kind": "kw_typealias"
},
"leadingTrivia": [
{
"kind": "LineComment",
"value": "\/\/ RUN: %swift-syntax-test -input-source-filename %s -serialize-raw-tree > %t.result"
},
{
"kind": "Newline",
"value": 1
},
{
"kind": "LineComment",
"value": "\/\/ RUN: diff %t.result %s.result"
},
{
"kind": "Newline",
"value": 2
}
],
"trailingTrivia": [
{
"kind": "Space",
"value": 1
}
],
"presence": "Present"
},
{
"id": 2,
"tokenKind": {
"kind": "identifier",
"text": "x"
},
"leadingTrivia": [],
"trailingTrivia": [
{
"kind": "Space",
"value": 1
}
],
"presence": "Present"
},
null,
{
"id": 19,
"kind": "TypeInitializerClause",
"layout": [
{
"id": 3,
"tokenKind": {
"kind": "equal"
},
"leadingTrivia": [],
"trailingTrivia": [
{
"kind": "Space",
"value": 1
}
],
"presence": "Present"
},
{
"id": 18,
"kind": "TupleType",
"layout": [
{
"id": 4,
"tokenKind": {
"kind": "l_paren"
},
"leadingTrivia": [],
"trailingTrivia": [],
"presence": "Present"
},
{
"id": 16,
"kind": "TupleTypeElementList",
"layout": [
{
"id": 11,
"kind": "TupleTypeElement",
"layout": [
null,
{
"id": 5,
"tokenKind": {
"kind": "kw__"
},
"leadingTrivia": [],
"trailingTrivia": [
{
"kind": "Space",
"value": 1
}
],
"presence": "Present"
},
{
"id": 6,
"tokenKind": {
"kind": "identifier",
"text": "b"
},
"leadingTrivia": [],
"trailingTrivia": [],
"presence": "Present"
},
{
"id": 7,
"tokenKind": {
"kind": "colon"
},
"leadingTrivia": [],
"trailingTrivia": [
{
"kind": "Space",
"value": 1
}
],
"presence": "Present"
},
{
"id": 9,
"kind": "SimpleTypeIdentifier",
"layout": [
{
"id": 8,
"tokenKind": {
"kind": "identifier",
"text": "Int"
},
"leadingTrivia": [],
"trailingTrivia": [],
"presence": "Present"
},
null
],
"presence": "Present"
},
null,
null,
{
"id": 10,
"tokenKind": {
"kind": "comma"
},
"leadingTrivia": [],
"trailingTrivia": [
{
"kind": "Space",
"value": 1
}
],
"presence": "Present"
}
],
"presence": "Present"
},
{
"id": 15,
"kind": "TupleTypeElement",
"layout": [
null,
{
"id": 12,
"tokenKind": {
"kind": "kw__"
},
"leadingTrivia": [],
"trailingTrivia": [],
"presence": "Present"
},
null,
{
"id": 7,
"tokenKind": {
"kind": "colon"
},
"leadingTrivia": [],
"trailingTrivia": [
{
"kind": "Space",
"value": 1
}
],
"presence": "Present"
},
{
"id": 14,
"kind": "SimpleTypeIdentifier",
"layout": [
{
"id": 13,
"tokenKind": {
"kind": "identifier",
"text": "String"
},
"leadingTrivia": [],
"trailingTrivia": [],
"presence": "Present"
},
null
],
"presence": "Present"
},
null,
null,
null
],
"presence": "Present"
}
],
"presence": "Present"
},
{
"id": 17,
"tokenKind": {
"kind": "r_paren"
},
"leadingTrivia": [],
"trailingTrivia": [],
"presence": "Present"
}
],
"presence": "Present"
}
],
"presence": "Present"
},
null
],
"presence": "Present"
},
null,
null
],
"presence": "Present"
}
],
"presence": "Present"
},
{
"id": 22,
"tokenKind": {
"kind": "eof",
"text": ""
},
"leadingTrivia": [
{
"kind": "Newline",
"value": 1
}
],
"trailingTrivia": [],
"presence": "Present"
}
],
"presence": "Present"
}
4 changes: 2 additions & 2 deletions utils/gyb_syntax_support/TypeNodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
Node('TupleTypeElement', kind='Syntax',
traits=['WithTrailingComma'],
children=[
Child('InOut', kind='InOutToken',
Child('InOut', kind='InoutToken',
is_optional=True),
Child('Name', kind='Token',
is_optional=True,
Expand All @@ -135,7 +135,7 @@
Child('Colon', kind='ColonToken',
is_optional=True),
Child('Type', kind='Type'),
Child('Ellipsis', kind='Token',
Child('Ellipsis', kind='EllipsisToken',
is_optional=True),
Child('Initializer', kind='InitializerClause',
is_optional=True),
Expand Down