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

Refactoring: rename ClassBuilderMode entry LIGHT_CLASSES_WITH_METADATA->KAPT

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-05-05 20:35:13 +03:00
parent 10b9be9f51
commit 6f3ea01084
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java
+1 -1
View File
@@ -404,7 +404,7 @@ public abstract class AnnotationCodegen {
case FULL: case FULL:
throw new IllegalStateException("Don't know how to compile annotation value " + value); throw new IllegalStateException("Don't know how to compile annotation value " + value);
case LIGHT_CLASSES: case LIGHT_CLASSES:
case LIGHT_CLASSES_WITH_METADATA: case KAPT:
return null; return null;
default: default:
throw new IllegalStateException("Unknown builder mode: " + mode); throw new IllegalStateException("Unknown builder mode: " + mode);
compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderMode.java
+1 -1
View File
@@ -28,5 +28,5 @@ public enum ClassBuilderMode {
/** /**
* Function signatures + metadata (to support incremental compilation with kapt) * Function signatures + metadata (to support incremental compilation with kapt)
*/ */
LIGHT_CLASSES_WITH_METADATA; KAPT;
} }
compiler/backend/src/org/jetbrains/kotlin/codegen/classBuilderModeUtil.kt
+1 -1
View File
@@ -17,4 +17,4 @@
package org.jetbrains.kotlin.codegen package org.jetbrains.kotlin.codegen
fun ClassBuilderMode.shouldGenerateMetadata() = fun ClassBuilderMode.shouldGenerateMetadata() =
this == ClassBuilderMode.FULL || this == ClassBuilderMode.LIGHT_CLASSES_WITH_METADATA this == ClassBuilderMode.FULL || this == ClassBuilderMode.KAPT
compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class JvmSerializerExtension extends SerializerExtension {
@Override @Override
public void serializeErrorType(@NotNull KotlinType type, @NotNull ProtoBuf.Type.Builder builder) { public void serializeErrorType(@NotNull KotlinType type, @NotNull ProtoBuf.Type.Builder builder) {
if (classBuilderMode == ClassBuilderMode.LIGHT_CLASSES_WITH_METADATA) { if (classBuilderMode == ClassBuilderMode.KAPT) {
builder.setClassName(stringTable.getStringIndex("error.NonExistingClass")); builder.setClassName(stringTable.getStringIndex("error.NonExistingClass"));
return; return;
} }
plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt
+1 -1
View File
@@ -59,7 +59,7 @@ class StubProducerExtension(val stubsOutputDir: File, val messageCollector: Mess
private class StubClassBuilderFactory : ClassBuilderFactory { private class StubClassBuilderFactory : ClassBuilderFactory {
override fun getClassBuilderMode() = ClassBuilderMode.LIGHT_CLASSES_WITH_METADATA override fun getClassBuilderMode() = ClassBuilderMode.KAPT
override fun newClassBuilder(origin: JvmDeclarationOrigin) = AbstractClassBuilder.Concrete( override fun newClassBuilder(origin: JvmDeclarationOrigin) = AbstractClassBuilder.Concrete(
ClassWriter(ClassWriter.COMPUTE_FRAMES or ClassWriter.COMPUTE_MAXS)) ClassWriter(ClassWriter.COMPUTE_FRAMES or ClassWriter.COMPUTE_MAXS))