JS backend: update dart-ast.jar.
(cherry picked from commit 1cc7586)
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -34,20 +34,13 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visit(JsProgram program, JsContext ctx) {
|
||||
return true;
|
||||
public void visitProgramFragment(JsProgramFragment x, JsContext context) {
|
||||
x.acceptChildren(this, context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visit(JsProgramFragment x, JsContext ctx) {
|
||||
// Descend naturally.
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visit(JsBlock x, JsContext ctx) {
|
||||
public void visitBlock(JsBlock x, JsContext ctx) {
|
||||
printJsBlock(x, false, true);
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -67,7 +60,7 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doTraverse(JsVisitable node, JsContext context) {
|
||||
protected void doAccept(JsNode node, JsContext context) {
|
||||
if (sourceMapBuilder != null) {
|
||||
Object sourceInfo = node.getSourceInfo();
|
||||
if (sourceInfo != null) {
|
||||
@@ -80,12 +73,12 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple
|
||||
}
|
||||
}
|
||||
}
|
||||
super.doTraverse(node, context);
|
||||
super.doAccept(node, context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void endVisit(JsProgram x, JsContext context) {
|
||||
super.endVisit(x, context);
|
||||
public void visitProgram(JsProgram program, JsContext context) {
|
||||
program.acceptChildren(this, context);
|
||||
if (sourceMapBuilder != null) {
|
||||
sourceMapBuilder.addLink();
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ public final class K2JSTranslator {
|
||||
) throws TranslationException {
|
||||
JsProgram program = generateProgram(files, mainCallParameters);
|
||||
JsSourceGenerationVisitor sourceGenerator = new JsSourceGenerationVisitor(output, sourceMapBuilder);
|
||||
program.traverse(sourceGenerator, null);
|
||||
program.accept(sourceGenerator, null);
|
||||
return output.toString();
|
||||
}
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
|
||||
if (expressionInside != null) {
|
||||
return expressionInside.accept(this, context);
|
||||
}
|
||||
return context.program().getEmptyStmt();
|
||||
return context.program().getEmptyStatement();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -214,7 +214,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
|
||||
private JsStatement translateNullableExpressionAsNotNullStatement(@Nullable JetExpression nullableExpression,
|
||||
@NotNull TranslationContext context) {
|
||||
if (nullableExpression == null) {
|
||||
return context.program().getEmptyStmt();
|
||||
return context.program().getEmptyStatement();
|
||||
}
|
||||
return convertToStatement(nullableExpression.accept(this, context));
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ public final class TryTranslator extends AbstractTranslator {
|
||||
private JsBlock translateCatchBody(@NotNull JetCatchClause catchClause) {
|
||||
JetExpression catchBody = catchClause.getCatchBody();
|
||||
if (catchBody == null) {
|
||||
return convertToBlock(program().getEmptyStmt());
|
||||
return convertToBlock(program().getEmptyStatement());
|
||||
}
|
||||
return convertToBlock(Translation.translateAsStatement(catchBody, context()));
|
||||
}
|
||||
|
||||
+1
-1
@@ -177,7 +177,7 @@ public final class InlinedCallExpressionTranslator extends AbstractCallExpressio
|
||||
@Override
|
||||
public JsNode mutate(@NotNull JsNode node) {
|
||||
if (node instanceof JsReturn) {
|
||||
JsExpression returnedExpression = ((JsReturn)node).getExpr();
|
||||
JsExpression returnedExpression = ((JsReturn)node).getExpression();
|
||||
return JsAstUtils.assignment(toAssignTo.name().makeRef(), returnedExpression);
|
||||
}
|
||||
return node;
|
||||
|
||||
Reference in New Issue
Block a user