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

Rename java -> jvm, jet -> kotlin in module serialization.java

Browse Source 
org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization.jvm
This commit is contained in:
Alexander Udalov
2015-01-09 14:06:45 +03:00
parent de6e8a7493
commit 00878cc31a
38 changed files with 1156 additions and 1156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
+2 -3
View File
@@ -21,8 +21,7 @@ import java.util.ArrayList
import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotatedCallableKind
import org.jetbrains.jet.descriptors.serialization.NameResolver
import org.jetbrains.jet.descriptors.serialization.ProtoBuf
import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf
import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.*
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.*
import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
@@ -119,7 +118,7 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
val methodSignature = getCallableSignature(callable, nameResolver, kind)
if (methodSignature != null) {
if (proto.hasExtension(index)) {
val paramSignature = MemberSignature.fromMethodSignatureAndParameterIndex(methodSignature, proto.getExtension(JavaProtoBuf.index))
val paramSignature = MemberSignature.fromMethodSignatureAndParameterIndex(methodSignature, proto.getExtension(index))
return findClassAndLoadMemberAnnotations(container, callable, nameResolver, kind, paramSignature)
}
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
+3 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.kotlin;
import kotlin.Function0;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
import org.jetbrains.jet.descriptors.serialization.PackageData;
import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents;
import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope;
@@ -55,7 +55,7 @@ public final class DeserializedDescriptorResolver {
String[] data = readData(kotlinClass, CLASS);
if (data != null) {
return components.getClassDeserializer().deserializeClass(
kotlinClass.getClassId(), JavaProtoBufUtil.readClassDataFrom(data)
kotlinClass.getClassId(), JvmProtoBufUtil.readClassDataFrom(data)
);
}
return null;
@@ -66,7 +66,7 @@ public final class DeserializedDescriptorResolver {
String[] data = readData(kotlinClass, PACKAGE_FACADE);
if (data != null) {
//all classes are included in java scope
PackageData packageData = JavaProtoBufUtil.readPackageDataFrom(data);
PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data);
return new DeserializedPackageMemberScope(
descriptor, packageData.getPackageProto(), packageData.getNameResolver(), components,
new Function0<Collection<Name>>() {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.kotlin
import org.jetbrains.jet.lang.resolve.name.ClassId
import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
import org.jetbrains.jet.descriptors.serialization.ClassData
import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
public class JavaClassDataFinder(
@@ -30,6 +30,6 @@ public class JavaClassDataFinder(
val javaClassId = DeserializedResolverUtils.kotlinClassIdToJavaClassId(classId)
val kotlinJvmBinaryClass = kotlinClassFinder.findKotlinClass(javaClassId) ?: return null
val data = deserializedDescriptorResolver.readData(kotlinJvmBinaryClass, KotlinClassHeader.Kind.CLASS) ?: return null
return JavaProtoBufUtil.readClassDataFrom(data)
return JvmProtoBufUtil.readClassDataFrom(data)
}
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java
+5 -5
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.lang.resolve.kotlin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf;
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
import org.jetbrains.jet.descriptors.serialization.NameResolver;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
@@ -33,7 +33,7 @@ public class SignatureDeserializer {
}
@NotNull
public String methodSignatureString(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
public String methodSignatureString(@NotNull JvmProtoBuf.JvmMethodSignature signature) {
Name name = nameResolver.getName(signature.getName());
StringBuilder sb = new StringBuilder();
@@ -48,17 +48,17 @@ public class SignatureDeserializer {
}
@NotNull
public MemberSignature methodSignature(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
public MemberSignature methodSignature(@NotNull JvmProtoBuf.JvmMethodSignature signature) {
return MemberSignature.fromMethodNameAndDesc(methodSignatureString(signature));
}
@NotNull
public String typeDescriptor(@NotNull JavaProtoBuf.JavaType type) {
public String typeDescriptor(@NotNull JvmProtoBuf.JvmType type) {
return typeDescriptor(type, new StringBuilder()).toString();
}
@NotNull
private StringBuilder typeDescriptor(@NotNull JavaProtoBuf.JavaType type, @NotNull StringBuilder sb) {
private StringBuilder typeDescriptor(@NotNull JvmProtoBuf.JvmType type, @NotNull StringBuilder sb) {
for (int i = 0; i < type.getArrayDimension(); i++) {
sb.append('[');
}