Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
427
Issues
427
List
Boards
Labels
Service Desk
Milestones
Merge Requests
69
Merge Requests
69
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
035e5845
Commit
035e5845
authored
Sep 28, 2018
by
Francis Dupont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[#,5!49], regen flex/bison
parent
e25805ae
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1181 additions
and
1386 deletions
+1181
-1386
src/bin/netconf/location.hh
src/bin/netconf/location.hh
+1
-1
src/bin/netconf/netconf_lexer.cc
src/bin/netconf/netconf_lexer.cc
+682
-769
src/bin/netconf/netconf_parser.cc
src/bin/netconf/netconf_parser.cc
+425
-499
src/bin/netconf/netconf_parser.h
src/bin/netconf/netconf_parser.h
+71
-115
src/bin/netconf/position.hh
src/bin/netconf/position.hh
+1
-1
src/bin/netconf/stack.hh
src/bin/netconf/stack.hh
+1
-1
No files found.
src/bin/netconf/location.hh
View file @
035e5845
// Generated 2018092
62116
// Generated 2018092
81108
// A Bison parser, made by GNU Bison 3.0.5.
// Locations for Bison parsers in C++
...
...
src/bin/netconf/netconf_lexer.cc
View file @
035e5845
This diff is collapsed.
Click to expand it.
src/bin/netconf/netconf_parser.cc
View file @
035e5845
This diff is collapsed.
Click to expand it.
src/bin/netconf/netconf_parser.h
View file @
035e5845
...
...
@@ -359,18 +359,18 @@ namespace isc { namespace netconf {
TOKEN_CA_SERVER
=
272
,
TOKEN_MODEL
=
273
,
TOKEN_CONTROL_SOCKET
=
274
,
TOKEN_TYPE
=
275
,
TOKEN_
SOCKET_
TYPE
=
275
,
TOKEN_UNIX
=
276
,
TOKEN_HTTP
=
277
,
TOKEN_STDOUT
=
278
,
TOKEN_NAME
=
279
,
TOKEN_
HOST
=
280
,
TOKEN_
PORT
=
281
,
TOKEN_
HOOKS_LIBRARIES
=
282
,
TOKEN_
LIBRARY
=
283
,
TOKEN_
PARAMETERS
=
284
,
TOKEN_LOGG
ING
=
285
,
TOKEN_
LOGGERS
=
286
,
TOKEN_
SOCKET_
NAME
=
279
,
TOKEN_
SOCKET_URL
=
280
,
TOKEN_
HOOKS_LIBRARIES
=
281
,
TOKEN_
LIBRARY
=
282
,
TOKEN_
PARAMETERS
=
283
,
TOKEN_
LOGGING
=
284
,
TOKEN_LOGG
ERS
=
285
,
TOKEN_
NAME
=
286
,
TOKEN_OUTPUT_OPTIONS
=
287
,
TOKEN_OUTPUT
=
288
,
TOKEN_DEBUGLEVEL
=
289
,
...
...
@@ -378,17 +378,13 @@ namespace isc { namespace netconf {
TOKEN_FLUSH
=
291
,
TOKEN_MAXSIZE
=
292
,
TOKEN_MAXVER
=
293
,
TOKEN_DHCP4
=
294
,
TOKEN_DHCP6
=
295
,
TOKEN_DHCPDDNS
=
296
,
TOKEN_CONTROL_AGENT
=
297
,
TOKEN_START_JSON
=
298
,
TOKEN_START_NETCONF
=
299
,
TOKEN_START_SUB_NETCONF
=
300
,
TOKEN_STRING
=
301
,
TOKEN_INTEGER
=
302
,
TOKEN_FLOAT
=
303
,
TOKEN_BOOLEAN
=
304
TOKEN_START_JSON
=
294
,
TOKEN_START_NETCONF
=
295
,
TOKEN_START_SUB_NETCONF
=
296
,
TOKEN_STRING
=
297
,
TOKEN_INTEGER
=
298
,
TOKEN_FLOAT
=
299
,
TOKEN_BOOLEAN
=
300
};
};
...
...
@@ -577,7 +573,7 @@ namespace isc { namespace netconf {
static
inline
symbol_type
make_TYPE
(
const
location_type
&
l
);
make_
SOCKET_
TYPE
(
const
location_type
&
l
);
static
inline
symbol_type
...
...
@@ -593,15 +589,11 @@ namespace isc { namespace netconf {
static
inline
symbol_type
make_NAME
(
const
location_type
&
l
);
static
inline
symbol_type
make_HOST
(
const
location_type
&
l
);
make_SOCKET_NAME
(
const
location_type
&
l
);
static
inline
symbol_type
make_
PORT
(
const
location_type
&
l
);
make_
SOCKET_URL
(
const
location_type
&
l
);
static
inline
symbol_type
...
...
@@ -623,6 +615,10 @@ namespace isc { namespace netconf {
symbol_type
make_LOGGERS
(
const
location_type
&
l
);
static
inline
symbol_type
make_NAME
(
const
location_type
&
l
);
static
inline
symbol_type
make_OUTPUT_OPTIONS
(
const
location_type
&
l
);
...
...
@@ -651,22 +647,6 @@ namespace isc { namespace netconf {
symbol_type
make_MAXVER
(
const
location_type
&
l
);
static
inline
symbol_type
make_DHCP4
(
const
location_type
&
l
);
static
inline
symbol_type
make_DHCP6
(
const
location_type
&
l
);
static
inline
symbol_type
make_DHCPDDNS
(
const
location_type
&
l
);
static
inline
symbol_type
make_CONTROL_AGENT
(
const
location_type
&
l
);
static
inline
symbol_type
make_START_JSON
(
const
location_type
&
l
);
...
...
@@ -753,7 +733,7 @@ namespace isc { namespace netconf {
/// \param yyvalue the value to check
static
bool
yy_table_value_is_error_
(
int
yyvalue
);
static
const
s
hort
int
yypact_ninf_
;
static
const
s
igned
char
yypact_ninf_
;
static
const
signed
char
yytable_ninf_
;
/// Convert a scanner token number \a t to a symbol number.
...
...
@@ -902,12 +882,12 @@ namespace isc { namespace netconf {
enum
{
yyeof_
=
0
,
yylast_
=
2
21
,
///< Last index in yytable_.
yynnts_
=
10
6
,
///< Number of nonterminal symbols.
yylast_
=
2
19
,
///< Last index in yytable_.
yynnts_
=
10
0
,
///< Number of nonterminal symbols.
yyfinal_
=
8
,
///< Termination state number.
yyterror_
=
1
,
yyerrcode_
=
256
,
yyntokens_
=
50
///< Number of tokens.
yyntokens_
=
46
///< Number of tokens.
};
...
...
@@ -954,9 +934,9 @@ namespace isc { namespace netconf {
15
,
16
,
17
,
18
,
19
,
20
,
21
,
22
,
23
,
24
,
25
,
26
,
27
,
28
,
29
,
30
,
31
,
32
,
33
,
34
,
35
,
36
,
37
,
38
,
39
,
40
,
41
,
42
,
43
,
44
,
45
,
46
,
47
,
48
,
49
45
};
const
unsigned
user_token_number_max_
=
30
4
;
const
unsigned
user_token_number_max_
=
30
0
;
const
token_number_type
undef_token_
=
2
;
if
(
static_cast
<
int
>
(
t
)
<=
yyeof_
)
...
...
@@ -987,25 +967,25 @@ namespace isc { namespace netconf {
{
switch
(
other
.
type_get
())
{
case
5
8
:
// value
case
61
:
// map_value
case
11
6
:
// socket_type_value
case
5
4
:
// value
case
57
:
// map_value
case
11
3
:
// socket_type_value
value
.
copy
<
ElementPtr
>
(
other
.
value
);
break
;
case
4
9
:
// "boolean"
case
4
5
:
// "boolean"
value
.
copy
<
bool
>
(
other
.
value
);
break
;
case
4
8
:
// "floating point"
case
4
4
:
// "floating point"
value
.
copy
<
double
>
(
other
.
value
);
break
;
case
4
7
:
// "integer"
case
4
3
:
// "integer"
value
.
copy
<
int64_t
>
(
other
.
value
);
break
;
case
4
6
:
// "constant string"
case
4
2
:
// "constant string"
value
.
copy
<
std
::
string
>
(
other
.
value
);
break
;
...
...
@@ -1024,25 +1004,25 @@ namespace isc { namespace netconf {
(
void
)
v
;
switch
(
this
->
type_get
())
{
case
5
8
:
// value
case
61
:
// map_value
case
11
6
:
// socket_type_value
case
5
4
:
// value
case
57
:
// map_value
case
11
3
:
// socket_type_value
value
.
copy
<
ElementPtr
>
(
v
);
break
;
case
4
9
:
// "boolean"
case
4
5
:
// "boolean"
value
.
copy
<
bool
>
(
v
);
break
;
case
4
8
:
// "floating point"
case
4
4
:
// "floating point"
value
.
copy
<
double
>
(
v
);
break
;
case
4
7
:
// "integer"
case
4
3
:
// "integer"
value
.
copy
<
int64_t
>
(
v
);
break
;
case
4
6
:
// "constant string"
case
4
2
:
// "constant string"
value
.
copy
<
std
::
string
>
(
v
);
break
;
...
...
@@ -1120,25 +1100,25 @@ namespace isc { namespace netconf {
// Type destructor.
switch
(
yytype
)
{
case
5
8
:
// value
case
61
:
// map_value
case
11
6
:
// socket_type_value
case
5
4
:
// value
case
57
:
// map_value
case
11
3
:
// socket_type_value
value
.
template
destroy
<
ElementPtr
>
();
break
;
case
4
9
:
// "boolean"
case
4
5
:
// "boolean"
value
.
template
destroy
<
bool
>
();
break
;
case
4
8
:
// "floating point"
case
4
4
:
// "floating point"
value
.
template
destroy
<
double
>
();
break
;
case
4
7
:
// "integer"
case
4
3
:
// "integer"
value
.
template
destroy
<
int64_t
>
();
break
;
case
4
6
:
// "constant string"
case
4
2
:
// "constant string"
value
.
template
destroy
<
std
::
string
>
();
break
;
...
...
@@ -1163,25 +1143,25 @@ namespace isc { namespace netconf {
super_type
::
move
(
s
);
switch
(
this
->
type_get
())
{
case
5
8
:
// value
case
61
:
// map_value
case
11
6
:
// socket_type_value
case
5
4
:
// value
case
57
:
// map_value
case
11
3
:
// socket_type_value
value
.
move
<
ElementPtr
>
(
s
.
value
);
break
;
case
4
9
:
// "boolean"
case
4
5
:
// "boolean"
value
.
move
<
bool
>
(
s
.
value
);
break
;
case
4
8
:
// "floating point"
case
4
4
:
// "floating point"
value
.
move
<
double
>
(
s
.
value
);
break
;
case
4
7
:
// "integer"
case
4
3
:
// "integer"
value
.
move
<
int64_t
>
(
s
.
value
);
break
;
case
4
6
:
// "constant string"
case
4
2
:
// "constant string"
value
.
move
<
std
::
string
>
(
s
.
value
);
break
;
...
...
@@ -1244,7 +1224,7 @@ namespace isc { namespace netconf {
265
,
266
,
267
,
268
,
269
,
270
,
271
,
272
,
273
,
274
,
275
,
276
,
277
,
278
,
279
,
280
,
281
,
282
,
283
,
284
,
285
,
286
,
287
,
288
,
289
,
290
,
291
,
292
,
293
,
294
,
295
,
296
,
297
,
298
,
299
,
300
,
301
,
302
,
303
,
304
295
,
296
,
297
,
298
,
299
,
300
};
return
static_cast
<
token_type
>
(
yytoken_number_
[
type
]);
}
...
...
@@ -1358,9 +1338,9 @@ namespace isc { namespace netconf {
}
NetconfParser
::
symbol_type
NetconfParser
::
make_TYPE
(
const
location_type
&
l
)
NetconfParser
::
make_
SOCKET_
TYPE
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_TYPE
,
l
);
return
symbol_type
(
token
::
TOKEN_
SOCKET_
TYPE
,
l
);
}
NetconfParser
::
symbol_type
...
...
@@ -1382,21 +1362,15 @@ namespace isc { namespace netconf {
}
NetconfParser
::
symbol_type
NetconfParser
::
make_NAME
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_NAME
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_HOST
(
const
location_type
&
l
)
NetconfParser
::
make_SOCKET_NAME
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_
HOST
,
l
);
return
symbol_type
(
token
::
TOKEN_
SOCKET_NAME
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_
PORT
(
const
location_type
&
l
)
NetconfParser
::
make_
SOCKET_URL
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_
PORT
,
l
);
return
symbol_type
(
token
::
TOKEN_
SOCKET_URL
,
l
);
}
NetconfParser
::
symbol_type
...
...
@@ -1429,6 +1403,12 @@ namespace isc { namespace netconf {
return
symbol_type
(
token
::
TOKEN_LOGGERS
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_NAME
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_NAME
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_OUTPUT_OPTIONS
(
const
location_type
&
l
)
{
...
...
@@ -1471,30 +1451,6 @@ namespace isc { namespace netconf {
return
symbol_type
(
token
::
TOKEN_MAXVER
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_DHCP4
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_DHCP4
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_DHCP6
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_DHCP6
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_DHCPDDNS
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_DHCPDDNS
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_CONTROL_AGENT
(
const
location_type
&
l
)
{
return
symbol_type
(
token
::
TOKEN_CONTROL_AGENT
,
l
);
}
NetconfParser
::
symbol_type
NetconfParser
::
make_START_JSON
(
const
location_type
&
l
)
{
...
...
@@ -1540,7 +1496,7 @@ namespace isc { namespace netconf {
#line 14 "netconf_parser.yy" // lalr1.cc:379
}
}
// isc::netconf
#line 15
44
"netconf_parser.h" // lalr1.cc:379
#line 15
00
"netconf_parser.h" // lalr1.cc:379
...
...
src/bin/netconf/position.hh
View file @
035e5845
// Generated 2018092
62116
// Generated 2018092
81108
// A Bison parser, made by GNU Bison 3.0.5.
// Positions for Bison parsers in C++
...
...
src/bin/netconf/stack.hh
View file @
035e5845
// Generated 2018092
62116
// Generated 2018092
81108
// A Bison parser, made by GNU Bison 3.0.5.
// Stack handling for Bison parsers in C++
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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