summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-02-13 22:34:33 +0100
committerMartin Mares <mj@ucw.cz>1999-02-13 22:34:33 +0100
commit726141746b7f86b02a902bd6b316792e4be0380c (patch)
tree3ccb45603bab3cead03793a8aaf71ce8c12779e4
parent5996da6a1d2eb11ac45d9d578618b9350e58593d (diff)
downloadbird-726141746b7f86b02a902bd6b316792e4be0380c.tar
bird-726141746b7f86b02a902bd6b316792e4be0380c.zip
'#' comments in config files are equivalent to end of line, therefore
also to implicit ';'.
-rw-r--r--TODO2
-rw-r--r--conf/cf-lex.l15
2 files changed, 5 insertions, 12 deletions
diff --git a/TODO b/TODO
index ced47f2..dc209f4 100644
--- a/TODO
+++ b/TODO
@@ -20,8 +20,6 @@ Core
- default preferences of protocols: prefer BGP over OSPF/RIP external routes?
- secondary addresses -> subinterfaces
-- config: comments at end of line -> explicit ';' needed?
-
- static: check validity of route destination?
- static: device routes
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 791d4ad..426f528 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -120,24 +120,19 @@ WHITE [ \t]
{WHITE}+
-\\\n {
- conf_lino++;
-}
+\\\n conf_lino++;
+\n { conf_lino++; return ';'; }
-\n {
- conf_lino++;
- return ';';
-}
-
-# { BEGIN(COMMENT); }
+# BEGIN(COMMENT);
-\/\* { BEGIN(CCOMM); }
+\/\* BEGIN(CCOMM);
. cf_error("Unknown character");
<COMMENT>\n {
conf_lino++;
BEGIN(INITIAL);
+ return ';';
}
<COMMENT>.