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

Rename KotlinCallable annotation to KotlinFunction

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-11 15:27:29 +03:00
parent 55dd51814f
commit 9d626ef1d9
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
+1 -1
View File
@@ -226,7 +226,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
ProtoBuf.Function functionProto = serializer.functionProto(funDescriptor).build(); ProtoBuf.Function functionProto = serializer.functionProto(funDescriptor).build();
AnnotationVisitor av = v.getVisitor().visitAnnotation(asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_CALLABLE), true); AnnotationVisitor av = v.getVisitor().visitAnnotation(asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_FUNCTION), true);
writeAnnotationData(av, serializer, functionProto); writeAnnotationData(av, serializer, functionProto);
writeModuleName(av, state); writeModuleName(av, state);
av.visitEnd(); av.visitEnd();
compiler/testData/codegen/bytecodeListing/annotations/literals.txt
Vendored
+3 -3
View File
@@ -4,7 +4,7 @@
@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass FunAnn @kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass FunAnn
@kotlin.jvm.internal.KotlinSyntheticClass @kotlin.jvm.internal.KotlinCallable LiteralsKt$foo$1 { @kotlin.jvm.internal.KotlinSyntheticClass @kotlin.jvm.internal.KotlinFunction LiteralsKt$foo$1 {
inner class LiteralsKt$foo$1 inner class LiteralsKt$foo$1
synthetic field $arg: int synthetic field $arg: int
public method invoke(): java.lang.Object public method invoke(): java.lang.Object
@@ -12,7 +12,7 @@
method <init>(p0: int): void method <init>(p0: int): void
} }
@kotlin.jvm.internal.KotlinSyntheticClass @kotlin.jvm.internal.KotlinCallable LiteralsKt$foo$2 { @kotlin.jvm.internal.KotlinSyntheticClass @kotlin.jvm.internal.KotlinFunction LiteralsKt$foo$2 {
inner class LiteralsKt$foo$2 inner class LiteralsKt$foo$2
synthetic field $arg: int synthetic field $arg: int
public method invoke(): java.lang.Object public method invoke(): java.lang.Object
@@ -25,7 +25,7 @@
method <init>(): void method <init>(): void
} }
@kotlin.jvm.internal.KotlinSyntheticClass @kotlin.jvm.internal.KotlinCallable LiteralsKt$foo$x$1 { @kotlin.jvm.internal.KotlinSyntheticClass @kotlin.jvm.internal.KotlinFunction LiteralsKt$foo$x$1 {
inner class LiteralsKt$foo$x$1 inner class LiteralsKt$foo$x$1
synthetic field $arg: int synthetic field $arg: int
public method invoke(): java.lang.Object public method invoke(): java.lang.Object
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java
+1 -1
View File
@@ -34,7 +34,7 @@ public final class JvmAnnotationNames {
public static final FqName KOTLIN_MULTIFILE_CLASS = new FqName("kotlin.jvm.internal.KotlinMultifileClass"); public static final FqName KOTLIN_MULTIFILE_CLASS = new FqName("kotlin.jvm.internal.KotlinMultifileClass");
public static final FqName KOTLIN_MULTIFILE_CLASS_PART = new FqName("kotlin.jvm.internal.KotlinMultifileClassPart"); public static final FqName KOTLIN_MULTIFILE_CLASS_PART = new FqName("kotlin.jvm.internal.KotlinMultifileClassPart");
public static final FqName KOTLIN_SYNTHETIC_CLASS = new FqName("kotlin.jvm.internal.KotlinSyntheticClass"); public static final FqName KOTLIN_SYNTHETIC_CLASS = new FqName("kotlin.jvm.internal.KotlinSyntheticClass");
public static final FqName KOTLIN_CALLABLE = new FqName("kotlin.jvm.internal.KotlinCallable"); public static final FqName KOTLIN_FUNCTION = new FqName("kotlin.jvm.internal.KotlinFunction");
public static final FqName KOTLIN_INTERFACE_DEFAULT_IMPLS = new FqName("kotlin.jvm.internal.KotlinInterfaceDefaultImpls"); public static final FqName KOTLIN_INTERFACE_DEFAULT_IMPLS = new FqName("kotlin.jvm.internal.KotlinInterfaceDefaultImpls");
public static final FqName KOTLIN_LOCAL_CLASS = new FqName("kotlin.jvm.internal.KotlinLocalClass"); public static final FqName KOTLIN_LOCAL_CLASS = new FqName("kotlin.jvm.internal.KotlinLocalClass");
core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt
+2 -2
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer
import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.BitEncoding
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
import kotlin.jvm.internal.KotlinCallable import kotlin.jvm.internal.KotlinFunction
import kotlin.reflect.KFunction import kotlin.reflect.KFunction
import kotlin.reflect.jvm.internal.EmptyContainerForLocal import kotlin.reflect.jvm.internal.EmptyContainerForLocal
import kotlin.reflect.jvm.internal.KFunctionImpl import kotlin.reflect.jvm.internal.KFunctionImpl
@@ -35,7 +35,7 @@ import kotlin.reflect.jvm.internal.getOrCreateModule
* Not all features are currently supported, in particular [KCallable.call] and [KCallable.callBy] will fail at the moment. * Not all features are currently supported, in particular [KCallable.call] and [KCallable.callBy] will fail at the moment.
*/ */
public fun <R> Function<R>.reflect(): KFunction<R>? { public fun <R> Function<R>.reflect(): KFunction<R>? {
val callable = javaClass.getAnnotation(KotlinCallable::class.java) ?: return null val callable = javaClass.getAnnotation(KotlinFunction::class.java) ?: return null
val input = BitEncoding.decodeBytes(callable.data).inputStream() val input = BitEncoding.decodeBytes(callable.data).inputStream()
val nameResolver = JvmNameResolver( val nameResolver = JvmNameResolver(
JvmProtoBuf.StringTableTypes.parseDelimitedFrom(input, JvmProtoBufUtil.EXTENSION_REGISTRY), JvmProtoBuf.StringTableTypes.parseDelimitedFrom(input, JvmProtoBufUtil.EXTENSION_REGISTRY),
core/runtime.jvm/src/kotlin/jvm/internal/KotlinCallable.java → core/runtime.jvm/src/kotlin/jvm/internal/KotlinFunction.java
+1 -1
View File
@@ -23,7 +23,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
public @interface KotlinCallable { public @interface KotlinFunction {
@Deprecated @Deprecated
int abiVersion(); int abiVersion();