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

Added JetMethod.flags() to replace kind(), with adding extra functionality (modality and visibility marking).

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-06-08 18:42:42 +04:00
parent e8c5677592
commit 12893cec54
8 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class FunctionCodegen {
throw new IllegalStateException();
}
JetMethodAnnotationWriter aw = JetMethodAnnotationWriter.visitAnnotation(mv);
aw.writeKind(JvmStdlibNames.JET_METHOD_KIND_REGULAR);
aw.writeFlags(JvmStdlibNames.JET_METHOD_FLAGS_DEFAULT);
aw.writeNullableReturnType(functionDescriptor.getReturnType().isNullable());
aw.writeTypeParameters(jvmSignature.getKotlinTypeParameter());
aw.writeReturnType(jvmSignature.getKotlinReturnType());
compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class PropertyCodegen {
public static void generateJetPropertyAnnotation(MethodVisitor mv, @NotNull String kotlinType, @NotNull String typeParameters) {
JetMethodAnnotationWriter aw = JetMethodAnnotationWriter.visitAnnotation(mv);
aw.writeKind(JvmStdlibNames.JET_METHOD_KIND_PROPERTY);
aw.writeFlags(JvmStdlibNames.JET_METHOD_FLAG_PROPERTY);
aw.writeTypeParameters(typeParameters);
aw.writePropertyType(kotlinType);
aw.visitEnd();
compiler/backend/src/org/jetbrains/jet/codegen/signature/kotlin/JetMethodAnnotationWriter.java
+3 -3
View File
@@ -31,9 +31,9 @@ public class JetMethodAnnotationWriter {
this.av = av;
}
public void writeKind(int kind) {
if (kind != JvmStdlibNames.JET_METHOD_KIND_DEFAULT) {
av.visit(JvmStdlibNames.JET_METHOD_KIND_FIELD, kind);
public void writeFlags(int flags) {
if (flags != JvmStdlibNames.JET_METHOD_FLAGS_DEFAULT) {
av.visit(JvmStdlibNames.JET_METHOD_FLAGS_FIELD, flags);
}
}