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

Default module name extraction

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-04 16:13:57 +03:00
parent b58479a169
commit 0de83b6f4c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+2 -1
View File
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.IncrementalCompilation
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.resolve.AnalyzerScriptParameter
import org.jetbrains.kotlin.util.PerformanceCounter
@@ -134,7 +135,7 @@ public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
else
emptyList<AnalyzerScriptParameter>())
configuration.put(JVMConfigurationKeys.MODULE_NAME, arguments.moduleName ?: "main")
configuration.put(JVMConfigurationKeys.MODULE_NAME, arguments.moduleName ?: JvmAbi.DEFAULT_MODULE_NAME)
putAdvancedOptions(configuration, arguments)
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
+1
View File
@@ -45,6 +45,7 @@ public final class JvmAbi {
public static final String KOTLIN_CLASS_FIELD_NAME = "$kotlinClass";
public static final String KOTLIN_PACKAGE_FIELD_NAME = "$kotlinPackage";
public static final String MODULE_NAME_FIELD = "$moduleName";
public static final String DEFAULT_MODULE_NAME = "main";
public static final ClassId REFLECTION_FACTORY_IMPL = ClassId.topLevel(new FqName("kotlin.reflect.jvm.internal.ReflectionFactoryImpl"));
@NotNull
core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java
+2 -1
View File
@@ -19,6 +19,7 @@ package kotlin.reflect.jvm.internal;
import kotlin.jvm.KotlinReflectionNotSupportedError;
import kotlin.jvm.internal.*;
import kotlin.reflect.*;
import org.jetbrains.kotlin.load.java.JvmAbi;
/**
* @suppress
@@ -32,7 +33,7 @@ public class ReflectionFactoryImpl extends ReflectionFactory {
@Override
public KPackage createKotlinPackage(Class javaClass) {
return createKotlinPackage(javaClass, "main");
return createKotlinPackage(javaClass, JvmAbi.DEFAULT_MODULE_NAME);
}
@Override