summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/cf-lex.l2
-rw-r--r--conf/confbase.Y4
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 22f0295..a30ddfb 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -179,6 +179,8 @@ WHITE [ \t]
\!\= return NEQ;
\<\= return LEQ;
\>\= return GEQ;
+\&\& return AND;
+\|\| return OR;
%%
diff --git a/conf/confbase.Y b/conf/confbase.Y
index b48a929..5da84b1 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -44,7 +44,7 @@ CF_DECLS
}
%token END CLI_MARKER INVALID_TOKEN
-%token GEQ LEQ NEQ
+%token GEQ LEQ NEQ AND OR
%token <i> NUM ENUM
%token <i32> RTRID
%token <a> IPA
@@ -57,7 +57,7 @@ CF_DECLS
%type <px> prefix prefix_or_ipa
%nonassoc PREFIX_DUMMY
-%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ
+%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ AND OR
%left '+' '-'
%left '*' '/' '%'
%left '!'