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

Adapt to protobuf style guide

Browse Source 
Identifiers consisting of multiple words should be separated by an underscore,
repeated field names should be singular
This commit is contained in:
Alexander Udalov
2013-06-27 20:45:50 +04:00
parent bdb7c1eb45
commit b4ac02b175
9 changed files with 812 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/descriptors.proto
+20 -20
View File
@@ -21,14 +21,14 @@ option optimize_for = LITE_RUNTIME; // Smaller runtime
option java_generic_services = false; // Less code
message SimpleNameTable {
repeated string names = 1;
repeated string name = 1;
}
message QualifiedNameTable {
message QualifiedName {
optional int32 parentQualifiedName = 1 [default = -1];
required int32 shortName = 2;
optional int32 parent_qualified_name = 1 [default = -1];
required int32 short_name = 2;
optional Kind kind = 3 [default = PACKAGE];
enum Kind {
@@ -37,7 +37,7 @@ message QualifiedNameTable {
}
}
repeated QualifiedName qualifiedNames = 1;
repeated QualifiedName qualified_name = 1;
}
message Type {
@@ -65,7 +65,7 @@ message Type {
required Type type = 2;
}
repeated Argument arguments = 2;
repeated Argument argument = 2;
optional bool nullable = 3 [default = false];
}
@@ -83,7 +83,7 @@ message TypeParameter {
}
optional Variance variance = 4 [default = INV];
repeated Type upperBounds = 5;
repeated Type upper_bound = 5;
}
message Class {
@@ -110,20 +110,20 @@ message Class {
required int32 name = 4;
repeated TypeParameter typeParameters = 5;
repeated Type supertypes = 6;
repeated TypeParameter type_parameter = 5;
repeated Type supertype = 6;
// we store only names, because the actual information must reside in the corresponding .class files,
// to be obtainable through reflection at runtime
repeated int32 nestedClassNames = 7;
repeated int32 nestedObjectNames = 8;
repeated int32 nested_class_name = 7;
repeated int32 nested_object_name = 8;
optional bool classObjectPresent = 9 [default = false];
optional bool class_object_present = 9 [default = false];
optional Callable primaryConstructor = 10;
optional Callable primary_constructor = 10;
// todo: other constructors?
repeated Callable members = 11;
repeated Callable member = 11;
}
message Callable {
@@ -162,12 +162,12 @@ message Callable {
Modality
has_annotations
*/
optional int32 getterFlags = 9 /* absent => same as property */;
optional int32 setterFlags = 10 /* absent => same as property */;
optional int32 getter_flags = 9 /* absent => same as property */;
optional int32 setter_flags = 10 /* absent => same as property */;
repeated TypeParameter typeParameters = 4;
repeated TypeParameter type_parameter = 4;
optional Type receiverType = 5;
optional Type receiver_type = 5;
required int32 name = 6;
@@ -179,13 +179,13 @@ message Callable {
optional int32 flags = 1;
required int32 name = 2;
required Type type = 3;
optional Type varargElementType = 4;
optional Type vararg_element_type = 4;
}
repeated ValueParameter valueParameters = 7;
repeated ValueParameter value_parameter = 7;
required Type returnType = 8;
required Type return_type = 8;
}
enum Modality {
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
+7 -7
View File
@@ -149,8 +149,8 @@ public class DescriptorDeserializer {
nameResolver.getName(proto.getName()),
memberKind(Flags.MEMBER_KIND.get(flags))
);
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(proto.getTypeParametersCount());
DescriptorDeserializer local = createChildDeserializer(property, proto.getTypeParametersList(), typeParameters);
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(proto.getTypeParameterCount());
DescriptorDeserializer local = createChildDeserializer(property, proto.getTypeParameterList(), typeParameters);
property.setType(
local.typeDeserializer.type(proto.getReturnType()),
typeParameters,
@@ -207,13 +207,13 @@ public class DescriptorDeserializer {
nameResolver.getName(proto.getName()),
memberKind(Flags.MEMBER_KIND.get(flags))
);
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(proto.getTypeParametersCount());
DescriptorDeserializer local = createChildDeserializer(function, proto.getTypeParametersList(), typeParameters);
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(proto.getTypeParameterCount());
DescriptorDeserializer local = createChildDeserializer(function, proto.getTypeParameterList(), typeParameters);
function.initialize(
local.typeDeserializer.typeOrNull(proto.hasReceiverType() ? proto.getReceiverType() : null),
getExpectedThisObject(),
typeParameters,
local.valueParameters(proto.getValueParametersList()),
local.valueParameters(proto.getValueParameterList()),
local.typeDeserializer.type(proto.getReturnType()),
modality(Flags.MODALITY.get(flags)),
visibility(Flags.VISIBILITY.get(flags)),
@@ -237,11 +237,11 @@ public class DescriptorDeserializer {
getAnnotations(proto),
// TODO: primary
true);
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(proto.getTypeParametersCount());
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(proto.getTypeParameterCount());
DescriptorDeserializer local = createChildDeserializer(descriptor, Collections.<TypeParameter>emptyList(), typeParameters);
descriptor.initialize(
classDescriptor.getTypeConstructor().getParameters(),
local.valueParameters(proto.getValueParametersList()),
local.valueParameters(proto.getValueParameterList()),
visibility(Flags.VISIBILITY.get(proto.getFlags())),
!classDescriptor.isInner()
);
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
+9 -9
View File
@@ -87,13 +87,13 @@ public class DescriptorSerializer {
DescriptorSerializer local = createChildSerializer();
for (TypeParameterDescriptor typeParameterDescriptor : classDescriptor.getTypeConstructor().getParameters()) {
builder.addTypeParameters(local.typeParameter(typeParameterDescriptor));
builder.addTypeParameter(local.typeParameter(typeParameterDescriptor));
}
if (!isSpecial.apply(classDescriptor)) {
// Special classes (Any, Nothing) have no supertypes
for (JetType supertype : classDescriptor.getTypeConstructor().getSupertypes()) {
builder.addSupertypes(local.type(supertype));
builder.addSupertype(local.type(supertype));
}
}
@@ -107,7 +107,7 @@ public class DescriptorSerializer {
if (descriptor instanceof CallableMemberDescriptor) {
CallableMemberDescriptor member = (CallableMemberDescriptor) descriptor;
if (member.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) continue;
builder.addMembers(local.callableProto(member));
builder.addMember(local.callableProto(member));
}
}
@@ -115,12 +115,12 @@ public class DescriptorSerializer {
for (DeclarationDescriptor descriptor : sort(nestedClasses)) {
ClassDescriptor nestedClass = (ClassDescriptor) descriptor;
int nameIndex = nameTable.getSimpleNameIndex(nestedClass.getName());
builder.addNestedClassNames(nameIndex);
builder.addNestedClassName(nameIndex);
}
for (ClassDescriptor descriptor : sort(classDescriptor.getUnsubstitutedInnerClassesScope().getObjectDescriptors())) {
int nameIndex = nameTable.getSimpleNameIndex(descriptor.getName());
builder.addNestedObjectNames(nameIndex);
builder.addNestedObjectName(nameIndex);
}
if (classDescriptor.getClassObjectDescriptor() != null) {
@@ -182,7 +182,7 @@ public class DescriptorSerializer {
DescriptorSerializer local = createChildSerializer();
for (TypeParameterDescriptor typeParameterDescriptor : descriptor.getTypeParameters()) {
builder.addTypeParameters(local.typeParameter(typeParameterDescriptor));
builder.addTypeParameter(local.typeParameter(typeParameterDescriptor));
}
ReceiverParameterDescriptor receiverParameter = descriptor.getReceiverParameter();
@@ -193,7 +193,7 @@ public class DescriptorSerializer {
builder.setName(nameTable.getSimpleNameIndex(descriptor.getName()));
for (ValueParameterDescriptor valueParameterDescriptor : descriptor.getValueParameters()) {
builder.addValueParameters(local.valueParameter(valueParameterDescriptor));
builder.addValueParameter(local.valueParameter(valueParameterDescriptor));
}
builder.setReturnType(local.type(getSerializableReturnType(descriptor.getReturnType())));
@@ -287,7 +287,7 @@ public class DescriptorSerializer {
}
for (JetType upperBound : typeParameter.getUpperBounds()) {
builder.addUpperBounds(type(upperBound));
builder.addUpperBound(type(upperBound));
}
return builder;
@@ -314,7 +314,7 @@ public class DescriptorSerializer {
builder.setConstructor(typeConstructor(type.getConstructor()));
for (TypeProjection projection : type.getArguments()) {
builder.addArguments(typeArgument(projection));
builder.addArgument(typeArgument(projection));
}
// to avoid storing a default
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java
+4 -4
View File
@@ -38,13 +38,13 @@ public class NameResolver {
@NotNull
public Name getName(int index) {
String name = simpleNames.getNames(index);
String name = simpleNames.getName(index);
return Name.guess(name);
}
@NotNull
public ClassId getClassId(int index) {
QualifiedName fqNameProto = qualifiedNames.getQualifiedNames(index);
QualifiedName fqNameProto = qualifiedNames.getQualifiedName(index);
assert fqNameProto.getKind() == ProtoBuf.QualifiedNameTable.QualifiedName.Kind.CLASS : "Not a class fqName: " + getClassId(index);
StringBuilder relativeClassName = new StringBuilder();
@@ -73,7 +73,7 @@ public class NameResolver {
) {
QualifiedName result = null;
if (fqNameProto.hasParentQualifiedName()) {
QualifiedName parentProto = qualifiedNames.getQualifiedNames(fqNameProto.getParentQualifiedName());
QualifiedName parentProto = qualifiedNames.getQualifiedName(fqNameProto.getParentQualifiedName());
if (kind == null || parentProto.getKind() == kind) {
result = renderFqName(sb, parentProto, kind);
sb.append(".");
@@ -82,7 +82,7 @@ public class NameResolver {
result = parentProto;
}
}
sb.append(simpleNames.getNames(fqNameProto.getShortName()));
sb.append(simpleNames.getName(fqNameProto.getShortName()));
return result;
}
}
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java
+2 -2
View File
@@ -56,7 +56,7 @@ public class NameSerializationUtil {
public static ProtoBuf.SimpleNameTable toSimpleNameTable(@NotNull NameTable nameTable) {
ProtoBuf.SimpleNameTable.Builder simpleNames = ProtoBuf.SimpleNameTable.newBuilder();
for (String simpleName : nameTable.getSimpleNames()) {
simpleNames.addNames(simpleName);
simpleNames.addName(simpleName);
}
return simpleNames.build();
}
@@ -65,7 +65,7 @@ public class NameSerializationUtil {
public static ProtoBuf.QualifiedNameTable toQualifiedNameTable(@NotNull NameTable nameTable) {
ProtoBuf.QualifiedNameTable.Builder qualifiedNames = ProtoBuf.QualifiedNameTable.newBuilder();
for (ProtoBuf.QualifiedNameTable.QualifiedName.Builder qName : nameTable.getFqNames()) {
qualifiedNames.addQualifiedNames(qName);
qualifiedNames.addQualifiedName(qName);
}
return qualifiedNames.build();
}
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java
+760 -760
View File
File diff suppressed because it is too large Load Diff
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java
+1 -1
View File
@@ -207,7 +207,7 @@ public class TypeDeserializer {
public DeserializedType(@NotNull ProtoBuf.Type proto) {
this.typeProto = proto;
this.arguments = typeArguments(proto.getArgumentsList());
this.arguments = typeArguments(proto.getArgumentList());
this.constructor = storageManager.createLazyValue(new Computable<TypeConstructor>() {
@Override
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
+7 -7
View File
@@ -85,8 +85,8 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
"Deserializer for class " + name, NONE);
DescriptorDeserializer outerDeserializer = DescriptorDeserializer.create(storageManager, notNullTypeDeserializer,
this, nameResolver, annotationResolver);
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(classProto.getTypeParametersCount());
this.deserializer = outerDeserializer.createChildDeserializer(this, classProto.getTypeParametersList(), typeParameters);
List<TypeParameterDescriptor> typeParameters = new ArrayList<TypeParameterDescriptor>(classProto.getTypeParameterCount());
this.deserializer = outerDeserializer.createChildDeserializer(this, classProto.getTypeParameterList(), typeParameters);
this.typeDeserializer = deserializer.getTypeDeserializer();
this.containingDeclaration = containingDeclaration;
@@ -123,13 +123,13 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
return computeClassObjectDecriptor();
}
});
this.nestedClasses = new NestedClassDescriptors(storageManager, stringSet(classProto.getNestedClassNamesList(), nameResolver)) {
this.nestedClasses = new NestedClassDescriptors(storageManager, stringSet(classProto.getNestedClassNameList(), nameResolver)) {
@Override
protected ClassDescriptor resolveNestedClass(@NotNull Name name) {
return nestedClassResolver.resolveNestedClass(DeserializedClassDescriptor.this, name);
}
};
this.nestedObjects = new NestedClassDescriptors(storageManager, stringSet(classProto.getNestedObjectNamesList(), nameResolver)) {
this.nestedObjects = new NestedClassDescriptors(storageManager, stringSet(classProto.getNestedObjectNameList(), nameResolver)) {
@Override
protected ClassDescriptor resolveNestedClass(@NotNull Name name) {
return nestedClassResolver.resolveNestedClass(DeserializedClassDescriptor.this, name);
@@ -271,8 +271,8 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
}
private Collection<JetType> computeSuperTypes() {
List<JetType> supertypes = new ArrayList<JetType>(classProto.getSupertypesCount());
for (ProtoBuf.Type supertype : classProto.getSupertypesList()) {
List<JetType> supertypes = new ArrayList<JetType>(classProto.getSupertypeCount());
for (ProtoBuf.Type supertype : classProto.getSupertypeList()) {
supertypes.add(typeDeserializer.type(supertype));
}
return supertypes;
@@ -329,7 +329,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
private final DeserializedClassDescriptor classDescriptor;
public DeserializedClassMemberScope(@NotNull StorageManager storageManager, @NotNull DeserializedClassDescriptor classDescriptor) {
super(storageManager, classDescriptor, classDescriptor.deserializer, classDescriptor.classProto.getMembersList());
super(storageManager, classDescriptor, classDescriptor.deserializer, classDescriptor.classProto.getMemberList());
this.classDescriptor = classDescriptor;
}
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java
+2 -2
View File
@@ -53,8 +53,8 @@ public class DeserializedTypeParameterDescriptor extends AbstractLazyTypeParamet
@NotNull
@Override
protected Set<JetType> resolveUpperBounds() {
Set<JetType> result = new LinkedHashSet<JetType>(proto.getUpperBoundsCount());
for (ProtoBuf.Type upperBound : proto.getUpperBoundsList()) {
Set<JetType> result = new LinkedHashSet<JetType>(proto.getUpperBoundCount());
for (ProtoBuf.Type upperBound : proto.getUpperBoundList()) {
result.add(typeDeserializer.type(upperBound));
}
if (result.isEmpty()) {