From 5ca4a21edfb29a544c63499290e508c694c50162 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 16 Jul 2018 10:10:33 +0200
Subject: [PATCH] Convert evaluator interface to function

---
 .../src/kotlin/script/experimental/api/scriptEvaluation.kt    | 4 +---
 .../src/kotlin/script/experimental/host/BasicScriptingHost.kt | 2 +-
 .../experimental/jvm/runners/BasicJvmScriptEvaluator.kt       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt
index b9a4f2fb536..e1b69d5b149 100644
--- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt
+++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptEvaluation.kt
@@ -26,9 +26,7 @@ data class EvaluationResult(val returnValue: Any?, val environment: ScriptEvalua
 
 interface ScriptEvaluator {
 
-    // constructor(properties: ScriptDefinitionPropertiesBag) // the constructor is expected from implementations
-
-    suspend fun eval(
+    suspend operator fun invoke(
         compiledScript: CompiledScript<*>,
         scriptEvaluationEnvironment: ScriptEvaluationEnvironment
     ): ResultWithDiagnostics<EvaluationResult>
diff --git a/libraries/scripting/common/src/kotlin/script/experimental/host/BasicScriptingHost.kt b/libraries/scripting/common/src/kotlin/script/experimental/host/BasicScriptingHost.kt
index 04f7f2bf9ba..5a07e2e5aa4 100644
--- a/libraries/scripting/common/src/kotlin/script/experimental/host/BasicScriptingHost.kt
+++ b/libraries/scripting/common/src/kotlin/script/experimental/host/BasicScriptingHost.kt
@@ -40,7 +40,7 @@ abstract class BasicScriptingHost(
             when (compiled) {
                 is ResultWithDiagnostics.Failure -> compiled
                 is ResultWithDiagnostics.Success -> {
-                    evaluator.eval(compiled.value, environment)
+                    evaluator(compiled.value, environment)
                 }
             }
         }
diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/runners/BasicJvmScriptEvaluator.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/runners/BasicJvmScriptEvaluator.kt
index f93de6d3d23..247efdba94e 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/runners/BasicJvmScriptEvaluator.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/runners/BasicJvmScriptEvaluator.kt
@@ -9,7 +9,7 @@ import kotlin.script.experimental.api.*
 
 open class BasicJvmScriptEvaluator() : ScriptEvaluator {
 
-    override suspend fun eval(
+    override suspend operator fun invoke(
         compiledScript: CompiledScript<*>,
         scriptEvaluationEnvironment: ScriptEvaluationEnvironment
     ): ResultWithDiagnostics<EvaluationResult> =