summaryrefslogtreecommitdiff
path: root/extra
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
parentd3181d18144c86428e2d1255191ff6a469a1a4ab (diff)
Merge an update from upstream
Diffstat (limited to 'extra')
-rw-r--r--extra/config/conf.c3
-rw-r--r--extra/config/confdata.c27
-rw-r--r--extra/config/expr.h2
-rw-r--r--extra/config/lex.zconf.c_shipped420
-rw-r--r--extra/config/mconf.c65
-rw-r--r--extra/config/symbol.c8
-rw-r--r--extra/config/zconf.l39
-rw-r--r--extra/config/zconf.tab.c_shipped1745
-rw-r--r--extra/config/zconf.tab.h_shipped146
9 files changed, 1380 insertions, 1075 deletions
diff --git a/extra/config/conf.c b/extra/config/conf.c
index bf82f6664..910d52ce6 100644
--- a/extra/config/conf.c
+++ b/extra/config/conf.c
@@ -115,6 +115,7 @@ static void conf_askvalue(struct symbol *sym, const char *def)
exit(1);
}
case ask_all:
+ fflush(stdout);
fgets(line, 128, stdin);
return;
case set_default:
@@ -364,7 +365,7 @@ static int conf_choice(struct menu *menu)
for (cmenu = menu->list; cmenu; cmenu = cmenu->next) {
if (!cmenu->sym || !menu_is_visible(cmenu))
continue;
- if (!strncmp(line, menu_get_prompt(cmenu), len)) {
+ if (!strncasecmp(line, menu_get_prompt(cmenu), len)) {
def_menu = cmenu;
break;
}
diff --git a/extra/config/confdata.c b/extra/config/confdata.c
index 78e9c553c..d3df3ab34 100644
--- a/extra/config/confdata.c
+++ b/extra/config/confdata.c
@@ -148,17 +148,24 @@ int conf_read(const char *name)
break;
}
switch (sym->type) {
- case S_TRISTATE:
- if (p[0] == 'm')
- sym->def = symbol_mod.curr;
- else
+ case S_TRISTATE:
+ if (p[0] == 'm') {
+ S_TRI(sym->def) = mod;
+ sym->flags &= ~SYMBOL_NEW;
+ break;
+ }
case S_BOOLEAN:
- if (p[0] == 'n')
- sym->def = symbol_no.curr;
- else
- sym->def = symbol_yes.curr;
- sym->flags &= ~SYMBOL_NEW;
- break;
+ if (p[0] == 'y') {
+ S_TRI(sym->def) = yes;
+ sym->flags &= ~SYMBOL_NEW;
+ break;
+ }
+ if (p[0] == 'n') {
+ S_TRI(sym->def) = no;
+ sym->flags &= ~SYMBOL_NEW;
+ break;
+ }
+ break;
case S_STRING:
if (*p++ != '"')
break;
diff --git a/extra/config/expr.h b/extra/config/expr.h
index fd9c32a7e..e96d03b5a 100644
--- a/extra/config/expr.h
+++ b/extra/config/expr.h
@@ -169,7 +169,7 @@ struct menu {
//char *help;
struct file *file;
int lineno;
- //void *data;
+ void *data;
};
#ifndef SWIG
diff --git a/extra/config/lex.zconf.c_shipped b/extra/config/lex.zconf.c_shipped
index b6cb1188f..baad0d09e 100644
--- a/extra/config/lex.zconf.c_shipped
+++ b/extra/config/lex.zconf.c_shipped
@@ -18,7 +18,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /var/cvs/uClibc/extra/config/lex.zconf.c_shipped,v 1.1 2002/10/31 18:19:06 andersen Exp $
+ * $Header: /var/cvs/uClibc/extra/config/lex.zconf.c_shipped,v 1.2 2002/11/08 00:47:06 andersen Exp $
*/
#define FLEX_SCANNER
@@ -542,7 +542,7 @@ static yyconst short yy_nxt[][37] =
},
{
- 11, 77, 77, -34, 77, -34, 77, 77, -34, 77,
+ 11, 77, 77, 78, 77, -34, 77, 77, -34, 77,
77, 77, 77, 77, 77, -34, 77, 77, 77, 77,
77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
77, 77, 77, 77, 77, 77, 77
@@ -564,11 +564,11 @@ static yyconst short yy_nxt[][37] =
},
{
- 11, 78, 79, 80, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
+ 11, 79, 79, 80, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
- 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
- 78, 78, 78, 78, 78, 78, 78
+ 79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
+ 79, 79, 79, 79, 79, 79, 79
},
{
@@ -860,7 +860,7 @@ static yyconst short yy_nxt[][37] =
},
{
- 11, 77, 77, -77, 77, -77, 77, 77, -77, 77,
+ 11, 77, 77, 78, 77, -77, 77, 77, -77, 77,
77, 77, 77, 77, 77, -77, 77, 77, 77, 77,
77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
@@ -875,7 +875,7 @@ static yyconst short yy_nxt[][37] =
},
{
- 11, -79, 106, 80, -79, -79, -79, -79, -79, -79,
+ 11, -79, -79, 80, -79, -79, -79, -79, -79, -79,
-79, -79, -79, -79, -79, -79, -79, -79, -79, -79,
-79, -79, -79, -79, -79, -79, -79, -79, -79, -79,
-79, -79, -79, -79, -79, -79, -79
@@ -906,7 +906,7 @@ static yyconst short yy_nxt[][37] =
{
11, -83, -83, -83, -83, -83, -83, -83, -83, -83,
- -83, 107, 84, 84, -83, -83, 84, 84, 84, 84,
+ -83, 106, 84, 84, -83, -83, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, -83
},
@@ -944,14 +944,14 @@ static yyconst short yy_nxt[][37] =
{
11, -88, -88, -88, -88, -88, -88, -88, -88, -88,
-88, -88, -88, 56, -88, -88, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 108, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 107, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -88
},
{
11, -89, -89, -89, -89, -89, -89, -89, -89, -89,
-89, -89, -89, 56, -89, -89, 56, 56, 56, 56,
- 56, 56, 56, 56, 109, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 108, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -89
},
@@ -959,20 +959,20 @@ static yyconst short yy_nxt[][37] =
{
11, -90, -90, -90, -90, -90, -90, -90, -90, -90,
-90, -90, -90, 56, -90, -90, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 110, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 109, 56, 56, 56,
56, 56, 56, 56, 56, 56, -90
},
{
11, -91, -91, -91, -91, -91, -91, -91, -91, -91,
-91, -91, -91, 56, -91, -91, 56, 56, 56, 56,
- 56, 111, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 110, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -91
},
{
11, -92, -92, -92, -92, -92, -92, -92, -92, -92,
- -92, -92, -92, 56, -92, -92, 112, 56, 56, 56,
+ -92, -92, -92, 56, -92, -92, 111, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -92
@@ -981,14 +981,14 @@ static yyconst short yy_nxt[][37] =
{
11, -93, -93, -93, -93, -93, -93, -93, -93, -93,
-93, -93, -93, 56, -93, -93, 56, 56, 56, 56,
- 113, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 112, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -93
},
{
11, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, 56, -94, -94, 56, 56, 114, 56,
- 56, 56, 56, 56, 115, 56, 116, 56, 56, 56,
+ -94, -94, -94, 56, -94, -94, 56, 56, 113, 56,
+ 56, 56, 56, 56, 114, 56, 115, 56, 56, 56,
56, 56, 56, 56, 56, 56, -94
},
@@ -996,7 +996,7 @@ static yyconst short yy_nxt[][37] =
{
11, -95, -95, -95, -95, -95, -95, -95, -95, -95,
-95, -95, -95, 56, -95, -95, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 117,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 116,
56, 56, 56, 56, 56, 56, -95
},
@@ -1018,7 +1018,7 @@ static yyconst short yy_nxt[][37] =
{
11, -98, -98, -98, -98, -98, -98, -98, -98, -98,
-98, -98, -98, 56, -98, -98, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 118, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 117, 56, 56,
56, 56, 56, 56, 56, 56, -98
},
@@ -1026,21 +1026,21 @@ static yyconst short yy_nxt[][37] =
11, -99, -99, -99, -99, -99, -99, -99, -99, -99,
-99, -99, -99, 56, -99, -99, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 119, 56, -99
+ 56, 56, 56, 56, 118, 56, -99
},
{
11, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-100, -100, -100, 56, -100, -100, 56, 56, 56, 56,
- 56, 56, 56, 56, 120, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 119, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -100
},
{
11, -101, -101, -101, -101, -101, -101, -101, -101, -101,
-101, -101, -101, 56, -101, -101, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 121, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 120, 56, 56, 56,
56, 56, 56, 56, 56, 56, -101
},
@@ -1049,20 +1049,20 @@ static yyconst short yy_nxt[][37] =
-102, -102, -102, 56, -102, -102, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 122, 56, -102
+ 56, 56, 56, 56, 121, 56, -102
},
{
11, -103, -103, -103, -103, -103, -103, -103, -103, -103,
-103, -103, -103, 56, -103, -103, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 123, 56, 56, 56, 56, -103
+ 56, 122, 56, 56, 56, 56, -103
},
{
11, -104, -104, -104, -104, -104, -104, -104, -104, -104,
-104, -104, -104, 56, -104, -104, 56, 56, 56, 56,
- 56, 56, 56, 56, 124, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 123, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -104
},
@@ -1071,35 +1071,35 @@ static yyconst short yy_nxt[][37] =
11, -105, -105, -105, -105, -105, -105, -105, -105, -105,
-105, -105, -105, 56, -105, -105, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 125, 56, 56, 56, -105
+ 56, 56, 124, 56, 56, 56, -105
},
{
- 11, -106, 106, 80, -106, -106, -106, -106, -106, -106,
- -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
- -106, -106, -106, -106, -106, -106, -106, -106, -106, -106,
- -106, -106, -106, -106, -106, -106, -106
+ 11, -106, -106, -106, -106, -106, -106, -106, -106, -106,
+ -106, 84, 84, 84, -106, -106, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, -106
},
{
11, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, 84, 84, 84, -107, -107, 84, 84, 84, 84,
+ -107, -107, -107, 56, -107, -107, 56, 56, 56, 56,
- 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 84, 84, 84, -107
+ 125, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, -107
},
{
11, -108, -108, -108, -108, -108, -108, -108, -108, -108,
- -108, -108, -108, 56, -108, -108, 56, 56, 56, 56,
- 126, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ -108, -108, -108, 56, -108, -108, 56, 56, 126, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -108
},
{
11, -109, -109, -109, -109, -109, -109, -109, -109, -109,
- -109, -109, -109, 56, -109, -109, 56, 56, 127, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ -109, -109, -109, 56, -109, -109, 56, 56, 56, 56,
+ 127, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -109
},
@@ -1107,36 +1107,36 @@ static yyconst short yy_nxt[][37] =
{
11, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-110, -110, -110, 56, -110, -110, 56, 56, 56, 56,
- 128, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 128, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -110
},
{
11, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, 56, -111, -111, 56, 56, 56, 56,
- 56, 56, 56, 56, 129, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, -111
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 129, 56, -111
},
{
11, -112, -112, -112, -112, -112, -112, -112, -112, -112,
-112, -112, -112, 56, -112, -112, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 130, 56, -112
+ 56, 56, 56, 56, 56, 56, 56, 130, 56, 56,
+ 56, 56, 56, 56, 56, 56, -112
},
{
11, -113, -113, -113, -113, -113, -113, -113, -113, -113,
-113, -113, -113, 56, -113, -113, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 131, 56, 56,
+ 56, 56, 56, 131, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -113
},
{
11, -114, -114, -114, -114, -114, -114, -114, -114, -114,
-114, -114, -114, 56, -114, -114, 56, 56, 56, 56,
- 56, 56, 56, 132, 56, 56, 56, 56, 56, 56,
+ 56, 132, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -114
},
@@ -1144,14 +1144,14 @@ static yyconst short yy_nxt[][37] =
{
11, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, 56, -115, -115, 56, 56, 56, 56,
- 56, 133, 56, 56, 56, 56, 56, 56, 56, 56,
+ 133, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -115
},
{
11, -116, -116, -116, -116, -116, -116, -116, -116, -116,
-116, -116, -116, 56, -116, -116, 56, 56, 56, 56,
- 134, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -116
},
@@ -1159,21 +1159,21 @@ static yyconst short yy_nxt[][37] =
11, -117, -117, -117, -117, -117, -117, -117, -117, -117,
-117, -117, -117, 56, -117, -117, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 134, 56, 56, 56,
56, 56, 56, 56, 56, 56, -117
},
{
11, -118, -118, -118, -118, -118, -118, -118, -118, -118,
-118, -118, -118, 56, -118, -118, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 135, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -118
},
{
11, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, 56, -119, -119, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 135, 56,
56, 56, 56, 56, 56, 56, -119
},
@@ -1181,51 +1181,51 @@ static yyconst short yy_nxt[][37] =
{
11, -120, -120, -120, -120, -120, -120, -120, -120, -120,
-120, -120, -120, 56, -120, -120, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 136, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 136,
56, 56, 56, 56, 56, 56, -120
},
{
11, -121, -121, -121, -121, -121, -121, -121, -121, -121,
-121, -121, -121, 56, -121, -121, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 137,
+ 56, 56, 56, 56, 137, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -121
},
{
11, -122, -122, -122, -122, -122, -122, -122, -122, -122,
- -122, -122, -122, 56, -122, -122, 56, 56, 56, 56,
+ -122, -122, -122, 56, -122, -122, 56, 56, 138, 56,
- 56, 56, 56, 56, 138, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -122
},
{
11, -123, -123, -123, -123, -123, -123, -123, -123, -123,
- -123, -123, -123, 56, -123, -123, 56, 56, 139, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ -123, -123, -123, 56, -123, -123, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 139, 56, 56,
56, 56, 56, 56, 56, 56, -123
},
{
11, -124, -124, -124, -124, -124, -124, -124, -124, -124,
-124, -124, -124, 56, -124, -124, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 140, 56, 56,
- 56, 56, 56, 56, 56, 56, -124
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 140, 56, 56, -124
},
{
11, -125, -125, -125, -125, -125, -125, -125, -125, -125,
- -125, -125, -125, 56, -125, -125, 56, 56, 56, 56,
+ -125, -125, -125, 56, -125, -125, 141, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 141, 56, 56, -125
+ 56, 56, 56, 56, 56, 56, -125
},
{
11, -126, -126, -126, -126, -126, -126, -126, -126, -126,
- -126, -126, -126, 56, -126, -126, 142, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ -126, -126, -126, 56, -126, -126, 56, 56, 56, 56,
+ 142, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -126
},
@@ -1233,36 +1233,36 @@ static yyconst short yy_nxt[][37] =
11, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-127, -127, -127, 56, -127, -127, 56, 56, 56, 56,
- 143, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 143, 56, 56,
56, 56, 56, 56, 56, 56, -127
},
{
11, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-128, -128, -128, 56, -128, -128, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 144, 56, 56,
+ 56, 56, 144, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -128
},
{
11, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, 56, -129, -129, 56, 56, 56, 56,
- 56, 56, 145, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 145, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -129
},
{
11, -130, -130, -130, -130, -130, -130, -130, -130, -130,
- -130, -130, -130, 56, -130, -130, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 146, 56, 56, 56, 56,
+ -130, -130, -130, 56, -130, -130, 56, 56, 56, 146,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -130
},
{
11, -131, -131, -131, -131, -131, -131, -131, -131, -131,
- -131, -131, -131, 56, -131, -131, 56, 56, 56, 147,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ -131, -131, -131, 56, -131, -131, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 147, 56,
56, 56, 56, 56, 56, 56, -131
},
@@ -1270,21 +1270,21 @@ static yyconst short yy_nxt[][37] =
11, -132, -132, -132, -132, -132, -132, -132, -132, -132,
-132, -132, -132, 56, -132, -132, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 148, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -132
},
{
11, -133, -133, -133, -133, -133, -133, -133, -133, -133,
-133, -133, -133, 56, -133, -133, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 148, 56, 56,
56, 56, 56, 56, 56, 56, -133
},
{
11, -134, -134, -134, -134, -134, -134, -134, -134, -134,
-134, -134, -134, 56, -134, -134, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 149, 56, 56,
+ 149, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -134
},
@@ -1292,15 +1292,15 @@ static yyconst short yy_nxt[][37] =
{
11, -135, -135, -135, -135, -135, -135, -135, -135, -135,
-135, -135, -135, 56, -135, -135, 56, 56, 56, 56,
- 150, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 150, 56, 56,
56, 56, 56, 56, 56, 56, -135
},
{
11, -136, -136, -136, -136, -136, -136, -136, -136, -136,
-136, -136, -136, 56, -136, -136, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 151, 56, 56,
- 56, 56, 56, 56, 56, 56, -136
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 151, 56, 56, -136
},
{
@@ -1308,35 +1308,35 @@ static yyconst short yy_nxt[][37] =
-137, -137, -137, 56, -137, -137, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 152, 56, 56, -137
+ 56, 152, 56, 56, 56, 56, -137
},
{
11, -138, -138, -138, -138, -138, -138, -138, -138, -138,
-138, -138, -138, 56, -138, -138, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 153, 56, 56, 56, 56, -138
+ 153, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, -138
},
{
11, -139, -139, -139, -139, -139, -139, -139, -139, -139,
-139, -139, -139, 56, -139, -139, 56, 56, 56, 56,
- 154, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 154, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -139
},
{
11, -140, -140, -140, -140, -140, -140, -140, -140, -140,
- -140, -140, -140, 56, -140, -140, 56, 56, 56, 56,
- 56, 56, 155, 56, 56, 56, 56, 56, 56, 56,
+ -140, -140, -140, 56, -140, -140, 155, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -140
},
{
11, -141, -141, -141, -141, -141, -141, -141, -141, -141,
- -141, -141, -141, 56, -141, -141, 156, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ -141, -141, -141, 56, -141, -141, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 156, 56, 56,
56, 56, 56, 56, 56, 56, -141
},
@@ -1344,7 +1344,7 @@ static yyconst short yy_nxt[][37] =
11, -142, -142, -142, -142, -142, -142, -142, -142, -142,
-142, -142, -142, 56, -142, -142, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 157, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -142
},
@@ -1352,14 +1352,14 @@ static yyconst short yy_nxt[][37] =
11, -143, -143, -143, -143, -143, -143, -143, -143, -143,
-143, -143, -143, 56, -143, -143, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, -143
+ 56, 56, 56, 157, 56, 56, -143
},
{
11, -144, -144, -144, -144, -144, -144, -144, -144, -144,
-144, -144, -144, 56, -144, -144, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 158, 56, 56, -144
+ 56, 56, 56, 56, 56, 56, -144
},
@@ -1367,49 +1367,49 @@ static yyconst short yy_nxt[][37] =
11, -145, -145, -145, -145, -145, -145, -145, -145, -145,
-145, -145, -145, 56, -145, -145, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, -145
+ 56, 56, 56, 158, 56, 56, -145
},
{
11, -146, -146, -146, -146, -146, -146, -146, -146, -146,
-146, -146, -146, 56, -146, -146, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 159, 56, 56, -146
+ 56, 56, 159, 56, 56, 56, -146
},
{
11, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-147, -147, -147, 56, -147, -147, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 160, 56, 56, 56, -147
+ 56, 56, 56, 56, 160, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, -147
},
{
11, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, 56, -148, -148, 56, 56, 56, 56,
- 56, 56, 56, 56, 161, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, -148
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 161, 56, -148
},
{
11, -149, -149, -149, -149, -149, -149, -149, -149, -149,
-149, -149, -149, 56, -149, -149, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 162, 56, -149
+ 56, 56, 56, 56, 56, 56, 56, 162, 56, 56,
+ 56, 56, 56, 56, 56, 56, -149
},
{
11, -150, -150, -150, -150, -150, -150, -150, -150, -150,
- -150, -150, -150, 56, -150, -150, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 163, 56, 56,
+ -150, -150, -150, 56, -150, -150, 163, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -150
},
{
11, -151, -151, -151, -151, -151, -151, -151, -151, -151,
- -151, -151, -151, 56, -151, -151, 164, 56, 56, 56,
+ -151, -151, -151, 56, -151, -151, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -151
},
@@ -1418,14 +1418,14 @@ static yyconst short yy_nxt[][37] =
11, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-152, -152, -152, 56, -152, -152, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 164, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -152
},
{
11, -153, -153, -153, -153, -153, -153, -153, -153, -153,
-153, -153, -153, 56, -153, -153, 56, 56, 56, 56,
- 165, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -153
},
@@ -1441,14 +1441,14 @@ static yyconst short yy_nxt[][37] =
11, -155, -155, -155, -155, -155, -155, -155, -155, -155,
-155, -155, -155, 56, -155, -155, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, -155
+ 56, 56, 56, 165, 56, 56, -155
},
{
11, -156, -156, -156, -156, -156, -156, -156, -156, -156,
-156, -156, -156, 56, -156, -156, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 166, 56, 56, -156
+ 56, 56, 56, 56, 56, 56, -156
},
{
@@ -1476,14 +1476,14 @@ static yyconst short yy_nxt[][37] =
{
11, -160, -160, -160, -160, -160, -160, -160, -160, -160,
- -160, -160, -160, 56, -160, -160, 56, 56, 56, 56,
+ -160, -160, -160, 56, -160, -160, 56, 56, 166, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -160
},
{
11, -161, -161, -161, -161, -161, -161, -161, -161, -161,
- -161, -161, -161, 56, -161, -161, 56, 56, 167, 56,
+ -161, -161, -161, 56, -161, -161, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -161
},
@@ -1493,29 +1493,29 @@ static yyconst short yy_nxt[][37] =
-162, -162, -162, 56, -162, -162, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, -162
+ 56, 56, 56, 56, 167, 56, -162
},
{
11, -163, -163, -163, -163, -163, -163, -163, -163, -163,
-163, -163, -163, 56, -163, -163, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 168, 56, -163
+ 56, 56, 56, 56, 56, 168, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, -163
},
{
11, -164, -164, -164, -164, -164, -164, -164, -164, -164,
-164, -164, -164, 56, -164, -164, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 169, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, -164
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 169, 56, 56, 56, -164
},
{
11, -165, -165, -165, -165, -165, -165, -165, -165, -165,
-165, -165, -165, 56, -165, -165, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 170, 56, 56, 56, -165
+ 170, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, -165
},
{
@@ -1529,7 +1529,7 @@ static yyconst short yy_nxt[][37] =
11, -167, -167, -167, -167, -167, -167, -167, -167, -167,
-167, -167, -167, 56, -167, -167, 56, 56, 56, 56,
- 172, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
56, 56, 56, 56, 56, 56, -167
},
@@ -1562,14 +1562,6 @@ static yyconst short yy_nxt[][37] =
56, 56, 56, 56, 56, 56, -171
},
- {
- 11, -172, -172, -172, -172, -172, -172, -172, -172, -172,
- -172, -172, -172, 56, -172, -172, 56, 56, 56, 56,
-
- 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 56, 56, -172
- },
-
} ;
@@ -1590,27 +1582,27 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
#define YY_NUM_RULES 55
#define YY_END_OF_BUFFER 56
-static yyconst short int yy_accept[173] =
+static yyconst short int yy_accept[172] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
56, 5, 4, 3, 2, 29, 30, 28, 28, 28,
28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
- 54, 51, 53, 45, 50, 46, 48, 44, 41, 35,
+ 54, 51, 53, 46, 50, 49, 48, 44, 41, 35,
40, 44, 33, 34, 43, 43, 36, 43, 43, 44,
4, 3, 2, 2, 1, 28, 28, 28, 28, 28,
28, 28, 15, 28, 28, 28, 28, 28, 28, 28,
- 28, 28, 54, 51, 53, 52, 45, 49, 48, 47,
+ 28, 28, 54, 51, 53, 52, 46, 45, 48, 47,
37, 31, 43, 43, 38, 39, 32, 28, 28, 28,
28, 28, 28, 28, 28, 26, 25, 28, 28, 28,
- 28, 28, 28, 28, 28, 48, 42, 23, 28, 28,
- 28, 28, 28, 28, 28, 28, 14, 28, 7, 28,
+ 28, 28, 28, 28, 28, 42, 23, 28, 28, 28,
+ 28, 28, 28, 28, 28, 14, 28, 7, 28, 28,
28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
- 28, 28, 16, 28, 28, 28, 28, 28, 28, 28,
- 28, 28, 10, 28, 13, 28, 28, 28, 28, 28,
- 28, 21, 28, 9, 27, 28, 24, 12, 20, 17,
- 28, 8, 28, 28, 28, 28, 28, 6, 19, 18,
- 22, 11
+ 28, 16, 28, 28, 28, 28, 28, 28, 28, 28,
+ 28, 10, 28, 13, 28, 28, 28, 28, 28, 28,
+ 21, 28, 9, 27, 28, 24, 12, 20, 17, 28,
+ 8, 28, 28, 28, 28, 28, 6, 19, 18, 22,
+ 11
} ;
static yyconst int yy_ec[256] =
@@ -1655,6 +1647,7 @@ static yyconst int yy_ec[256] =
char *yytext;
#line 1 "zconf.l"
#define INITIAL 0
+#define YY_NEVER_INTERACTIVE 1
#define COMMAND 1
#define HELP 2
#define STRING 3
@@ -1722,7 +1715,7 @@ void alloc_string(const char *str, int size)
memcpy(text, str, size);
text[size] = 0;
}
-#line 1726 "lex.zconf.c"
+#line 1719 "lex.zconf.c"
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -1874,7 +1867,7 @@ YY_DECL
int str = 0;
int ts, i;
-#line 1878 "lex.zconf.c"
+#line 1871 "lex.zconf.c"
if ( yy_init )
{
@@ -1957,125 +1950,123 @@ YY_RULE_SETUP
#line 84 "zconf.l"
{
unput(yytext[0]);
- //printf("new config: ");
- //symbol_end(NULL);
BEGIN(COMMAND);
}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 93 "zconf.l"
+#line 91 "zconf.l"
BEGIN(PARAM); return T_MAINMENU;
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 94 "zconf.l"
+#line 92 "zconf.l"
BEGIN(PARAM); return T_MENU;
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 95 "zconf.l"
+#line 93 "zconf.l"
BEGIN(PARAM); return T_ENDMENU;
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 96 "zconf.l"
+#line 94 "zconf.l"
BEGIN(PARAM); return T_SOURCE;
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 97 "zconf.l"
+#line 95 "zconf.l"
BEGIN(PARAM); return T_CHOICE;
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 98 "zconf.l"
+#line 96 "zconf.l"
BEGIN(PARAM); return T_ENDCHOICE;
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 99 "zconf.l"
+#line 97 "zconf.l"
BEGIN(PARAM);