azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[minor] rename function

Browse Source
This commit is contained in:
Ilya Chernikov
2018-09-06 12:54:52 +02:00
parent ba2e08c014
commit 34569071b3
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/scripting/jvm-maven-deps/host/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/host/host.kt
+2 -2
View File
@@ -11,11 +11,11 @@ import kotlin.script.experimental.api.EvaluationResult
import kotlin.script.experimental.api.ResultWithDiagnostics import kotlin.script.experimental.api.ResultWithDiagnostics
import kotlin.script.experimental.host.toScriptSource import kotlin.script.experimental.host.toScriptSource
import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
import kotlin.script.experimental.jvmhost.createCompilationConfigurationFromTemplate import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> { fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
val compilationConfiguration = createCompilationConfigurationFromTemplate<ScriptWithMavenDeps>() val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<ScriptWithMavenDeps>()
return BasicJvmScriptingHost().eval(scriptFile.toScriptSource(), compilationConfiguration, null) return BasicJvmScriptingHost().eval(scriptFile.toScriptSource(), compilationConfiguration, null)
} }
libraries/examples/scripting/jvm-simple-script/host/src/org/jetbrains/kotlin/script/examples/jvm/simple/host/host.kt
+2 -2
View File
@@ -13,10 +13,10 @@ import kotlin.script.experimental.host.toScriptSource
import kotlin.script.experimental.jvm.dependenciesFromCurrentContext import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
import kotlin.script.experimental.jvm.jvm import kotlin.script.experimental.jvm.jvm
import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost import kotlin.script.experimental.jvmhost.BasicJvmScriptingHost
import kotlin.script.experimental.jvmhost.createCompilationConfigurationFromTemplate import kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromTemplate
fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> { fun evalFile(scriptFile: File): ResultWithDiagnostics<EvaluationResult> {
val compilationConfiguration = createCompilationConfigurationFromTemplate<SimpleScript> { val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<SimpleScript> {
jvm { jvm {
dependenciesFromCurrentContext( dependenciesFromCurrentContext(
"scripting-jvm-simple-script" /* script library jar name */ "scripting-jvm-simple-script" /* script library jar name */
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/BasicJvmScriptingHost.kt
+1 -1
View File
@@ -20,7 +20,7 @@ open class BasicJvmScriptingHost(
) : BasicScriptingHost(compiler, evaluator) ) : BasicScriptingHost(compiler, evaluator)
inline fun <reified T : Any> createCompilationConfigurationFromTemplate( inline fun <reified T : Any> createJvmCompilationConfigurationFromTemplate(
hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration, hostConfiguration: ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration,
noinline body: ScriptCompilationConfiguration.Builder.() -> Unit = {} noinline body: ScriptCompilationConfiguration.Builder.() -> Unit = {}
): ScriptCompilationConfiguration = createCompilationConfigurationFromTemplate( ): ScriptCompilationConfiguration = createCompilationConfigurationFromTemplate(
libraries/scripting/jvm-host/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt
+3 -3
View File
@@ -67,7 +67,7 @@ class ScriptingHostTest {
val host = BasicJvmScriptingHost(compiler = compiler, evaluator = evaluator) val host = BasicJvmScriptingHost(compiler = compiler, evaluator = evaluator)
Assert.assertTrue(cache.baseDir.listFiles().isEmpty()) Assert.assertTrue(cache.baseDir.listFiles().isEmpty())
val scriptCompilationConfiguration = createCompilationConfigurationFromTemplate<SimpleScriptTemplate>() val scriptCompilationConfiguration = createJvmCompilationConfigurationFromTemplate<SimpleScriptTemplate>()
var compiledScript: CompiledScript<*>? = null var compiledScript: CompiledScript<*>? = null
val output = captureOut { val output = captureOut {
@@ -110,7 +110,7 @@ class ScriptingHostTest {
@Test @Test
fun testCompiledScriptClassLoader() { fun testCompiledScriptClassLoader() {
val script = "val x = 1" val script = "val x = 1"
val scriptCompilationConfiguration = createCompilationConfigurationFromTemplate<SimpleScriptTemplate>() val scriptCompilationConfiguration = createJvmCompilationConfigurationFromTemplate<SimpleScriptTemplate>()
val compiler = JvmScriptCompiler(defaultJvmScriptingHostConfiguration) val compiler = JvmScriptCompiler(defaultJvmScriptingHostConfiguration)
val compiledScript = runBlocking { val compiledScript = runBlocking {
val res = compiler(script.toScriptSource(), scriptCompilationConfiguration).throwOnFailure() val res = compiler(script.toScriptSource(), scriptCompilationConfiguration).throwOnFailure()
@@ -147,7 +147,7 @@ fun ResultWithDiagnostics<*>.throwOnFailure(): ResultWithDiagnostics<*> = apply
} }
private fun evalScript(script: String, host: BasicScriptingHost = BasicJvmScriptingHost()) { private fun evalScript(script: String, host: BasicScriptingHost = BasicJvmScriptingHost()) {
val compilationConfiguration = createCompilationConfigurationFromTemplate<SimpleScriptTemplate>() val compilationConfiguration = createJvmCompilationConfigurationFromTemplate<SimpleScriptTemplate>()
host.eval(script.toScriptSource(), compilationConfiguration, null).throwOnFailure() host.eval(script.toScriptSource(), compilationConfiguration, null).throwOnFailure()
} }