summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>1999-04-07 12:11:08 +0000
committerPavel Machek <pavel@ucw.cz>1999-04-07 12:11:08 +0000
commit23b1539bf90bfb6b35d9a2be0a2b6b1e311c1460 (patch)
tree1e14ad6211df41634cbd0e9cf9a638e36ec17060 /conf
parent7976a574b692f747d833d899caf0fbbf702714c1 (diff)
Filters upgraded - a bit. Moved code to filter.c because it is where
it belongs. (f-util.c stays there for auxiliary and non-important things.)
Diffstat (limited to 'conf')
-rw-r--r--conf/cf-lex.l2
-rw-r--r--conf/confbase.Y3
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index b6b0df70..a9e7b542 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -103,7 +103,7 @@ WHITE [ \t]
return SYM;
}
-[={}:;,()+*/%-] {
+[={}:;,()+*/%-<>~] {
return yytext[0];
}
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 880b0df5..0598d560 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -37,9 +37,10 @@ CF_DECLS
%type <i> expr bool pxlen
-%left '='
+%nonassoc '=' '<' '>'
%left '+' '-'
%left '*' '/' '%'
+%left '!'
CF_KEYWORDS(DEFINE, ON, OFF, YES, NO)