Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
9f25ce59
Commit
9f25ce59
authored
Dec 20, 2016
by
Tomek Mrugalski
🛰
Browse files
[5017] DHCP{4,6} parsers regenerated
parent
313cdfdd
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/dhcp4_lexer.cc
View file @
9f25ce59
This diff is collapsed.
Click to expand it.
src/bin/dhcp4/dhcp4_parser.cc
View file @
9f25ce59
This diff is collapsed.
Click to expand it.
src/bin/dhcp4/dhcp4_parser.h
View file @
9f25ce59
...
...
@@ -305,7 +305,6 @@ namespace isc { namespace dhcp {
union
union_type
{
// value
// version_value
char
dummy1
[
sizeof
(
ElementPtr
)];
// "boolean"
...
...
@@ -352,69 +351,69 @@ namespace isc { namespace dhcp {
TOKEN_DHCP4
=
265
,
TOKEN_INTERFACES_CONFIG
=
266
,
TOKEN_INTERFACES
=
267
,
TOKEN_
ECHO_CLIENT_ID
=
268
,
TOKEN_
MAT
CH_CLIENT_ID
=
269
,
TOKEN_
NEXT_SERVER
=
270
,
TOKEN_SERVER
_HOSTNAME
=
271
,
TOKEN_
BOOT_FILE_
NAME
=
272
,
TOKEN_
LEASE_DATABAS
E
=
273
,
TOKEN_
HOSTS
_DATABASE
=
274
,
TOKEN_
TYP
E
=
275
,
TOKEN_
USER
=
276
,
TOKEN_
PASSWORD
=
277
,
TOKEN_
HOST
=
278
,
TOKEN_
PERSI
ST
=
279
,
TOKEN_
LFC_INTERVAL
=
280
,
TOKEN_
READONLY
=
281
,
TOKEN_
VALID_LIFETIME
=
282
,
TOKEN_
RENEW_
TIME
R
=
283
,
TOKEN_RE
BIND
_TIMER
=
284
,
TOKEN_
DECLINE_PROBATION_PERIOD
=
285
,
TOKEN_
SUBNET4
=
286
,
TOKEN_SUBNET
_4O6_INTERFACE
=
287
,
TOKEN_SUBNET_4O6_INTERFACE
_ID
=
288
,
TOKEN_SUBNET_4O6_
SUBNET
=
289
,
TOKEN_
OPTION_DEF
=
290
,
TOKEN_OPTION_D
ATA
=
291
,
TOKEN_
NAME
=
292
,
TOKEN_
DATA
=
293
,
TOKEN_
CODE
=
294
,
TOKEN_
SPAC
E
=
295
,
TOKEN_
CSV_FORMAT
=
296
,
TOKEN_
RECORD_TYPES
=
297
,
TOKEN_
ENCAPSULATE
=
298
,
TOKEN_
ARRAY
=
299
,
TOKEN_
POOLS
=
300
,
TOKEN_POOL
=
301
,
TOKEN_
SUBNET
=
302
,
TOKEN_
INTERFACE
=
303
,
TOKEN_INTERFACE
_ID
=
304
,
TOKEN_ID
=
305
,
TOKEN_
RAPID_COMMIT
=
306
,
TOKEN_R
ESERVATION_MODE
=
307
,
TOKEN_
HOST_
RESERVATION_
IDENTIFIERS
=
308
,
TOKEN_
CLIENT_CLASSE
S
=
309
,
TOKEN_
T
ES
T
=
310
,
TOKEN_
CLIENT_CLASS
=
311
,
TOKEN_
RESERVATION
S
=
312
,
TOKEN_
DUID
=
313
,
TOKEN_
HW_ADDRESS
=
314
,
TOKEN_
CIRCUIT_ID
=
315
,
TOKEN_C
LIEN
T_ID
=
316
,
TOKEN_
HOSTNAME
=
317
,
TOKEN_
RELAY
=
318
,
TOKEN_
IP_ADDRESS
=
319
,
TOKEN_
HOOKS_LIBRARIE
S
=
320
,
TOKEN_LIBRAR
Y
=
321
,
TOKEN_
PARAMETERS
=
322
,
TOKEN_
EXPIRED_LEASES_PROCESSING
=
323
,
TOKEN_
SERVER_ID
=
324
,
TOKEN_
IDENTIFIER
=
325
,
TOKEN_
HTYPE
=
326
,
TOKEN_
TIM
E
=
327
,
TOKEN_
ENTERPRISE_ID
=
328
,
TOKEN_
DHCP4O6_PORT
=
329
,
TOKEN_
VERSION
=
330
,
TOKEN_
DHCP_SOCKET_TYPE
=
268
,
TOKEN_
E
CH
O
_CLIENT_ID
=
269
,
TOKEN_
MATCH_CLIENT_ID
=
270
,
TOKEN_
NEXT_
SERVER
=
271
,
TOKEN_
SERVER_HOST
NAME
=
272
,
TOKEN_
BOOT_FILE_NAM
E
=
273
,
TOKEN_
LEASE
_DATABASE
=
274
,
TOKEN_
HOSTS_DATABAS
E
=
275
,
TOKEN_
TYPE
=
276
,
TOKEN_
USER
=
277
,
TOKEN_
PASSWORD
=
278
,
TOKEN_
HO
ST
=
279
,
TOKEN_
PERSIST
=
280
,
TOKEN_
LFC_INTERVAL
=
281
,
TOKEN_
READONLY
=
282
,
TOKEN_
VALID_LIFE
TIME
=
283
,
TOKEN_RE
NEW
_TIMER
=
284
,
TOKEN_
REBIND_TIMER
=
285
,
TOKEN_
DECLINE_PROBATION_PERIOD
=
286
,
TOKEN_SUBNET
4
=
287
,
TOKEN_SUBNET_4O6_INTERFACE
=
288
,
TOKEN_SUBNET_4O6_
INTERFACE_ID
=
289
,
TOKEN_
SUBNET_4O6_SUBNET
=
290
,
TOKEN_OPTION_D
EF
=
291
,
TOKEN_
OPTION_DATA
=
292
,
TOKEN_
NAME
=
293
,
TOKEN_
DATA
=
294
,
TOKEN_
COD
E
=
295
,
TOKEN_
SPACE
=
296
,
TOKEN_
CSV_FORMAT
=
297
,
TOKEN_
RECORD_TYPES
=
298
,
TOKEN_
ENCAPSULATE
=
299
,
TOKEN_
ARRAY
=
300
,
TOKEN_POOL
S
=
301
,
TOKEN_
POOL
=
302
,
TOKEN_
SUBNET
=
303
,
TOKEN_INTERFACE
=
304
,
TOKEN_
INTERFACE_
ID
=
305
,
TOKEN_
ID
=
306
,
TOKEN_R
APID_COMMIT
=
307
,
TOKEN_RESERVATION_
MODE
=
308
,
TOKEN_
HOST_RESERVATION_IDENTIFIER
S
=
309
,
TOKEN_
CLIENT_CLASS
ES
=
310
,
TOKEN_
TEST
=
311
,
TOKEN_
CLIENT_CLAS
S
=
312
,
TOKEN_
RESERVATIONS
=
313
,
TOKEN_
DUID
=
314
,
TOKEN_
HW_ADDRESS
=
315
,
TOKEN_C
IRCUI
T_ID
=
316
,
TOKEN_
CLIENT_ID
=
317
,
TOKEN_
HOSTNAME
=
318
,
TOKEN_
RELAY
=
319
,
TOKEN_
IP_ADDRES
S
=
320
,
TOKEN_
HOOKS_
LIBRAR
IES
=
321
,
TOKEN_
LIBRARY
=
322
,
TOKEN_
PARAMETERS
=
323
,
TOKEN_
EXPIRED_LEASES_PROCESSING
=
324
,
TOKEN_
SERVER_ID
=
325
,
TOKEN_
IDENTIFIER
=
326
,
TOKEN_
HTYP
E
=
327
,
TOKEN_
TIME
=
328
,
TOKEN_
ENTERPRISE_ID
=
329
,
TOKEN_
DHCP4O6_PORT
=
330
,
TOKEN_CONTROL_SOCKET
=
331
,
TOKEN_SOCKET_TYPE
=
332
,
TOKEN_SOCKET_NAME
=
333
,
...
...
@@ -599,6 +598,10 @@ namespace isc { namespace dhcp {
symbol_type
make_INTERFACES
(
const
location_type
&
l
);
static
inline
symbol_type
make_DHCP_SOCKET_TYPE
(
const
location_type
&
l
);
static
inline
symbol_type
make_ECHO_CLIENT_ID
(
const
location_type
&
l
);
...
...
@@ -847,10 +850,6 @@ namespace isc { namespace dhcp {
symbol_type
make_DHCP4O6_PORT
(
const
location_type
&
l
);
static
inline
symbol_type
make_VERSION
(
const
location_type
&
l
);
static
inline
symbol_type
make_CONTROL_SOCKET
(
const
location_type
&
l
);
...
...
@@ -1160,8 +1159,8 @@ namespace isc { namespace dhcp {
enum
{
yyeof_
=
0
,
yylast_
=
62
3
,
///< Last index in yytable_.
yynnts_
=
26
6
,
///< Number of nonterminal symbols.
yylast_
=
62
4
,
///< Last index in yytable_.
yynnts_
=
26
7
,
///< Number of nonterminal symbols.
yyfinal_
=
22
,
///< Termination state number.
yyterror_
=
1
,
yyerrcode_
=
256
,
...
...
@@ -1253,7 +1252,6 @@ namespace isc { namespace dhcp {
switch
(
other
.
type_get
())
{
case
114
:
// value
case
331
:
// version_value
value
.
copy
<
ElementPtr
>
(
other
.
value
);
break
;
...
...
@@ -1291,7 +1289,6 @@ namespace isc { namespace dhcp {
switch
(
this
->
type_get
())
{
case
114
:
// value
case
331
:
// version_value
value
.
copy
<
ElementPtr
>
(
v
);
break
;
...
...
@@ -1388,7 +1385,6 @@ namespace isc { namespace dhcp {
switch
(
yytype
)
{
case
114
:
// value
case
331
:
// version_value
value
.
template
destroy
<
ElementPtr
>
();
break
;
...
...
@@ -1432,7 +1428,6 @@ namespace isc { namespace dhcp {
switch
(
this
->
type_get
())
{
case
114
:
// value
case
331
:
// version_value
value
.
move
<
ElementPtr
>
(
s
.
value
);
break
;
...
...
@@ -1588,6 +1583,12 @@ namespace isc { namespace dhcp {
return
symbol_type
(
token
::
TOKEN_INTERFACES
,
l
);
}
Dhcp4Parser
::
symbol_type
Dhcp4Parser
::
make_DHCP_SOCKET_TYPE
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_DHCP_SOCKET_TYPE
,
l
);
}
Dhcp4Parser
::
symbol_type
Dhcp4Parser
::
make_ECHO_CLIENT_ID
(
const
location_type
&
l
)
{
...
...
@@ -1960,12 +1961,6 @@ namespace isc { namespace dhcp {
return
symbol_type
(
token
::
TOKEN_DHCP4O6_PORT
,
l
);
}
Dhcp4Parser
::
symbol_type
Dhcp4Parser
::
make_VERSION
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_VERSION
,
l
);
}
Dhcp4Parser
::
symbol_type
Dhcp4Parser
::
make_CONTROL_SOCKET
(
const
location_type
&
l
)
{
...
...
@@ -2125,7 +2120,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
}
}
// isc::dhcp
#line 212
9
"dhcp4_parser.h" // lalr1.cc:377
#line 212
4
"dhcp4_parser.h" // lalr1.cc:377
...
...
src/bin/dhcp6/dhcp6_lexer.cc
View file @
9f25ce59
This diff is collapsed.
Click to expand it.
src/bin/dhcp6/dhcp6_parser.cc
View file @
9f25ce59
This diff is collapsed.
Click to expand it.
src/bin/dhcp6/dhcp6_parser.h
View file @
9f25ce59
...
...
@@ -305,7 +305,6 @@ namespace isc { namespace dhcp {
union
union_type
{
// value
// version_value
char
dummy1
[
sizeof
(
ElementPtr
)];
// "boolean"
...
...
@@ -415,34 +414,33 @@ namespace isc { namespace dhcp {
TOKEN_TIME
=
328
,
TOKEN_ENTERPRISE_ID
=
329
,
TOKEN_DHCP4O6_PORT
=
330
,
TOKEN_VERSION
=
331
,
TOKEN_CONTROL_SOCKET
=
332
,
TOKEN_SOCKET_TYPE
=
333
,
TOKEN_SOCKET_NAME
=
334
,
TOKEN_DHCP_DDNS
=
335
,
TOKEN_LOGGING
=
336
,
TOKEN_LOGGERS
=
337
,
TOKEN_OUTPUT_OPTIONS
=
338
,
TOKEN_OUTPUT
=
339
,
TOKEN_DEBUGLEVEL
=
340
,
TOKEN_SEVERITY
=
341
,
TOKEN_DHCP4
=
342
,
TOKEN_DHCPDDNS
=
343
,
TOKEN_TOPLEVEL_JSON
=
344
,
TOKEN_TOPLEVEL_DHCP6
=
345
,
TOKEN_SUB_DHCP6
=
346
,
TOKEN_SUB_INTERFACES6
=
347
,
TOKEN_SUB_SUBNET6
=
348
,
TOKEN_SUB_POOL6
=
349
,
TOKEN_SUB_PD_POOL
=
350
,
TOKEN_SUB_RESERVATION
=
351
,
TOKEN_SUB_OPTION_DEF
=
352
,
TOKEN_SUB_OPTION_DATA
=
353
,
TOKEN_SUB_HOOKS_LIBRARY
=
354
,
TOKEN_STRING
=
355
,
TOKEN_INTEGER
=
356
,
TOKEN_FLOAT
=
357
,
TOKEN_BOOLEAN
=
358
TOKEN_CONTROL_SOCKET
=
331
,
TOKEN_SOCKET_TYPE
=
332
,
TOKEN_SOCKET_NAME
=
333
,
TOKEN_DHCP_DDNS
=
334
,
TOKEN_LOGGING
=
335
,
TOKEN_LOGGERS
=
336
,
TOKEN_OUTPUT_OPTIONS
=
337
,
TOKEN_OUTPUT
=
338
,
TOKEN_DEBUGLEVEL
=
339
,
TOKEN_SEVERITY
=
340
,
TOKEN_DHCP4
=
341
,
TOKEN_DHCPDDNS
=
342
,
TOKEN_TOPLEVEL_JSON
=
343
,
TOKEN_TOPLEVEL_DHCP6
=
344
,
TOKEN_SUB_DHCP6
=
345
,
TOKEN_SUB_INTERFACES6
=
346
,
TOKEN_SUB_SUBNET6
=
347
,
TOKEN_SUB_POOL6
=
348
,
TOKEN_SUB_PD_POOL
=
349
,
TOKEN_SUB_RESERVATION
=
350
,
TOKEN_SUB_OPTION_DEF
=
351
,
TOKEN_SUB_OPTION_DATA
=
352
,
TOKEN_SUB_HOOKS_LIBRARY
=
353
,
TOKEN_STRING
=
354
,
TOKEN_INTEGER
=
355
,
TOKEN_FLOAT
=
356
,
TOKEN_BOOLEAN
=
357
};
};
...
...
@@ -853,10 +851,6 @@ namespace isc { namespace dhcp {
symbol_type
make_DHCP4O6_PORT
(
const
location_type
&
l
);
static
inline
symbol_type
make_VERSION
(
const
location_type
&
l
);
static
inline
symbol_type
make_CONTROL_SOCKET
(
const
location_type
&
l
);
...
...
@@ -1170,12 +1164,12 @@ namespace isc { namespace dhcp {
enum
{
yyeof_
=
0
,
yylast_
=
63
8
,
///< Last index in yytable_.
yynnts_
=
27
4
,
///< Number of nonterminal symbols.
yylast_
=
63
0
,
///< Last index in yytable_.
yynnts_
=
27
1
,
///< Number of nonterminal symbols.
yyfinal_
=
24
,
///< Termination state number.
yyterror_
=
1
,
yyerrcode_
=
256
,
yyntokens_
=
10
4
///< Number of tokens.
yyntokens_
=
10
3
///< Number of tokens.
};
...
...
@@ -1227,9 +1221,9 @@ namespace isc { namespace dhcp {
65
,
66
,
67
,
68
,
69
,
70
,
71
,
72
,
73
,
74
,
75
,
76
,
77
,
78
,
79
,
80
,
81
,
82
,
83
,
84
,
85
,
86
,
87
,
88
,
89
,
90
,
91
,
92
,
93
,
94
,
95
,
96
,
97
,
98
,
99
,
100
,
101
,
102
,
103
95
,
96
,
97
,
98
,
99
,
100
,
101
,
102
};
const
unsigned
int
user_token_number_max_
=
35
8
;
const
unsigned
int
user_token_number_max_
=
35
7
;
const
token_number_type
undef_token_
=
2
;
if
(
static_cast
<
int
>
(
t
)
<=
yyeof_
)
...
...
@@ -1262,24 +1256,23 @@ namespace isc { namespace dhcp {
{
switch
(
other
.
type_get
())
{
case
117
:
// value
case
341
:
// version_value
case
116
:
// value
value
.
copy
<
ElementPtr
>
(
other
.
value
);
break
;
case
10
3
:
// "boolean"
case
10
2
:
// "boolean"
value
.
copy
<
bool
>
(
other
.
value
);
break
;
case
10
2
:
// "floating point"
case
10
1
:
// "floating point"
value
.
copy
<
double
>
(
other
.
value
);
break
;
case
10
1
:
// "integer"
case
10
0
:
// "integer"
value
.
copy
<
int64_t
>
(
other
.
value
);
break
;
case
100
:
// "constant string"
case
99
:
// "constant string"
value
.
copy
<
std
::
string
>
(
other
.
value
);
break
;
...
...
@@ -1300,24 +1293,23 @@ namespace isc { namespace dhcp {
(
void
)
v
;
switch
(
this
->
type_get
())
{
case
117
:
// value
case
341
:
// version_value
case
116
:
// value
value
.
copy
<
ElementPtr
>
(
v
);
break
;
case
10
3
:
// "boolean"
case
10
2
:
// "boolean"
value
.
copy
<
bool
>
(
v
);
break
;
case
10
2
:
// "floating point"
case
10
1
:
// "floating point"
value
.
copy
<
double
>
(
v
);
break
;
case
10
1
:
// "integer"
case
10
0
:
// "integer"
value
.
copy
<
int64_t
>
(
v
);
break
;
case
100
:
// "constant string"
case
99
:
// "constant string"
value
.
copy
<
std
::
string
>
(
v
);
break
;
...
...
@@ -1397,24 +1389,23 @@ namespace isc { namespace dhcp {
// Type destructor.
switch
(
yytype
)
{
case
117
:
// value
case
341
:
// version_value
case
116
:
// value
value
.
template
destroy
<
ElementPtr
>
();
break
;
case
10
3
:
// "boolean"
case
10
2
:
// "boolean"
value
.
template
destroy
<
bool
>
();
break
;
case
10
2
:
// "floating point"
case
10
1
:
// "floating point"
value
.
template
destroy
<
double
>
();
break
;
case
10
1
:
// "integer"
case
10
0
:
// "integer"
value
.
template
destroy
<
int64_t
>
();
break
;
case
100
:
// "constant string"
case
99
:
// "constant string"
value
.
template
destroy
<
std
::
string
>
();
break
;
...
...
@@ -1441,24 +1432,23 @@ namespace isc { namespace dhcp {
super_type
::
move
(
s
);
switch
(
this
->
type_get
())
{
case
117
:
// value
case
341
:
// version_value
case
116
:
// value
value
.
move
<
ElementPtr
>
(
s
.
value
);
break
;
case
10
3
:
// "boolean"
case
10
2
:
// "boolean"
value
.
move
<
bool
>
(
s
.
value
);
break
;
case
10
2
:
// "floating point"
case
10
1
:
// "floating point"
value
.
move
<
double
>
(
s
.
value
);
break
;
case
10
1
:
// "integer"
case
10
0
:
// "integer"
value
.
move
<
int64_t
>
(
s
.
value
);
break
;
case
100
:
// "constant string"
case
99
:
// "constant string"
value
.
move
<
std
::
string
>
(
s
.
value
);
break
;
...
...
@@ -1527,7 +1517,7 @@ namespace isc { namespace dhcp {
325
,
326
,
327
,
328
,
329
,
330
,
331
,
332
,
333
,
334
,
335
,
336
,
337
,
338
,
339
,
340
,
341
,
342
,
343
,
344
,
345
,
346
,
347
,
348
,
349
,
350
,
351
,
352
,
353
,
354
,
355
,
356
,
357
,
358
355
,
356
,
357
};
return
static_cast
<
token_type
>
(
yytoken_number_
[
type
]);
}
...
...
@@ -1976,12 +1966,6 @@ namespace isc { namespace dhcp {
return
symbol_type
(
token
::
TOKEN_DHCP4O6_PORT
,
l
);
}
Dhcp6Parser
::
symbol_type
Dhcp6Parser
::
make_VERSION
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_VERSION
,
l
);
}
Dhcp6Parser
::
symbol_type
Dhcp6Parser
::
make_CONTROL_SOCKET
(
const
location_type
&
l
)
{
...
...
@@ -2147,7 +2131,7 @@ namespace isc { namespace dhcp {
#line 14 "dhcp6_parser.yy" // lalr1.cc:377
}
}
// isc::dhcp
#line 215
1
"dhcp6_parser.h" // lalr1.cc:377
#line 21
3
5 "dhcp6_parser.h" // lalr1.cc:377
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment