renamed JetVisitor to JetVisitorVoid

This commit is contained in:
svtk
2011-08-16 17:09:06 +04:00
parent 57db9b076a
commit 948f434d5e
108 changed files with 127 additions and 128 deletions
@@ -32,7 +32,7 @@ import java.util.*;
* @author max * @author max
* @author yole * @author yole
*/ */
public class ExpressionCodegen extends JetVisitor { public class ExpressionCodegen extends JetVisitorVoid {
private static final String CLASS_OBJECT = "java/lang/Object"; private static final String CLASS_OBJECT = "java/lang/Object";
private static final String CLASS_STRING = "java/lang/String"; private static final String CLASS_STRING = "java/lang/String";
public static final String CLASS_STRING_BUILDER = "java/lang/StringBuilder"; public static final String CLASS_STRING_BUILDER = "java/lang/StringBuilder";
@@ -109,7 +109,7 @@ public class GenerationState {
} }
public static void prepareAnonymousClasses(JetElement aClass, final JetTypeMapper typeMapper) { public static void prepareAnonymousClasses(JetElement aClass, final JetTypeMapper typeMapper) {
aClass.acceptChildren(new JetVisitor() { aClass.acceptChildren(new JetVisitorVoid() {
@Override @Override
public void visitJetElement(JetElement element) { public void visitJetElement(JetElement element) {
super.visitJetElement(element); super.visitJetElement(element);
@@ -89,7 +89,7 @@ public class JetControlFlowProcessor {
return result; return result;
} }
private class CFPVisitor extends JetVisitor { private class CFPVisitor extends JetVisitorVoid {
private final boolean preferBlock; private final boolean preferBlock;
private final boolean inCondition; private final boolean inCondition;
@@ -643,8 +643,8 @@ public class JetControlFlowProcessor {
JetWhenCondition[] conditions = whenEntry.getConditions(); JetWhenCondition[] conditions = whenEntry.getConditions();
for (int i = 0; i < conditions.length; i++) { for (int i = 0; i < conditions.length; i++) {
JetWhenCondition condition = conditions[i]; JetWhenCondition condition = conditions[i];
condition.accept(new JetVisitor() { condition.accept(new JetVisitorVoid() {
private final JetVisitor conditionVisitor = this; private final JetVisitorVoid conditionVisitor = this;
@Override @Override
public void visitWhenConditionCall(JetWhenConditionCall condition) { public void visitWhenConditionCall(JetWhenConditionCall condition) {
@@ -662,7 +662,7 @@ public class JetControlFlowProcessor {
public void visitWhenConditionIsPattern(JetWhenConditionIsPattern condition) { public void visitWhenConditionIsPattern(JetWhenConditionIsPattern condition) {
JetPattern pattern = condition.getPattern(); JetPattern pattern = condition.getPattern();
if (pattern != null) { if (pattern != null) {
pattern.accept(new JetVisitor() { pattern.accept(new JetVisitorVoid() {
@Override @Override
public void visitTypePattern(JetTypePattern typePattern) { public void visitTypePattern(JetTypePattern typePattern) {
// TODO // TODO
@@ -17,7 +17,7 @@ public class JetAnnotatedExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitAnnotatedExpression(this); visitor.visitAnnotatedExpression(this);
} }
@@ -15,7 +15,7 @@ public class JetAnnotation extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitAnnotation(this); visitor.visitAnnotation(this);
} }
@@ -17,7 +17,7 @@ public class JetAnnotationEntry extends JetElement implements JetCall {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitAnnotationEntry(this); visitor.visitAnnotationEntry(this);
} }
@@ -29,7 +29,7 @@ public class JetArrayAccessExpression extends JetReferenceExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitArrayAccessExpression(this); visitor.visitArrayAccessExpression(this);
} }
@@ -16,7 +16,7 @@ public class JetBinaryExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitBinaryExpression(this); visitor.visitBinaryExpression(this);
} }
@@ -15,7 +15,7 @@ public class JetBinaryExpressionWithTypeRHS extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitBinaryWithTypeRHSExpression(this); visitor.visitBinaryWithTypeRHSExpression(this);
} }
@@ -24,7 +24,7 @@ public class JetBindingPattern extends JetPattern {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitBindingPattern(this); visitor.visitBindingPattern(this);
} }
@@ -15,7 +15,7 @@ public class JetBlockExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitBlockExpression(this); visitor.visitBlockExpression(this);
} }
@@ -12,7 +12,7 @@ public class JetBlockStringTemplateEntry extends JetStringTemplateEntryWithExpre
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitBlockStringTemplateEntry(this); visitor.visitBlockStringTemplateEntry(this);
} }
@@ -12,7 +12,7 @@ public class JetBreakExpression extends JetLabelQualifiedExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitBreakExpression(this); visitor.visitBreakExpression(this);
} }
@@ -17,7 +17,7 @@ public class JetCallExpression extends JetExpression implements JetCall {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitCallExpression(this); visitor.visitCallExpression(this);
} }
@@ -16,7 +16,7 @@ public class JetCatchClause extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitCatchSection(this); visitor.visitCatchSection(this);
} }
@@ -34,7 +34,7 @@ public class JetClass extends JetTypeParameterListOwner implements JetClassOrObj
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitClass(this); visitor.visitClass(this);
} }
@@ -25,7 +25,7 @@ public class JetClassBody extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitClassBody(this); visitor.visitClassBody(this);
} }
@@ -12,7 +12,7 @@ public class JetClassInitializer extends JetDeclaration {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitAnonymousInitializer(this); visitor.visitAnonymousInitializer(this);
} }
@@ -14,7 +14,7 @@ public class JetClassObject extends JetDeclaration {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitClassObject(this); visitor.visitClassObject(this);
} }
@@ -12,7 +12,7 @@ public class JetConstantExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitConstantExpression(this); visitor.visitConstantExpression(this);
} }
@@ -18,7 +18,7 @@ public class JetConstructor extends JetDeclaration implements JetDeclarationWith
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitConstructor(this); visitor.visitConstructor(this);
} }
@@ -12,7 +12,7 @@ public class JetContinueExpression extends JetLabelQualifiedExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitContinueExpression(this); visitor.visitContinueExpression(this);
} }
@@ -23,7 +23,7 @@ public class JetDecomposerPattern extends JetPattern {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDecomposerPattern(this); visitor.visitDecomposerPattern(this);
} }
@@ -14,7 +14,7 @@ public class JetDelegationSpecifier extends JetElement{
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDelegationSpecifier(this); visitor.visitDelegationSpecifier(this);
} }
@@ -15,7 +15,7 @@ public class JetDelegationSpecifierList extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDelegationSpecifierList(this); visitor.visitDelegationSpecifierList(this);
} }
@@ -13,7 +13,7 @@ public class JetDelegatorByExpressionSpecifier extends JetDelegationSpecifier {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDelegationByExpressionSpecifier(this); visitor.visitDelegationByExpressionSpecifier(this);
} }
@@ -17,7 +17,7 @@ public class JetDelegatorToSuperCall extends JetDelegationSpecifier implements J
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDelegationToSuperCallSpecifier(this); visitor.visitDelegationToSuperCallSpecifier(this);
} }
@@ -12,7 +12,7 @@ public class JetDelegatorToSuperClass extends JetDelegationSpecifier {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDelegationToSuperClassSpecifier(this); visitor.visitDelegationToSuperClassSpecifier(this);
} }
@@ -18,7 +18,7 @@ public class JetDelegatorToThisCall extends JetDelegationSpecifier implements Je
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDelegationToThisCall(this); visitor.visitDelegationToThisCall(this);
} }
@@ -14,7 +14,7 @@ public class JetDoWhileExpression extends JetLoopExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDoWhileExpression(this); visitor.visitDoWhileExpression(this);
} }
@@ -12,7 +12,7 @@ public class JetDotQualifiedExpression extends JetQualifiedExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitDotQualifiedExpression(this); visitor.visitDotQualifiedExpression(this);
} }
@@ -40,15 +40,15 @@ public class JetElement extends ASTWrapperPsiElement {
@Override @Override
public final void accept(@NotNull PsiElementVisitor visitor) { public final void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) { if (visitor instanceof JetVisitorVoid) {
accept((JetVisitor) visitor); accept((JetVisitorVoid) visitor);
} }
else { else {
visitor.visitElement(this); visitor.visitElement(this);
} }
} }
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitJetElement(this); visitor.visitJetElement(this);
} }
@@ -47,7 +47,7 @@ public class JetEnumEntry extends JetClass {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitEnumEntry(this); visitor.visitEnumEntry(this);
} }
@@ -13,7 +13,7 @@ public class JetEscapeStringTemplateEntry extends JetStringTemplateEntry {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitEscapeStringTemplateEntry(this); visitor.visitEscapeStringTemplateEntry(this);
} }
@@ -13,7 +13,7 @@ public class JetExpression extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitExpression(this); visitor.visitExpression(this);
} }
@@ -18,7 +18,7 @@ public class JetExpressionPattern extends JetPattern {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitExpressionPattern(this); visitor.visitExpressionPattern(this);
} }
@@ -34,8 +34,8 @@ public class JetFile extends PsiFileBase {
@Override @Override
public void accept(@NotNull PsiElementVisitor visitor) { public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) { if (visitor instanceof JetVisitorVoid) {
((JetVisitor) visitor).visitJetFile(this); ((JetVisitorVoid) visitor).visitJetFile(this);
} }
else { else {
visitor.visitFile(this); visitor.visitFile(this);
@@ -13,7 +13,7 @@ public class JetFinallySection extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitFinallySection(this); visitor.visitFinallySection(this);
} }
@@ -14,7 +14,7 @@ public class JetForExpression extends JetLoopExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitForExpression(this); visitor.visitForExpression(this);
} }
@@ -13,7 +13,7 @@ public class JetFunctionLiteralExpression extends JetExpression implements JetDe
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitFunctionLiteralExpression(this); visitor.visitFunctionLiteralExpression(this);
} }
@@ -40,7 +40,7 @@ public class JetFunctionType extends JetTypeElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitFunctionType(this); visitor.visitFunctionType(this);
} }
@@ -12,7 +12,7 @@ public class JetHashQualifiedExpression extends JetQualifiedExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitHashQualifiedExpression(this); visitor.visitHashQualifiedExpression(this);
} }
@@ -14,7 +14,7 @@ public class JetIfExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitIfExpression(this); visitor.visitIfExpression(this);
} }
@@ -15,7 +15,7 @@ public class JetImportDirective extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitImportDirective(this); visitor.visitImportDirective(this);
} }
@@ -15,7 +15,7 @@ public class JetInitializerList extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitInitializerList(this); visitor.visitInitializerList(this);
} }
@@ -15,7 +15,7 @@ public class JetIsExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitIsExpression(this); visitor.visitIsExpression(this);
} }
@@ -12,7 +12,7 @@ public class JetLiteralStringTemplateEntry extends JetStringTemplateEntry {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitLiteralStringTemplateEntry(this); visitor.visitLiteralStringTemplateEntry(this);
} }
@@ -19,7 +19,7 @@ public class JetModifierList extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitModifierList(this); visitor.visitModifierList(this);
} }
@@ -14,7 +14,7 @@ public class JetNamedFunction extends JetFunction {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitNamedFunction(this); visitor.visitNamedFunction(this);
} }
@@ -19,7 +19,7 @@ public class JetNamespace extends JetNamedDeclaration {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitNamespace(this); visitor.visitNamespace(this);
} }
@@ -19,7 +19,7 @@ public class JetNamespaceBody extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitNamespaceBody(this); visitor.visitNamespaceBody(this);
} }
@@ -9,7 +9,7 @@ package org.jetbrains.jet.lang.psi;
// } // }
// //
// @Override // @Override
// public void accept(JetVisitor visitor) { // public void accept(JetVisitorVoid visitor) {
// visitor.visitNewExpression(this); // visitor.visitNewExpression(this);
// } // }
// //
@@ -20,7 +20,7 @@ public class JetNullableType extends JetTypeElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitNullableType(this); visitor.visitNullableType(this);
} }
@@ -79,7 +79,7 @@ public class JetObjectDeclaration extends JetNamedDeclaration implements JetClas
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitObjectDeclaration(this); visitor.visitObjectDeclaration(this);
} }
@@ -13,7 +13,7 @@ public class JetObjectLiteralExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitObjectLiteralExpression(this); visitor.visitObjectLiteralExpression(this);
} }
@@ -15,7 +15,7 @@ public class JetParameter extends JetNamedDeclaration {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitParameter(this); visitor.visitParameter(this);
} }
@@ -15,7 +15,7 @@ public class JetParameterList extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitParameterList(this); visitor.visitParameterList(this);
} }
@@ -13,7 +13,7 @@ public class JetParenthesizedExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitParenthesizedExpression(this); visitor.visitParenthesizedExpression(this);
} }
@@ -19,7 +19,7 @@ public class JetPostfixExpression extends JetUnaryExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitPostfixExpression(this); visitor.visitPostfixExpression(this);
} }
@@ -12,7 +12,7 @@ public class JetPredicateExpression extends JetQualifiedExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitPredicateExpression(this); visitor.visitPredicateExpression(this);
} }
@@ -14,7 +14,7 @@ public class JetPrefixExpression extends JetUnaryExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitPrefixExpression(this); visitor.visitPrefixExpression(this);
} }
@@ -20,7 +20,7 @@ public class JetProperty extends JetTypeParameterListOwner {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitProperty(this); visitor.visitProperty(this);
} }
@@ -17,7 +17,7 @@ public class JetPropertyAccessor extends JetDeclaration implements JetDeclaratio
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitPropertyAccessor(this); visitor.visitPropertyAccessor(this);
} }
@@ -29,7 +29,7 @@ public class JetPsiUtil {
public static Set<JetElement> findRootExpressions(@NotNull Collection<JetElement> unreachableElements) { public static Set<JetElement> findRootExpressions(@NotNull Collection<JetElement> unreachableElements) {
Set<JetElement> rootElements = new HashSet<JetElement>(); Set<JetElement> rootElements = new HashSet<JetElement>();
final Set<JetElement> shadowedElements = new HashSet<JetElement>(); final Set<JetElement> shadowedElements = new HashSet<JetElement>();
JetVisitor shadowAllChildren = new JetVisitor() { JetVisitorVoid shadowAllChildren = new JetVisitorVoid() {
@Override @Override
public void visitJetElement(JetElement element) { public void visitJetElement(JetElement element) {
if (shadowedElements.add(element)) { if (shadowedElements.add(element)) {
@@ -13,7 +13,7 @@ public class JetReturnExpression extends JetLabelQualifiedExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitReturnExpression(this); visitor.visitReturnExpression(this);
} }
@@ -12,7 +12,7 @@ public class JetRootNamespaceExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitRootNamespaceExpression(this); visitor.visitRootNamespaceExpression(this);
} }
@@ -12,7 +12,7 @@ public class JetSafeQualifiedExpression extends JetQualifiedExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitSafeQualifiedExpression(this); visitor.visitSafeQualifiedExpression(this);
} }
@@ -21,7 +21,7 @@ public class JetSelfType extends JetTypeElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitSelfType(this); visitor.visitSelfType(this);
} }
@@ -157,7 +157,7 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitSimpleNameExpression(this); visitor.visitSimpleNameExpression(this);
} }
@@ -2,7 +2,6 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
/** /**
* @author abreslav * @author abreslav
@@ -14,7 +13,7 @@ public class JetSimpleNameStringTemplateEntry extends JetStringTemplateEntryWith
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitSimpleNameStringTemplateEntry(this); visitor.visitSimpleNameStringTemplateEntry(this);
} }
@@ -12,7 +12,7 @@ public abstract class JetStringTemplateEntryWithExpression extends JetStringTemp
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitStringTemplateEntryWithExpression(this); visitor.visitStringTemplateEntryWithExpression(this);
} }
@@ -12,7 +12,7 @@ public class JetStringTemplateExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitStringTemplateExpression(this); visitor.visitStringTemplateExpression(this);
} }
@@ -15,7 +15,7 @@ public class JetThisExpression extends JetLabelQualifiedExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitThisExpression(this); visitor.visitThisExpression(this);
} }
@@ -13,7 +13,7 @@ public class JetThrowExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitThrowExpression(this); visitor.visitThrowExpression(this);
} }
@@ -16,7 +16,7 @@ public class JetTryExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTryExpression(this); visitor.visitTryExpression(this);
} }
@@ -15,7 +15,7 @@ public class JetTupleExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTupleExpression(this); visitor.visitTupleExpression(this);
} }
@@ -15,7 +15,7 @@ public class JetTuplePattern extends JetPattern {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTuplePattern(this); visitor.visitTuplePattern(this);
} }
@@ -21,7 +21,7 @@ public class JetTupleType extends JetTypeElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTupleType(this); visitor.visitTupleType(this);
} }
@@ -15,7 +15,7 @@ public class JetTypeArgumentList extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypeArgumentList(this); visitor.visitTypeArgumentList(this);
} }
@@ -16,7 +16,7 @@ public class JetTypeConstraint extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypeConstraint(this); visitor.visitTypeConstraint(this);
} }
@@ -15,7 +15,7 @@ public class JetTypeConstraintList extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypeConstraintList(this); visitor.visitTypeConstraintList(this);
} }
@@ -16,7 +16,7 @@ public class JetTypeParameter extends JetNamedDeclaration {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypeParameter(this); visitor.visitTypeParameter(this);
} }
@@ -19,7 +19,7 @@ public class JetTypeParameterList extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypeParameterList(this); visitor.visitTypeParameterList(this);
} }
@@ -18,7 +18,7 @@ public class JetTypePattern extends JetPattern {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypePattern(this); visitor.visitTypePattern(this);
} }
@@ -28,7 +28,7 @@ public class JetTypeProjection extends JetDeclaration {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypeProjection(this); visitor.visitTypeProjection(this);
} }
@@ -18,7 +18,7 @@ public class JetTypeReference extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypeReference(this); visitor.visitTypeReference(this);
} }
@@ -14,7 +14,7 @@ public class JetTypedef extends JetTypeParameterListOwner {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitTypedef(this); visitor.visitTypedef(this);
} }
@@ -23,7 +23,7 @@ public class JetUserType extends JetTypeElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitUserType(this); visitor.visitUserType(this);
} }
@@ -14,7 +14,7 @@ public class JetValueArgument extends JetElement implements ValueArgumentPsi {
super(node); super(node);
} }
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitArgument(this); visitor.visitArgument(this);
} }
@@ -15,7 +15,7 @@ public class JetValueArgumentList extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitValueArgumentList(this); visitor.visitValueArgumentList(this);
} }
@@ -5,7 +5,7 @@ import com.intellij.psi.PsiElementVisitor;
/** /**
* @author max * @author max
*/ */
public class JetVisitor extends PsiElementVisitor { public class JetVisitorVoid extends PsiElementVisitor {
public void visitJetElement(JetElement element) { public void visitJetElement(JetElement element) {
visitElement(element); visitElement(element);
} }
@@ -29,7 +29,7 @@ public class JetWhenConditionCall extends JetWhenCondition {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitWhenConditionCall(this); visitor.visitWhenConditionCall(this);
} }
@@ -35,7 +35,7 @@ public class JetWhenConditionInRange extends JetWhenCondition {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitWhenConditionInRange(this); visitor.visitWhenConditionInRange(this);
} }
@@ -23,7 +23,7 @@ public class JetWhenConditionIsPattern extends JetWhenCondition {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitWhenConditionIsPattern(this); visitor.visitWhenConditionIsPattern(this);
} }
@@ -23,7 +23,7 @@ public class JetWhenEntry extends JetElement {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitWhenEntry(this); visitor.visitWhenEntry(this);
} }
@@ -26,7 +26,7 @@ public class JetWhenExpression extends JetExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitWhenExpression(this); visitor.visitWhenExpression(this);
} }
@@ -14,7 +14,7 @@ public class JetWhileExpression extends JetLoopExpression {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitWhileExpression(this); visitor.visitWhileExpression(this);
} }
@@ -12,7 +12,7 @@ public class JetWildcardPattern extends JetPattern {
} }
@Override @Override
public void accept(@NotNull JetVisitor visitor) { public void accept(@NotNull JetVisitorVoid visitor) {
visitor.visitWildcardPattern(this); visitor.visitWildcardPattern(this);
} }
@@ -48,7 +48,7 @@ public class AnnotationResolver {
public CompileTimeConstant<?> resolveAnnotationArgument(@NotNull JetExpression expression, @NotNull JetType expectedType) { public CompileTimeConstant<?> resolveAnnotationArgument(@NotNull JetExpression expression, @NotNull JetType expectedType) {
final CompileTimeConstant<?>[] result = new CompileTimeConstant<?>[1]; final CompileTimeConstant<?>[] result = new CompileTimeConstant<?>[1];
// expression.accept(new JetVisitor() { // expression.accept(new JetVisitorVoid() {
// @Override // @Override
// public void visitConstantExpression(JetConstantExpression expression) { // public void visitConstantExpression(JetConstantExpression expression) {
// JetType type = typeInferrer.getType(JetScope.EMPTY, expression, false, expectedType); // JetType type = typeInferrer.getType(JetScope.EMPTY, expression, false, expectedType);
@@ -71,7 +71,7 @@ public class ClassDescriptorResolver {
List<JetDeclaration> declarations = classElement.getDeclarations(); List<JetDeclaration> declarations = classElement.getDeclarations();
for (JetDeclaration declaration : declarations) { for (JetDeclaration declaration : declarations) {
declaration.accept(new JetVisitor() { declaration.accept(new JetVisitorVoid() {
@Override @Override
public void visitProperty(JetProperty property) { public void visitProperty(JetProperty property) {
if (property.getPropertyTypeRef() != null) { if (property.getPropertyTypeRef() != null) {

Some files were not shown because too many files have changed in this diff Show More