summaryrefslogtreecommitdiff
path: root/extra/config/zconf.l
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-11-08 00:47:07 +0000
committerEric Andersen <andersen@codepoet.org>2002-11-08 00:47:07 +0000
commite89052ae8b40a4cf531e2273175f359c3c28a56a (patch)
treeec47fb38e0fb50d5b60883cf4a5c9de38fafc362 /extra/config/zconf.l
parentd3181d18144c86428e2d1255191ff6a469a1a4ab (diff)
Merge an update from upstream
Diffstat (limited to 'extra/config/zconf.l')
-rw-r--r--extra/config/zconf.l39
1 files changed, 24 insertions, 15 deletions
diff --git a/extra/config/zconf.l b/extra/config/zconf.l
index 6d81e5eb7..a412bf411 100644
--- a/extra/config/zconf.l
+++ b/extra/config/zconf.l
@@ -1,4 +1,4 @@
-%option backup nostdinit noyywrap full ecs
+%option backup nostdinit noyywrap never-interactive full ecs
%option 8bit backup nodefault perf-report perf-report
%x COMMAND HELP STRING PARAM
%{
@@ -83,8 +83,6 @@ n [A-Za-z0-9_]
. {
unput(yytext[0]);
- //printf("new config: ");
- //symbol_end(NULL);
BEGIN(COMMAND);
}
@@ -144,31 +142,43 @@ n [A-Za-z0-9_]
return T_WORD;
}
.
+ <<EOF>> {
+ BEGIN(INITIAL);
+ }
}
<STRING>{
- [^'"\n\\]+ {
+ [^'"\\\n]+/\n {
+ append_string(yytext, yyleng);
+ zconflval.string = text;
+ return T_STRING;
+ }
+ [^'"\\\n]+ {
append_string(yytext, yyleng);
}
+ \\.?/\n {
+ append_string(yytext+1, yyleng);
+ zconflval.string = text;
+ return T_STRING;
+ }
+ \\.? {
+ append_string(yytext+1, yyleng);
+ }
\'|\" {
if (str == yytext[0]) {
BEGIN(PARAM);
zconflval.string = text;
- //printf("s:%s\n", text);
return T_STRING;
} else
append_string(yytext, 1);
}
- \\[ \t]*\n append_string(yytext+yyleng-1, 1); current_file->lineno++;
- \\[ \t]* append_string(yytext+1, yyleng-1);
- \\. append_string(yytext+1, 1);
\n {
- //printf(":%d: open string!\n", current_file->lineno+1);
- exit(0);
+ printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
+ BEGIN(INITIAL);
+ return T_EOL;
}
<<EOF>> {
- //printf(":%d: open string!\n", current_file->lineno+1);
- exit(0);
+ BEGIN(INITIAL);
}
}
@@ -221,6 +231,7 @@ n [A-Za-z0-9_]
zconf_endfile();
return T_EOF;
}
+ fclose(yyin);
yyterminate();
}
@@ -245,7 +256,6 @@ void zconf_initscan(const char *name)
printf("can't find file %s\n", name);
exit(1);
}
- //fprintf(stderr, "zconf_initscan: %s\n", name);
current_buf = malloc(sizeof(*current_buf));
memset(current_buf, 0, sizeof(*current_buf));
@@ -271,8 +281,6 @@ void zconf_nextfile(const char *name)
buf->parent = current_buf;
current_buf = buf;
- //fprintf(stderr, "zconf_nextfile: %s\n", name);
-
if (file->flags & FILE_BUSY) {
printf("recursive scan (%s)?\n", name);
exit(1);
@@ -297,6 +305,7 @@ static struct buffer *zconf_endfile(void)
parent = current_buf->parent;
if (parent) {
+ fclose(yyin);
yy_delete_buffer(YY_CURRENT_BUFFER);
yy_switch_to_buffer(parent->state);
}