From 7b63f034a3f1ec2d7e59c142fbdfd0417d1c8586 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Fri, 9 Dec 2011 19:42:03 +0400 Subject: [PATCH] fix hasDefaultValue annotation parameter name --- .../src/org/jetbrains/jet/codegen/FunctionCodegen.java | 7 +------ .../src/org/jetbrains/jet/lang/resolve/StdlibNames.java | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index a53849fd83b..19568ea91b0 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -8,17 +8,12 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.StdlibNames; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeProjection; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Type; import org.objectweb.asm.commons.InstructionAdapter; import org.objectweb.asm.commons.Method; -import org.objectweb.asm.signature.SignatureVisitor; -import org.objectweb.asm.signature.SignatureWriter; -import org.objectweb.asm.util.CheckSignatureAdapter; import java.util.List; import java.util.Set; @@ -114,7 +109,7 @@ public class FunctionCodegen { ValueParameterDescriptor parameterDescriptor = paramDescrs.get(i); av.visit(StdlibNames.JET_PARAMETER_NAME_FIELD, parameterDescriptor.getName()); if(parameterDescriptor.hasDefaultValue()) { - av.visit(StdlibNames.JET_PARAMETER_HAS_DEFAULT_FIELD, true); + av.visit(StdlibNames.JET_PARAMETER_HAS_DEFAULT_VALUE_FIELD, true); } if(parameterDescriptor.getOutType().isNullable()) { av.visit(StdlibNames.JET_PARAMETER_NULLABLE_FIELD, true); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/StdlibNames.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/StdlibNames.java index 5f54c4a96d1..fcc779f5c99 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/StdlibNames.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/StdlibNames.java @@ -12,7 +12,7 @@ public class StdlibNames { public static final String JET_PARAMETER_DESCRIPTOR = "Ljet/typeinfo/JetParameter;"; public static final String JET_PARAMETER_NAME_FIELD = "name"; - public static final String JET_PARAMETER_HAS_DEFAULT_FIELD = "hasDefault"; + public static final String JET_PARAMETER_HAS_DEFAULT_VALUE_FIELD = "hasDefaultValue"; public static final String JET_PARAMETER_NULLABLE_FIELD = "nullable";