Source parser and stream utils #117
Conversation
� Conflicts: � ktoml-file/src/commonMain/kotlin/com/akuleshov7/ktoml/file/FileUtils.kt
ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/parsers/TomlParser.kt
Outdated
Show resolved
Hide resolved
ktoml-source/src/commonMain/kotlin/com/akuleshov7/ktoml/source/TomlSourceReader.kt
Outdated
Show resolved
Hide resolved
ktoml-source/src/commonMain/kotlin/com/akuleshov7/ktoml/source/TomlSourceReader.kt
Outdated
Show resolved
Hide resolved
ktoml-source/src/commonTest/kotlin/com/akuleshov7/ktoml/file/TomlSourceParserTest.kt
Show resolved
Hide resolved
ktoml-source/src/jvmMain/kotlin/com/akuleshov7/ktoml/source/JvmStreams.kt
Show resolved
Hide resolved
ktoml-source/src/jvmTest/kotlin/com/akuleshov7/ktoml/source/StreamTests.kt
Outdated
Show resolved
Hide resolved
| /** | ||
| * Read from source one line at a time and passes the lines to the [decoder] function. | ||
| */ | ||
| public inline fun <T> Source.useLines(decoder: (Sequence<String>) -> T): T { |
There was a problem hiding this comment.
is it possible to rename it to something more clear? :)
readAndDecodeLines or something like this?
|
May be you can also add some small example to the readme? You have added new logic to the API, that can be useful for users. I fixed diktat/detekt code style issues and fixed some small typos |
|
@akuleshov7 I'll try to look at your comments today, but I may have to delay until next week, I'm a little bit swamped right now |
|
@bishiboosh, you have been waiting for a review for a half of a year (sorry), so I do not think it is a problem for me to wait several week😅 |
|
Only today I have noticed that this PR was opened in the same day when this awful war started exactly one year ago. I have opened #188 to finalise this PR: we need also to think how to reduce the number of affected users of the library. |
� Conflicts: � gradlew.bat � kotlin-js-store/yarn.lock � ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/Toml.kt � ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/parsers/TomlParser.kt � ktoml-core/src/commonTest/kotlin/com/akuleshov7/ktoml/decoders/multiline/BasicMultilineStringDecoderTest.kt � ktoml-file/build.gradle.kts � ktoml-file/src/commonMain/kotlin/com/akuleshov7/ktoml/file/TomlFileReader.kt � ktoml-file/src/commonMain/kotlin/com/akuleshov7/ktoml/file/TomlFileWriter.kt � ktoml-file/src/commonTest/kotlin/com/akuleshov7/ktoml/file/TomlFileParserTest.kt � ktoml-source/src/jvmTest/resources/com/akuleshov7/ktoml/source/class_cast_regression1.toml
|
And finally, after more than a year, I have merged conflicts 🥳 |
| @@ -4,8 +4,8 @@ | |||
| "PACKAGE_NAME_INCORRECT_PATH") | |||
|
|
|||
| object Versions { | |||
| const val KOTLIN = "1.6.21" | |||
| const val KOTLIN = "1.8.0" | |||
There was a problem hiding this comment.
good note, thanks, updated to 1.8.21
The main motivation for this PR is to replicate what's done in https://github.com/Kotlin/kotlinx.serialization/blob/master/formats/json/jvmMain/src/kotlinx/serialization/json/JvmStreams.kt, because I'm using ktoml currently in an Android app and using streams directly without copying them to memory first would be a huge advantage to me.
The modifications done to the lib are the following:
parseStringsToTomlTreeto use a sequence instead of a list.Sourcektoml-file, allowing to avoid copying the file to memory while parsing itInputStreamI realize that this introduces JVM-only code, so I could spin the stream-related methods into a new project if needs be.