kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-expression-evaluator] Improve exception texts

Browse Source
This commit is contained in:
Edwin Jakobs
2025-01-05 08:16:42 +01:00
parent 1e9c46e8f7
commit b82ffb93c9
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
orx-expression-evaluator-typed/src/commonMain/kotlin/typed/CompiledFunctions.kt
View File

@@ -28,9 +28,13 @@ fun <T0, R> compileFunction1(
return { p0 -> return { p0 ->
varP0 = p0 varP0 = p0
ParseTreeWalker.DEFAULT.walk(listener, root) try {
ParseTreeWalker.DEFAULT.walk(listener, root)
} catch(e: Throwable) {
throw RuntimeException("Error while evaluating '$expression' with parameter $parameter0=$p0. ${e.message}", e)
}
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
listener.state.lastExpressionResult as? R ?: error("no result") listener.state.lastExpressionResult as? R ?: error("No result while evaluating '$expression' with parameter $parameter0=$p0")
} }
} }

17
orx-expression-evaluator-typed/src/commonMain/kotlin/typed/TypedExpressions.kt
View File

@@ -781,7 +781,7 @@ abstract class TypedExpressionListenerBase(
IDType.VARIABLE -> s.valueStack.pushChecked( IDType.VARIABLE -> s.valueStack.pushChecked(
when (name) { when (name) {
"PI" -> PI "PI" -> PI
else -> constants(name) ?: errorValue("unresolved variable: '${name}'", 0.0 / 0.0) else -> constants(name) ?: errorValue("unresolved value: '${name}'. Available constant: ${constants}", Unit)
} }
) )
@@ -835,10 +835,15 @@ abstract class TypedExpressionListenerBase(
is Function<*> -> { is Function<*> -> {
fun input(): String {
return "in '${node.getParent()?.text}'"
}
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
receiver as (String) -> Any receiver as (String) -> Any?
val function = val function =
receiver.invoke(name) receiver.invoke(name) ?: error("Unresolved function '${name} ${input()}")
when (idType) { when (idType) {
IDType.MEMBER_FUNCTION0 -> { IDType.MEMBER_FUNCTION0 -> {
@@ -849,19 +854,19 @@ abstract class TypedExpressionListenerBase(
IDType.MEMBER_FUNCTION1 -> { IDType.MEMBER_FUNCTION1 -> {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
function as (Any) -> Any (function as? (Any) -> Any) ?: error("Cannot cast function '$name' ($function) to (Any) -> Any ${input()}")
s.functionStack.push({ x -> function(x[0]) }) s.functionStack.push({ x -> function(x[0]) })
} }
IDType.MEMBER_FUNCTION2 -> { IDType.MEMBER_FUNCTION2 -> {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
function as (Any, Any) -> Any function as? (Any, Any) -> Any ?: error("Cannot cast function '$name' ($function) to (Any, Any) -> Any ${input()}")
s.functionStack.push({ x -> function(x[0], x[1]) }) s.functionStack.push({ x -> function(x[0], x[1]) })
} }
IDType.MEMBER_FUNCTION3 -> { IDType.MEMBER_FUNCTION3 -> {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
function as (Any, Any, Any) -> Any function as? (Any, Any, Any) -> Any ?: error("Cannot cast function '$name' ($function) to (Any, Any, Any) -> Any ${input()}")
s.functionStack.push({ x -> function(x[0], x[1], x[2]) }) s.functionStack.push({ x -> function(x[0], x[1], x[2]) })
} }

2
orx-expression-evaluator/src/commonMain/kotlin/Expressions.kt
View File

@@ -261,7 +261,7 @@ internal class ExpressionListener(
IDType.VARIABLE -> doubleStack.push( IDType.VARIABLE -> doubleStack.push(
when (name) { when (name) {
"PI" -> PI "PI" -> PI
else -> constants[name] ?: errorValue("unresolved variable: '${name}'", 0.0 / 0.0) else -> constants[name] ?: errorValue("unresolved value: '${name}'. available values: ${constants}", 0.0 / 0.0)
} }
) )