This commit is contained in:
Sergey Ignatov
2011-10-31 17:01:56 +04:00
parent 18c2b34257
commit 16ed93a0a3
3 changed files with 5 additions and 2 deletions
@@ -5,6 +5,7 @@ package org.jetbrains.jet.j2k.ast;
*/ */
public interface Identifier extends INode { public interface Identifier extends INode {
public static Identifier EMPTY_IDENTIFIER = new IdentifierImpl(""); public static Identifier EMPTY_IDENTIFIER = new IdentifierImpl("");
public String getName(); public String getName();
public boolean isEmpty(); public boolean isEmpty();
@@ -15,6 +15,7 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
private Expression myResult = Expression.EMPTY_EXPRESSION; private Expression myResult = Expression.EMPTY_EXPRESSION;
@NotNull @NotNull
@Override
public Expression getResult() { public Expression getResult() {
return myResult; return myResult;
} }
@@ -18,7 +18,8 @@ public class StatementVisitor extends ElementVisitor implements Visitor {
private Statement myResult = Statement.EMPTY_STATEMENT; private Statement myResult = Statement.EMPTY_STATEMENT;
@NotNull @NotNull
public Statement getStatement() { @Override
public Statement getResult() {
return myResult; return myResult;
} }
@@ -82,6 +83,7 @@ public class StatementVisitor extends ElementVisitor implements Visitor {
@Override @Override
public void visitEmptyStatement(PsiEmptyStatement statement) { public void visitEmptyStatement(PsiEmptyStatement statement) {
super.visitEmptyStatement(statement); super.visitEmptyStatement(statement);
myResult = Statement.EMPTY_STATEMENT;
} }
@Override @Override
@@ -213,7 +215,6 @@ public class StatementVisitor extends ElementVisitor implements Visitor {
@Override @Override
public void visitReturnStatement(PsiReturnStatement statement) { public void visitReturnStatement(PsiReturnStatement statement) {
super.visitReturnStatement(statement); super.visitReturnStatement(statement);
myResult = new ReturnStatement( myResult = new ReturnStatement(
expressionToExpression(statement.getReturnValue()) expressionToExpression(statement.getReturnValue())
); );