diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 15:39:32 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 15:39:32 +0200 |
| commit | 3752654852f4962465154257348000d6de1c2dae (patch) | |
| tree | 7fcafdf3cb47131408e85f674577ad2a10fef18d /conf | |
| parent | 032201378faa52e2d7a15ea265426e133d9becca (diff) | |
| parent | 80272d4b64a38ee6f04a1c4e8566cac3a2293176 (diff) | |
Merge commit '80272d4b64a38ee6f04a1c4e8566cac3a2293176' into haugesund
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/cf-lex.l | 2 | ||||
| -rw-r--r-- | conf/confbase.Y | 1 |
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 '!' |