diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/cf-lex.l | 4 | ||||
| -rw-r--r-- | conf/confbase.Y | 6 |
2 files changed, 4 insertions, 6 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>. diff --git a/conf/confbase.Y b/conf/confbase.Y index 7b5caf5f..880b0df5 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -54,10 +54,10 @@ config: conf_entries END { conf_entries: /* EMPTY */ - | conf_entries conf ';' + | conf_entries conf ; -CF_ADDTO(conf, /* EMPTY */) +CF_ADDTO(conf, ';') /* Constant expressions */ @@ -74,7 +74,7 @@ expr: CF_ADDTO(conf, definition) definition: - DEFINE SYM '=' expr { + DEFINE SYM '=' expr ';' { if ($2->class != SYM_VOID) cf_error("Symbol already defined"); $2->class = SYM_NUMBER; $2->aux = $4; |