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

Renamed FLAG_KIND_* to FLAG_METHOD_KIND_*

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-10-01 21:46:34 +04:00
parent 3db3745439
commit a6ab74fc15
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java
+6 -6
View File
@@ -50,12 +50,12 @@ public class JvmStdlibNames {
public static final int FLAG_PRIVATE_BIT = 1 << 3;
public static final int FLAG_INTERNAL_BIT = 1 << 4;
// three bits (one reserved)
public static final int FLAG_KIND_MASK = 7 << 5;
public static final int FLAG_KIND_DECLARATION = 0 << 5;
public static final int FLAG_KIND_FAKE_OVERRIDE = 1 << 5;
public static final int FLAG_KIND_DELEGATION = 2 << 5;
public static final int FLAG_KIND_SYNTHESIZED = 3 << 5;
// for method, three bits (one reserved)
public static final int FLAG_METHOD_KIND_MASK = 7 << 5;
public static final int FLAG_METHOD_KIND_DECLARATION = 0 << 5;
public static final int FLAG_METHOD_KIND_FAKE_OVERRIDE = 1 << 5;
public static final int FLAG_METHOD_KIND_DELEGATION = 2 << 5;
public static final int FLAG_METHOD_KIND_SYNTHESIZED = 3 << 5;
public static final JvmClassName JET_CONSTRUCTOR = JvmClassName.byFqNameWithoutInnerClasses("jet.runtime.typeinfo.JetConstructor");
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/DescriptorKindUtils.java
+9 -9
View File
@@ -29,20 +29,20 @@ public class DescriptorKindUtils {
public static int kindToFlags(CallableMemberDescriptor.Kind kind) {
switch (kind) {
case DECLARATION: return JvmStdlibNames.FLAG_KIND_DECLARATION;
case FAKE_OVERRIDE: return JvmStdlibNames.FLAG_KIND_FAKE_OVERRIDE;
case DELEGATION: return JvmStdlibNames.FLAG_KIND_DELEGATION;
case SYNTHESIZED: return JvmStdlibNames.FLAG_KIND_SYNTHESIZED;
case DECLARATION: return JvmStdlibNames.FLAG_METHOD_KIND_DECLARATION;
case FAKE_OVERRIDE: return JvmStdlibNames.FLAG_METHOD_KIND_FAKE_OVERRIDE;
case DELEGATION: return JvmStdlibNames.FLAG_METHOD_KIND_DELEGATION;
case SYNTHESIZED: return JvmStdlibNames.FLAG_METHOD_KIND_SYNTHESIZED;
default: throw new IllegalArgumentException("Unknown kind: " + kind);
}
}
public static CallableMemberDescriptor.Kind flagsToKind(int value) {
switch (value & JvmStdlibNames.FLAG_KIND_MASK) {
case JvmStdlibNames.FLAG_KIND_DECLARATION: return CallableMemberDescriptor.Kind.DECLARATION;
case JvmStdlibNames.FLAG_KIND_FAKE_OVERRIDE: return CallableMemberDescriptor.Kind.FAKE_OVERRIDE;
case JvmStdlibNames.FLAG_KIND_DELEGATION: return CallableMemberDescriptor.Kind.DELEGATION;
case JvmStdlibNames.FLAG_KIND_SYNTHESIZED: return CallableMemberDescriptor.Kind.SYNTHESIZED;
switch (value & JvmStdlibNames.FLAG_METHOD_KIND_MASK) {
case JvmStdlibNames.FLAG_METHOD_KIND_DECLARATION: return CallableMemberDescriptor.Kind.DECLARATION;
case JvmStdlibNames.FLAG_METHOD_KIND_FAKE_OVERRIDE: return CallableMemberDescriptor.Kind.FAKE_OVERRIDE;
case JvmStdlibNames.FLAG_METHOD_KIND_DELEGATION: return CallableMemberDescriptor.Kind.DELEGATION;
case JvmStdlibNames.FLAG_METHOD_KIND_SYNTHESIZED: return CallableMemberDescriptor.Kind.SYNTHESIZED;
default: throw new IllegalArgumentException("Unknown int value of kind: " + value);
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class JetMethodAnnotation extends PsiAnnotationWithFlags {
}
public int kind() {
return flags() & JvmStdlibNames.FLAG_KIND_MASK;
return flags() & JvmStdlibNames.FLAG_METHOD_KIND_MASK;
}
@NotNull