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

Refactor: AnalyzerScriptParameter -> ScriptParameter

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-11-20 20:45:04 +03:00
parent 0d10f0fcf9
commit 6520e9aed6
11 changed files with 27 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+3 -3
View File
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.config.addKotlinSourceRoot
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
import org.jetbrains.kotlin.script.AnalyzerScriptParameter
import org.jetbrains.kotlin.script.ScriptParameter
import org.jetbrains.kotlin.util.PerformanceCounter
import org.jetbrains.kotlin.utils.KotlinPaths
import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir
@@ -126,10 +126,10 @@ public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
return ExitCode.OK
}
configuration.put<List<AnalyzerScriptParameter>>(JVMConfigurationKeys.SCRIPT_PARAMETERS, if (arguments.script)
configuration.put<List<ScriptParameter>>(JVMConfigurationKeys.SCRIPT_PARAMETERS, if (arguments.script)
CommandLineScriptUtils.scriptParameters()
else
emptyList<AnalyzerScriptParameter>())
emptyList<ScriptParameter>())
putAdvancedOptions(configuration, arguments)
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java
+3 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cli.jvm.compiler;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.script.AnalyzerScriptParameter;
import org.jetbrains.kotlin.script.ScriptParameter;
import org.jetbrains.kotlin.types.KotlinType;
import java.util.Collections;
@@ -33,10 +33,10 @@ public class CommandLineScriptUtils {
private CommandLineScriptUtils() {
}
public static List<AnalyzerScriptParameter> scriptParameters() {
public static List<ScriptParameter> scriptParameters() {
KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns();
KotlinType arrayOfStrings = builtIns.getArrayType(INVARIANT, builtIns.getStringType());
AnalyzerScriptParameter argsParameter = new AnalyzerScriptParameter(ARGS_NAME, arrayOfStrings);
ScriptParameter argsParameter = new ScriptParameter(ARGS_NAME, arrayOfStrings);
return Collections.singletonList(argsParameter);
}
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+2 -2
View File
@@ -60,7 +60,7 @@ import org.jetbrains.kotlin.psi.KtScript;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.jvm.JvmClassName;
import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM;
import org.jetbrains.kotlin.script.AnalyzerScriptParameter;
import org.jetbrains.kotlin.script.ScriptParameter;
import org.jetbrains.kotlin.script.KotlinScriptDefinition;
import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider;
import org.jetbrains.kotlin.util.PerformanceCounter;
@@ -274,7 +274,7 @@ public class KotlinToJVMBytecodeCompiler {
@NotNull KotlinPaths paths,
@NotNull KotlinCoreEnvironment environment
) {
List<AnalyzerScriptParameter> scriptParameters = environment.getConfiguration().getList(JVMConfigurationKeys.SCRIPT_PARAMETERS);
List<ScriptParameter> scriptParameters = environment.getConfiguration().getList(JVMConfigurationKeys.SCRIPT_PARAMETERS);
if (!scriptParameters.isEmpty()) {
KotlinScriptDefinitionProvider.getInstance(environment.getProject()).addScriptDefinition(
new KotlinScriptDefinition(".kts", scriptParameters)
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java
+2 -2
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CompilerJarLocator;
import org.jetbrains.kotlin.config.CompilerConfigurationKey;
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents;
import org.jetbrains.kotlin.modules.Module;
import org.jetbrains.kotlin.script.AnalyzerScriptParameter;
import org.jetbrains.kotlin.script.ScriptParameter;
import java.util.List;
@@ -28,7 +28,7 @@ public class JVMConfigurationKeys {
private JVMConfigurationKeys() {
}
public static final CompilerConfigurationKey<List<AnalyzerScriptParameter>> SCRIPT_PARAMETERS =
public static final CompilerConfigurationKey<List<ScriptParameter>> SCRIPT_PARAMETERS =
CompilerConfigurationKey.create("script");
public static final CompilerConfigurationKey<Boolean> DISABLE_CALL_ASSERTIONS =
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt
+1 -1
View File
@@ -57,7 +57,7 @@ public class LazyScriptClassMemberScope(
val scriptDefinition = KotlinScriptDefinitionProvider.getInstance(file.project).findScriptDefinition(file)
return scriptDefinition.scriptParameters.mapIndexed { index, scriptParameter ->
ValueParameterDescriptorImpl(
constructor, null, index, Annotations.EMPTY, scriptParameter.getName(), scriptParameter.getType(),
constructor, null, index, Annotations.EMPTY, scriptParameter.name, scriptParameter.type,
/* declaresDefaultValue = */ false,
/* isCrossinline = */ false,
/* isNoinline = */ false,
compiler/frontend/src/org/jetbrains/kotlin/script/AnalyzerScriptParameter.java
-43
View File
@@ -1,43 +0,0 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.script;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.types.KotlinType;
public class AnalyzerScriptParameter {
@NotNull
private final Name name;
@NotNull
private final KotlinType type;
public AnalyzerScriptParameter(@NotNull Name name, @NotNull KotlinType type) {
this.name = name;
this.type = type;
}
@NotNull
public Name getName() {
return name;
}
@NotNull
public KotlinType getType() {
return type;
}
}
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt
+6 -1
View File
@@ -16,4 +16,9 @@
package org.jetbrains.kotlin.script
class KotlinScriptDefinition(val extension: String, val scriptParameters: List<AnalyzerScriptParameter>)
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.KotlinType
class KotlinScriptDefinition(val extension: String, val scriptParameters: List<ScriptParameter>)
class ScriptParameter(val name: Name, val type: KotlinType)
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class KotlinScriptDefinitionProvider {
private final Set<PsiFile> scriptsFiles = new HashSet<PsiFile>();
private static final KotlinScriptDefinition
standardScript = new KotlinScriptDefinition(KotlinParserDefinition.STD_SCRIPT_EXT, Collections.<AnalyzerScriptParameter>emptyList());
standardScript = new KotlinScriptDefinition(KotlinParserDefinition.STD_SCRIPT_EXT, Collections.<ScriptParameter>emptyList());
public static KotlinScriptDefinitionProvider getInstance(Project project) {
return ServiceManager.getService(project, KotlinScriptDefinitionProvider.class);
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
+3 -3
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.AnalyzingUtils;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.script.AnalyzerScriptParameter;
import org.jetbrains.kotlin.script.ScriptParameter;
import org.jetbrains.kotlin.script.KotlinScriptDefinition;
import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider;
import org.jetbrains.kotlin.test.KotlinTestUtils;
@@ -117,7 +117,7 @@ public class CodegenTestFiles {
expectedValues.add(Pair.create(fieldName, expectedValue));
}
List<AnalyzerScriptParameter> scriptParameterTypes = Lists.newArrayList();
List<ScriptParameter> scriptParameterTypes = Lists.newArrayList();
List<Object> scriptParameterValues = Lists.newArrayList();
if (file.isScript()) {
@@ -152,7 +152,7 @@ public class CodegenTestFiles {
throw new AssertionError("TODO: " + type);
}
scriptParameterTypes.add(new AnalyzerScriptParameter(Name.identifier(name), jetType));
scriptParameterTypes.add(new ScriptParameter(Name.identifier(name), jetType));
scriptParameterValues.add(value);
}
compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.script.AnalyzerScriptParameter;
import org.jetbrains.kotlin.script.ScriptParameter;
import org.jetbrains.kotlin.script.KotlinScriptDefinition;
import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider;
import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -34,7 +34,7 @@ public class ScriptGenTest extends CodegenTestCase {
private static final KotlinScriptDefinition FIB_SCRIPT_DEFINITION =
new KotlinScriptDefinition(
".lang.kt",
singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType()))
singletonList(new ScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType()))
);
@Override
compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
+4 -4
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.config.ContentRootsKt;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.script.AnalyzerScriptParameter;
import org.jetbrains.kotlin.script.ScriptParameter;
import org.jetbrains.kotlin.script.KotlinScriptDefinition;
import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider;
import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -72,7 +72,7 @@ public class ScriptTest {
@Nullable
private static Class<?> compileScript(
@NotNull String scriptPath,
@Nullable List<AnalyzerScriptParameter> scriptParameters,
@Nullable List<ScriptParameter> scriptParameters,
@NotNull List<KotlinScriptDefinition> scriptDefinitions
) {
KotlinPaths paths = PathUtil.getKotlinPathsForDistDirectory();
@@ -110,7 +110,7 @@ public class ScriptTest {
}
@NotNull
private static List<AnalyzerScriptParameter> numIntParam() {
return Collections.singletonList(new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType()));
private static List<ScriptParameter> numIntParam() {
return Collections.singletonList(new ScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType()));
}
}