Mercurial > hg > graal-compiler
changeset 23232:9787a53c5345
Remove FilteredNodeIterable#or.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 01 Jan 2016 15:29:38 +0100 |
parents | abe8b7a5baec |
children | 7ba20dadcc84 |
files | graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/FilteredNodeIterable.java graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicate.java graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicates.java |
diffstat | 3 files changed, 0 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/FilteredNodeIterable.java Fri Jan 01 15:28:03 2016 +0100 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/FilteredNodeIterable.java Fri Jan 01 15:29:38 2016 +0100 @@ -40,11 +40,6 @@ return this; } - public FilteredNodeIterable<T> or(NodePredicate nodePredicate) { - this.predicate = this.predicate.or(nodePredicate); - return this; - } - @Override public DistinctFilteredNodeIterable<T> distinct() { DistinctFilteredNodeIterable<T> distinct = new DistinctFilteredNodeIterable<>(nodeIterable);
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicate.java Fri Jan 01 15:28:03 2016 +0100 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicate.java Fri Jan 01 15:29:38 2016 +0100 @@ -25,7 +25,6 @@ import com.oracle.graal.graph.Node; import com.oracle.graal.graph.iterators.NodePredicates.AndPredicate; import com.oracle.graal.graph.iterators.NodePredicates.NotPredicate; -import com.oracle.graal.graph.iterators.NodePredicates.OrPredicate; public interface NodePredicate { @@ -35,10 +34,6 @@ return new AndPredicate(this, np); } - default NodePredicate or(NodePredicate np) { - return new OrPredicate(this, np); - } - default NodePredicate negate() { return new NotPredicate(this); }
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicates.java Fri Jan 01 15:28:03 2016 +0100 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicates.java Fri Jan 01 15:29:38 2016 +0100 @@ -83,10 +83,6 @@ public NodePredicate negate() { return CONTRADICTION; } - - public NodePredicate or(NodePredicate np) { - return this; - } } static final class ContradictionPredicate implements NodePredicate { @@ -103,10 +99,6 @@ public NodePredicate negate() { return TAUTOLOGY; } - - public NodePredicate or(NodePredicate np) { - return np; - } } static final class AndPredicate implements NodePredicate { @@ -143,22 +135,6 @@ } } - static final class OrPredicate implements NodePredicate { - - private final NodePredicate a; - private final NodePredicate b; - - OrPredicate(NodePredicate a, NodePredicate b) { - this.a = a; - this.b = b; - } - - @Override - public boolean apply(Node n) { - return a.apply(n) || b.apply(n); - } - } - static final class IsNullPredicate implements NodePredicate { @Override