summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOndrej Filip <feela@majklik.network.cz>2010-01-27 22:26:45 +0100
committerOndrej Filip <feela@majklik.network.cz>2010-01-27 22:26:45 +0100
commit7515dafc006f8b71bc15aa7ed9749c7d4fb00153 (patch)
tree99078786868a52b79d43e3ab65918681c9357789 /conf
parent6cb8f742f1adf99881334b8ae21c398d98571aa1 (diff)
Allow multiple || and && statements.
Diffstat (limited to 'conf')
-rw-r--r--conf/confbase.Y4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y
index a2df85dc..6d2607e4 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -60,8 +60,8 @@ CF_DECLS
%type <t> text_or_none
%nonassoc PREFIX_DUMMY
-%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ AND OR PO PC
-%left '+' '-'
+%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ PO PC
+%left '+' '-' AND OR
%left '*' '/' '%'
%left '!'