From e89052ae8b40a4cf531e2273175f359c3c28a56a Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 8 Nov 2002 00:47:07 +0000
Subject: Merge an update from upstream
---
extra/config/conf.c | 3 +-
extra/config/confdata.c | 27 +-
extra/config/expr.h | 2 +-
extra/config/lex.zconf.c_shipped | 420 ++++-----
extra/config/mconf.c | 65 +-
extra/config/symbol.c | 8 +-
extra/config/zconf.l | 39 +-
extra/config/zconf.tab.c_shipped | 1745 +++++++++++++++++++++-----------------
extra/config/zconf.tab.h_shipped | 146 +++-
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); return T_COMMENT;
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 100 "zconf.l"
+#line 98 "zconf.l"
BEGIN(PARAM); return T_CONFIG;
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 101 "zconf.l"
+#line 99 "zconf.l"
BEGIN(PARAM); return T_HELP;
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 102 "zconf.l"
+#line 100 "zconf.l"
BEGIN(PARAM); return T_IF;
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 103 "zconf.l"
+#line 101 "zconf.l"
BEGIN(PARAM); return T_ENDIF;
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 104 "zconf.l"
+#line 102 "zconf.l"
BEGIN(PARAM); return T_DEPENDS;
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 105 "zconf.l"
+#line 103 "zconf.l"
BEGIN(PARAM); return T_REQUIRES;
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 106 "zconf.l"
+#line 104 "zconf.l"
BEGIN(PARAM); return T_OPTIONAL;
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 107 "zconf.l"
+#line 105 "zconf.l"
BEGIN(PARAM); return T_DEFAULT;
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 108 "zconf.l"
+#line 106 "zconf.l"
BEGIN(PARAM); return T_PROMPT;
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 109 "zconf.l"
+#line 107 "zconf.l"
BEGIN(PARAM); return T_TRISTATE;
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 110 "zconf.l"
+#line 108 "zconf.l"
BEGIN(PARAM); return T_BOOLEAN;
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 111 "zconf.l"
+#line 109 "zconf.l"
BEGIN(PARAM); return T_BOOLEAN;
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 112 "zconf.l"
+#line 110 "zconf.l"
BEGIN(PARAM); return T_INT;
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 113 "zconf.l"
+#line 111 "zconf.l"
BEGIN(PARAM); return T_HEX;
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 114 "zconf.l"
+#line 112 "zconf.l"
BEGIN(PARAM); return T_STRING;
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 115 "zconf.l"
+#line 113 "zconf.l"
{
alloc_string(yytext, yyleng);
zconflval.string = text;
@@ -2084,64 +2075,64 @@ YY_RULE_SETUP
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 120 "zconf.l"
+#line 118 "zconf.l"
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 121 "zconf.l"
+#line 119 "zconf.l"
current_file->lineno++; BEGIN(INITIAL);
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 125 "zconf.l"
+#line 123 "zconf.l"
return T_AND;
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 126 "zconf.l"
+#line 124 "zconf.l"
return T_OR;
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 127 "zconf.l"
+#line 125 "zconf.l"
return T_OPEN_PAREN;
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 128 "zconf.l"
+#line 126 "zconf.l"
return T_CLOSE_PAREN;
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 129 "zconf.l"
+#line 127 "zconf.l"
return T_NOT;
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 130 "zconf.l"
+#line 128 "zconf.l"
return T_EQUAL;
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 131 "zconf.l"
+#line 129 "zconf.l"
return T_UNEQUAL;
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 132 "zconf.l"
+#line 130 "zconf.l"
return T_IF;
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 133 "zconf.l"
+#line 131 "zconf.l"
return T_ON;
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 134 "zconf.l"
+#line 132 "zconf.l"
{
str = yytext[0];
new_string();
@@ -2150,17 +2141,17 @@ YY_RULE_SETUP
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 139 "zconf.l"
+#line 137 "zconf.l"
BEGIN(INITIAL); current_file->lineno++; return T_EOL;
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 140 "zconf.l"
+#line 138 "zconf.l"
/* ignore */
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 141 "zconf.l"
+#line 139 "zconf.l"
{
alloc_string(yytext, yyleng);
zconflval.string = text;
@@ -2169,66 +2160,87 @@ YY_RULE_SETUP
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 146 "zconf.l"
+#line 144 "zconf.l"
YY_BREAK
+case YY_STATE_EOF(PARAM):
+#line 145 "zconf.l"
+{
+ BEGIN(INITIAL);
+ }
+ YY_BREAK
case 45:
+*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
+yy_c_buf_p = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 150 "zconf.l"
+#line 151 "zconf.l"
{
append_string(yytext, yyleng);
+ zconflval.string = text;
+ return T_STRING;
}
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 153 "zconf.l"
+#line 156 "zconf.l"
{
- if (str == yytext[0]) {
- BEGIN(PARAM);
- zconflval.string = text;
- //printf("s:%s\n", text);
- return T_STRING;
- } else
- append_string(yytext, 1);
+ append_string(yytext, yyleng);
}
YY_BREAK
case 47:
+*yy_cp = yy_hold_char; /* undo effects of setting up yytext */
+yy_c_buf_p = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 162 "zconf.l"
-append_string(yytext+yyleng-1, 1); current_file->lineno++;
+#line 159 "zconf.l"
+{
+ append_string(yytext+1, yyleng);
+ zconflval.string = text;
+ return T_STRING;
+ }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 163 "zconf.l"
-append_string(yytext+1, yyleng-1);
+#line 164 "zconf.l"
+{
+ append_string(yytext+1, yyleng);
+ }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 164 "zconf.l"
-append_string(yytext+1, 1);
+#line 167 "zconf.l"
+{
+ if (str == yytext[0]) {
+ BEGIN(PARAM);
+ zconflval.string = text;
+ return T_STRING;
+ } else
+ append_string(yytext, 1);
+ }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 165 "zconf.l"
+#line 175 "zconf.l"
{
- //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;
}
YY_BREAK
case YY_STATE_EOF(STRING):
-#line 169 "zconf.l"
+#line 180 "zconf.l"
{
- //printf(":%d: open string!\n", current_file->lineno+1);
- exit(0);
+ BEGIN(INITIAL);
}
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 176 "zconf.l"
+#line 186 "zconf.l"
{
ts = 0;
for (i = 0; i < yyleng; i++) {
@@ -2258,7 +2270,7 @@ case 52:
yy_c_buf_p = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 199 "zconf.l"
+#line 209 "zconf.l"
{
current_file->lineno++;
zconf_endhelp();
@@ -2267,7 +2279,7 @@ YY_RULE_SETUP
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 204 "zconf.l"
+#line 214 "zconf.l"
{
current_file->lineno++;
append_string("\n", 1);
@@ -2275,7 +2287,7 @@ YY_RULE_SETUP
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 208 "zconf.l"
+#line 218 "zconf.l"
{
append_string(yytext, yyleng);
if (!first_ts)
@@ -2283,7 +2295,7 @@ YY_RULE_SETUP
}
YY_BREAK
case YY_STATE_EOF(HELP):
-#line 213 "zconf.l"
+#line 223 "zconf.l"
{
zconf_endhelp();
return T_HELPTEXT;
@@ -2292,22 +2304,22 @@ case YY_STATE_EOF(HELP):
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(COMMAND):
-case YY_STATE_EOF(PARAM):
-#line 219 "zconf.l"
+#line 229 "zconf.l"
{
if (current_buf) {
zconf_endfile();
return T_EOF;
}
+ fclose(yyin);
yyterminate();
}
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 227 "zconf.l"
+#line 238 "zconf.l"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
-#line 2311 "lex.zconf.c"
+#line 2323 "lex.zconf.c"
case YY_END_OF_BUFFER:
{
@@ -3170,7 +3182,7 @@ int main()
return 0;
}
#endif
-#line 227 "zconf.l"
+#line 238 "zconf.l"
void zconf_starthelp(void)
{
@@ -3192,7 +3204,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));
@@ -3218,8 +3229,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);
@@ -3244,6 +3253,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);
}
diff --git a/extra/config/mconf.c b/extra/config/mconf.c
index c738a3f35..2ebc18819 100644
--- a/extra/config/mconf.c
+++ b/extra/config/mconf.c
@@ -1,6 +1,9 @@
/*
* Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
* Released under the terms of the GNU GPL v2.0.
+ *
+ * Introduced single menu mode (show all sub-menus in one large tree).
+ * 2002-11-06 Petr Baudis <pasky@ucw.cz>
*/
#include <sys/ioctl.h>
@@ -12,6 +15,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include <termios.h>
#include <unistd.h>
#define LKC_DIRECT_LINK
@@ -80,10 +84,12 @@ static char buf[4096], *bufptr = buf;
static char input_buf[4096];
static char *args[1024], **argptr = args;
static int indent = 0;
+static struct termios ios_org;
static int rows, cols;
static struct menu *current_menu;
static int child_count;
static int do_resize;
+static int single_menu_mode;
static void conf(struct menu *menu);
static void conf_choice(struct menu *menu);
@@ -274,10 +280,20 @@ static void build_conf(struct menu *menu)
case P_MENU:
child_count++;
cprint("m%p", menu);
- if (menu->parent != &rootmenu)
- cprint1(" %*c", indent + 1, ' ');
- cprint1("%s --->", prompt);
+
+ if (single_menu_mode) {
+ cprint1("%s%*c%s",
+ menu->data ? "-->" : "++>",
+ indent + 1, ' ', prompt);
+ } else {
+ if (menu->parent != &rootmenu)
+ cprint1(" %*c", indent + 1, ' ');
+ cprint1("%s --->", prompt);
+ }
+
cprint_done();
+ if (single_menu_mode && menu->data)
+ goto conf_childs;
return;
default:
if (prompt) {
@@ -392,6 +408,7 @@ static void conf(struct menu *menu)
char active_entry[40];
int stat, type, i;
+ unlink("lxdialog.scrltmp");
active_entry[0] = 0;
while (1) {
cprint_init();
@@ -442,7 +459,10 @@ static void conf(struct menu *menu)
case 0:
switch (type) {
case 'm':
- conf(submenu);
+ if (single_menu_mode)
+ submenu->data = (void *) !submenu->data;
+ else
+ conf(submenu);
break;
case 't':
if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)
@@ -484,6 +504,8 @@ static void conf(struct menu *menu)
case 6:
if (type == 't')
sym_toggle_tristate_value(sym);
+ else if (type == 'm')
+ conf(submenu);
break;
}
}
@@ -518,11 +540,19 @@ static void show_helptext(const char *title, const char *text)
static void show_help(struct menu *menu)
{
const char *help;
+ char *helptext;
+ struct symbol *sym = menu->sym;
- help = menu->sym->help;
+ help = sym->help;
if (!help)
help = nohelp_text;
- show_helptext(menu_get_prompt(menu), help);
+ if (sym->name) {
+ helptext = malloc(strlen(sym->name) + strlen(help) + 16);
+ sprintf(helptext, "%s:\n\n%s", sym->name, help);
+ show_helptext(menu_get_prompt(menu), helptext);
+ free(helptext);
+ } else
+ show_helptext(menu_get_prompt(menu), help);
}
static void show_readme(void)
@@ -679,14 +709,35 @@ static void conf_save(void)
}
}
+static void conf_cleanup(void)
+{
+ tcsetattr(1, TCSAFLUSH, &ios_org);
+ unlink(".help.tmp");
+ unlink("lxdialog.scrltmp");
+}
+
int main(int ac, char **av)
{
+ struct symbol *sym;
+ char *mode;
int stat;
+
conf_parse(av[1]);
conf_read(NULL);
- sprintf(menu_backtitle, "uClibc v%s Configuration", getenv("VERSION"));
+ sym = sym_lookup("VERSION", 0);
+ sym_calc_value(sym);
+ sprintf(menu_backtitle, "uClibc v%s Configuration",
+ sym_get_string_value(sym));
+ mode = getenv("MENUCONFIG_MODE");
+ if (mode) {
+ if (!strcasecmp(mode, "single_menu"))
+ single_menu_mode = 1;
+ }
+
+ tcgetattr(1, &ios_org);
+ atexit(conf_cleanup);
init_wsize();
conf(&rootmenu);
diff --git a/extra/config/symbol.c b/extra/config/symbol.c
index d02876060..7ec2ff48b 100644
--- a/extra/config/symbol.c
+++ b/extra/config/symbol.c
@@ -61,24 +61,28 @@ void sym_init(void)
uname(&uts);
+#if 0
sym = sym_lookup("ARCH", 0);
sym->type = S_STRING;
sym->flags |= SYMBOL_AUTO;
p = getenv("ARCH");
if (p)
sym_add_default(sym, p);
+#endif
- sym = sym_lookup("KERNELRELEASE", 0);
+ sym = sym_lookup("VERSION", 0);
sym->type = S_STRING;
sym->flags |= SYMBOL_AUTO;
- p = getenv("KERNELRELEASE");
+ p = getenv("VERSION");
if (p)
sym_add_default(sym, p);
+#if 0
sym = sym_lookup("UNAME_RELEASE", 0);
sym->type = S_STRING;
sym->flags |= SYMBOL_AUTO;
sym_add_default(sym, uts.release);
+#endif
sym = sym_lookup("TARGET_ARCH", 0);
sym->type = S_STRING;
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);
}
diff --git a/extra/config/zconf.tab.c_shipped b/extra/config/zconf.tab.c_shipped
index d8ba013b6..2a02d8173 100644
--- a/extra/config/zconf.tab.c_shipped
+++ b/extra/config/zconf.tab.c_shipped
@@ -1,49 +1,137 @@
-/* A Bison parser, made from zconf.y
- by GNU bison 1.35. */
+/* A Bison parser, made from zconf.y, by GNU bison 1.75. */
-#define YYBISON 1 /* Identify Bison output. */
+/* Skeleton parser for Yacc-like parsing with Bison,
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+ This special exception was added by the Free Software Foundation
+ in version 1.24 of Bison. */
+
+/* Written by Richard Stallman by simplifying the original so called
+ ``semantic'' parser. */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+ infringing on user name space. This should be done even for local
+ variables, as they might otherwise be expanded by user macros.
+ There are some unavoidable exceptions within include files to
+ define necessary library symbols; they are noted "INFRINGES ON
+ USER NAME SPACE" below. */
+
+/* Identify Bison output. */
+#define YYBISON 1
+
+/* Pure parsers. */
+#define YYPURE 0
+
+/* Using locations. */
+#define YYLSP_NEEDED 0
+
+/* If NAME_PREFIX is specified substitute the variables and functions
+ names. */
#define yyparse zconfparse
-#define yylex zconflex
+#define yylex zconflex
#define yyerror zconferror
-#define yylval zconflval
-#define yychar zconfchar
+#define yylval zconflval
+#define yychar zconfchar
#define yydebug zconfdebug
#define yynerrs zconfnerrs
-# define T_MAINMENU 257
-# define T_MENU 258
-# define T_ENDMENU 259
-# define T_SOURCE 260
-# define T_CHOICE 261
-# define T_ENDCHOICE 262
-# define T_COMMENT 263
-# define T_CONFIG 264
-# define T_HELP 265
-# define T_HELPTEXT 266
-# define T_IF 267
-# define T_ENDIF 268
-# define T_DEPENDS 269
-# define T_REQUIRES 270
-# define T_OPTIONAL 271
-# define T_PROMPT 272
-# define T_DEFAULT 273
-# define T_TRISTATE 274
-# define T_BOOLEAN 275
-# define T_INT 276
-# define T_HEX 277
-# define T_WORD 278
-# define T_STRING 279
-# define T_UNEQUAL 280
-# define T_EOF 281
-# define T_EOL 282
-# define T_CLOSE_PAREN 283
-# define T_OPEN_PAREN 284
-# define T_ON 285
-# define T_OR 286
-# define T_AND 287
-# define T_EQUAL 288
-# define T_NOT 289
+
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ T_MAINMENU = 258,
+ T_MENU = 259,
+ T_ENDMENU = 260,
+ T_SOURCE = 261,
+ T_CHOICE = 262,
+ T_ENDCHOICE = 263,
+ T_COMMENT = 264,
+ T_CONFIG = 265,
+ T_HELP = 266,
+ T_HELPTEXT = 267,
+ T_IF = 268,
+ T_ENDIF = 269,
+ T_DEPENDS = 270,
+ T_REQUIRES = 271,
+ T_OPTIONAL = 272,
+ T_PROMPT = 273,
+ T_DEFAULT = 274,
+ T_TRISTATE = 275,
+ T_BOOLEAN = 276,
+ T_INT = 277,
+ T_HEX = 278,
+ T_WORD = 279,
+ T_STRING = 280,
+ T_UNEQUAL = 281,
+ T_EOF = 282,
+ T_EOL = 283,
+ T_CLOSE_PAREN = 284,
+ T_OPEN_PAREN = 285,
+ T_ON = 286,
+ T_OR = 287,
+ T_AND = 288,
+ T_EQUAL = 289,
+ T_NOT = 290
+ };
+#endif
+#define T_MAINMENU 258
+#define T_MENU 259
+#define T_ENDMENU 260
+#define T_SOURCE 261
+#define T_CHOICE 262
+#define T_ENDCHOICE 263
+#define T_COMMENT 264
+#define T_CONFIG 265
+#define T_HELP 266
+#define T_HELPTEXT 267
+#define T_IF 268
+#define T_ENDIF 269
+#define T_DEPENDS 270
+#define T_REQUIRES 271
+#define T_OPTIONAL 272
+#define T_PROMPT 273
+#define T_DEFAULT 274
+#define T_TRISTATE 275
+#define T_BOOLEAN 276
+#define T_INT 277
+#define T_HEX 278
+#define T_WORD 279
+#define T_STRING 280
+#define T_UNEQUAL 281
+#define T_EOF 282
+#define T_EOL 283
+#define T_CLOSE_PAREN 284
+#define T_OPEN_PAREN 285
+#define T_ON 286
+#define T_OR 287
+#define T_AND 288
+#define T_EQUAL 289
+#define T_NOT 290
+
+
+
+
+/* Copy the first part of user declarations. */
#line 1 "zconf.y"
/*
@@ -74,38 +162,173 @@ struct symbol *symbol_hash[257];
#define YYERROR_VERBOSE
-#line 32 "zconf.y"
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
#ifndef YYSTYPE
-typedef union
-{
+#line 33 "zconf.y"
+typedef union {
int token;
char *string;
struct symbol *symbol;
struct expr *expr;
struct menu *menu;
} yystype;
+/* Line 193 of /usr/share/bison/yacc.c. */
+#line 190 "zconf.tab.c"
# define YYSTYPE yystype
# define YYSTYPE_IS_TRIVIAL 1
#endif
+
+#ifndef YYLTYPE
+typedef struct yyltype
+{
+ int first_line;
+ int first_column;
+ int last_line;
+ int last_column;
+} yyltype;
+# define YYLTYPE yyltype
+# define YYLTYPE_IS_TRIVIAL 1
+#endif
+
+/* Copy the second part of user declarations. */
#line 83 "zconf.y"
#define LKC_DIRECT_LINK
#include "lkc.h"
-#ifndef YYDEBUG
-# define YYDEBUG 1
+
+
+/* Line 213 of /usr/share/bison/yacc.c. */
+#line 215 "zconf.tab.c"
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols. */
+
+# if YYSTACK_USE_ALLOCA
+# define YYSTACK_ALLOC alloca
+# else
+# ifndef YYSTACK_USE_ALLOCA
+# if defined (alloca) || defined (_ALLOCA_H)
+# define YYSTACK_ALLOC alloca
+# else
+# ifdef __GNUC__
+# define YYSTACK_ALLOC __builtin_alloca
+# endif
+# endif
+# endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+ /* Pacify GCC's `empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# endif
+# define YYSTACK_ALLOC malloc
+# define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+
+
+#if (! defined (yyoverflow) \
+ && (! defined (__cplusplus) \
+ || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member. */
+union yyalloc
+{
+ short yyss;
+ YYSTYPE yyvs;
+ };
+
+/* The size of the maximum gap between one aligned stack and the next. */
+# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+ N elements. */
+# define YYSTACK_BYTES(N) \
+ ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
+ + YYSTACK_GAP_MAX)
+
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ register YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (0)
+# endif
+# endif
+
+/* Relocate STACK from its old location to the new one. The
+ local variables YYSIZE and YYSTACKSIZE give the old and new number of
+ elements in the stack, and YYPTR gives the new location of the
+ stack. Advance YYPTR to a properly aligned location for the next
+ stack. */
+# define YYSTACK_RELOCATE(Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
+ while (0)
+
#endif
+#if defined (__STDC__) || defined (__cplusplus)
+ typedef signed char yysigned_char;
+#else
+ typedef short yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL 2
+#define YYLAST 151
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS 36
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS 39
+/* YYNRULES -- Number of rules. */
+#define YYNRULES 96
+/* YYNRULES -- Number of states. */
+#define YYNSTATES 145
-#define YYFINAL 145
-#define YYFLAG -32768
-#define YYNTBASE 36
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+#define YYUNDEFTOK 2
+#define YYMAXUTOK 290
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 289 ? yytranslate[x] : 74)
+#define YYTRANSLATE(X) \
+ ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const char yytranslate[] =
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+static const unsigned char yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -132,367 +355,271 @@ static const char yytranslate[] =
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35
+ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35
};
#if YYDEBUG
-static const short yyprhs[] =
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+ YYRHS. */
+static const unsigned short yyprhs[] =
{
- 0, 0, 1, 4, 6, 8, 10, 14, 16, 18,
- 20, 23, 25, 27, 29, 31, 33, 36, 40, 41,
- 45, 49, 52, 55, 58, 61, 64, 67, 70, 74,
- 78, 80, 84, 86, 91, 94, 95, 99, 103, 106,
- 109, 113, 115, 118, 119, 122, 125, 127, 133, 137,
- 138, 141, 144, 147, 150, 154, 156, 161, 164, 165,
- 168, 171, 174, 178, 181, 184, 187, 191, 194, 197,
- 198, 202, 205, 209, 212, 215, 216, 218, 222, 224,
- 226, 228, 230, 232, 234, 236, 237, 240, 242, 246,
- 250, 254, 257, 261, 265, 267
+ 0, 0, 3, 4, 7, 9, 11, 13, 17, 19,
+ 21, 23, 26, 28, 30, 32, 34, 36, 39, 43,
+ 44, 48, 52, 55, 58, 61, 64, 67, 70, 73,
+ 77, 81, 83, 87, 89, 94, 97, 98, 102, 106,
+ 109, 112, 116, 118, 121, 122, 125, 128, 130, 136,
+ 140, 141, 144, 147, 150, 153, 157, 159, 164, 167,
+ 168, 171, 174, 177, 181, 184, 187, 190, 194, 197,
+ 200, 201, 205, 208, 212, 215, 218, 219, 221, 225,
+ 227, 229, 231, 233, 235, 237, 239, 240, 243, 245,
+ 249, 253, 257, 260, 264, 268, 270
};
-static const short yyrhs[] =
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
{
- -1, 36, 37, 0, 38, 0, 46, 0, 57, 0,
- 3, 68, 70, 0, 5, 0, 14, 0, 8, 0,
- 1, 70, 0, 52, 0, 62, 0, 40, 0, 60,
- 0, 70, 0, 10, 24, 0, 39, 28, 41, 0,
- 0, 41, 42, 28, 0, 41, 66, 28, 0, 41,
- 64, 0, 41, 28, 0, 20, 67, 0, 21, 67,
- 0, 22, 67, 0, 23, 67, 0, 25, 67, 0,
- 18, 68, 71, 0, 19, 73, 71, 0, 7, 0,
- 43, 28, 47, 0, 69, 0, 44, 49, 45, 28,
- 0, 44, 49, 0, 0, 47, 48, 28, 0, 47,
- 66, 28, 0, 47, 64, 0, 47, 28, 0, 18,
- 68, 71, 0, 17, 0, 19, 73, 0, 0, 49,
- 38, 0, 13, 72, 0, 69, 0, 50, 28, 53,
- 51, 28, 0, 50, 28, 53, 0, 0, 53, 38,
- 0, 53, 57, 0, 53, 46, 0, 4, 68, 0,
- 54, 28, 65, 0, 69, 0, 55, 58, 56, 28,
- 0, 55, 58, 0, 0, 58, 38, 0, 58, 57,
- 0, 58, 46, 0, 58, 1, 28, 0, 6, 68,
- 0, 59, 28, 0, 9, 68, 0, 61, 28, 65,
- 0, 11, 28, 0, 63, 12, 0, 0, 65, 66,
- 28, 0, 65, 28, 0, 15, 31, 72, 0, 15,
- 72, 0, 16, 72, 0, 0, 68, 0, 68, 13,
- 72, 0, 24, 0, 25, 0, 5, 0, 8, 0,
- 14, 0, 28, 0, 27, 0, 0, 13, 72, 0,
- 73, 0, 73, 34, 73, 0, 73, 26, 73, 0,
- 30, 72, 29, 0, 35, 72, 0, 72, 32, 72,
- 0, 72, 33, 72, 0, 24, 0, 25, 0
+ 37, 0, -1, -1, 37, 38, -1, 39, -1, 47,
+ -1, 58, -1, 3, 69, 71, -1, 5, -1, 14,
+ -1, 8, -1, 1, 71, -1, 53, -1, 63, -1,
+ 41, -1, 61, -1, 71, -1, 10, 24, -1, 40,
+ 28, 42, -1, -1, 42, 43, 28, -1, 42, 67,
+ 28, -1, 42, 65, -1, 42, 28, -1, 20, 68,
+ -1, 21, 68, -1, 22, 68, -1, 23, 68, -1,
+ 25, 68, -1, 18, 69, 72, -1, 19, 74, 72,
+ -1, 7, -1, 44, 28, 48, -1, 70, -1, 45,
+ 50, 46, 28, -1, 45, 50, -1, -1, 48, 49,
+