From a6ab74fc154a916b0a7116d61522111d7fea5f2c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 1 Oct 2012 21:46:34 +0400 Subject: [PATCH] Renamed FLAG_KIND_* to FLAG_METHOD_KIND_* --- .../jet/lang/resolve/java/JvmStdlibNames.java | 12 ++++++------ .../resolve/java/kt/DescriptorKindUtils.java | 18 +++++++++--------- .../resolve/java/kt/JetMethodAnnotation.java | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) 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 18c0502d9d9..022c4ab4750 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 @@ -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"); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/DescriptorKindUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/DescriptorKindUtils.java index 27484288350..35c8a31bbea 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/DescriptorKindUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/DescriptorKindUtils.java @@ -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); } } 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 393722f5aa4..dc6ac3bff48 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 @@ -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