diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 0d3c816c41b..d0f569bfc4f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -143,14 +143,14 @@ public class FunctionCodegen { BitSet kotlinFlags = new BitSet(); if (CodegenUtil.isInterface(functionDescriptor.getContainingDeclaration()) && modality != Modality.ABSTRACT) { kotlinFlags.set(modality == Modality.FINAL - ? JvmStdlibNames.JET_METHOD_FLAG_FORCE_FINAL_BIT - : JvmStdlibNames.JET_METHOD_FLAG_FORCE_OPEN_BIT); + ? JvmStdlibNames.FLAG_FORCE_FINAL_BIT + : JvmStdlibNames.FLAG_FORCE_OPEN_BIT); } if (functionDescriptor.getVisibility() == Visibilities.INTERNAL) { - kotlinFlags.set(JvmStdlibNames.JET_METHOD_FLAG_INTERNAL_BIT); + kotlinFlags.set(JvmStdlibNames.FLAG_INTERNAL_BIT); } else if (functionDescriptor.getVisibility() == Visibilities.PRIVATE) { - kotlinFlags.set(JvmStdlibNames.JET_METHOD_FLAG_PRIVATE_BIT); + kotlinFlags.set(JvmStdlibNames.FLAG_PRIVATE_BIT); } aw.writeFlags(kotlinFlags); aw.writeNullableReturnType(functionDescriptor.getReturnType().isNullable()); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 3b538c58c59..d23a48a42f6 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -778,13 +778,13 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { JetMethodAnnotationWriter aw = JetMethodAnnotationWriter.visitAnnotation(mv); BitSet kotlinFlags = new BitSet(); if (fun.getVisibility() == Visibilities.INTERNAL) { - kotlinFlags.set(JvmStdlibNames.JET_METHOD_FLAG_INTERNAL_BIT); + kotlinFlags.set(JvmStdlibNames.FLAG_INTERNAL_BIT); } else if (fun.getVisibility() == Visibilities.PRIVATE) { - kotlinFlags.set(JvmStdlibNames.JET_METHOD_FLAG_PRIVATE_BIT); + kotlinFlags.set(JvmStdlibNames.FLAG_PRIVATE_BIT); } if (fun instanceof PropertyAccessorDescriptor) { - kotlinFlags.set(JvmStdlibNames.JET_METHOD_FLAG_PROPERTY_BIT); + kotlinFlags.set(JvmStdlibNames.FLAG_PROPERTY_BIT); aw.writeTypeParameters(jvmSignature.getKotlinTypeParameter()); aw.writePropertyType(jvmSignature.getKotlinReturnType()); } else { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java index 78ac7004e41..1eed98f4fe6 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java @@ -230,17 +230,17 @@ public class PropertyCodegen { JetMethodAnnotationWriter aw = JetMethodAnnotationWriter.visitAnnotation(mv); Modality modality = propertyDescriptor.getModality(); BitSet flags = new BitSet(); - flags.set(JvmStdlibNames.JET_METHOD_FLAG_PROPERTY_BIT); + flags.set(JvmStdlibNames.FLAG_PROPERTY_BIT); if (CodegenUtil.isInterface(propertyDescriptor.getContainingDeclaration()) && modality != Modality.ABSTRACT) { flags.set(modality == Modality.FINAL - ? JvmStdlibNames.JET_METHOD_FLAG_FORCE_FINAL_BIT - : JvmStdlibNames.JET_METHOD_FLAG_FORCE_OPEN_BIT); + ? JvmStdlibNames.FLAG_FORCE_FINAL_BIT + : JvmStdlibNames.FLAG_FORCE_OPEN_BIT); } if (visibility == Visibilities.INTERNAL) { - flags.set(JvmStdlibNames.JET_METHOD_FLAG_INTERNAL_BIT); + flags.set(JvmStdlibNames.FLAG_INTERNAL_BIT); } else if (visibility == Visibilities.PRIVATE) { - flags.set(JvmStdlibNames.JET_METHOD_FLAG_PRIVATE_BIT); + flags.set(JvmStdlibNames.FLAG_PRIVATE_BIT); } aw.writeFlags(flags); aw.writeTypeParameters(typeParameters); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetMethodAnnotationWriter.java b/compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetMethodAnnotationWriter.java index 82f69f2e0a3..b6639867b6f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetMethodAnnotationWriter.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetMethodAnnotationWriter.java @@ -41,7 +41,7 @@ public class JetMethodAnnotationWriter { } } - if (flagsValue != JvmStdlibNames.JET_METHOD_FLAGS_DEFAULT_VALUE) { + if (flagsValue != JvmStdlibNames.FLAGS_DEFAULT_VALUE) { av.visit(JvmStdlibNames.JET_METHOD_FLAGS_FIELD, flagsValue); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 4ee648c3b73..7ede67bb295 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -1540,7 +1540,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes } // TODO: ugly - if (method.getJetMethod().flags().get(JvmStdlibNames.JET_METHOD_FLAG_PROPERTY_BIT)) { + if (method.getJetMethod().flags().get(JvmStdlibNames.FLAG_PROPERTY_BIT)) { return null; } @@ -1829,10 +1829,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes private static Modality resolveModality(PsiMemberWrapper memberWrapper, boolean isFinal) { if (memberWrapper instanceof PsiMethodWrapper) { PsiMethodWrapper method = (PsiMethodWrapper) memberWrapper; - if (method.getJetMethod().flags().get(JvmStdlibNames.JET_METHOD_FLAG_FORCE_OPEN_BIT)) { + if (method.getJetMethod().flags().get(JvmStdlibNames.FLAG_FORCE_OPEN_BIT)) { return Modality.OPEN; } - if (method.getJetMethod().flags().get(JvmStdlibNames.JET_METHOD_FLAG_FORCE_FINAL_BIT)) { + if (method.getJetMethod().flags().get(JvmStdlibNames.FLAG_FORCE_FINAL_BIT)) { return Modality.FINAL; } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java index 8d012e51774..a6a7fc17fb7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java @@ -125,7 +125,7 @@ class JavaDescriptorResolverHelper { NamedMembers members = getNamedMembers(Name.identifier(propertyName)); // TODO: some java properties too - if (method.getJetMethod().flags().get(JvmStdlibNames.JET_METHOD_FLAG_PROPERTY_BIT)) { + if (method.getJetMethod().flags().get(JvmStdlibNames.FLAG_PROPERTY_BIT)) { int i = 0; @@ -167,7 +167,7 @@ class JavaDescriptorResolverHelper { String propertyName = propertyParseResult.getPropertyName(); NamedMembers members = getNamedMembers(Name.identifier(propertyName)); - if (method.getJetMethod().flags().get(JvmStdlibNames.JET_METHOD_FLAG_PROPERTY_BIT)) { + if (method.getJetMethod().flags().get(JvmStdlibNames.FLAG_PROPERTY_BIT)) { if (method.getParameters().size() == 0) { // TODO: report error properly throw new IllegalStateException(); @@ -204,7 +204,7 @@ class JavaDescriptorResolverHelper { } } - if (!method.getJetMethod().flags().get(JvmStdlibNames.JET_METHOD_FLAG_PROPERTY_BIT)) { + if (!method.getJetMethod().flags().get(JvmStdlibNames.FLAG_PROPERTY_BIT)) { NamedMembers namedMembers = getNamedMembers(Name.identifier(method.getName())); namedMembers.addMethod(method); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java index 7341978b307..5ca5a48642f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java @@ -48,13 +48,13 @@ public class JvmStdlibNames { public static final String JET_METHOD_TYPE_PARAMETERS_FIELD = "typeParameters"; public static final String JET_METHOD_PROPERTY_TYPE_FIELD = "propertyType"; - public static final int JET_METHOD_FLAGS_DEFAULT_VALUE = 0; - public static final int JET_METHOD_FLAGS_BITS = 5; - public static final int JET_METHOD_FLAG_PROPERTY_BIT = 0; - public static final int JET_METHOD_FLAG_FORCE_OPEN_BIT = 1; - public static final int JET_METHOD_FLAG_FORCE_FINAL_BIT = 2; - public static final int JET_METHOD_FLAG_PRIVATE_BIT = 3; - public static final int JET_METHOD_FLAG_INTERNAL_BIT = 4; + public static final int FLAGS_DEFAULT_VALUE = 0; + public static final int FLAGS_BITS = 5; + public static final int FLAG_PROPERTY_BIT = 0; + public static final int FLAG_FORCE_OPEN_BIT = 1; + public static final int FLAG_FORCE_FINAL_BIT = 2; + public static final int FLAG_PRIVATE_BIT = 3; + public static final int FLAG_INTERNAL_BIT = 4; public static final JvmClassName JET_CONSTRUCTOR = JvmClassName.byFqNameWithoutInnerClasses("jet.runtime.typeinfo.JetConstructor"); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java index e74b81210c9..fe6ef3da155 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java @@ -36,14 +36,14 @@ public class JetMethodAnnotation extends PsiAnnotationWrapper { private BitSet flags = null; public BitSet flags() { if (flags == null) { - int flagsValue = getIntAttribute(JvmStdlibNames.JET_METHOD_FLAGS_FIELD, JvmStdlibNames.JET_METHOD_FLAGS_DEFAULT_VALUE); - if (flagsValue == JvmStdlibNames.JET_METHOD_FLAGS_DEFAULT_VALUE) { + int flagsValue = getIntAttribute(JvmStdlibNames.JET_METHOD_FLAGS_FIELD, JvmStdlibNames.FLAGS_DEFAULT_VALUE); + if (flagsValue == JvmStdlibNames.FLAGS_DEFAULT_VALUE) { // for compatibility - flagsValue = getIntAttribute(JvmStdlibNames.JET_METHOD_KIND_FIELD, JvmStdlibNames.JET_METHOD_FLAGS_DEFAULT_VALUE); + flagsValue = getIntAttribute(JvmStdlibNames.JET_METHOD_KIND_FIELD, JvmStdlibNames.FLAGS_DEFAULT_VALUE); } - flags = new BitSet(JvmStdlibNames.JET_METHOD_FLAGS_BITS); - for (int bit = 0; bit < JvmStdlibNames.JET_METHOD_FLAGS_BITS; bit++) { + flags = new BitSet(JvmStdlibNames.FLAGS_BITS); + for (int bit = 0; bit < JvmStdlibNames.FLAGS_BITS; bit++) { flags.set(bit, (flagsValue & (1 << bit)) != 0); } }