summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOndrej Filip <feela@majklik.network.cz>2010-01-27 23:45:36 +0100
committerOndrej Filip <feela@majklik.network.cz>2010-01-27 23:45:36 +0100
commit1960d20350c5191b089f0a233d99969a0ff23ef6 (patch)
tree2d51c8d5cee864f33090d34e8124afbc333b8ed3 /conf
parent7515dafc006f8b71bc15aa7ed9749c7d4fb00153 (diff)
Priority for '||' and '&&' fixed.
Diffstat (limited to 'conf')
-rw-r--r--conf/confbase.Y3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 6d2607e4..91bfb1d5 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -60,8 +60,9 @@ CF_DECLS
%type <t> text_or_none
%nonassoc PREFIX_DUMMY
+%left AND OR
%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ PO PC
-%left '+' '-' AND OR
+%left '+' '-'
%left '*' '/' '%'
%left '!'