Skip to content

[5.1] Bring property wrappers up-to-date with the proposal under review #25484

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 8 commits into from
Jun 17, 2019
Merged

[5.1] Bring property wrappers up-to-date with the proposal under review #25484

merged 8 commits into from
Jun 17, 2019

Conversation

DougGregor
Copy link
Member

Bring property 3wrappers up-to-date with the current proposal under review, which includes:

  • Add support for composing multiple property wrappers
  • Rename value to wrappedValue, but support the old name with a warning + Fix-It
  • Allow both initial-value and explicit initialization to work together
  • Make the $ property internal when wrappedValue is present

Should fix rdar://problem/51576815

@DougGregor
[SE-0258] Implement basic support for property wrapper composition.
26f0b74 
When multiple property wrapper attributes are provided on a declaration,
compose them outside-in to form a composite property wrapper type. For
example,

  @A @b @C var foo = 17

will produce

  var $foo = A(initialValue: B(initialValue: C(initialValue: 17)))

and foo's getter/setter will access "foo.value.value.value".

(cherry picked from commit 82ed5e9)
@DougGregor
[SE-0258] Clean up some code repetition involving initialization forms.
18f17fd 
(cherry picked from commit 166a6b8)
@DougGregor
[SE-0258] Rewrite findOriginalPropertyWrapperInitialValue() for compo…
f2c9fcc 
…sition.

Rewrite findOriginalPropertyWrapperInitialValue() to cope with composition
of property wrappers, making it more robust in the process.

Should fix rdar://problem/51576815.

(cherry picked from commit e857852)
@DougGregor
[SE-0258] More tests and hardening for property wrapper composition
a19050c 
(cherry picked from commit 8cc7f09)
@DougGregor
[SE-0258] Rename 'value' to 'wrappedValue'.
ab95774 
The latter name is far less likely to conflict. Maintain backward compatibility
by also accepting 'value' (with a warning).

(cherry picked from commit 99b40ba)
@DougGregor
[SE-0258] Support initial values & explicit initialization arguments.
2a03cc0 
Allow both explicit initialization and initial values to work together, e.g.,

```
@clamping(min: 0, max: 255) var red: Int = 127
```

gets initialized as

```
Clamping(initialValue: 127, min: 0, max: 255)
```

(cherry picked from commit d35e1ea)
@DougGregor
[SE-0258] Add a Fix-It for the value -> wrappedValue rename.
339d3c2 
(cherry picked from commit 99d42c4)
@DougGregor
[SE-0258] Escalate access of wrapperValue-produced $x to internal.
b450fea 
(cherry picked from commit 1160017)
@DougGregor
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - b450fea

@DougGregor DougGregor merged commit 5a124f1 into swiftlang:swift-5.1-branch Jun 17, 2019
@DougGregor DougGregor deleted the property-wrappers-5.1 branch June 17, 2019 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@DougGregor @swift-ci