Refactor scripting - get rid of unused type parameter in CompiledScript

This commit is contained in:
Ilya Chernikov
2020-04-02 12:48:05 +02:00
parent c64ba50655
commit 138efda19f
19 changed files with 54 additions and 54 deletions
@@ -317,13 +317,13 @@ interface ScriptCompiler {
suspend operator fun invoke(
script: SourceCode,
scriptCompilationConfiguration: ScriptCompilationConfiguration
): ResultWithDiagnostics<CompiledScript<*>>
): ResultWithDiagnostics<CompiledScript>
}
/**
* The interface to the compiled script
*/
interface CompiledScript<out ScriptBase : Any> {
interface CompiledScript {
/**
* The location identifier for the script source, taken from SourceCode.locationId
@@ -346,7 +346,7 @@ interface CompiledScript<out ScriptBase : Any> {
/**
* The scripts compiled along with this one in one module, imported or otherwise included into compilation
*/
val otherScripts: List<CompiledScript<*>>
val otherScripts: List<CompiledScript>
get() = emptyList()
/**
@@ -147,7 +147,7 @@ val ScriptEvaluationContextDataKeys.commandLineArgs by PropertiesCollection.key<
* The facade to the script data for evaluation configuration refinement callbacks
*/
data class ScriptEvaluationConfigurationRefinementContext(
val compiledScript: CompiledScript<*>,
val compiledScript: CompiledScript,
val evaluationConfiguration: ScriptEvaluationConfiguration,
val contextData: ScriptEvaluationContextData? = null
)
@@ -120,7 +120,7 @@ data class RefineEvaluationConfigurationData(
}
fun ScriptEvaluationConfiguration.refineBeforeEvaluation(
script: CompiledScript<*>,
script: CompiledScript,
contextData: ScriptEvaluationContextData? = null
): ResultWithDiagnostics<ScriptEvaluationConfiguration> {
val hostConfiguration = get(ScriptEvaluationConfiguration.hostConfiguration)
@@ -191,7 +191,7 @@ interface ScriptEvaluator {
* @param scriptEvaluationConfiguration evaluation configuration
*/
suspend operator fun invoke(
compiledScript: CompiledScript<*>,
compiledScript: CompiledScript,
scriptEvaluationConfiguration: ScriptEvaluationConfiguration = ScriptEvaluationConfiguration.Default
): ResultWithDiagnostics<EvaluationResult>
}