bartek/smnp-kt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create validation on midi() function

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2020-03-14 14:20:46 +01:00
parent d3f6138a8b
commit ba23545e1b
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/io/smnp/evaluation/evaluator/AccessOperatorEvaluator.kt
View File

@@ -4,8 +4,8 @@ import io.smnp.dsl.ast.model.node.*
import io.smnp.environment.Environment
import io.smnp.error.EnvironmentException
import io.smnp.error.EvaluationException
import io.smnp.error.MethodInvocationException
import io.smnp.error.PositionException
import io.smnp.error.SmnpException
import io.smnp.evaluation.model.entity.EvaluatorOutput
class AccessOperatorEvaluator : Evaluator() {
@@ -36,9 +36,7 @@ class AccessOperatorEvaluator : Evaluator() {
(argsNode as FunctionCallArgumentsNode).items.map { evaluator.evaluate(it, environment).value }
try {
return EvaluatorOutput.value(environment.invokeMethod(lhs, identifier, arguments))
} catch(e: MethodInvocationException) {
throw PositionException(EnvironmentException(e, environment), identifierNode.position)
} catch(e: EvaluationException) {
} catch(e: SmnpException) {
throw PositionException(EnvironmentException(e, environment), identifierNode.position)
}
}

9
app/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionCallEvaluator.kt
View File

@@ -6,9 +6,8 @@ import io.smnp.dsl.ast.model.node.IdentifierNode
import io.smnp.dsl.ast.model.node.Node
import io.smnp.environment.Environment
import io.smnp.error.EnvironmentException
import io.smnp.error.EvaluationException
import io.smnp.error.FunctionInvocationException
import io.smnp.error.PositionException
import io.smnp.error.SmnpException
import io.smnp.evaluation.model.entity.EvaluatorOutput
class FunctionCallEvaluator : Evaluator() {
@@ -22,10 +21,8 @@ class FunctionCallEvaluator : Evaluator() {
try {
return EvaluatorOutput.value(environment.invokeFunction(identifier, arguments))
} catch(e: FunctionInvocationException) {
throw PositionException(EnvironmentException(e, environment), node.position)
} catch(e: EvaluationException) {
throw PositionException(EnvironmentException(e, environment), node.position)
} catch(e: SmnpException) {
throw PositionException(EnvironmentException(e, environment), identifierNode.position)
}
}
}