simplify AST (idea like)
This commit is contained in:
@@ -388,12 +388,12 @@ public class JsToStringGenerationVisitor extends JsVisitor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitDebugger(JsDebugger x, JsContext ctx) {
|
||||
public void visitDebugger(JsDebugger x, JsContext context) {
|
||||
p.print(CHARS_DEBUGGER);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitDefault(JsDefault x, JsContext ctx) {
|
||||
public void visitDefault(JsDefault x, JsContext context) {
|
||||
p.print(CHARS_DEFAULT);
|
||||
_colon();
|
||||
|
||||
@@ -413,7 +413,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitDoWhile(JsDoWhile x, JsContext ctx) {
|
||||
public void visitDoWhile(JsDoWhile x, JsContext context) {
|
||||
p.print(CHARS_DO);
|
||||
_nestedPush(x.getBody());
|
||||
accept(x.getBody());
|
||||
@@ -499,23 +499,23 @@ public class JsToStringGenerationVisitor extends JsVisitor {
|
||||
space();
|
||||
nameDef(x.getIterVarName());
|
||||
|
||||
if (x.getIterExpr() != null) {
|
||||
if (x.getIterExpression() != null) {
|
||||
spaceOpt();
|
||||
assignment();
|
||||
spaceOpt();
|
||||
accept(x.getIterExpr());
|
||||
accept(x.getIterExpression());
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Just a name ref.
|
||||
//
|
||||
accept(x.getIterExpr());
|
||||
accept(x.getIterExpression());
|
||||
}
|
||||
|
||||
space();
|
||||
p.print(CHARS_IN);
|
||||
space();
|
||||
accept(x.getObjExpr());
|
||||
accept(x.getObjectExpression());
|
||||
|
||||
rightParen();
|
||||
_nestedPush(x.getBody());
|
||||
@@ -734,7 +734,7 @@ public class JsToStringGenerationVisitor extends JsVisitor {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visitProgram(JsProgram x, JsContext ctx) {
|
||||
public void visitProgram(JsProgram x, JsContext context) {
|
||||
p.print("<JsProgram>");
|
||||
}
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ package com.google.dart.compiler.backend.js.ast;
|
||||
*/
|
||||
public class JsForIn extends JsNodeImpl implements JsStatement {
|
||||
private JsStatement body;
|
||||
private JsExpression iterExpr;
|
||||
private JsExpression objExpr;
|
||||
private JsExpression iterExpression;
|
||||
private JsExpression objectExpression;
|
||||
|
||||
// Optional: the name of a new iterator variable to introduce
|
||||
private final JsName iterVarName;
|
||||
@@ -27,28 +27,28 @@ public class JsForIn extends JsNodeImpl implements JsStatement {
|
||||
return body;
|
||||
}
|
||||
|
||||
public JsExpression getIterExpr() {
|
||||
return iterExpr;
|
||||
public JsExpression getIterExpression() {
|
||||
return iterExpression;
|
||||
}
|
||||
|
||||
public JsName getIterVarName() {
|
||||
return iterVarName;
|
||||
}
|
||||
|
||||
public JsExpression getObjExpr() {
|
||||
return objExpr;
|
||||
public JsExpression getObjectExpression() {
|
||||
return objectExpression;
|
||||
}
|
||||
|
||||
public void setBody(JsStatement body) {
|
||||
this.body = body;
|
||||
}
|
||||
|
||||
public void setIterExpr(JsExpression iterExpr) {
|
||||
this.iterExpr = iterExpr;
|
||||
public void setIterExpression(JsExpression iterExpression) {
|
||||
this.iterExpression = iterExpression;
|
||||
}
|
||||
|
||||
public void setObjExpr(JsExpression objExpr) {
|
||||
this.objExpr = objExpr;
|
||||
public void setObjectExpression(JsExpression objectExpression) {
|
||||
this.objectExpression = objectExpression;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -58,10 +58,10 @@ public class JsForIn extends JsNodeImpl implements JsStatement {
|
||||
|
||||
@Override
|
||||
public void acceptChildren(JsVisitor visitor, JsContext context) {
|
||||
if (iterExpr != null) {
|
||||
iterExpr = visitor.acceptLvalue(iterExpr);
|
||||
if (iterExpression != null) {
|
||||
iterExpression = visitor.acceptLvalue(iterExpression);
|
||||
}
|
||||
objExpr = visitor.accept(objExpr);
|
||||
objectExpression = visitor.accept(objectExpression);
|
||||
body = visitor.accept(body);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
|
||||
package com.google.dart.compiler.backend.js.ast;
|
||||
|
||||
public interface JsNode {
|
||||
import com.google.dart.compiler.common.HasSourceInfo;
|
||||
|
||||
public interface JsNode extends HasSourceInfo {
|
||||
NodeKind getKind();
|
||||
|
||||
/**
|
||||
|
||||
@@ -145,16 +145,16 @@ public abstract class JsVisitor {
|
||||
visitElement(x, ctx);
|
||||
}
|
||||
|
||||
public void visitDebugger(JsDebugger x, JsContext ctx) {
|
||||
visitElement(x, ctx);
|
||||
public void visitDebugger(JsDebugger x, JsContext context) {
|
||||
visitElement(x, context);
|
||||
}
|
||||
|
||||
public void visitDefault(JsDefault x, JsContext ctx) {
|
||||
visitElement(x, ctx);
|
||||
public void visitDefault(JsDefault x, JsContext context) {
|
||||
visitElement(x, context);
|
||||
}
|
||||
|
||||
public void visitDoWhile(JsDoWhile x, JsContext ctx) {
|
||||
visitElement(x, ctx);
|
||||
public void visitDoWhile(JsDoWhile x, JsContext context) {
|
||||
visitElement(x, context);
|
||||
}
|
||||
|
||||
public void visitEmpty(JsEmpty x, JsContext ctx) {
|
||||
|
||||
Reference in New Issue
Block a user