Skip to content

DateComponents: Fix Overlapping accesses to 'self' warnings. #1345

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
Nov 29, 2017
Merged

DateComponents: Fix Overlapping accesses to 'self' warnings. #1345

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
73 changes: 58 additions & 15 deletions Foundation/DateComponents.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,92 +88,131 @@ public struct DateComponents : ReferenceConvertible, Hashable, Equatable, _Mutab
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var era: Int? {
get { return _handle.map { _getter($0.era) } }
set { _applyMutation { $0.era = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.era = value }
}
}

/// A year or count of years.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var year: Int? {
get { return _handle.map { _getter($0.year) } }
set { _applyMutation { $0.year = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.year = value }
}
}

/// A month or count of months.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var month: Int? {
get { return _handle.map { _getter($0.month) } }
set { _applyMutation { $0.month = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.month = value }
}
}

/// A day or count of days.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var day: Int? {
get { return _handle.map { _getter($0.day) } }
set { _applyMutation { $0.day = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.day = value }
}
}

/// An hour or count of hours.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var hour: Int? {
get { return _handle.map { _getter($0.hour) } }
set { _applyMutation { $0.hour = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.hour = value }
}
}

/// A minute or count of minutes.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var minute: Int? {
get { return _handle.map { _getter($0.minute) } }
set { _applyMutation { $0.minute = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.minute = value }
}
}

/// A second or count of seconds.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var second: Int? {
get { return _handle.map { _getter($0.second) } }
set { _applyMutation { $0.second = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.second = value }
}
}

/// A nanosecond or count of nanoseconds.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var nanosecond: Int? {
get { return _handle.map { _getter($0.nanosecond) } }
set { _applyMutation { $0.nanosecond = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.nanosecond = value }
}
}

/// A weekday or count of weekdays.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var weekday: Int? {
get { return _handle.map { _getter($0.weekday) } }
set { _applyMutation { $0.weekday = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.weekday = value }
}
}

/// A weekday ordinal or count of weekday ordinals.
/// Weekday ordinal units represent the position of the weekday within the next larger calendar unit, such as the month. For example, 2 is the weekday ordinal unit for the second Friday of the month.///
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var weekdayOrdinal: Int? {
get { return _handle.map { _getter($0.weekdayOrdinal) } }
set { _applyMutation { $0.weekdayOrdinal = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.weekdayOrdinal = value }
}
}

/// A quarter or count of quarters.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var quarter: Int? {
get { return _handle.map { _getter($0.quarter) } }
set { _applyMutation { $0.quarter = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.quarter = value }
}
}

/// A week of the month or a count of weeks of the month.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var weekOfMonth: Int? {
get { return _handle.map { _getter($0.weekOfMonth) } }
set { _applyMutation { $0.weekOfMonth = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.weekOfMonth = value }
}
}

/// A week of the year or count of the weeks of the year.
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var weekOfYear: Int? {
get { return _handle.map { _getter($0.weekOfYear) } }
set { _applyMutation { $0.weekOfYear = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.weekOfYear = value }
}
}

/// The ISO 8601 week-numbering year of the receiver.
Expand All @@ -184,7 +223,10 @@ public struct DateComponents : ReferenceConvertible, Hashable, Equatable, _Mutab
/// - note: This value is interpreted in the context of the calendar in which it is used.
public var yearForWeekOfYear: Int? {
get { return _handle.map { _getter($0.yearForWeekOfYear) } }
set { _applyMutation { $0.yearForWeekOfYear = _setter(newValue) } }
set {
let value = _setter(newValue)
_applyMutation { $0.yearForWeekOfYear = value }
}
}

/// Set to true if these components represent a leap month.
Expand Down Expand Up @@ -217,8 +259,9 @@ public struct DateComponents : ReferenceConvertible, Hashable, Equatable, _Mutab
///
/// The calendar and timeZone and isLeapMonth properties cannot be set by this method.
public mutating func setValue(_ value: Int?, for component: Calendar.Component) {
let _value = _setter(value)
_applyMutation {
$0.setValue(_setter(value), forComponent: Calendar._toCalendarUnit([component]))
$0.setValue(_value, forComponent: Calendar._toCalendarUnit([component]))
}
}

Expand Down