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

Renamed JET_METHOD_FLAG* to FLAG* since they will be used not only in JetMethod annotation, but in JetClass, too.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-14 20:03:00 +04:00
parent 9f45e7cc08
commit 769d4ad2f0
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+4 -4
View File
@@ -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());
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+3 -3
View File
@@ -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 {
compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+5 -5
View File
@@ -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);
compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetMethodAnnotationWriter.java
+1 -1
View File
@@ -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);
}
}