summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2022-03-25 19:15:11 +0100
committerMaria Matejka <mq@ucw.cz>2022-05-04 15:37:41 +0200
commitd4bcef0e0bfee911d403c0cf830de3e3007eeb38 (patch)
tree50bff8f853eab7efb6b6a6ad718449d5758b5be1 /conf
parentcd9550b24487ac7327b0234fd825f4214fdf7b16 (diff)
Filter operations: bitwise AND and OR
Diffstat (limited to 'conf')
-rw-r--r--conf/cf-lex.l2
-rw-r--r--conf/confbase.Y1
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index c9d2f5a5..b9457a83 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -347,7 +347,7 @@ else: {
return DDOT;
}
-[={}:;,.()+*/%<>~\[\]?!\|-] {
+[={}:;,.()+*/%<>~\[\]?!\|&-] {
return yytext[0];
}
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 6985783b..753df325 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -120,6 +120,7 @@ CF_DECLS
%nonassoc PREFIX_DUMMY
%left AND OR
%nonassoc '=' '<' '>' '~' GEQ LEQ NEQ NMA PO PC
+%left '|' '&'
%left '+' '-'
%left '*' '/' '%'
%left '!'