Skip to content

Commit ce197e5

Browse files
committed
Rename DayOfWeek.number to isoDayNumber
1 parent b4b0c01 commit ce197e5

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

core/commonMain/src/DayOfWeek.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public expect enum class DayOfWeek {
1717
SUNDAY;
1818
}
1919

20-
public val DayOfWeek.number: Int get() = ordinal + 1
20+
public val DayOfWeek.isoDayNumber: Int get() = ordinal + 1
2121

2222
@SharedImmutable
2323
private val allDaysOfWeek = DayOfWeek.values().asList()
24-
public fun DayOfWeek(number: Int): DayOfWeek {
25-
require(number in 1..7)
26-
return allDaysOfWeek[number - 1]
24+
public fun DayOfWeek(isoDayNumber: Int): DayOfWeek {
25+
require(isoDayNumber in 1..7)
26+
return allDaysOfWeek[isoDayNumber - 1]
2727
}

core/commonTest/src/LocalDateTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class LocalDateTest {
2222
assertEquals(month, value.monthNumber)
2323
assertEquals(Month(month), value.month)
2424
assertEquals(day, value.dayOfMonth)
25-
if (dayOfWeek != null) assertEquals(dayOfWeek, value.dayOfWeek.number)
25+
if (dayOfWeek != null) assertEquals(dayOfWeek, value.dayOfWeek.isoDayNumber)
2626
if (dayOfYear != null) assertEquals(dayOfYear, value.dayOfYear)
2727

2828
val fromComponents = LocalDate(year, month, day)
@@ -31,7 +31,7 @@ class LocalDateTest {
3131

3232
fun checkLocalDateTimePart(date: LocalDate, datetime: LocalDateTime) {
3333
checkEquals(date, datetime.date)
34-
checkComponents(date, datetime.year, datetime.monthNumber, datetime.dayOfMonth, datetime.dayOfWeek.number, datetime.dayOfYear)
34+
checkComponents(date, datetime.year, datetime.monthNumber, datetime.dayOfMonth, datetime.dayOfWeek.isoDayNumber, datetime.dayOfYear)
3535
}
3636

3737
@Test

core/commonTest/src/LocalDateTimeTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ fun checkComponents(value: LocalDateTime, year: Int, month: Int, day: Int, hour:
120120
assertEquals(minute, value.minute, "minutes")
121121
assertEquals(second, value.second, "seconds")
122122
assertEquals(nanosecond, value.nanosecond, "nanoseconds")
123-
if (dayOfWeek != null) assertEquals(dayOfWeek, value.dayOfWeek.number, "weekday")
123+
if (dayOfWeek != null) assertEquals(dayOfWeek, value.dayOfWeek.isoDayNumber, "weekday")
124124
if (dayOfYear != null) assertEquals(dayOfYear, value.dayOfYear, "day of year")
125125

126126
val fromComponents = LocalDateTime(year, month, day, hour, minute, second, nanosecond)

core/nativeTest/src/ThreeTenBpLocalDateTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class ThreeTenBpLocalDateTest {
6262
for (i in 1..length) {
6363
val d = LocalDate(2007, month, i)
6464
assertSame(d.dayOfWeek, dow)
65-
dow = DayOfWeek(dow.number % 7 + 1)
65+
dow = DayOfWeek(dow.isoDayNumber % 7 + 1)
6666
}
6767
}
6868
}

0 commit comments

Comments
 (0)