From 5f4aee76a2e26a6947f47273d510edc524716a45 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Thu, 1 Jun 2000 08:43:29 +0000
Subject: Added && and ||.

---
 conf/cf-lex.l   | 2 ++
 conf/confbase.Y | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'conf')

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 '!'
-- 
cgit v1.2.3