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

JetValueParameter.nullable is deprecated as it duplicates info in type field

Browse Source
This commit is contained in:
Alex Tkachman
2012-09-23 13:19:51 +02:00
parent b70cc84764
commit 4600990d52
5 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
-2
View File
@@ -371,7 +371,6 @@ public class FunctionCodegen extends GenerationStateAware {
if (receiverParameter.exists()) {
JetValueParameterAnnotationWriter av = JetValueParameterAnnotationWriter.visitParameterAnnotation(mv, start++);
av.writeName("this$receiver");
av.writeNullable(receiverParameter.getType().isNullable());
av.writeReceiver();
if (kotlinParameterTypes.get(0) != null) {
av.writeType(kotlinParameterTypes.get(0).getKotlinSignature());
@@ -384,7 +383,6 @@ public class FunctionCodegen extends GenerationStateAware {
JetValueParameterAnnotationWriter av = JetValueParameterAnnotationWriter.visitParameterAnnotation(mv, i + start);
av.writeName(parameterDescriptor.getName().getName());
av.writeHasDefaultValue(parameterDescriptor.declaresDefaultValue());
av.writeNullable(parameterDescriptor.getType().isNullable());
if (kotlinParameterTypes.get(i) != null) {
av.writeType(kotlinParameterTypes.get(i + start).getKotlinSignature());
}
compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetValueParameterAnnotationWriter.java
-6
View File
@@ -42,12 +42,6 @@ public class JetValueParameterAnnotationWriter {
mv.visitParameterAnnotation(n, JvmStdlibNames.JET_VALUE_PARAMETER.getDescriptor(), true));
}
public void writeNullable(boolean nullable) {
if (nullable) {
av.visit(JvmStdlibNames.JET_VALUE_PARAMETER_NULLABLE_FIELD, true);
}
}
public void writeReceiver() {
av.visit(JvmStdlibNames.JET_VALUE_PARAMETER_RECEIVER_FIELD, true);
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+1 -4
View File
@@ -997,10 +997,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
else {
JetType transformedType;
if (parameter.getJetValueParameter().nullable()) {
transformedType = TypeUtils.makeNullableAsSpecified(outType, parameter.getJetValueParameter().nullable());
}
else if (findAnnotation(parameter.getPsiParameter(), JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().getFqName()) != null) {
if (findAnnotation(parameter.getPsiParameter(), JvmAbi.JETBRAINS_NOT_NULL_ANNOTATION.getFqName().getFqName()) != null) {
transformedType = TypeUtils.makeNullableAsSpecified(outType, false);
}
else {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java
-7
View File
@@ -37,7 +37,6 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper {
private String name;
private String type;
private boolean nullable;
private boolean receiver;
private boolean hasDefaultValue;
@@ -45,7 +44,6 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper {
protected void initialize() {
name = getStringAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_NAME_FIELD, "");
type = getStringAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_TYPE_FIELD, "");
nullable = getBooleanAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_NULLABLE_FIELD, false);
receiver = getBooleanAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_RECEIVER_FIELD, false);
hasDefaultValue = getBooleanAttribute(JvmStdlibNames.JET_VALUE_PARAMETER_HAS_DEFAULT_VALUE_FIELD, false);
}
@@ -62,11 +60,6 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper {
return type;
}
public boolean nullable() {
checkInitialized();
return nullable;
}
public boolean receiver() {
checkInitialized();
return receiver;
runtime/src/jet/runtime/typeinfo/JetValueParameter.java
+1
View File
@@ -42,6 +42,7 @@ public @interface JetValueParameter {
JetTypeProjection[] typeProjections() default {};
/**
* @deprecated info contained in type field
* @return is this type nullable
*/
boolean nullable () default false;