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

Got rid of subVisitor.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-13 22:16:43 +04:00
parent 79cf8e60b8
commit e04b946bf9
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+11 -21
View File
@@ -46,23 +46,6 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private final DeclarationDescriptorVisitor<Void, StringBuilder> subVisitor = new RenderDeclarationDescriptorVisitor() {
@Override
public Void visitTypeParameterDescriptor(TypeParameterDescriptor descriptor, StringBuilder builder) {
renderTypeParameter(descriptor, builder, false);
return null;
}
@Override
public Void visitValueParameterDescriptor(ValueParameterDescriptor descriptor, StringBuilder builder) {
super.visitVariableDescriptor(descriptor, builder, true);
if (hasDefaultValue(descriptor)) {
builder.append(" = ...");
}
return null;
}
};
private final RenderDeclarationDescriptorVisitor rootVisitor = new RenderDeclarationDescriptorVisitor();
private final boolean shortNames;
@@ -294,7 +277,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
handler.appendBeforeValueParameters(function, builder);
for (ValueParameterDescriptor parameter : function.getValueParameters()) {
handler.appendBeforeValueParameter(parameter, builder);
parameter.accept(subVisitor, builder);
renderValueParameterOfFunction(parameter, builder);
handler.appendAfterValueParameter(parameter, builder);
}
handler.appendAfterValueParameters(function, builder);
@@ -302,7 +285,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
else {
builder.append("(");
for (ValueParameterDescriptor parameter : function.getValueParameters()) {
parameter.accept(subVisitor, builder);
renderValueParameterOfFunction(parameter, builder);
if (parameter.getIndex() != function.getValueParameters().size() - 1) {
builder.append(", ");
}
@@ -311,6 +294,13 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
}
}
private void renderValueParameterOfFunction(ValueParameterDescriptor descriptor, StringBuilder builder) {
rootVisitor.visitVariableDescriptor(descriptor, builder, true);
if (hasDefaultValue(descriptor)) {
builder.append(" = ...");
}
}
private class RenderDeclarationDescriptorVisitor implements DeclarationDescriptorVisitor<Void, StringBuilder> {
@Override
public Void visitValueParameterDescriptor(ValueParameterDescriptor descriptor, StringBuilder builder) {
@@ -495,7 +485,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
builder.append(lt());
for (Iterator<TypeParameterDescriptor> iterator = typeParameters.iterator(); iterator.hasNext(); ) {
TypeParameterDescriptor typeParameterDescriptor = iterator.next();
typeParameterDescriptor.accept(subVisitor, builder);
renderTypeParameter(typeParameterDescriptor, builder, false);
if (iterator.hasNext()) {
builder.append(", ");
}
@@ -635,5 +625,5 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
// rendered with "where"
}
}
}
}
}