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

Babel: Fix build with restricted protocol set

Browse source 
All keywords used in Babel config have to be declared locally.

Thanks to Leo Vandewoestijne for the bugreport.
This commit is contained in:
Ondrej Zajicek (work) 2018-03-07 17:35:24 +01:00
parent d6cf996151
commit 2d6d4b8053
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
conf/confbase.Y
View file

@ -77,7 +77,7 @@ CF_DECLS
%type <time> datetime %type <time> datetime
%type <a> ipa %type <a> ipa
%type <px> prefix prefix_or_ipa %type <px> prefix prefix_or_ipa
%type <t> text %type <t> text opttext
%type <t> text_or_none %type <t> text_or_none
%nonassoc PREFIX_DUMMY %nonassoc PREFIX_DUMMY
@ -200,6 +200,11 @@ text:
} }
; ;
opttext:
TEXT
| /* empty */ { $$ = NULL; }
;
text_or_none: text_or_none:
TEXT { $$ = $1; } TEXT { $$ = $1; }
| { $$ = NULL; } | { $$ = NULL; }

5
proto/babel/config.Y
View file

@ -20,8 +20,9 @@ CF_DEFINES
CF_DECLS CF_DECLS
CF_KEYWORDS(BABEL, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT, WIRED, CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
WIRELESS, RX, TX, BUFFER, LENGTH, CHECK, LINK, BABEL_METRIC) TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS, ENTRIES)
CF_GRAMMAR CF_GRAMMAR

6
proto/ospf/config.Y
View file

@ -146,7 +146,6 @@ CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY
CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY, LENGTH) CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY, LENGTH)
CF_KEYWORDS(SECONDARY, MERGE, LSA, SUPPRESSION) CF_KEYWORDS(SECONDARY, MERGE, LSA, SUPPRESSION)
%type <t> opttext
%type <ld> lsadb_args %type <ld> lsadb_args
%type <i> nbma_eligible %type <i> nbma_eligible
@ -415,11 +414,6 @@ ospf_iface:
ospf_iface_start ospf_iface_patt_list ospf_iface_opt_list { ospf_iface_finish(); } ospf_iface_start ospf_iface_patt_list ospf_iface_opt_list { ospf_iface_finish(); }
; ;
opttext:
TEXT
| /* empty */ { $$ = NULL; }
;
CF_ADDTO(dynamic_attr, OSPF_METRIC1 { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, T_INT, EA_OSPF_METRIC1); }) CF_ADDTO(dynamic_attr, OSPF_METRIC1 { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, T_INT, EA_OSPF_METRIC1); })
CF_ADDTO(dynamic_attr, OSPF_METRIC2 { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, T_INT, EA_OSPF_METRIC2); }) CF_ADDTO(dynamic_attr, OSPF_METRIC2 { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, T_INT, EA_OSPF_METRIC2); })
CF_ADDTO(dynamic_attr, OSPF_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, T_INT, EA_OSPF_TAG); }) CF_ADDTO(dynamic_attr, OSPF_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, T_INT, EA_OSPF_TAG); })