flecomte/postgres-json
1
1
Fork 0
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

clean

Browse Source
This commit is contained in:
Fabrice Lecomte
2023-06-03 01:09:28 +02:00
parent 96aaa1ada9
commit 817912dd5b
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/kotlin/fr/postgresjson/definition/Function.kt
View File

@@ -11,22 +11,6 @@ class Function(
override val source: Path? = null,
) : Resource, ParametersInterface {
// private fun <T> NextScript<T>.changeValue(block: (T) -> T): NextScript<T> {
// return NextScript(block(value), restOfScript)
// }
//
// private fun <T> NextScript<T>.changeScript(block: (String) -> String): NextScript<T> {
// return NextScript(value, block(restOfScript))
// }
//
// private fun <T> NextScript<T>.dropOneOf(vararg endTextList: String): NextScript<T> {
// return changeScript { script ->
// endTextList
// .filter { script.startsWith(it) }
// .let { script.drop(it.size) }
// }
// }
fun getDefinition(): String = parameters
.filter { it.direction == IN }
.joinToString(", ") { it.type.toString() }

4
src/main/kotlin/fr/postgresjson/definition/parse/ParsingFunction.kt
View File

@@ -32,7 +32,7 @@ internal fun parseFunction(script: String, source: Path? = null): Function {
internal fun ScriptPart.getFunctionName(): NextScript<String> {
try {
return getNextScript { status.isNotEscaped() && afterBeginBy("(", " ", "\n") }
.changeValue { unescapeOrLowercase() }
.changeValue(String::unescapeOrLowercase)
} catch (e: ParseException) {
throw FunctionNameMalformed(this, e)
}
@@ -96,7 +96,7 @@ private fun ScriptPart.getParameterMode(): NextScript<Direction> {
private fun ScriptPart.getParameterName(): NextScript<String> {
try {
return getNextScript { afterBeginBy(" ", "\n") && status.isNotEscaped() }
.changeValue { unescapeOrLowercase() }
.changeValue(String::unescapeOrLowercase)
} catch (e: ParseException) {
throw ParameterNameMalformed(this, e)
}

14
src/main/kotlin/fr/postgresjson/definition/parse/ParsingHelper.kt
View File

@@ -149,13 +149,25 @@ internal inline fun ScriptPart.change(block: String.() -> String): ScriptPart {
}
@OptIn(ExperimentalContracts::class)
internal inline fun <T> NextScript<T>.changeValue(block: T.() -> T): NextScript<T> {
internal inline fun <T> NextScript<T>.changeValue(block: (T) -> T): NextScript<T> {
contract {
callsInPlace(block, EXACTLY_ONCE)
}
return NextScript(value.run(block), nextScriptPart.restOfScript)
}
internal fun <T> NextScript<T>.changeScript(block: (String) -> String): NextScript<T> {
return NextScript(value, block(restOfScript))
}
internal fun <T> NextScript<T>.dropOneOf(vararg endTextList: String): NextScript<T> {
return changeScript { script ->
endTextList
.filter { script.startsWith(it) }
.let { script.drop(it.size) }
}
}
internal fun ScriptPart.getNextInteger(): NextScript<Int?> {
val digits = restOfScript.takeWhile { it.isDigit() }
val restOfScript = restOfScript.trimStart { it.isDigit() }