Revision e81b440f conf/gen_keywords.m4

View differences:

conf/gen_keywords.m4
23 23
m4_define(CF_DEFINES, `m4_divert(-1)')
24 24

  
25 25
# Keywords are translated to C initializers
26
m4_define(CF_handle_kw, `m4_divert(1){ "m4_translit($1,[[A-Z]],[[a-z]])", $1 },
26
m4_define(CF_handle_kw, `m4_divert(1){ "m4_translit($1,[[A-Z]],[[a-z]])", $1, NULL },
27 27
m4_divert(-1)')
28 28
m4_define(CF_keywd, `m4_ifdef([[CF_tok_$1]],,[[m4_define([[CF_tok_$1]],1)CF_handle_kw($1)]])')
29 29
m4_define(CF_KEYWORDS, `m4_define([[CF_toks]],[[]])CF_iterate([[CF_keywd]], [[$@]])m4_ifelse(CF_toks,,,%token[[]]CF_toks
......
34 34
')
35 35

  
36 36
# Enums are translated to C initializers: use CF_ENUM(typename, prefix, values)
37
m4_define(CF_enum, `m4_divert(1){ "CF_enum_prefix[[]]$1", -((CF_enum_type<<16) | CF_enum_prefix[[]]$1) },
37
m4_define(CF_enum, `m4_divert(1){ "CF_enum_prefix[[]]$1", -((CF_enum_type<<16) | CF_enum_prefix[[]]$1), NULL },
38 38
m4_divert(-1)')
39 39
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')
40 40

  
......
42 42
m4_m4wrap(`
43 43
m4_divert(0)
44 44
static struct keyword keyword_list[] = {
45
m4_undivert(1){ NULL, -1 } };
45
m4_undivert(1){ NULL, -1, NULL } };
46 46
')
47 47

  
48 48
# As we are processing C source, we must access all M4 primitives via

Also available in: Unified diff