Skip to content

Move a local function outside of the containing inline function #551

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
dkhalanskyjb merged 1 commit into from
Jul 7, 2025
Merged

Move a local function outside of the containing inline function #551

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
7 changes: 4 additions & 3 deletions core/commonKotlin/src/internal/Tzfile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ internal fun readTzFile(data: ByteArray): TzFile {
override fun toString(): String = "Ttinfo(utoff=$utoff, isdst=$isdst, abbrind=$abbrind)"
}

fun abbreviationForIndex(abbreviations: List<Byte>, startIndex: UByte): String = abbreviations.drop(startIndex.toInt())
.takeWhile { byte -> byte != 0.toByte() }.toByteArray().decodeToString()

inline fun BinaryDataReader.readData(header: Header, readTime: () -> Long): TzFileData {
val transitionTimes = List(header.timecnt) { readTime() }
val transitionTypes = List(header.timecnt) { readByte() }
Expand All @@ -99,8 +102,6 @@ internal fun readTzFile(data: ByteArray): TzFile {
)
}
val abbreviations = List(header.charcnt) { readByte() }
fun abbreviationForIndex(startIndex: UByte): String = abbreviations.drop(startIndex.toInt())
.takeWhile { byte -> byte != 0.toByte() }.toByteArray().decodeToString()
val leapSecondRules = List(header.leapcnt) {
TzFileData.LeapSecondRule(
readTime(),
Expand All @@ -114,7 +115,7 @@ internal fun readTzFile(data: ByteArray): TzFile {
return TzFileData(
leapSecondRules,
transitionTimes.zip(transitionTypes) { time, type -> TzFileData.Transition(time, type.toInt()) },
ttinfos.map { TzFileData.ClockState(TzFileOffset(it.utoff), it.isdst, abbreviationForIndex(it.abbrind)) }
ttinfos.map { TzFileData.ClockState(TzFileOffset(it.utoff), it.isdst, abbreviationForIndex(abbreviations, it.abbrind)) }
)
}

Expand Down