Skip to content

[Parse] Treat '@unknown' as the start of a statement #22974

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

Jump to bottom
Merged
merged 1 commit into from
Mar 1, 2019
Merged

[Parse] Treat '@unknown' as the start of a statement #22974

merged 1 commit into from
Mar 1, 2019

Conversation

@jrose-apple
Copy link
Contributor

@jrose-apple jrose-apple commented Feb 28, 2019

...allowing a plain return to work in a switch in a Void-returning function.

SR-9920

@jrose-apple jrose-apple requested a review from rintaro February 28, 2019 04:30
@jrose-apple
Copy link
Contributor Author

jrose-apple commented Feb 28, 2019

@rintaro Can you think of any other test cases I should add, or related issues I should fix while I'm here?

@swift-ci Please smoke test

@jrose-apple
Copy link
Contributor Author

jrose-apple commented Feb 28, 2019

@swift-ci Please test source compatibility

@rintaro
Copy link
Member

rintaro commented Feb 28, 2019 •
edited
Loading

👍
This patch should improve recovery for:

enum E {
  case foo, bar
}
func foo(e: E) {
  switch e {
  case .foo:
    _ = [1
  @unknown default:
    ()
  }
}
$ ../build/Ninja-ReleaseAssert/swift-macosx-x86_64/bin/swift test.swift
test.swift:8:11: error: expected ',' separator
    _ = [1
          ^
          ,
test.swift:9:3: error: expected expression in container literal
  @unknown default:
  ^
test.swift:6:3: error: switch must be exhaustive
  switch e {
  ^
test.swift:6:3: note: add missing case: '.bar'
  switch e {
  ^

@jrose-apple
[Parse] Treat '@unknown' as the start of a statement
048f5a4 
...allowing a plain 'return' to work in a switch in a Void-returning
function.

https://bugs.swift.org/browse/SR-9920
@jrose-apple jrose-apple force-pushed the return-to-the-unknown branch from 146eef1 to 048f5a4 Compare March 1, 2019 03:42
@jrose-apple
Copy link
Contributor Author

jrose-apple commented Mar 1, 2019

@swift-ci Please smoke test

@jrose-apple jrose-apple merged commit 003850f into swiftlang:master Mar 1, 2019
@jrose-apple jrose-apple deleted the return-to-the-unknown branch March 1, 2019 16:31
akyrtzi added a commit to akyrtzi/swift that referenced this pull request Mar 17, 2019
@akyrtzi
[parser] Fix infinite loop with erroneously placed attribute at state…
adfd09d 
…ment level

This infinite loop case was introduced after changes of swiftlang#22974
It was found by the stress tester.
@akyrtzi akyrtzi mentioned this pull request Mar 17, 2019
Merged
@belkadan belkadan mentioned this pull request Feb 28, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rintaro rintaro Awaiting requested review from rintaro

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jrose-apple @rintaro