Allow separators to be omitted from lists. #22714

nate-chandler · 2019-02-19T19:06:11Z

Enables newlines to be used in place of separators in some lists.

nate-chandler · 2019-02-19T19:06:35Z

@swift-ci please test source compatibility

harlanhaskins · 2019-02-20T01:51:42Z

@swift-ci please test source compatibility

AnnaZaks · 2019-02-22T03:09:32Z

@swift-ci please test source compatibility

nate-chandler · 2019-03-11T19:29:40Z

@swift-ci please test source compatibility

nate-chandler · 2019-03-11T22:18:49Z

@swift-ci please test source compatibility

benlangmuir · 2019-03-22T21:56:40Z

@nate-chandler I wrote some tests for the IDE side; it looks like everything I've thought about is already working, which is great. I pushed an omit-comma-ide-tests branch to my swift fork: https://github.com/benlangmuir/swift/tree/omit-comma-ide-tests . You could probably just cherry-pick the two test commits at the top of that branch into this PR.

nate-chandler · 2019-03-22T23:43:08Z

@benlangmuir Fantastic! Will do.

nate-chandler · 2019-03-23T00:21:47Z

@benlangmuir Okay, the commits are cherry-picked to
cf8c2f6 and
97cfe0e .

benlangmuir · 2019-03-25T15:31:42Z

@swift-ci please test

swift-ci · 2019-03-25T15:33:52Z

Build failed
Swift Test Linux Platform
Git Sha - 28f1b7c

swift-ci · 2019-03-25T15:36:03Z

Build failed
Swift Test OS X Platform
Git Sha - 28f1b7c

nate-chandler · 2019-03-25T17:56:24Z

@swift-ci please test

swift-ci · 2019-03-25T17:58:31Z

Build failed
Swift Test Linux Platform
Git Sha - 97cfe0eb01f8118717a7794e41d92fabfd17e94a

swift-ci · 2019-03-25T18:00:30Z

Build failed
Swift Test OS X Platform
Git Sha - 97cfe0eb01f8118717a7794e41d92fabfd17e94a

nate-chandler · 2019-03-30T00:26:32Z

@swift-ci please test

swift-ci · 2019-03-30T00:28:29Z

Build failed
Swift Test Linux Platform
Git Sha - 8566d447e3545586c1aeb20a4ea8e9375ec87cb7

swift-ci · 2019-03-30T02:01:06Z

Build failed
Swift Test OS X Platform
Git Sha - 8566d447e3545586c1aeb20a4ea8e9375ec87cb7

nate-chandler · 2019-04-01T17:21:14Z

@swift-ci please test

swift-ci · 2019-04-01T17:23:31Z

Build failed
Swift Test Linux Platform
Git Sha - 11ffe3138759dbaadc802de834218ce7a0f236ca

swift-ci · 2019-04-01T17:25:16Z

Build failed
Swift Test OS X Platform
Git Sha - 11ffe3138759dbaadc802de834218ce7a0f236ca

Allowing them here enables function calls with argument labels whose names are contextual keywords that introduce stmts (for) and decls (protocol).

nate-chandler · 2019-04-05T00:50:08Z

@swift-ci please test source compatibility

swift-ci · 2019-04-05T00:51:00Z

Build failed
Swift Test Linux Platform
Git Sha - da4873b

swift-ci · 2019-04-05T01:53:37Z

Build failed
Swift Test OS X Platform
Git Sha - acdd16f

nate-chandler · 2019-04-05T02:55:20Z

@swift-ci Please clean test Linux platform

swift-ci · 2019-04-05T03:30:15Z

Build failed
Swift Test Linux Platform
Git Sha - acdd16f

lib/Parse/ParseDecl.cpp

lib/Parse/ParseExpr.cpp

lib/Parse/Parser.cpp

lib/Parse/ParseStmt.cpp

Fixed whitespace.

nate-chandler · 2019-04-05T17:20:32Z

@swift-ci please clean test

swift-ci · 2019-04-05T17:22:36Z

Build failed
Swift Test Linux Platform
Git Sha - acdd16f

swift-ci · 2019-04-05T17:24:41Z

Build failed
Swift Test OS X Platform
Git Sha - acdd16f

xedin

LGTM!

lib/Parse/Parser.cpp

nate-chandler · 2019-04-05T18:54:25Z

@swift-ci please clean test

swift-ci · 2019-04-05T18:56:26Z

Build failed
Swift Test Linux Platform
Git Sha - faecb8d

swift-ci · 2019-04-05T18:58:43Z

Build failed
Swift Test OS X Platform
Git Sha - faecb8d

nate-chandler · 2019-04-05T21:45:19Z

@swift-ci please test source compatibility

lib/Parse/Parser.cpp

tkremenek · 2019-04-10T02:12:31Z

@swift-ci build toolchain

tkremenek · 2019-04-10T16:02:12Z

@swift-ci clean build toolchain

tkremenek · 2019-04-10T16:02:49Z

@swift-ci clean build

nate-chandler · 2019-04-10T16:09:53Z

Toolchains:

