summaryrefslogtreecommitdiff
path: root/conf/cf-lex.l
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-03-29 19:04:14 +0000
committerMartin Mares <mj@ucw.cz>1999-03-29 19:04:14 +0000
commit7f400d1c620e80461e61384c7d0b8893edb92695 (patch)
tree5bc6e2f1433f747c0cc4d1925ad4782123ae35ad /conf/cf-lex.l
parent1127ac6ec7eff52d4ccbc4d836a63fa6513f6d48 (diff)
After today's lengthy discussions about filter syntax, let's clean up
whitespace/semicolon rules for whole config file: o All non-zero amounts of whitespace are equivalent to single space (aka `all the whitespace has been born equal' ;-)). o Comments count as whitespace. o Whitespace has no syntactic signifance (it can only separate lexical elements). o Consequence: line ends are no longer treated as `;'s. o Every declaration must be terminated by an explicit `;' unless or by a group enclosed in `{' and `}'.
Diffstat (limited to 'conf/cf-lex.l')
-rw-r--r--conf/cf-lex.l4
1 files changed, 1 insertions, 3 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index d000f972..b6b0df70 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -119,8 +119,7 @@ WHITE [ \t]
{WHITE}+
-\\\n conf_lino++;
-\n { conf_lino++; return ';'; }
+\n conf_lino++;
# BEGIN(COMMENT);
@@ -131,7 +130,6 @@ WHITE [ \t]
<COMMENT>\n {
conf_lino++;
BEGIN(INITIAL);
- return ';';
}
<COMMENT>.