From 6cf7cd5c07c028e62f21f9b46d49d3c304b3a14d Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 19 Nov 2015 15:34:17 +0300 Subject: [PATCH] Minor. Rename VALUE -> DEFAULT --- .../kotlin/codegen/state/JetTypeMapper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index 83a39d9397f..f02da84e263 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -116,7 +116,7 @@ public class JetTypeMapper { /** * kotlin.Int is mapped to I */ - VALUE, + DEFAULT, /** * kotlin.Int is mapped to Ljava/lang/Integer; */ @@ -128,7 +128,7 @@ public class JetTypeMapper { SUPER_TYPE, /** * kotlin.reflect.KClass mapped to java.lang.Class - * Other types mapped as VALUE + * Other types mapped as DEFAULT */ VALUE_FOR_ANNOTATION, /** @@ -364,7 +364,7 @@ public class JetTypeMapper { return mapType(descriptor.getReturnType(), sw, JetTypeMapperMode.VALUE_FOR_ANNOTATION); } else { - return mapType(returnType, sw, JetTypeMapperMode.VALUE, Variance.OUT_VARIANCE); + return mapType(returnType, sw, JetTypeMapperMode.DEFAULT, Variance.OUT_VARIANCE); } } @@ -385,12 +385,12 @@ public class JetTypeMapper { @NotNull public Type mapClass(@NotNull ClassifierDescriptor classifier) { - return mapType(classifier.getDefaultType(), null, JetTypeMapperMode.VALUE); + return mapType(classifier.getDefaultType(), null, JetTypeMapperMode.DEFAULT); } @NotNull public Type mapType(@NotNull KotlinType jetType) { - return mapType(jetType, null, JetTypeMapperMode.VALUE); + return mapType(jetType, null, JetTypeMapperMode.DEFAULT); } @NotNull @@ -1132,7 +1132,7 @@ public class JetTypeMapper { @Nullable public String mapFieldSignature(@NotNull KotlinType backingFieldType) { BothSignatureWriter sw = new BothSignatureWriter(BothSignatureWriter.Mode.TYPE); - mapType(backingFieldType, sw, JetTypeMapperMode.VALUE); + mapType(backingFieldType, sw, JetTypeMapperMode.DEFAULT); return sw.makeJavaGenericSignature(); } @@ -1223,7 +1223,7 @@ public class JetTypeMapper { private void writeParameter(@NotNull BothSignatureWriter sw, @NotNull JvmMethodParameterKind kind, @NotNull KotlinType type) { sw.writeParameterType(kind); - mapType(type, sw, JetTypeMapperMode.VALUE); + mapType(type, sw, JetTypeMapperMode.DEFAULT); sw.writeParameterTypeEnd(); }