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

Rename jet -> kotlin and regroup files in serialization

Browse Source 
org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization

Deserialization goes to subpackage deserialization, built-ins-related stuff
goes to subpackage builtins
This commit is contained in:
Alexander Udalov
2015-01-09 14:13:26 +03:00
parent 00878cc31a
commit 05eaf81ba6
79 changed files with 4007 additions and 4012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization.jvm/src/jvm_descriptors.proto
+2 -2
View File
@@ -69,7 +69,7 @@ message JvmPropertySignature {
optional JvmMethodSignature setter = 4;
}
extend org.jetbrains.jet.descriptors.serialization.Callable {
extend org.jetbrains.kotlin.serialization.Callable {
optional JvmMethodSignature method_signature = 100;
optional JvmPropertySignature property_signature = 101;
@@ -82,7 +82,7 @@ extend org.jetbrains.jet.descriptors.serialization.Callable {
optional int32 impl_class_name = 102;
}
extend org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter {
extend org.jetbrains.kotlin.serialization.Callable.ValueParameter {
// Index of the corresponding parameter of this method in JVM (counting receiver parameters, enum constructor synthetic parameters, etc.)
optional int32 index = 100;
}
core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+12 -12
View File
@@ -2798,14 +2798,14 @@ public final class JvmProtoBuf {
public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
/**
* <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
*/
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature> methodSignature = com.google.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
null,
@@ -2813,14 +2813,14 @@ public final class JvmProtoBuf {
com.google.protobuf.WireFormat.FieldType.MESSAGE);
public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 101;
/**
* <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
*/
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature> propertySignature = com.google.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
null,
@@ -2828,14 +2828,14 @@ public final class JvmProtoBuf {
com.google.protobuf.WireFormat.FieldType.MESSAGE);
public static final int IMPL_CLASS_NAME_FIELD_NUMBER = 102;
/**
* <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
* <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
*/
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
java.lang.Integer> implClassName = com.google.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
0,
null,
null,
@@ -2843,14 +2843,14 @@ public final class JvmProtoBuf {
com.google.protobuf.WireFormat.FieldType.INT32);
public static final int INDEX_FIELD_NUMBER = 100;
/**
* <code>extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }</code>
* <code>extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }</code>
*/
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter,
org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
java.lang.Integer> index = com.google.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
0,
null,
null,
core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.serialization.jvm;
import com.google.protobuf.ExtensionRegistryLite;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.descriptors.serialization.ClassData;
import org.jetbrains.jet.descriptors.serialization.PackageData;
import org.jetbrains.kotlin.serialization.ClassData;
import org.jetbrains.kotlin.serialization.PackageData;
public class JvmProtoBufUtil {
private JvmProtoBufUtil() {