Mercurial > hg > graal-jvmci-8
diff graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultASTPrinter.java @ 20129:5b7db8941fd7
Truffle: make NodeClass and NodeField a top-level class.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Thu, 02 Apr 2015 01:22:41 +0200 |
parents | e3c95cbbb50c |
children | 8dc73c226c63 |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultASTPrinter.java Thu Apr 02 14:28:27 2015 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultASTPrinter.java Thu Apr 02 01:22:41 2015 +0200 @@ -29,9 +29,7 @@ import com.oracle.truffle.api.instrument.*; import com.oracle.truffle.api.nodes.*; -import com.oracle.truffle.api.nodes.NodeUtil.NodeClass; -import com.oracle.truffle.api.nodes.NodeUtil.NodeField; -import com.oracle.truffle.api.nodes.NodeUtil.NodeFieldKind; +import com.oracle.truffle.api.nodes.NodeFieldAccessor.NodeFieldKind; import com.oracle.truffle.api.source.*; /** @@ -76,9 +74,9 @@ p.print(NodeUtil.printSyntaxTags(node)); - ArrayList<NodeField> childFields = new ArrayList<>(); + ArrayList<NodeFieldAccessor> childFields = new ArrayList<>(); - for (NodeField field : NodeClass.get(node.getClass()).getFields()) { + for (NodeFieldAccessor field : NodeClass.get(node.getClass()).getFields()) { if (field.getKind() == NodeFieldKind.CHILD || field.getKind() == NodeFieldKind.CHILDREN) { childFields.add(field); } else if (field.getKind() == NodeFieldKind.DATA) { @@ -100,7 +98,7 @@ if (childFields.size() != 0) { p.print(" {"); - for (NodeField field : childFields) { + for (NodeFieldAccessor field : childFields) { Object value = field.loadValue(node); if (value == null) { @@ -122,7 +120,7 @@ } } - protected void printChildren(PrintWriter p, int maxDepth, Node markNode, int level, NodeField field, Object value) { + protected void printChildren(PrintWriter p, int maxDepth, Node markNode, int level, NodeFieldAccessor field, Object value) { printNewLine(p, level); p.print(field.getName()); Node[] children = (Node[]) value; @@ -136,7 +134,7 @@ p.print("]"); } - protected void printChild(PrintWriter p, int maxDepth, Node markNode, int level, NodeField field, Object value) { + protected void printChild(PrintWriter p, int maxDepth, Node markNode, int level, NodeFieldAccessor field, Object value) { final Node valueNode = (Node) value; printNewLine(p, level, valueNode == markNode); p.print(field.getName());