--- a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java Tue May 07 14:36:57 2013 +0200
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java Tue May 07 14:43:17 2013 +0200
@@ -27,6 +27,7 @@
import java.util.Arrays;
import java.util.List;
+
import jdk.nashorn.internal.codegen.CompilerConstants;
import jdk.nashorn.internal.ir.AccessNode;
import jdk.nashorn.internal.ir.BinaryNode;
@@ -44,7 +45,6 @@
import jdk.nashorn.internal.ir.IfNode;
import jdk.nashorn.internal.ir.IndexNode;
import jdk.nashorn.internal.ir.LabelNode;
-import jdk.nashorn.internal.ir.LineNumberNode;
import jdk.nashorn.internal.ir.LiteralNode;
import jdk.nashorn.internal.ir.Node;
import jdk.nashorn.internal.ir.ObjectNode;
@@ -52,6 +52,7 @@
import jdk.nashorn.internal.ir.ReturnNode;
import jdk.nashorn.internal.ir.RuntimeNode;
import jdk.nashorn.internal.ir.SplitNode;
+import jdk.nashorn.internal.ir.Statement;
import jdk.nashorn.internal.ir.SwitchNode;
import jdk.nashorn.internal.ir.TernaryNode;
import jdk.nashorn.internal.ir.ThrowNode;
@@ -406,17 +407,15 @@
}
// body consists of nested functions and statements
- final List<Node> stats = functionNode.getBody().getStatements();
+ final List<Statement> stats = functionNode.getBody().getStatements();
final int size = stats.size();
int idx = 0;
arrayStart("body");
for (final Node stat : stats) {
- if (! stat.isDebug()) {
- stat.accept(this);
- if (idx != (size - 1)) {
- comma();
- }
+ stat.accept(this);
+ if (idx != (size - 1)) {
+ comma();
}
idx++;
}
@@ -504,11 +503,6 @@
return leave();
}
- @Override
- public boolean enterLineNumberNode(final LineNumberNode lineNumberNode) {
- return false;
- }
-
@SuppressWarnings("rawtypes")
@Override
public boolean enterLiteralNode(final LiteralNode literalNode) {
@@ -931,15 +925,13 @@
int idx = 0;
arrayStart(name);
for (final Node node : nodes) {
- if (node == null || !node.isDebug()) {
- if (node != null) {
- node.accept(this);
- } else {
- nullValue();
- }
- if (idx != (size - 1)) {
- comma();
- }
+ if (node != null) {
+ node.accept(this);
+ } else {
+ nullValue();
+ }
+ if (idx != (size - 1)) {
+ comma();
}
idx++;
}