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

PR-1021: Merge Keplin project scripting code into Kotlin core.

Browse Source 
Overhauls the scripting layers (GenericRepl and related, and JSR223 and related)
Adds repeating modes (none, only latest eval'd line, or random order)
Also adds better thread-safe IO capturing, default imports, SimpleRepl wrapper, more unit tests

NOTE: the script-util part of the pull request was rejected due to various problems and incompatibilities.
It may be incorporated into the code later.

(originally cherry picked from commit 6f7d517)
This commit is contained in:
apatrida
2017-01-18 04:17:41 +01:00
committed by Ilya Chernikov
parent 8caf607378
commit 5ad06e1e92
29 changed files with 1146 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinRemoteReplClient.kt
+30 -16
View File
@@ -35,15 +35,15 @@ open class KotlinRemoteReplClientBase(
targetPlatform: CompileService.TargetPlatform,
templateClasspath: List<File>,
templateClassName: String,
scriptArgs: Array<Any?>? = null,
scriptArgsTypes: Array<Class<*>>? = null,
scriptArgs: Array<out Any?>? = null,
scriptArgsTypes: Array<out Class<out Any>>? = null,
compilerMessagesOutputStream: OutputStream = System.err,
evalOutputStream: OutputStream? = null,
evalErrorStream: OutputStream? = null,
evalInputStream: InputStream? = null,
port: Int = SOCKET_ANY_FREE_PORT,
operationsTracer: RemoteOperationsTracer? = null
) : ReplChecker {
) {
val sessionId = compileService.leaseReplSession(
clientAliveFlagFile?.absolutePath,
@@ -70,10 +70,6 @@ open class KotlinRemoteReplClientBase(
}
})
}
override fun check(codeLine: ReplCodeLine, history: List<ReplCodeLine>): ReplCheckResult {
return compileService.remoteReplLineCheck(sessionId, codeLine, history).get()
}
}
class KotlinRemoteReplCompiler(
@@ -99,10 +95,20 @@ class KotlinRemoteReplCompiler(
evalInputStream = null,
port = port,
operationsTracer = operationsTracer
), ReplCompiler {
), ReplCompiler, ReplCheckAction {
override fun resetToLine(lineNumber: Int): List<ReplCodeLine> {
return emptyList() // TODO: not implemented, no current need
}
override fun compile(codeLine: ReplCodeLine, history: List<ReplCodeLine>): ReplCompileResult {
return compileService.remoteReplLineCompile(sessionId, codeLine, history).get()
override val history: List<ReplCodeLine>
get() = emptyList() // TODO: not implemented, no current need
override fun check(codeLine: ReplCodeLine): ReplCheckResult {
return compileService.remoteReplLineCheck(sessionId, codeLine).get()
}
override fun compile(codeLine: ReplCodeLine, verifyHistory: List<ReplCodeLine>?): ReplCompileResult {
return compileService.remoteReplLineCompile(sessionId, codeLine, verifyHistory).get()
}
}
@@ -114,8 +120,8 @@ class KotlinRemoteReplEvaluator(
targetPlatform: CompileService.TargetPlatform,
templateClasspath: List<File>,
templateClassName: String,
scriptArgs: Array<Any?>?,
scriptArgsTypes: Array<Class<*>>?,
scriptArgs: Array<out Any?>? = null,
scriptArgsTypes: Array<out Class<out Any>>? = null,
compilerMessagesOutputStream: OutputStream,
evalOutputStream: OutputStream?,
evalErrorStream: OutputStream?,
@@ -137,12 +143,20 @@ class KotlinRemoteReplEvaluator(
evalInputStream = evalInputStream,
port = port,
operationsTracer = operationsTracer
), ReplEvaluator {
), ReplAtomicEvalAction, ReplEvaluatorExposedInternalHistory, ReplCheckAction {
override val lastEvaluatedScript: ClassWithInstance? = null // not implemented, no need so far
override val lastEvaluatedScripts: List<EvalHistoryType> = emptyList() // not implemented, no need so far
// TODO: invokeWrapper is ignored here, and in the daemon the session wrapper is used instead; So consider to make it per call (avoid performance penalties though)
override fun eval(codeLine: ReplCodeLine, history: List<ReplCodeLine>, invokeWrapper: InvokeWrapper?): ReplEvalResult {
return compileService.remoteReplLineEval(sessionId, codeLine, history).get()
// TODO: scriptArgs are ignored here, they should be passed through
override fun compileAndEval(codeLine: ReplCodeLine,
scriptArgs: ScriptArgsWithTypes?,
verifyHistory: List<ReplCodeLine>?,
invokeWrapper: InvokeWrapper?): ReplEvalResult {
return compileService.remoteReplLineEval(sessionId, codeLine, verifyHistory).get()
}
override fun check(codeLine: ReplCodeLine): ReplCheckResult {
return compileService.remoteReplLineCheck(sessionId, codeLine).get()
}
}