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

Add support for function/methods invocation on Evaluator

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2020-03-10 22:16:40 +01:00
parent d29ef61245
commit ab82ee8628
4 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/io/smnp/dsl/ast/model/node/FunctionCallNode.kt
View File

@@ -1,6 +1,9 @@
package io.smnp.dsl.ast.model.node package io.smnp.dsl.ast.model.node
class FunctionCallNode(identifier: Node, arguments: Node) : Node(2, identifier.position) { class FunctionCallNode(identifier: Node, arguments: Node) : Node(2, identifier.position) {
operator fun component1() = children[0]
operator fun component2() = children[1]
val identifier: Node val identifier: Node
get() = children[0] get() = children[0]

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

@@ -1,9 +1,6 @@
package io.smnp.evaluation.evaluator package io.smnp.evaluation.evaluator
import io.smnp.dsl.ast.model.node.AccessOperatorNode import io.smnp.dsl.ast.model.node.*
import io.smnp.dsl.ast.model.node.FunctionCallNode
import io.smnp.dsl.ast.model.node.IdentifierNode
import io.smnp.dsl.ast.model.node.Node
import io.smnp.environment.Environment import io.smnp.environment.Environment
import io.smnp.error.EvaluationException import io.smnp.error.EvaluationException
import io.smnp.evaluation.model.entity.EvaluatorOutput import io.smnp.evaluation.model.entity.EvaluatorOutput
@@ -22,8 +19,10 @@ class AccessOperatorEvaluator : Evaluator() {
EvaluatorOutput.value(lhs.properties[rhs] ?: throw EvaluationException("Unknown property $rhs of type ${lhs.type.name.toLowerCase()}", rhsNode.position)) EvaluatorOutput.value(lhs.properties[rhs] ?: throw EvaluationException("Unknown property $rhs of type ${lhs.type.name.toLowerCase()}", rhsNode.position))
} }
is FunctionCallNode -> { is FunctionCallNode -> {
// todo Implement when methods become available val (identifierNode, argsNode) = rhsNode
EvaluatorOutput.fail() val identifier = (identifierNode as IdentifierNode).token.rawValue
val arguments = (argsNode as FunctionCallArgumentsNode).items.map { evaluator.evaluate(it, environment).value!! }
return EvaluatorOutput.value(environment.invokeMethod(lhs, identifier, arguments))
} }
else -> { else -> {
throw EvaluationException("Invalid property access type - only property name and method call are allowed", rhsNode.position) throw EvaluationException("Invalid property access type - only property name and method call are allowed", rhsNode.position)

4
app/src/main/kotlin/io/smnp/evaluation/evaluator/ExpressionEvaluator.kt
View File

@@ -25,7 +25,9 @@ class ExpressionEvaluator : Evaluator() {
SumOperatorEvaluator(), SumOperatorEvaluator(),
AccessOperatorEvaluator(), AccessOperatorEvaluator(),
LogicOperatorEvaluator(), LogicOperatorEvaluator(),
RelationOperatorEvaluator() RelationOperatorEvaluator(),
FunctionCallEvaluator()
).evaluate(node, environment) ).evaluate(node, environment)
if(output.result == EvaluationResult.OK) { if(output.result == EvaluationResult.OK) {

21
app/src/main/kotlin/io/smnp/evaluation/evaluator/FunctionCallEvaluator.kt Normal file
View File

@@ -0,0 +1,21 @@
package io.smnp.evaluation.evaluator
import io.smnp.dsl.ast.model.node.FunctionCallArgumentsNode
import io.smnp.dsl.ast.model.node.FunctionCallNode
import io.smnp.dsl.ast.model.node.IdentifierNode
import io.smnp.dsl.ast.model.node.Node
import io.smnp.environment.Environment
import io.smnp.evaluation.model.entity.EvaluatorOutput
class FunctionCallEvaluator : Evaluator() {
override fun supportedNodes() = listOf(FunctionCallNode::class)
override fun tryToEvaluate(node: Node, environment: Environment): EvaluatorOutput {
val evaluator = assert(ExpressionEvaluator(), "expression")
val (identifierNode, argsNode) = node as FunctionCallNode
val identifier = (identifierNode as IdentifierNode).token.rawValue
val arguments = (argsNode as FunctionCallArgumentsNode).items.map { evaluator.evaluate(it, environment).value!! }
return EvaluatorOutput.value(environment.invokeFunction(identifier, arguments))
}
}