changeset 23238:bc992c49ca71

Remove IsNotNullPredicate.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 01 Jan 2016 18:35:53 +0100
parents 46db8e4d2ee0
children aeb81e02fc3d
files graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterable.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(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterable.java	Fri Jan 01 18:32:58 2016 +0100
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodeIterable.java	Fri Jan 01 18:35:53 2016 +0100
@@ -40,10 +40,6 @@
         return new FilteredNodeIterable<>(this).and(predicate);
     }
 
-    default FilteredNodeIterable<T> nonNull() {
-        return new FilteredNodeIterable<>(this).and(NodePredicates.isNotNull());
-    }
-
     default NodeIterable<T> distinct() {
         return new FilteredNodeIterable<>(this).distinct();
     }
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicate.java	Fri Jan 01 18:32:58 2016 +0100
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicate.java	Fri Jan 01 18:35:53 2016 +0100
@@ -24,7 +24,6 @@
 
 import com.oracle.graal.graph.Node;
 import com.oracle.graal.graph.iterators.NodePredicates.AndPredicate;
-import com.oracle.graal.graph.iterators.NodePredicates.NotPredicate;
 
 public interface NodePredicate {
 
@@ -33,8 +32,4 @@
     default NodePredicate and(NodePredicate np) {
         return new AndPredicate(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 18:32:58 2016 +0100
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/iterators/NodePredicates.java	Fri Jan 01 18:35:53 2016 +0100
@@ -29,7 +29,6 @@
     private static final TautologyPredicate TAUTOLOGY = new TautologyPredicate();
     private static final ContradictionPredicate CONTRADICTION = new ContradictionPredicate();
     private static final IsNullPredicate IS_NULL = new IsNullPredicate();
-    private static final IsNotNullPredicate IS_NOT_NULL = new IsNotNullPredicate();
 
     public static NodePredicate alwaysTrue() {
         return TAUTOLOGY;
@@ -43,10 +42,6 @@
         return IS_NULL;
     }
 
-    public static NodePredicate isNotNull() {
-        return IS_NOT_NULL;
-    }
-
     public static NodePredicate equals(Node n) {
         return new EqualsPredicate(n);
     }
@@ -79,10 +74,6 @@
         public NodePredicate and(NodePredicate np) {
             return np;
         }
-
-        public NodePredicate negate() {
-            return CONTRADICTION;
-        }
     }
 
     static final class ContradictionPredicate implements NodePredicate {
@@ -95,10 +86,6 @@
         public NodePredicate and(NodePredicate np) {
             return this;
         }
-
-        public NodePredicate negate() {
-            return TAUTOLOGY;
-        }
     }
 
     static final class AndPredicate implements NodePredicate {
@@ -141,22 +128,6 @@
         public boolean apply(Node n) {
             return n == null;
         }
-
-        public NodePredicate negate() {
-            return IS_NOT_NULL;
-        }
-    }
-
-    static final class IsNotNullPredicate implements NodePredicate {
-
-        @Override
-        public boolean apply(Node n) {
-            return n != null;
-        }
-
-        public NodePredicate negate() {
-            return IS_NULL;
-        }
     }
 
     static final class EqualsPredicate implements NodePredicate {
@@ -171,10 +142,6 @@
         public boolean apply(Node n) {
             return u == n;
         }
-
-        public NodePredicate negate() {
-            return new NotEqualsPredicate(u);
-        }
     }
 
     static final class NotEqualsPredicate implements NodePredicate {