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

simplify AST (idea like)

Browse Source
This commit is contained in:
develar
2012-10-25 09:27:11 +04:00
parent c41bf918bf
commit 4b2c170c00
47 changed files with 278 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java
+8 -15
View File
@@ -10,7 +10,7 @@ import com.google.dart.compiler.backend.js.ast.*;
* Searches for method invocations in constructor expressions that would not * Searches for method invocations in constructor expressions that would not
* normally be surrounded by parentheses. * normally be surrounded by parentheses.
*/ */
public class JsConstructExpressionVisitor extends JsVisitor { public class JsConstructExpressionVisitor extends RecursiveJsVisitor {
public static boolean exec(JsExpression expression) { public static boolean exec(JsExpression expression) {
if (JsPrecedenceVisitor.exec(expression) < JsPrecedenceVisitor.PRECEDENCE_NEW) { if (JsPrecedenceVisitor.exec(expression) < JsPrecedenceVisitor.PRECEDENCE_NEW) {
return true; return true;
@@ -29,55 +29,48 @@ public class JsConstructExpressionVisitor extends JsVisitor {
* We only look at the array expression since the index has its own scope. * We only look at the array expression since the index has its own scope.
*/ */
@Override @Override
public boolean visit(JsArrayAccess x, JsContext ctx) { public void visitArrayAccess(JsArrayAccess x, JsContext ctx) {
accept(x.getArrayExpression()); accept(x.getArrayExpression());
return false;
} }
/** /**
* Array literals have their own scoping. * Array literals have their own scoping.
*/ */
@Override @Override
public boolean visit(JsArrayLiteral x, JsContext ctx) { public void visitArray(JsArrayLiteral x, JsContext ctx) {
return false;
} }
/** /**
* Functions have their own scoping. * Functions have their own scoping.
*/ */
@Override @Override
public boolean visit(JsFunction x, JsContext ctx) { public void visitFunction(JsFunction x, JsContext ctx) {
return false;
} }
@Override @Override
public boolean visit(JsInvocation x, JsContext ctx) { public void visitInvocation(JsInvocation x, JsContext ctx) {
containsInvocation = true; containsInvocation = true;
return false;
} }
@Override @Override
public boolean visit(JsNameRef x, JsContext ctx) { public void visitNameRef(JsNameRef x, JsContext ctx) {
if (!x.isLeaf()) { if (!x.isLeaf()) {
accept(x.getQualifier()); accept(x.getQualifier());
} }
return false;
} }
/** /**
* New constructs bind to the nearest set of parentheses. * New constructs bind to the nearest set of parentheses.
*/ */
@Override @Override
public boolean visit(JsNew x, JsContext ctx) { public void visitNew(JsNew x, JsContext ctx) {
return false;
} }
/** /**
* Object literals have their own scope. * Object literals have their own scope.
*/ */
@Override @Override
public boolean visit(JsObjectLiteral x, JsContext ctx) { public void visitObjectLiteral(JsObjectLiteral x, JsContext ctx) {
return false;
} }
/** /**
src/com/google/dart/compiler/backend/js/JsFirstExpressionVisitor.java
+12 -23
View File
@@ -30,7 +30,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpressionStatement;
* <li>function() {}</li> * <li>function() {}</li>
* </ul> * </ul>
*/ */
public class JsFirstExpressionVisitor extends JsVisitor { public class JsFirstExpressionVisitor extends RecursiveJsVisitor {
public static boolean exec(JsExpressionStatement statement) { public static boolean exec(JsExpressionStatement statement) {
JsExpression expression = statement.getExpression(); JsExpression expression = statement.getExpression();
// Pure function declarations do not need parentheses // Pure function declarations do not need parentheses
@@ -49,67 +49,56 @@ public class JsFirstExpressionVisitor extends JsVisitor {
} }
@Override @Override
public boolean visit(JsArrayAccess x, JsContext ctx) { public void visitArrayAccess(JsArrayAccess x, JsContext ctx) {
accept(x.getArrayExpression()); accept(x.getArrayExpression());
return false;
} }
@Override @Override
public boolean visit(JsArrayLiteral x, JsContext ctx) { public void visitArray(JsArrayLiteral x, JsContext ctx) {
return false;
} }
@Override @Override
public boolean visit(JsBinaryOperation x, JsContext ctx) { public void visitBinaryExpression(JsBinaryOperation x, JsContext ctx) {
accept(x.getArg1()); accept(x.getArg1());
return false;
} }
@Override @Override
public boolean visit(JsConditional x, JsContext ctx) { public void visitConditional(JsConditional x, JsContext ctx) {
accept(x.getTestExpression()); accept(x.getTestExpression());
return false;
} }
@Override @Override
public boolean visit(JsFunction x, JsContext ctx) { public void visitFunction(JsFunction x, JsContext ctx) {
needsParentheses = true; needsParentheses = true;
return false;
} }
@Override @Override
public boolean visit(JsInvocation x, JsContext ctx) { public void visitInvocation(JsInvocation x, JsContext ctx) {
accept(x.getQualifier()); accept(x.getQualifier());
return false;
} }
@Override @Override
public boolean visit(JsNameRef x, JsContext ctx) { public void visitNameRef(JsNameRef x, JsContext ctx) {
if (!x.isLeaf()) { if (!x.isLeaf()) {
accept(x.getQualifier()); accept(x.getQualifier());
} }
return false;
} }
@Override @Override
public boolean visit(JsNew x, JsContext ctx) { public void visitNew(JsNew x, JsContext ctx) {
return false;
} }
@Override @Override
public boolean visit(JsObjectLiteral x, JsContext ctx) { public void visitObjectLiteral(JsObjectLiteral x, JsContext ctx) {
needsParentheses = true; needsParentheses = true;
return false;
} }
@Override @Override
public boolean visit(JsPostfixOperation x, JsContext ctx) { public void visitPostfixOperation(JsPostfixOperation x, JsContext ctx) {
accept(x.getArg()); accept(x.getArg());
return false;
} }
@Override @Override
public boolean visit(JsPrefixOperation x, JsContext ctx) { public void visitPrefixOperation(JsPrefixOperation x, JsContext ctx) {
return false;
} }
} }
src/com/google/dart/compiler/backend/js/JsPrecedenceVisitor.java
+26 -151
View File
@@ -5,7 +5,6 @@
package com.google.dart.compiler.backend.js; package com.google.dart.compiler.backend.js;
import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
/** /**
* Precedence indices from "JavaScript - The Definitive Guide" 4th Edition (page * Precedence indices from "JavaScript - The Definitive Guide" 4th Edition (page
@@ -31,6 +30,11 @@ import com.google.dart.compiler.backend.js.ast.JsVars.JsVar;
class JsPrecedenceVisitor extends JsVisitor { class JsPrecedenceVisitor extends JsVisitor {
static final int PRECEDENCE_NEW = 15; static final int PRECEDENCE_NEW = 15;
private int answer = -1;
private JsPrecedenceVisitor() {
}
public static int exec(JsExpression expression) { public static int exec(JsExpression expression) {
JsPrecedenceVisitor visitor = new JsPrecedenceVisitor(); JsPrecedenceVisitor visitor = new JsPrecedenceVisitor();
visitor.accept(expression); visitor.accept(expression);
@@ -40,237 +44,108 @@ class JsPrecedenceVisitor extends JsVisitor {
return visitor.answer; return visitor.answer;
} }
private int answer = -1;
private JsPrecedenceVisitor() {
}
@Override @Override
public boolean visit(JsArrayAccess x, JsContext ctx) { public void visitArrayAccess(JsArrayAccess x, JsContext ctx) {
answer = 16; answer = 16;
return false;
} }
@Override @Override
public boolean visit(JsArrayLiteral x, JsContext ctx) { public void visitArray(JsArrayLiteral x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
return false;
} }
@Override @Override
public boolean visit(JsBinaryOperation x, JsContext ctx) { public void visitBinaryExpression(JsBinaryOperation x, JsContext ctx) {
answer = x.getOperator().getPrecedence(); answer = x.getOperator().getPrecedence();
return false;
} }
@Override @Override
public boolean visit(JsBlock x, JsContext ctx) { public void visitBoolean(JsLiteral.JsBooleanLiteral x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsLiteral.JsBooleanLiteral x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
return false;
} }
@Override @Override
public boolean visit(JsBreak x, JsContext ctx) { public void visitConditional(JsConditional x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsCase x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsCatch x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsConditional x, JsContext ctx) {
answer = 3; answer = 3;
return false;
} }
@Override @Override
public boolean visit(JsContinue x, JsContext ctx) { public void visitFunction(JsFunction x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsDebugger x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsDefault x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsDoWhile x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public void visit(JsEmpty x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsExpressionStatement x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsFor x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsForIn x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsFunction x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
return false;
} }
@Override @Override
public boolean visit(JsIf x, JsContext ctx) { public void visitInvocation(JsInvocation x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsInvocation x, JsContext ctx) {
answer = 16; answer = 16;
return false;
} }
@Override @Override
public boolean visit(JsLabel x, JsContext ctx) { public void visitNameRef(JsNameRef x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsNameRef x, JsContext ctx) {
if (x.isLeaf()) { if (x.isLeaf()) {
answer = 17; // primary answer = 17; // primary
} }
else { else {
answer = 16; // property access answer = 16; // property access
} }
return false;
} }
@Override @Override
public boolean visit(JsNew x, JsContext ctx) { public void visitNew(JsNew x, JsContext ctx) {
answer = PRECEDENCE_NEW; answer = PRECEDENCE_NEW;
return false;
} }
@Override @Override
public void visit(JsNullLiteral x, JsContext ctx) { public void visitNull(JsNullLiteral x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
} }
@Override @Override
public void visit(JsNumberLiteral.JsIntLiteral x, JsContext ctx) { public void visitInt(JsNumberLiteral.JsIntLiteral x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
} }
@Override @Override
public void visit(JsNumberLiteral.JsDoubleLiteral x, JsContext ctx) { public void visitDouble(JsNumberLiteral.JsDoubleLiteral x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
} }
@Override @Override
public boolean visit(JsObjectLiteral x, JsContext ctx) { public void visitObjectLiteral(JsObjectLiteral x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
return false;
} }
@Override @Override
public boolean visit(JsParameter x, JsContext ctx) { public void visitPostfixOperation(JsPostfixOperation x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsPostfixOperation x, JsContext ctx) {
answer = x.getOperator().getPrecedence(); answer = x.getOperator().getPrecedence();
return false;
} }
@Override @Override
public boolean visit(JsPrefixOperation x, JsContext ctx) { public void visitPrefixOperation(JsPrefixOperation x, JsContext ctx) {
answer = x.getOperator().getPrecedence(); answer = x.getOperator().getPrecedence();
return false;
} }
@Override @Override
public boolean visit(JsProgram x, JsContext ctx) { public void visitPropertyInitializer(JsPropertyInitializer x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsPropertyInitializer x, JsContext ctx) {
answer = 17; // primary
return false;
}
@Override
public void visit(JsRegExp x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
} }
@Override @Override
public boolean visit(JsReturn x, JsContext ctx) { public void visitRegExp(JsRegExp x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public void visit(JsStringLiteral x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
} }
@Override @Override
public boolean visit(JsSwitch x, JsContext ctx) { public void visitString(JsStringLiteral x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsLiteral.JsThisRef x, JsContext ctx) {
answer = 17; // primary answer = 17; // primary
return false;
} }
@Override @Override
public boolean visit(JsThrow x, JsContext ctx) { public void visitThis(JsLiteral.JsThisRef x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence."); answer = 17; // primary
} }
@Override @Override
public boolean visit(JsTry x, JsContext ctx) { protected void visitElement(JsNode node, JsContext context) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsVar x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsVars x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence.");
}
@Override
public boolean visit(JsWhile x, JsContext ctx) {
throw new RuntimeException("Only expressions have precedence."); throw new RuntimeException("Only expressions have precedence.");
} }
} }
src/com/google/dart/compiler/backend/js/JsRequiresSemiVisitor.java
+46 -102
View File
@@ -5,17 +5,16 @@
package com.google.dart.compiler.backend.js; package com.google.dart.compiler.backend.js;
import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.backend.js.ast.JsExpressionStatement;
/** /**
* Determines if a statement at the end of a block requires a semicolon. * Determines if a statement at the end of a block requires a semicolon.
* * <p/>
* For example, the following statements require semicolons:<br> * For example, the following statements require semicolons:<br>
* <ul> * <ul>
* <li>if (cond);</li> * <li>if (cond);</li>
* <li>while (cond);</li> * <li>while (cond);</li>
* </ul> * </ul>
* * <p/>
* The following do not require semicolons:<br> * The following do not require semicolons:<br>
* <ul> * <ul>
* <li>return 1</li> * <li>return 1</li>
@@ -23,114 +22,59 @@ import com.google.dart.compiler.backend.js.ast.JsExpressionStatement;
* </ul> * </ul>
*/ */
public class JsRequiresSemiVisitor extends JsVisitor { public class JsRequiresSemiVisitor extends JsVisitor {
private boolean needsSemicolon;
public static boolean exec(JsStatement lastStatement) { private JsRequiresSemiVisitor() {
JsRequiresSemiVisitor visitor = new JsRequiresSemiVisitor();
visitor.accept(lastStatement);
return visitor.needsSemicolon;
}
private boolean needsSemicolon = false;
private JsRequiresSemiVisitor() {
}
@Override
public boolean visit(JsBlock x, JsContext ctx) {
return false;
}
@Override
public boolean visit(JsBreak x, JsContext ctx) {
return false;
}
@Override
public boolean visit(JsDebugger x, JsContext ctx) {
return false;
}
@Override
public boolean visit(JsDoWhile x, JsContext ctx) {
return false;
}
@Override
public boolean visit(JsExpressionStatement x, JsContext ctx) {
return false;
}
@Override
public boolean visit(JsFor x, JsContext ctx) {
if (x.getBody() instanceof JsEmpty) {
needsSemicolon = true;
} }
return false;
}
@Override public static boolean exec(JsStatement lastStatement) {
public boolean visit(JsForIn x, JsContext ctx) { JsRequiresSemiVisitor visitor = new JsRequiresSemiVisitor();
if (x.getBody() instanceof JsEmpty) { visitor.accept(lastStatement);
needsSemicolon = true; return visitor.needsSemicolon;
} }
return false;
}
@Override @Override
public boolean visit(JsIf x, JsContext ctx) { public void visitFor(JsFor x, JsContext ctx) {
JsStatement thenStmt = x.getThenStatement(); if (x.getBody() instanceof JsEmpty) {
JsStatement elseStmt = x.getElseStatement(); needsSemicolon = true;
JsStatement toCheck = thenStmt; }
if (elseStmt != null) {
toCheck = elseStmt;
} }
if (toCheck instanceof JsEmpty) {
needsSemicolon = true; @Override
} else { public void visitForIn(JsForIn x, JsContext ctx) {
// Must recurse to determine last statement (possible if-else chain). if (x.getBody() instanceof JsEmpty) {
accept(toCheck); needsSemicolon = true;
}
} }
return false;
}
@Override @Override
public boolean visit(JsLabel x, JsContext ctx) { public void visitIf(JsIf x, JsContext ctx) {
if (x.getStatement() instanceof JsEmpty) { JsStatement thenStmt = x.getThenStatement();
needsSemicolon = true; JsStatement elseStmt = x.getElseStatement();
JsStatement toCheck = thenStmt;
if (elseStmt != null) {
toCheck = elseStmt;
}
if (toCheck instanceof JsEmpty) {
needsSemicolon = true;
}
else {
// Must recurse to determine last statement (possible if-else chain).
accept(toCheck);
}
} }
return false;
}
@Override @Override
public boolean visit(JsReturn x, JsContext ctx) { public void visitLabel(JsLabel x, JsContext ctx) {
return false; if (x.getStatement() instanceof JsEmpty) {
} needsSemicolon = true;
}
@Override }
public boolean visit(JsSwitch x, JsContext ctx) {
return false; @Override
} public void visitWhile(JsWhile x, JsContext ctx) {
if (x.getBody() instanceof JsEmpty) {
@Override needsSemicolon = true;
public boolean visit(JsThrow x, JsContext ctx) { }
return false;
}
@Override
public boolean visit(JsTry x, JsContext ctx) {
return false;
}
@Override
public boolean visit(JsVars x, JsContext ctx) {
return false;
}
@Override
public boolean visit(JsWhile x, JsContext ctx) {
if (x.getBody() instanceof JsEmpty) {
needsSemicolon = true;
} }
return false;
}
} }
src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java
+44 -93
View File
@@ -205,20 +205,18 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
@Override @Override
public boolean visit(JsArrayAccess x, JsContext context) { public void visitArrayAccess(JsArrayAccess x, JsContext context) {
printPair(x, x.getArrayExpression()); printPair(x, x.getArrayExpression());
leftSquare(); leftSquare();
accept(x.getIndexExpression()); accept(x.getIndexExpression());
rightSquare(); rightSquare();
return false;
} }
@Override @Override
public boolean visit(JsArrayLiteral x, JsContext ctx) { public void visitArray(JsArrayLiteral x, JsContext ctx) {
leftSquare(); leftSquare();
printExpressions(x.getExpressions()); printExpressions(x.getExpressions());
rightSquare(); rightSquare();
return false;
} }
private void printExpressions(List<JsExpression> expressions) { private void printExpressions(List<JsExpression> expressions) {
@@ -234,7 +232,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
@Override @Override
public boolean visit(JsBinaryOperation binaryOperation, JsContext context) { public void visitBinaryExpression(JsBinaryOperation binaryOperation, JsContext context) {
JsBinaryOperator operator = binaryOperation.getOperator(); JsBinaryOperator operator = binaryOperation.getOperator();
JsExpression arg1 = binaryOperation.getArg1(); JsExpression arg1 = binaryOperation.getArg1();
boolean isExpressionEnclosed = parenPush(binaryOperation, arg1, !operator.isLeftAssociative()); boolean isExpressionEnclosed = parenPush(binaryOperation, arg1, !operator.isLeftAssociative());
@@ -276,39 +274,33 @@ public class JsToStringGenerationVisitor extends JsVisitor {
if (isParenOpened) { if (isParenOpened) {
rightParen(); rightParen();
} }
return false;
} }
@Override @Override
public boolean visit(JsBlock x, JsContext ctx) { public void visitBlock(JsBlock x, JsContext ctx) {
printJsBlock(x, true, true); printJsBlock(x, true, true);
return false;
} }
@Override @Override
public boolean visit(JsLiteral.JsBooleanLiteral x, JsContext ctx) { public void visitBoolean(JsLiteral.JsBooleanLiteral x, JsContext ctx) {
if (x.getValue()) { if (x.getValue()) {
p.print(CHARS_TRUE); p.print(CHARS_TRUE);
} }
else { else {
p.print(CHARS_FALSE); p.print(CHARS_FALSE);
} }
return false;
} }
@Override @Override
public boolean visit(JsBreak x, JsContext ctx) { public void visitBreak(JsBreak x, JsContext ctx) {
p.print(CHARS_BREAK); p.print(CHARS_BREAK);
continueOrBreakLabel(x); continueOrBreakLabel(x);
return false;
} }
@Override @Override
public boolean visit(JsContinue x, JsContext ctx) { public void visitContinue(JsContinue x, JsContext ctx) {
p.print(CHARS_CONTINUE); p.print(CHARS_CONTINUE);
continueOrBreakLabel(x); continueOrBreakLabel(x);
return false;
} }
private void continueOrBreakLabel(JsContinue x) { private void continueOrBreakLabel(JsContinue x) {
@@ -320,7 +312,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
@Override @Override
public boolean visit(JsCase x, JsContext ctx) { public void visitCase(JsCase x, JsContext ctx) {
p.print(CHARS_CASE); p.print(CHARS_CASE);
space(); space();
accept(x.getCaseExpression()); accept(x.getCaseExpression());
@@ -328,7 +320,6 @@ public class JsToStringGenerationVisitor extends JsVisitor {
newlineOpt(); newlineOpt();
printSwitchMemberStatements(x); printSwitchMemberStatements(x);
return false;
} }
private void printSwitchMemberStatements(JsSwitchMember x) { private void printSwitchMemberStatements(JsSwitchMember x) {
@@ -346,7 +337,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
@Override @Override
public boolean visit(JsCatch x, JsContext ctx) { public void visitCatch(JsCatch x, JsContext ctx) {
spaceOpt(); spaceOpt();
p.print(CHARS_CATCH); p.print(CHARS_CATCH);
spaceOpt(); spaceOpt();
@@ -366,12 +357,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
rightParen(); rightParen();
spaceOpt(); spaceOpt();
accept(x.getBody()); accept(x.getBody());
return false;
} }
@Override @Override
public boolean visit(JsConditional x, JsContext ctx) { public void visitConditional(JsConditional x, JsContext ctx) {
// Associativity: for the then and else branches, it is safe to insert // Associativity: for the then and else branches, it is safe to insert
// another // another
// ternary expression, but if the test expression is a ternary, it should // ternary expression, but if the test expression is a ternary, it should
@@ -385,7 +374,6 @@ public class JsToStringGenerationVisitor extends JsVisitor {
_colon(); _colon();
spaceOpt(); spaceOpt();
printPair(x, x.getElseExpression()); printPair(x, x.getElseExpression());
return false;
} }
private void printPair(JsExpression parent, JsExpression expression) { private void printPair(JsExpression parent, JsExpression expression) {
@@ -400,22 +388,20 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
@Override @Override
public boolean visit(JsDebugger x, JsContext ctx) { public void visitDebugger(JsDebugger x, JsContext ctx) {
p.print(CHARS_DEBUGGER); p.print(CHARS_DEBUGGER);
return false;
} }
@Override @Override
public boolean visit(JsDefault x, JsContext ctx) { public void visitDefault(JsDefault x, JsContext ctx) {
p.print(CHARS_DEFAULT); p.print(CHARS_DEFAULT);
_colon(); _colon();
printSwitchMemberStatements(x); printSwitchMemberStatements(x);
return false;
} }
@Override @Override
public boolean visit(JsWhile x, JsContext ctx) { public void visitWhile(JsWhile x, JsContext ctx) {
_while(); _while();
spaceOpt(); spaceOpt();
leftParen(); leftParen();
@@ -424,11 +410,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
_nestedPush(x.getBody()); _nestedPush(x.getBody());
accept(x.getBody()); accept(x.getBody());
_nestedPop(x.getBody()); _nestedPop(x.getBody());
return false;
} }
@Override @Override
public boolean visit(JsDoWhile x, JsContext ctx) { public void visitDoWhile(JsDoWhile x, JsContext ctx) {
p.print(CHARS_DO); p.print(CHARS_DO);
_nestedPush(x.getBody()); _nestedPush(x.getBody());
accept(x.getBody()); accept(x.getBody());
@@ -446,15 +431,14 @@ public class JsToStringGenerationVisitor extends JsVisitor {
leftParen(); leftParen();
accept(x.getCondition()); accept(x.getCondition());
rightParen(); rightParen();
return false;
} }
@Override @Override
public void visit(JsEmpty x, JsContext ctx) { public void visitEmpty(JsEmpty x, JsContext ctx) {
} }
@Override @Override
public boolean visit(JsExpressionStatement x, JsContext ctx) { public void visitExpressionStatement(JsExpressionStatement x, JsContext ctx) {
boolean surroundWithParentheses = JsFirstExpressionVisitor.exec(x); boolean surroundWithParentheses = JsFirstExpressionVisitor.exec(x);
if (surroundWithParentheses) { if (surroundWithParentheses) {
leftParen(); leftParen();
@@ -463,11 +447,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
if (surroundWithParentheses) { if (surroundWithParentheses) {
rightParen(); rightParen();
} }
return false;
} }
@Override @Override
public boolean visit(JsFor x, JsContext ctx) { public void visitFor(JsFor x, JsContext ctx) {
_for(); _for();
spaceOpt(); spaceOpt();
leftParen(); leftParen();
@@ -503,11 +486,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
_nestedPush(x.getBody()); _nestedPush(x.getBody());
accept(x.getBody()); accept(x.getBody());
_nestedPop(x.getBody()); _nestedPop(x.getBody());
return false;
} }
@Override @Override
public boolean visit(JsForIn x, JsContext ctx) { public void visitForIn(JsForIn x, JsContext ctx) {
_for(); _for();
spaceOpt(); spaceOpt();
leftParen(); leftParen();
@@ -539,11 +521,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
_nestedPush(x.getBody()); _nestedPush(x.getBody());
accept(x.getBody()); accept(x.getBody());
_nestedPop(x.getBody()); _nestedPop(x.getBody());
return false;
} }
@Override @Override
public boolean visit(JsFunction x, JsContext ctx) { public void visitFunction(JsFunction x, JsContext ctx) {
p.print(CHARS_FUNCTION); p.print(CHARS_FUNCTION);
space(); space();
if (x.getName() != null) { if (x.getName() != null) {
@@ -563,11 +544,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
lineBreakAfterBlock = false; lineBreakAfterBlock = false;
accept(x.getBody()); accept(x.getBody());
needSemi = true; needSemi = true;
return false;
} }
@Override @Override
public boolean visit(JsIf x, JsContext ctx) { public void visitIf(JsIf x, JsContext ctx) {
_if(); _if();
spaceOpt(); spaceOpt();
leftParen(); leftParen();
@@ -600,30 +580,27 @@ public class JsToStringGenerationVisitor extends JsVisitor {
_nestedPop(elseStatement); _nestedPop(elseStatement);
} }
} }
return false;
} }
@Override @Override
public boolean visit(JsInvocation x, JsContext ctx) { public void visitInvocation(JsInvocation x, JsContext ctx) {
printPair(x, x.getQualifier()); printPair(x, x.getQualifier());
leftParen(); leftParen();
printExpressions(x.getArguments()); printExpressions(x.getArguments());
rightParen(); rightParen();
return false;
} }
@Override @Override
public boolean visit(JsLabel x, JsContext ctx) { public void visitLabel(JsLabel x, JsContext ctx) {
nameOf(x); nameOf(x);
_colon(); _colon();
spaceOpt(); spaceOpt();
accept(x.getStatement()); accept(x.getStatement());
return false;
} }
@Override @Override
public boolean visit(JsNameRef x, JsContext ctx) { public void visitNameRef(JsNameRef x, JsContext ctx) {
JsExpression q = x.getQualifier(); JsExpression q = x.getQualifier();
if (q != null) { if (q != null) {
parenPush(x, q, false); parenPush(x, q, false);
@@ -641,11 +618,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
p.print('.'); p.print('.');
} }
_nameRef(x); _nameRef(x);
return false;
} }
@Override @Override
public boolean visit(JsNew x, JsContext ctx) { public void visitNew(JsNew x, JsContext ctx) {
p.print(CHARS_NEW); p.print(CHARS_NEW);
space(); space();
@@ -662,27 +638,25 @@ public class JsToStringGenerationVisitor extends JsVisitor {
leftParen(); leftParen();
printExpressions(x.getArguments()); printExpressions(x.getArguments());
rightParen(); rightParen();
return false;
} }
@Override @Override
public void visit(JsNullLiteral x, JsContext ctx) { public void visitNull(JsNullLiteral x, JsContext ctx) {
p.print(CHARS_NULL); p.print(CHARS_NULL);
} }
@Override @Override
public void visit(JsIntLiteral x, JsContext ctx) { public void visitInt(JsIntLiteral x, JsContext ctx) {
p.print(x.value); p.print(x.value);
} }
@Override @Override
public void visit(JsDoubleLiteral x, JsContext ctx) { public void visitDouble(JsDoubleLiteral x, JsContext ctx) {
p.print(x.value); p.print(x.value);
} }
@Override @Override
public boolean visit(JsObjectLiteral objectLiteral, JsContext context) { public void visitObjectLiteral(JsObjectLiteral objectLiteral, JsContext context) {
p.print('{'); p.print('{');
if (objectLiteral.isMultiline()) { if (objectLiteral.isMultiline()) {
p.indentIn(); p.indentIn();
@@ -731,27 +705,24 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
p.print('}'); p.print('}');
return false;
} }
@Override @Override
public boolean visit(JsParameter x, JsContext ctx) { public void visitParameter(JsParameter x, JsContext ctx) {
nameOf(x); nameOf(x);
return false;
} }
@Override @Override
public boolean visit(JsPostfixOperation x, JsContext ctx) { public void visitPostfixOperation(JsPostfixOperation x, JsContext ctx) {
JsUnaryOperator op = x.getOperator(); JsUnaryOperator op = x.getOperator();
JsExpression arg = x.getArg(); JsExpression arg = x.getArg();
// unary operators always associate correctly (I think) // unary operators always associate correctly (I think)
printPair(x, arg); printPair(x, arg);
p.print(op.getSymbol()); p.print(op.getSymbol());
return false;
} }
@Override @Override
public boolean visit(JsPrefixOperation x, JsContext ctx) { public void visitPrefixOperation(JsPrefixOperation x, JsContext ctx) {
JsUnaryOperator op = x.getOperator(); JsUnaryOperator op = x.getOperator();
p.print(op.getSymbol()); p.print(op.getSymbol());
JsExpression arg = x.getArg(); JsExpression arg = x.getArg();
@@ -760,31 +731,20 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
// unary operators always associate correctly (I think) // unary operators always associate correctly (I think)
printPair(x, arg); printPair(x, arg);
return false;
} }
@Override @Override
public boolean visit(JsProgram x, JsContext ctx) { public void visitProgram(JsProgram x, JsContext ctx) {
p.print("<JsProgram>"); p.print("<JsProgram>");
return false;
} }
@Override @Override
public boolean visit(JsProgramFragment x, JsContext ctx) { public void visitProgramFragment(JsProgramFragment x, JsContext ctx) {
p.print("<JsProgramFragment>"); p.print("<JsProgramFragment>");
return false;
} }
@Override @Override
public boolean visit(JsPropertyInitializer x, JsContext ctx) { public void visitRegExp(JsRegExp x, JsContext ctx) {
// Since there are separators, we actually print the property init
// in visit(JsObjectLiteral).
//
return false;
}
@Override
public void visit(JsRegExp x, JsContext ctx) {
_slash(); _slash();
p.print(x.getPattern()); p.print(x.getPattern());
_slash(); _slash();
@@ -795,23 +755,22 @@ public class JsToStringGenerationVisitor extends JsVisitor {
} }
@Override @Override
public boolean visit(JsReturn x, JsContext ctx) { public void visitReturn(JsReturn x, JsContext ctx) {
p.print(CHARS_RETURN); p.print(CHARS_RETURN);
JsExpression expr = x.getExpression(); JsExpression expr = x.getExpression();
if (expr != null) { if (expr != null) {
space(); space();
accept(expr); accept(expr);
} }
return false;
} }
@Override @Override
public void visit(JsStringLiteral x, JsContext ctx) { public void visitString(JsStringLiteral x, JsContext ctx) {
p.print(javaScriptString(x.getValue())); p.print(javaScriptString(x.getValue()));
} }
@Override @Override
public boolean visit(JsSwitch x, JsContext ctx) { public void visit(JsSwitch x, JsContext ctx) {
p.print(CHARS_SWITCH); p.print(CHARS_SWITCH);
spaceOpt(); spaceOpt();
leftParen(); leftParen();
@@ -821,25 +780,22 @@ public class JsToStringGenerationVisitor extends JsVisitor {
_blockOpen(); _blockOpen();
acceptList(x.getCases()); acceptList(x.getCases());
_blockClose(); _blockClose();
return false;
} }
@Override @Override
public boolean visit(JsLiteral.JsThisRef x, JsContext ctx) { public void visitThis(JsLiteral.JsThisRef x, JsContext ctx) {
p.print(CHARS_THIS); p.print(CHARS_THIS);
return false;
} }
@Override @Override
public boolean visit(JsThrow x, JsContext ctx) { public void visitThrow(JsThrow x, JsContext ctx) {
p.print(CHARS_THROW); p.print(CHARS_THROW);
space(); space();
accept(x.getExpression()); accept(x.getExpression());
return false;
} }
@Override @Override
public boolean visit(JsTry x, JsContext ctx) { public void visitTry(JsTry x, JsContext ctx) {
p.print(CHARS_TRY); p.print(CHARS_TRY);
spaceOpt(); spaceOpt();
accept(x.getTryBlock()); accept(x.getTryBlock());
@@ -852,12 +808,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
spaceOpt(); spaceOpt();
accept(finallyBlock); accept(finallyBlock);
} }
return false;
} }
@Override @Override
public boolean visit(JsVar var, JsContext ctx) { public void visit(JsVar var, JsContext ctx) {
nameOf(var); nameOf(var);
JsExpression initExpr = var.getInitExpression(); JsExpression initExpr = var.getInitExpression();
if (initExpr != null) { if (initExpr != null) {
@@ -870,11 +824,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
rightParen(); rightParen();
} }
} }
return false;
} }
@Override @Override
public boolean visit(JsVars vars, JsContext context) { public void visitVars(JsVars vars, JsContext context) {
var(); var();
space(); space();
boolean sep = false; boolean sep = false;
@@ -892,11 +845,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
accept(var); accept(var);
} }
return false;
} }
@Override @Override
public boolean visit(JsDocComment comment, JsContext context) { public void visitDocComment(JsDocComment comment, JsContext context) {
boolean asSingleLine = comment.getTags().size() == 1; boolean asSingleLine = comment.getTags().size() == 1;
if (!asSingleLine) { if (!asSingleLine) {
newlineOpt(); newlineOpt();
@@ -929,7 +881,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
p.print((CharSequence) value); p.print((CharSequence) value);
} }
else { else {
visit((JsNameRef) value, context); visitNameRef((JsNameRef) value, context);
} }
} }
@@ -950,7 +902,6 @@ public class JsToStringGenerationVisitor extends JsVisitor {
if (asSingleLine) { if (asSingleLine) {
spaceOpt(); spaceOpt();
} }
return false;
} }
protected final void newlineOpt() { protected final void newlineOpt() {
src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java
+1 -1
View File
@@ -53,7 +53,7 @@ public final class JsArrayAccess extends JsExpressionImpl {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitArrayAccess(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java
+1 -1
View File
@@ -58,7 +58,7 @@ public final class JsArrayLiteral extends JsLiteral {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitArray(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java
+1 -1
View File
@@ -70,7 +70,7 @@ public final class JsBinaryOperation extends JsExpressionImpl {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitBinaryExpression(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsBlock.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class JsBlock extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitBlock(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsBreak.java
+1 -1
View File
@@ -23,6 +23,6 @@ public final class JsBreak extends JsContinue {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitBreak(this, context);
} }
} }
src/com/google/dart/compiler/backend/js/ast/JsCase.java
+1 -1
View File
@@ -24,7 +24,7 @@ public final class JsCase extends JsSwitchMember {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitCase(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsCatch.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class JsCatch extends JsNodeImpl implements HasCondition {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitCatch(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsConditional.java
+1 -1
View File
@@ -62,7 +62,7 @@ public final class JsConditional extends JsExpressionImpl {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitConditional(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsContinue.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class JsContinue extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitContinue(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsDebugger.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class JsDebugger extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitDebugger(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsDefault.java
+1 -1
View File
@@ -10,7 +10,7 @@ package com.google.dart.compiler.backend.js.ast;
public final class JsDefault extends JsSwitchMember { public final class JsDefault extends JsSwitchMember {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitDefault(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java
+1 -4
View File
@@ -22,9 +22,6 @@ public class JsDoWhile extends JsWhile {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
if (v.visit(this, context)) { v.visitDoWhile(this, context);
condition = v.accept(condition);
body = v.accept(body);
}
} }
} }
src/com/google/dart/compiler/backend/js/ast/JsDocComment.java
+1 -2
View File
@@ -29,12 +29,11 @@ public class JsDocComment extends JsExpressionImpl {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitDocComment(this, context);
} }
@Override @Override
public void acceptChildren(JsVisitor visitor, JsContext context) { public void acceptChildren(JsVisitor visitor, JsContext context) {
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsEmpty.java
+1 -1
View File
@@ -10,7 +10,7 @@ public class JsEmpty extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitEmpty(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java
+1 -1
View File
@@ -17,7 +17,7 @@ public final class JsExpressionStatement extends AbstractNode implements JsState
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitExpressionStatement(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsFor.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class JsFor extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitFor(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsForIn.java
+1 -3
View File
@@ -53,9 +53,7 @@ public class JsForIn extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
if (v.visit(this, context)) { v.visitForIn(this, context);
}
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsFunction.java
+1 -1
View File
@@ -91,7 +91,7 @@ public final class JsFunction extends JsLiteral implements HasName {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitFunction(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsIf.java
+1 -1
View File
@@ -52,7 +52,7 @@ public final class JsIf extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitIf(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
+1 -1
View File
@@ -68,7 +68,7 @@ public final class JsInvocation extends JsExpressionImpl.JsExpressionHasArgument
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitInvocation(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsLabel.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class JsLabel extends JsNodeImpl implements JsStatement, HasName {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitLabel(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsLiteral.java
+2 -2
View File
@@ -44,7 +44,7 @@ public abstract class JsLiteral extends JsExpressionImpl implements CanBooleanEv
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitThis(this, context);
} }
@Override @Override
@@ -87,7 +87,7 @@ public abstract class JsLiteral extends JsExpressionImpl implements CanBooleanEv
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitBoolean(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
+1 -1
View File
@@ -95,7 +95,7 @@ public final class JsNameRef extends JsExpressionImpl implements CanBooleanEval,
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitNameRef(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsNew.java
+1 -1
View File
@@ -43,7 +43,7 @@ public final class JsNew extends JsExpressionImpl.JsExpressionHasArguments {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitNew(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java
+1 -1
View File
@@ -30,7 +30,7 @@ public final class JsNullLiteral extends JsLiteral.JsValueLiteral {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitNull(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java
+2 -2
View File
@@ -39,7 +39,7 @@ public abstract class JsNumberLiteral extends JsLiteral.JsValueLiteral {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitDouble(this, context);
} }
public String toString() { public String toString() {
@@ -66,7 +66,7 @@ public abstract class JsNumberLiteral extends JsLiteral.JsValueLiteral {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitInt(this, context);
} }
public String toString() { public String toString() {
src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
+1 -1
View File
@@ -70,7 +70,7 @@ public final class JsObjectLiteral extends JsLiteral {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitObjectLiteral(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsParameter.java
+1 -1
View File
@@ -28,7 +28,7 @@ public final class JsParameter extends JsNodeImpl implements HasName {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitParameter(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java
+1 -1
View File
@@ -29,7 +29,7 @@ public final class JsPostfixOperation extends JsUnaryOperation {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitPostfixOperation(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java
+1 -1
View File
@@ -47,7 +47,7 @@ public final class JsPrefixOperation extends JsUnaryOperation implements CanBool
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitPrefixOperation(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsProgram.java
+1 -1
View File
@@ -110,7 +110,7 @@ public final class JsProgram extends JsNodeImpl {
@Override @Override
public void accept(JsVisitor v, @Nullable JsContext context) { public void accept(JsVisitor v, @Nullable JsContext context) {
v.visit(this, context); v.visitProgram(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class JsProgramFragment extends JsNodeImpl {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitProgramFragment(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class JsPropertyInitializer extends JsNodeImpl {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitPropertyInitializer(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsRegExp.java
+1 -1
View File
@@ -52,7 +52,7 @@ public final class JsRegExp extends JsLiteral.JsValueLiteral {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitRegExp(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsReturn.java
+1 -1
View File
@@ -27,7 +27,7 @@ public final class JsReturn extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitReturn(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java
+1 -1
View File
@@ -42,7 +42,7 @@ public final class JsStringLiteral extends JsLiteral.JsValueLiteral {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitString(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsThrow.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class JsThrow extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitThrow(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsTry.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class JsTry extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitTry(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsVars.java
+1 -1
View File
@@ -119,7 +119,7 @@ public class JsVars extends JsNodeImpl implements JsStatement, Iterable<JsVars.J
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitVars(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/JsVisitor.java
+96 -87
View File
@@ -84,198 +84,207 @@ public abstract class JsVisitor {
}; };
public <T extends JsNode> T accept(T node) { public <T extends JsNode> T accept(T node) {
doTraverse(node, UNMODIFIABLE_CONTEXT); doAccept(node, UNMODIFIABLE_CONTEXT);
return node; return node;
} }
public final <T extends JsNode> void acceptList(List<T> collection) { public final <T extends JsNode> void acceptList(List<T> collection) {
for (T node : collection) { for (T node : collection) {
doTraverse(node, UNMODIFIABLE_CONTEXT); doAccept(node, UNMODIFIABLE_CONTEXT);
} }
} }
public JsExpression acceptLvalue(JsExpression expr) { public JsExpression acceptLvalue(JsExpression expr) {
doTraverse(expr, LVALUE_CONTEXT); doAccept(expr, LVALUE_CONTEXT);
return expr; return expr;
} }
public final <T extends JsNode> void acceptWithInsertRemove(List<T> collection) { public final <T extends JsNode> void acceptWithInsertRemove(List<T> collection) {
for (T node : collection) { for (T node : collection) {
doTraverse(node, UNMODIFIABLE_CONTEXT); doAccept(node, UNMODIFIABLE_CONTEXT);
} }
} }
public boolean visit(JsArrayAccess x, JsContext ctx) { public void visitArrayAccess(JsArrayAccess x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsArrayLiteral x, JsContext ctx) { public void visitArray(JsArrayLiteral x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsBinaryOperation x, JsContext ctx) { public void visitBinaryExpression(JsBinaryOperation x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsBlock x, JsContext ctx) { public void visitBlock(JsBlock x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsLiteral.JsBooleanLiteral x, JsContext ctx) { public void visitBoolean(JsLiteral.JsBooleanLiteral x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsBreak x, JsContext ctx) { public void visitBreak(JsBreak x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsCase x, JsContext ctx) { public void visitCase(JsCase x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsCatch x, JsContext ctx) { public void visitCatch(JsCatch x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsConditional x, JsContext ctx) { public void visitConditional(JsConditional x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsContinue x, JsContext ctx) { public void visitContinue(JsContinue x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsDebugger x, JsContext ctx) { public void visitDebugger(JsDebugger x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsDefault x, JsContext ctx) { public void visitDefault(JsDefault x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsDoWhile x, JsContext ctx) { public void visitDoWhile(JsDoWhile x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public void visit(JsEmpty x, JsContext ctx) { public void visitEmpty(JsEmpty x, JsContext ctx) {
visitElement(x, ctx);
} }
public boolean visit(JsExpressionStatement x, JsContext ctx) { public void visitExpressionStatement(JsExpressionStatement x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsFor x, JsContext ctx) { public void visitFor(JsFor x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsForIn x, JsContext ctx) { public void visitForIn(JsForIn x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsFunction x, JsContext ctx) { public void visitFunction(JsFunction x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsIf x, JsContext ctx) { public void visitIf(JsIf x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsInvocation x, JsContext ctx) { public void visitInvocation(JsInvocation x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsLabel x, JsContext ctx) { public void visitLabel(JsLabel x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsNameRef x, JsContext ctx) { public void visitNameRef(JsNameRef x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public boolean visit(JsNew x, JsContext ctx) { public void visitNew(JsNew x, JsContext ctx) {
return true; visitElement(x, ctx);
} }
public void visit(JsNullLiteral x, JsContext ctx) { public void visitNull(JsNullLiteral x, JsContext ctx) {
visitElement(x, ctx);
} }
public void visit(JsNumberLiteral.JsIntLiteral x, JsContext ctx) { public void visitInt(JsNumberLiteral.JsIntLiteral x, JsContext context) {
visitElement(x, context);
} }
public void visit(JsNumberLiteral.JsDoubleLiteral x, JsContext ctx) { public void visitDouble(JsNumberLiteral.JsDoubleLiteral x, JsContext context) {
visitElement(x, context);
} }
public boolean visit(JsObjectLiteral x, JsContext ctx) { public void visitObjectLiteral(JsObjectLiteral x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsParameter x, JsContext ctx) { public void visitParameter(JsParameter x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsPostfixOperation x, JsContext ctx) { public void visitPostfixOperation(JsPostfixOperation x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsPrefixOperation x, JsContext ctx) { public void visitPrefixOperation(JsPrefixOperation x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsProgram x, JsContext ctx) { public void visitProgram(JsProgram x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsProgramFragment x, JsContext ctx) { public void visitProgramFragment(JsProgramFragment x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsPropertyInitializer x, JsContext ctx) { public void visitPropertyInitializer(JsPropertyInitializer x, JsContext context) {
return true; visitElement(x, context);
} }
public void visit(JsRegExp x, JsContext ctx) { public void visitRegExp(JsRegExp x, JsContext context) {
visitElement(x, context);
} }
public boolean visit(JsReturn x, JsContext ctx) { public void visitReturn(JsReturn x, JsContext context) {
return true; visitElement(x, context);
} }
public void visit(JsStringLiteral x, JsContext ctx) { public void visitString(JsStringLiteral x, JsContext context) {
visitElement(x, context);
} }
public boolean visit(JsSwitch x, JsContext ctx) { public void visit(JsSwitch x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsLiteral.JsThisRef x, JsContext ctx) { public void visitThis(JsLiteral.JsThisRef x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsThrow x, JsContext ctx) { public void visitThrow(JsThrow x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsTry x, JsContext ctx) { public void visitTry(JsTry x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsVar x, JsContext ctx) { public void visit(JsVar x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsVars x, JsContext ctx) { public void visitVars(JsVars x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsWhile x, JsContext ctx) { public void visitWhile(JsWhile x, JsContext context) {
return true; visitElement(x, context);
} }
public boolean visit(JsDocComment x, JsContext context) { public void visitDocComment(JsDocComment comment, JsContext context) {
return true; visitElement(comment, context);
} }
protected void doTraverse(JsNode node, JsContext context) { protected void visitElement(JsNode node, JsContext context) {
}
protected void doAccept(JsNode node, JsContext context) {
node.accept(this, context); node.accept(this, context);
} }
} }
src/com/google/dart/compiler/backend/js/ast/JsWhile.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class JsWhile extends JsNodeImpl implements JsStatement {
@Override @Override
public void accept(JsVisitor v, JsContext context) { public void accept(JsVisitor v, JsContext context) {
v.visit(this, context); v.visitWhile(this, context);
} }
@Override @Override
src/com/google/dart/compiler/backend/js/ast/RecursiveJsVisitor.java
+4
View File
@@ -1,4 +1,8 @@
package com.google.dart.compiler.backend.js.ast; package com.google.dart.compiler.backend.js.ast;
public abstract class RecursiveJsVisitor extends JsVisitor { public abstract class RecursiveJsVisitor extends JsVisitor {
@Override
protected void visitElement(JsNode node, JsContext context) {
node.acceptChildren(this, context);
}
} }