Check for AND before OR in _eval_expr_2().

Much more common, so make it the fast case.

1 files changed, 15 insertions, 15 deletions

diff --git a/kconfiglib.py b/kconfiglib.py
index 2a74d92..8dba935 100644
--- a/kconfiglib.py
+++ b/kconfiglib.py
@@ -1484,38 +1484,38 @@ error, and you should email ulfalizer a.t Google's email service."""
 
         first_expr = expr[0]
 
-        if first_expr == OR:
-            res = "n"
+        if first_expr == AND:
+            res = "y"
 
             for subexpr in expr[1]:
                 ev = self._eval_expr_2(subexpr)
 
-                # Return immediately upon discovering a "y" term
-                if ev == "y":
-                    return "y"
+                # Return immediately upon discovering an "n" term
+                if ev == "n":
+                    return "n"
 
                 if ev == "m":
                     res = "m"
 
-            # 'res' is either "n" or "m" here; we already handled the
-            # short-circuiting "y" case in the loop.
+            # 'res' is either "m" or "y" here; we already handled the
+            # short-circuiting "n" case in the loop.
             return res
 
-        if first_expr == AND:
-            res = "y"
+        if first_expr == OR:
+            res = "n"
 
             for subexpr in expr[1]:
                 ev = self._eval_expr_2(subexpr)
 
-                # Return immediately upon discovering an "n" term
-                if ev == "n":
-                    return "n"
+                # Return immediately upon discovering a "y" term
+                if ev == "y":
+                    return "y"
 
                 if ev == "m":
                     res = "m"
 
-            # 'res' is either "m" or "y" here; we already handled the
-            # short-circuiting "n" case in the loop.
+            # 'res' is either "n" or "m" here; we already handled the
+            # short-circuiting "y" case in the loop.
             return res
 
         if first_expr == NOT:
@@ -2193,7 +2193,7 @@ def _expr_to_str_rec(expr):
 
     e0 = expr[0]
 
-    if e0 == OR or e0 == AND:
+    if e0 == AND or e0 == OR:
         return _intersperse(expr[1], expr[0])
 
     if e0 == NOT: