JS backend: update dart-ast.jar.

(cherry picked from commit 1cc7586)
This commit is contained in:
develar
2012-10-25 10:17:21 +04:00
committed by Zalim Bashorov
parent 711aee6026
commit 6c40cf371e
7 changed files with 12 additions and 19 deletions
Binary file not shown.
Binary file not shown.
@@ -34,20 +34,13 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
} }
@Override @Override
public boolean visit(JsProgram program, JsContext ctx) { public void visitProgramFragment(JsProgramFragment x, JsContext context) {
return true; x.acceptChildren(this, context);
} }
@Override @Override
public boolean visit(JsProgramFragment x, JsContext ctx) { public void visitBlock(JsBlock x, JsContext ctx) {
// Descend naturally.
return true;
}
@Override
public boolean visit(JsBlock x, JsContext ctx) {
printJsBlock(x, false, true); printJsBlock(x, false, true);
return false;
} }
@Override @Override
@@ -67,7 +60,7 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
} }
@Override @Override
protected void doTraverse(JsVisitable node, JsContext context) { protected void doAccept(JsNode node, JsContext context) {
if (sourceMapBuilder != null) { if (sourceMapBuilder != null) {
Object sourceInfo = node.getSourceInfo(); Object sourceInfo = node.getSourceInfo();
if (sourceInfo != null) { if (sourceInfo != null) {
@@ -80,12 +73,12 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
} }
} }
} }
super.doTraverse(node, context); super.doAccept(node, context);
} }
@Override @Override
public void endVisit(JsProgram x, JsContext context) { public void visitProgram(JsProgram program, JsContext context) {
super.endVisit(x, context); program.acceptChildren(this, context);
if (sourceMapBuilder != null) { if (sourceMapBuilder != null) {
sourceMapBuilder.addLink(); sourceMapBuilder.addLink();
} }
@@ -100,7 +100,7 @@ public final class K2JSTranslator {
) throws TranslationException { ) throws TranslationException {
JsProgram program = generateProgram(files, mainCallParameters); JsProgram program = generateProgram(files, mainCallParameters);
JsSourceGenerationVisitor sourceGenerator = new JsSourceGenerationVisitor(output, sourceMapBuilder); JsSourceGenerationVisitor sourceGenerator = new JsSourceGenerationVisitor(output, sourceMapBuilder);
program.traverse(sourceGenerator, null); program.accept(sourceGenerator, null);
return output.toString(); return output.toString();
} }
@@ -140,7 +140,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
if (expressionInside != null) { if (expressionInside != null) {
return expressionInside.accept(this, context); return expressionInside.accept(this, context);
} }
return context.program().getEmptyStmt(); return context.program().getEmptyStatement();
} }
@Override @Override
@@ -214,7 +214,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
private JsStatement translateNullableExpressionAsNotNullStatement(@Nullable JetExpression nullableExpression, private JsStatement translateNullableExpressionAsNotNullStatement(@Nullable JetExpression nullableExpression,
@NotNull TranslationContext context) { @NotNull TranslationContext context) {
if (nullableExpression == null) { if (nullableExpression == null) {
return context.program().getEmptyStmt(); return context.program().getEmptyStatement();
} }
return convertToStatement(nullableExpression.accept(this, context)); return convertToStatement(nullableExpression.accept(this, context));
} }
@@ -89,7 +89,7 @@ public final class TryTranslator extends AbstractTranslator {
private JsBlock translateCatchBody(@NotNull JetCatchClause catchClause) { private JsBlock translateCatchBody(@NotNull JetCatchClause catchClause) {
JetExpression catchBody = catchClause.getCatchBody(); JetExpression catchBody = catchClause.getCatchBody();
if (catchBody == null) { if (catchBody == null) {
return convertToBlock(program().getEmptyStmt()); return convertToBlock(program().getEmptyStatement());
} }
return convertToBlock(Translation.translateAsStatement(catchBody, context())); return convertToBlock(Translation.translateAsStatement(catchBody, context()));
} }
@@ -177,7 +177,7 @@ public final class InlinedCallExpressionTranslator extends AbstractCallExpressio
@Override @Override
public JsNode mutate(@NotNull JsNode node) { public JsNode mutate(@NotNull JsNode node) {
if (node instanceof JsReturn) { if (node instanceof JsReturn) {
JsExpression returnedExpression = ((JsReturn)node).getExpr(); JsExpression returnedExpression = ((JsReturn)node).getExpression();
return JsAstUtils.assignment(toAssignTo.name().makeRef(), returnedExpression); return JsAstUtils.assignment(toAssignTo.name().makeRef(), returnedExpression);
} }
return node; return node;