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

Code clean

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-04 15:39:51 +03:00
parent 20bb9963b3
commit 2ca9b3ae0e
13 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+1 -1
View File
@@ -469,7 +469,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
v.aconst(thisAsmType);
if (factory.getArgumentTypes().length == 2) {
v.aconst(JvmCodegenUtil.getModuleName(state.getModule()));
v.aconst(state.getModuleName());
}
v.invokestatic(REFLECTION, factory.getName(), factory.getDescriptor(), false);
v.putstatic(thisAsmType.getInternalName(), fieldName, type);
compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt
+1 -1
View File
@@ -92,7 +92,7 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
{ ModuleContent(files, GlobalSearchScope.EMPTY_SCOPE) },
JvmPlatformParameters { throw IllegalStateException() },
CompilerEnvironment,
packagePartProviderFactory = { a, b -> JvmPackagePartProvider(environment) }
packagePartProviderFactory = { module, content -> JvmPackagePartProvider(environment) }
)
val moduleDescriptor = resolver.descriptorForModule(builtInModule)
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
-4
View File
@@ -242,10 +242,6 @@ public class KotlinCoreEnvironment private constructor(
messageCollector.report(severity, message, CompilerMessageLocation.NO_LOCATION)
}
public fun getJavaRoots() : List<JavaRoot> {
return javaRoots
}
companion object {
private val APPLICATION_LOCK = Object()
compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+1 -1
View File
@@ -130,7 +130,7 @@ public abstract class AnalyzerFacade<in P : PlatformAnalysisParameters> {
platformParameters: P,
targetEnvironment: TargetEnvironment,
delegateResolver: ResolverForProject<M> = EmptyResolverForProject(),
packagePartProviderFactory: (M, ModuleContent) -> PackagePartProvider = { (m, c) -> PackagePartProvider.EMPTY }
packagePartProviderFactory: (M, ModuleContent) -> PackagePartProvider = { module, content -> PackagePartProvider.EMPTY }
): ResolverForProject<M> {
val storageManager = projectContext.storageManager
fun createResolverForProject(): ResolverForProjectImpl<M> {
compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
-2
View File
@@ -55,7 +55,6 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
Class<? extends Annotation> annotationClass = loadAnnotationClassQuietly(JvmAnnotationNames.KOTLIN_PACKAGE.asString());
assertTrue(aClass.isAnnotationPresent(annotationClass));
assertTrue(aClass.isAnnotationPresent(annotationClass));
Annotation kotlinPackage = aClass.getAnnotation(annotationClass);
@@ -80,7 +79,6 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
Class<? extends Annotation> annotationClass = loadAnnotationClassQuietly(JvmAnnotationNames.KOTLIN_FILE_FACADE.asString());
assertTrue(aClass.isAnnotationPresent(annotationClass));
assertTrue(aClass.isAnnotationPresent(annotationClass));
Annotation kotlinPackage = aClass.getAnnotation(annotationClass);