macOS: https://ci.swift.org/job/swift-PR-toolchain-osx/272/artifact/branch-master/swift-PR-22714-272-osx.tar.gz
Linux: https://ci.swift.org/job/swift-PR-toolchain-Linux/211/artifact/branch-master/swift-PR-22714-211-ubuntu16.04.tar.gz

hartbit · 2019-04-11T05:28:27Z

I tried the toolchain and it doesn't seem to allow me eliding commas in parameter lists

nate-chandler · 2019-04-11T15:28:14Z

I tried the toolchain and it doesn't seem to allow me eliding commas in parameter lists

Hi @hartbit,

Thanks for the report! What you're seeing is intentional behavior. The proposed change allows comma elision only in expression lists.

func foo(
    _ a: Int, // required here
    _ b: Int
)
    -> Int
{
    return a + b
}

let s = foo(
    1 // optional here
    2
)

beccadax · 2019-04-15T01:21:19Z

Trying to build a toolchain with this feature and static subscripts.

nate-chandler changed the title ~~WIP: Allow separators to be omitted from lists.~~ [WIP] Allow separators to be omitted from lists. Mar 13, 2019

nate-chandler and others added 9 commits April 1, 2019 11:06

WIP: Allow separators to be omitted from lists.

83ede8b

Basic test coverage.

0222aaa

Allowed omission from function calls and tuples.

5b7c04b

Added tests on initializers.

57ea012

Corrected argument capitalization.

dd5a874

Add tests for indentation, swift-syntax for optional commas

ab31290

Add code-completion tests for optional commas

0d0d843

Corrected expected error messages in Parse/invalid.swift.

917d989

Stmts/decls can start line if separators omitted.

5cf817d

Allowing them here enables function calls with argument labels whose names are contextual keywords that introduce stmts (for) and decls (protocol).

nate-chandler requested a review from xedin April 5, 2019 00:51

xedin requested changes Apr 5, 2019

View reviewed changes

lib/Parse/ParseDecl.cpp Outdated Show resolved Hide resolved

lib/Parse/ParseExpr.cpp Outdated Show resolved Hide resolved

lib/Parse/Parser.cpp Outdated Show resolved Hide resolved

xedin reviewed Apr 5, 2019

View reviewed changes

lib/Parse/ParseStmt.cpp Outdated Show resolved Hide resolved

Lookahead in parseList, not isStartOf{Decl,Stmt}.

faecb8d

Fixed whitespace.

nate-chandler requested a review from xedin April 5, 2019 17:34

xedin approved these changes Apr 5, 2019

View reviewed changes

lib/Parse/Parser.cpp Outdated Show resolved Hide resolved

Unified two separate conditional blocks into one.

4b8c2f9

xedin reviewed Apr 5, 2019

View reviewed changes

lib/Parse/Parser.cpp Outdated Show resolved Hide resolved

Fixed whitespace.

2adc41d

nate-chandler closed this Jun 25, 2019

nate-chandler deleted the nate/omit-comma branch July 5, 2023 23:33

Allow separators to be omitted from lists. #22714

Allow separators to be omitted from lists. #22714

Conversation

nate-chandler commented Feb 19, 2019 • edited Loading

nate-chandler commented Feb 19, 2019

harlanhaskins commented Feb 20, 2019

AnnaZaks commented Feb 22, 2019

nate-chandler commented Mar 11, 2019

nate-chandler commented Mar 11, 2019

benlangmuir commented Mar 22, 2019 • edited Loading

nate-chandler commented Mar 22, 2019

nate-chandler commented Mar 23, 2019

benlangmuir commented Mar 25, 2019

swift-ci commented Mar 25, 2019

swift-ci commented Mar 25, 2019

nate-chandler commented Mar 25, 2019

swift-ci commented Mar 25, 2019

swift-ci commented Mar 25, 2019

nate-chandler commented Mar 30, 2019

swift-ci commented Mar 30, 2019

swift-ci commented Mar 30, 2019

nate-chandler commented Apr 1, 2019

swift-ci commented Apr 1, 2019

swift-ci commented Apr 1, 2019

nate-chandler commented Apr 5, 2019

swift-ci commented Apr 5, 2019

swift-ci commented Apr 5, 2019

nate-chandler commented Apr 5, 2019

swift-ci commented Apr 5, 2019

nate-chandler commented Apr 5, 2019

swift-ci commented Apr 5, 2019

swift-ci commented Apr 5, 2019

xedin left a comment

Choose a reason for hiding this comment

nate-chandler commented Apr 5, 2019

swift-ci commented Apr 5, 2019

swift-ci commented Apr 5, 2019

nate-chandler commented Apr 5, 2019

tkremenek commented Apr 10, 2019

tkremenek commented Apr 10, 2019

tkremenek commented Apr 10, 2019

nate-chandler commented Apr 10, 2019 • edited Loading

hartbit commented Apr 11, 2019

nate-chandler commented Apr 11, 2019

beccadax commented Apr 15, 2019

nate-chandler commented Feb 19, 2019 •

edited

Loading

benlangmuir commented Mar 22, 2019 •

edited

Loading

nate-chandler commented Apr 10, 2019 •

edited

Loading