summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2015-06-05 10:45:48 +0200
committerUlf Magnusson <ulfalizer@gmail.com>2015-06-05 10:45:48 +0200
commit47b512313460381f351cdfddf1d2ac2a22c53e98 (patch)
tree730f3d0e61dbde42054dc3a753d1b447a121eef8
parente91bc472e0d4c162ba5d785349d7fdfc18750531 (diff)
Move some ANDs after ORs for consistency.
-rw-r--r--kconfiglib.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/kconfiglib.py b/kconfiglib.py
index 2e88361..6a319a3 100644
--- a/kconfiglib.py
+++ b/kconfiglib.py
@@ -1921,7 +1921,7 @@ def _get_expr_syms(expr):
e0 = expr[0]
- if e0 == OR or e0 == AND:
+ if e0 == AND or e0 == OR:
for term in expr[1]:
rec(term)
@@ -2010,7 +2010,7 @@ def _make_and(e1, e2):
#
# Tokens
-(T_OR, T_AND, T_NOT,
+(T_AND, T_OR, T_NOT,
T_OPEN_PAREN, T_CLOSE_PAREN,
T_EQUAL, T_UNEQUAL,
T_MAINMENU, T_MENU, T_ENDMENU,
@@ -2110,7 +2110,7 @@ default_value = { BOOL : "n",
NO_SELECTION = 0
# Integers representing expression types
-OR, AND, NOT, EQUAL, UNEQUAL = range(0, 5)
+AND, OR, NOT, EQUAL, UNEQUAL = range(0, 5)
# Map from tristate values to integers
tri_to_int = { "n" : 0, "m" : 1, "y" : 2 }