Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Defined CF_ENUM.

Browse source
This commit is contained in:
Martin Mares 1999-11-15 11:35:41 +00:00
parent cbc3183007
commit 944f008af7
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
conf/cf-lex.l
View file

@ -9,14 +9,14 @@
%{ %{
#undef REJECT /* Avoid name clashes */ #undef REJECT /* Avoid name clashes */
#include "filter/filter.h"
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include "nest/bird.h" #include "nest/bird.h"
#include "nest/route.h"
#include "filter/filter.h"
#include "conf/conf.h" #include "conf/conf.h"
#include "conf/cf-parse.tab.h" #include "conf/cf-parse.tab.h"
@ -119,7 +119,15 @@ WHITE [ \t]
while (k) while (k)
{ {
if (!strcmp(k->name, yytext)) if (!strcmp(k->name, yytext))
return k->value; {
if (k->value > 0)
return k->value;
else
{
cf_lval.i = -k->value;
return ENUM;
}
}
k=k->next; k=k->next;
} }
cf_lval.s = cf_find_sym(yytext, h); cf_lval.s = cf_find_sym(yytext, h);

2
conf/confbase.Y
View file

@ -38,7 +38,7 @@ CF_DECLS
} }
%token END CLI_MARKER %token END CLI_MARKER
%token <i> NUM %token <i> NUM ENUM
%token <i32> RTRID %token <i32> RTRID
%token <a> IPA %token <a> IPA
%token <s> SYM %token <s> SYM

5
conf/gen_keywords.m4
View file

@ -22,6 +22,11 @@ m4_define(CF_KEYWORDS, `m4_define([[CF_toks]],[[]])CF_iterate([[CF_keywd]], [[$@
m4_define(CF_CLI, `CF_KEYWORDS(m4_translit($1, [[ ]], [[,]])) m4_define(CF_CLI, `CF_KEYWORDS(m4_translit($1, [[ ]], [[,]]))
') ')
# Enums are translated to C initializers: use CF_ENUM(typename, prefix, values)
m4_define(CF_enum, `m4_divert(0){ "CF_enum_prefix[[]]$1", -((CF_enum_type<<16) | CF_enum_prefix[[]]$1) },
m4_divert(-1)')
m4_define(CF_ENUM, `m4_define([[CF_enum_type]],$1)m4_define([[CF_enum_prefix]],$2)CF_iterate([[CF_enum]], [[m4_shift(m4_shift($@))]])DNL')
# As we are processing C source, we must access all M4 primitives via # As we are processing C source, we must access all M4 primitives via
# m4_* and also set different quoting convention: `[[' and ']]' # m4_* and also set different quoting convention: `[[' and ']]'
m4_changequote([[,]]) m4_changequote([[,]])

3
conf/gen_parser.m4
View file

@ -44,6 +44,9 @@ m4_divert(2)CF_KEYWORDS(m4_translit($1, [[ ]], [[,]]))
m4_divert(3)CF_ADDTO(cli_cmd, CF_cmd) m4_divert(3)CF_ADDTO(cli_cmd, CF_cmd)
CF_cmd: $1 ') CF_cmd: $1 ')
# ENUM declarations are ignored
m4_define(CF_ENUM, `')
# After all configuration templates end, we finally generate the grammar file. # After all configuration templates end, we finally generate the grammar file.
m4_m4wrap(` m4_m4wrap(`
m4_divert(0)DNL m4_divert(0)DNL