# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1328136256 -3600
# Node ID 002673e4c67f4ad7c9844414c7bf3fd7c50e75c1
# Parent  f75f0cdf0cccf50226a6f87399d6dfcfa4a247c7
Fix evaluation order of the And and Or node predicates.

diff -r f75f0cdf0ccc -r 002673e4c67f graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/iterators/NodePredicates.java
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/iterators/NodePredicates.java	Wed Feb 01 17:46:20 2012 +0100
+++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/iterators/NodePredicates.java	Wed Feb 01 23:44:16 2012 +0100
@@ -142,13 +142,13 @@
     private static final class AndPredicate extends NodePredicate {
         private final NodePredicate a;
         private final NodePredicate b;
-        private AndPredicate(NodePredicate pa, NodePredicate pb) {
-            this.a = pa;
-            this.b = pb;
+        private AndPredicate(NodePredicate a, NodePredicate b) {
+            this.a = a;
+            this.b = b;
         }
         @Override
         public boolean apply(Node n) {
-            return b.apply(n) && a.apply(n);
+            return a.apply(n) && b.apply(n);
         }
     }
 
@@ -166,13 +166,13 @@
     private static final class OrPredicate extends NodePredicate {
         private final NodePredicate a;
         private final NodePredicate b;
-        private OrPredicate(NodePredicate np, NodePredicate thiz) {
-            this.a = np;
-            this.b = thiz;
+        private OrPredicate(NodePredicate a, NodePredicate b) {
+            this.a = a;
+            this.b = b;
         }
         @Override
         public boolean apply(Node n) {
-            return b.apply(n) || a.apply(n);
+            return a.apply(n) || b.apply(n);
         }
     }