diff options
| author | Pavel Machek <pavel@ucw.cz> | 2000-06-01 08:43:29 +0000 |
|---|---|---|
| committer | Pavel Machek <pavel@ucw.cz> | 2000-06-01 08:43:29 +0000 |
| commit | 5f4aee76a2e26a6947f47273d510edc524716a45 (patch) | |
| tree | 9004972bd0c1fd4de12e9cfdfdfee67babb50066 /conf | |
| parent | 1877dab21715eb23addb3391afbd8dbf571f833d (diff) | |
Added && and ||.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/cf-lex.l | 2 | ||||
| -rw-r--r-- | conf/confbase.Y | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l index 22f02959..a30ddfbd 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 b48a9290..5da84b1e 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 '!' |