mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 07:25:18 +00:00
Code Issues Releases Wiki Activity

[master] Regen bison with 3.2.1 (last) version

Browse Source
This commit is contained in:
Francis Dupont
2018-11-15 13:38:22 +00:00
parent 63a0042be2
commit b0b1d2e765
30 changed files with 2384 additions and 2334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

471
src/bin/agent/agent_parser.cc
View File

File diff suppressed because it is too large Load Diff

36
src/bin/agent/agent_parser.h
View File

@@ -1,8 +1,8 @@
// A Bison parser, made by GNU Bison 3.0.4.
// A Bison parser, made by GNU Bison 3.2.1.
// Skeleton interface for Bison LALR(1) parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
#ifndef YY_AGENT_AGENT_PARSER_H_INCLUDED
# define YY_AGENT_AGENT_PARSER_H_INCLUDED
// // "%code requires" blocks.
#line 17 "agent_parser.yy" // lalr1.cc:377
#line 17 "agent_parser.yy" // lalr1.cc:379
#include <string>
#include <cc/data.h>
@@ -51,7 +51,7 @@ using namespace isc::agent;
using namespace isc::data;
using namespace std;
#line 55 "agent_parser.h" // lalr1.cc:377
#line 55 "agent_parser.h" // lalr1.cc:379
# include <cassert>
# include <cstdlib> // std::abort
@@ -134,9 +134,9 @@ using namespace std;
# endif /* ! defined YYDEBUG */
#endif /* ! defined AGENT_DEBUG */
#line 14 "agent_parser.yy" // lalr1.cc:377
#line 14 "agent_parser.yy" // lalr1.cc:379
namespace isc { namespace agent {
#line 140 "agent_parser.h" // lalr1.cc:377
#line 140 "agent_parser.h" // lalr1.cc:379
@@ -841,6 +841,8 @@ namespace isc { namespace agent {
typedef basic_symbol<by_state> super_type;
/// Construct an empty symbol.
stack_symbol_type ();
/// Copy construct.
stack_symbol_type (const stack_symbol_type& that);
/// Steal the contents from \a sym to build this.
stack_symbol_type (state_type s, symbol_type& sym);
/// Assignment, needed by push_back.
@@ -869,7 +871,7 @@ namespace isc { namespace agent {
void yypush_ (const char* m, state_type s, symbol_type& sym);
/// Pop \a n symbols the three stacks.
void yypop_ (unsigned int n = 1);
void yypop_ (unsigned n = 1);
/// Constants.
enum
@@ -928,12 +930,12 @@ namespace isc { namespace agent {
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44
};
const unsigned int user_token_number_max_ = 299;
const unsigned user_token_number_max_ = 299;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
if (static_cast<int> (t) <= yyeof_)
return yyeof_;
else if (static_cast<unsigned int> (t) <= user_token_number_max_)
else if (static_cast<unsigned> (t) <= user_token_number_max_)
return translate_table[t];
else
return undef_token_;
@@ -947,13 +949,11 @@ namespace isc { namespace agent {
// basic_symbol.
template <typename Base>
inline
AgentParser::basic_symbol<Base>::basic_symbol ()
: value ()
{}
template <typename Base>
inline
AgentParser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
: Base (other)
, value ()
@@ -989,9 +989,7 @@ namespace isc { namespace agent {
}
template <typename Base>
inline
AgentParser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
: Base (t)
, value ()
@@ -1074,14 +1072,12 @@ namespace isc { namespace agent {
template <typename Base>
inline
AgentParser::basic_symbol<Base>::~basic_symbol ()
{
clear ();
}
template <typename Base>
inline
void
AgentParser::basic_symbol<Base>::clear ()
{
@@ -1128,7 +1124,6 @@ namespace isc { namespace agent {
}
template <typename Base>
inline
bool
AgentParser::basic_symbol<Base>::empty () const
{
@@ -1136,11 +1131,10 @@ namespace isc { namespace agent {
}
template <typename Base>
inline
void
AgentParser::basic_symbol<Base>::move (basic_symbol& s)
{
super_type::move(s);
super_type::move (s);
switch (this->type_get ())
{
case 53: // value
@@ -1488,9 +1482,9 @@ namespace isc { namespace agent {
}
#line 14 "agent_parser.yy" // lalr1.cc:377
#line 14 "agent_parser.yy" // lalr1.cc:379
} } // isc::agent
#line 1494 "agent_parser.h" // lalr1.cc:377
#line 1488 "agent_parser.h" // lalr1.cc:379

33
src/bin/agent/location.hh
View File

@@ -1,9 +1,9 @@
// Generated 201804111444
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Locations for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -41,9 +41,9 @@
# include "position.hh"
#line 14 "agent_parser.yy" // location.cc:296
#line 14 "agent_parser.yy" // location.cc:292
namespace isc { namespace agent {
#line 46 "location.hh" // location.cc:296
#line 46 "location.hh" // location.cc:292
/// Abstract a location.
class location
{
@@ -53,30 +53,27 @@ namespace isc { namespace agent {
location (const position& b, const position& e)
: begin (b)
, end (e)
{
}
{}
/// Construct a 0-width location in \a p.
explicit location (const position& p = position ())
: begin (p)
, end (p)
{
}
{}
/// Construct a 0-width location in \a f, \a l, \a c.
explicit location (std::string* f,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: begin (f, l, c)
, end (f, l, c)
{
}
{}
/// Initialization.
void initialize (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
begin.initialize (f, l, c);
end = begin;
@@ -174,7 +171,7 @@ namespace isc { namespace agent {
inline std::basic_ostream<YYChar>&
operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
{
unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
ostr << loc.begin;
if (loc.end.filename
&& (!loc.begin.filename
@@ -187,7 +184,7 @@ namespace isc { namespace agent {
return ostr;
}
#line 14 "agent_parser.yy" // location.cc:296
#line 14 "agent_parser.yy" // location.cc:292
} } // isc::agent
#line 192 "location.hh" // location.cc:296
#line 189 "location.hh" // location.cc:292
#endif // !YY_AGENT_LOCATION_HH_INCLUDED

33
src/bin/agent/position.hh
View File

@@ -1,9 +1,9 @@
// Generated 201804111444
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Positions for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -51,28 +51,27 @@
# endif
# endif
#line 14 "agent_parser.yy" // location.cc:296
#line 14 "agent_parser.yy" // location.cc:292
namespace isc { namespace agent {
#line 56 "position.hh" // location.cc:296
#line 56 "position.hh" // location.cc:292
/// Abstract a position.
class position
{
public:
/// Construct a position.
explicit position (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: filename (f)
, line (l)
, column (c)
{
}
{}
/// Initialization.
void initialize (std::string* fn = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
filename = fn;
line = l;
@@ -101,15 +100,15 @@ namespace isc { namespace agent {
/// File name to which this position refers.
std::string* filename;
/// Current line number.
unsigned int line;
unsigned line;
/// Current column number.
unsigned int column;
unsigned column;
private:
/// Compute max(min, lhs+rhs) (provided min <= lhs).
static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
static unsigned add_ (unsigned lhs, int rhs, unsigned min)
{
return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
return (0 < rhs || -static_cast<unsigned>(rhs) < lhs
? rhs + lhs
: min);
}
@@ -175,7 +174,7 @@ namespace isc { namespace agent {
return ostr << pos.line << '.' << pos.column;
}
#line 14 "agent_parser.yy" // location.cc:296
#line 14 "agent_parser.yy" // location.cc:292
} } // isc::agent
#line 180 "position.hh" // location.cc:296
#line 179 "position.hh" // location.cc:292
#endif // !YY_AGENT_POSITION_HH_INCLUDED

43
src/bin/agent/stack.hh
View File

@@ -1,9 +1,9 @@
// Generated 201804111444
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Stack handling for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -41,9 +41,10 @@
# include <vector>
#line 14 "agent_parser.yy" // stack.hh:132
#line 14 "agent_parser.yy" // stack.hh:131
namespace isc { namespace agent {
#line 46 "stack.hh" // stack.hh:132
#line 46 "stack.hh" // stack.hh:131
/// A stack with random access from its top.
template <class T, class S = std::vector<T> >
class stack
{
@@ -58,20 +59,24 @@ namespace isc { namespace agent {
seq_.reserve (200);
}
stack (unsigned int n)
stack (unsigned n)
: seq_ (n)
{}
inline
/// Random access.
///
/// Index 0 returns the topmost element.
T&
operator[] (unsigned int i)
operator[] (unsigned i)
{
return seq_[seq_.size () - 1 - i];
}
inline
/// Random access.
///
/// Index 0 returns the topmost element.
const T&
operator[] (unsigned int i) const
operator[] (unsigned i) const
{
return seq_[seq_.size () - 1 - i];
}
@@ -79,7 +84,6 @@ namespace isc { namespace agent {
/// Steal the contents of \a t.
///
/// Close to move-semantics.
inline
void
push (T& t)
{
@@ -87,9 +91,8 @@ namespace isc { namespace agent {
operator[](0).move (t);
}
inline
void
pop (unsigned int n = 1)
pop (unsigned n = 1)
{
for (; n; --n)
seq_.pop_back ();
@@ -101,21 +104,18 @@ namespace isc { namespace agent {
seq_.clear ();
}
inline
typename S::size_type
size () const
{
return seq_.size ();
}
inline
const_iterator
begin () const
{
return seq_.rbegin ();
}
inline
const_iterator
end () const
{
@@ -134,25 +134,24 @@ namespace isc { namespace agent {
class slice
{
public:
slice (const S& stack, unsigned int range)
slice (const S& stack, unsigned range)
: stack_ (stack)
, range_ (range)
{}
inline
const T&
operator [] (unsigned int i) const
operator [] (unsigned i) const
{
return stack_[range_ - i];
}
private:
const S& stack_;
unsigned int range_;
unsigned range_;
};
#line 14 "agent_parser.yy" // stack.hh:132
#line 14 "agent_parser.yy" // stack.hh:131
} } // isc::agent
#line 156 "stack.hh" // stack.hh:132
#line 155 "stack.hh" // stack.hh:131
#endif // !YY_AGENT_STACK_HH_INCLUDED

615
src/bin/d2/d2_parser.cc
View File

File diff suppressed because it is too large Load Diff

36
src/bin/d2/d2_parser.h
View File

@@ -1,8 +1,8 @@
// A Bison parser, made by GNU Bison 3.0.4.
// A Bison parser, made by GNU Bison 3.2.1.
// Skeleton interface for Bison LALR(1) parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
#ifndef YY_D2_PARSER_D2_PARSER_H_INCLUDED
# define YY_D2_PARSER_D2_PARSER_H_INCLUDED
// // "%code requires" blocks.
#line 17 "d2_parser.yy" // lalr1.cc:377
#line 17 "d2_parser.yy" // lalr1.cc:379
#include <string>
#include <cc/data.h>
@@ -52,7 +52,7 @@ using namespace isc::d2;
using namespace isc::data;
using namespace std;
#line 56 "d2_parser.h" // lalr1.cc:377
#line 56 "d2_parser.h" // lalr1.cc:379
# include <cassert>
# include <cstdlib> // std::abort
@@ -135,9 +135,9 @@ using namespace std;
# endif /* ! defined YYDEBUG */
#endif /* ! defined D2_PARSER_DEBUG */
#line 14 "d2_parser.yy" // lalr1.cc:377
#line 14 "d2_parser.yy" // lalr1.cc:379
namespace isc { namespace d2 {
#line 141 "d2_parser.h" // lalr1.cc:377
#line 141 "d2_parser.h" // lalr1.cc:379
@@ -902,6 +902,8 @@ namespace isc { namespace d2 {
typedef basic_symbol<by_state> super_type;
/// Construct an empty symbol.
stack_symbol_type ();
/// Copy construct.
stack_symbol_type (const stack_symbol_type& that);
/// Steal the contents from \a sym to build this.
stack_symbol_type (state_type s, symbol_type& sym);
/// Assignment, needed by push_back.
@@ -930,7 +932,7 @@ namespace isc { namespace d2 {
void yypush_ (const char* m, state_type s, symbol_type& sym);
/// Pop \a n symbols the three stacks.
void yypop_ (unsigned int n = 1);
void yypop_ (unsigned n = 1);
/// Constants.
enum
@@ -991,12 +993,12 @@ namespace isc { namespace d2 {
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56
};
const unsigned int user_token_number_max_ = 311;
const unsigned user_token_number_max_ = 311;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
if (static_cast<int> (t) <= yyeof_)
return yyeof_;
else if (static_cast<unsigned int> (t) <= user_token_number_max_)
else if (static_cast<unsigned> (t) <= user_token_number_max_)
return translate_table[t];
else
return undef_token_;
@@ -1010,13 +1012,11 @@ namespace isc { namespace d2 {
// basic_symbol.
template <typename Base>
inline
D2Parser::basic_symbol<Base>::basic_symbol ()
: value ()
{}
template <typename Base>
inline
D2Parser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
: Base (other)
, value ()
@@ -1052,9 +1052,7 @@ namespace isc { namespace d2 {
}
template <typename Base>
inline
D2Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
: Base (t)
, value ()
@@ -1137,14 +1135,12 @@ namespace isc { namespace d2 {
template <typename Base>
inline
D2Parser::basic_symbol<Base>::~basic_symbol ()
{
clear ();
}
template <typename Base>
inline
void
D2Parser::basic_symbol<Base>::clear ()
{
@@ -1191,7 +1187,6 @@ namespace isc { namespace d2 {
}
template <typename Base>
inline
bool
D2Parser::basic_symbol<Base>::empty () const
{
@@ -1199,11 +1194,10 @@ namespace isc { namespace d2 {
}
template <typename Base>
inline
void
D2Parser::basic_symbol<Base>::move (basic_symbol& s)
{
super_type::move(s);
super_type::move (s);
switch (this->type_get ())
{
case 68: // value
@@ -1624,9 +1618,9 @@ namespace isc { namespace d2 {
}
#line 14 "d2_parser.yy" // lalr1.cc:377
#line 14 "d2_parser.yy" // lalr1.cc:379
} } // isc::d2
#line 1630 "d2_parser.h" // lalr1.cc:377
#line 1624 "d2_parser.h" // lalr1.cc:379

32
src/bin/d2/location.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Locations for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,9 +41,9 @@
# include "position.hh"
#line 14 "d2_parser.yy" // location.cc:296
#line 14 "d2_parser.yy" // location.cc:292
namespace isc { namespace d2 {
#line 46 "location.hh" // location.cc:296
#line 46 "location.hh" // location.cc:292
/// Abstract a location.
class location
{
@@ -52,30 +53,27 @@ namespace isc { namespace d2 {
location (const position& b, const position& e)
: begin (b)
, end (e)
{
}
{}
/// Construct a 0-width location in \a p.
explicit location (const position& p = position ())
: begin (p)
, end (p)
{
}
{}
/// Construct a 0-width location in \a f, \a l, \a c.
explicit location (std::string* f,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: begin (f, l, c)
, end (f, l, c)
{
}
{}
/// Initialization.
void initialize (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
begin.initialize (f, l, c);
end = begin;
@@ -173,7 +171,7 @@ namespace isc { namespace d2 {
inline std::basic_ostream<YYChar>&
operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
{
unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
ostr << loc.begin;
if (loc.end.filename
&& (!loc.begin.filename
@@ -186,7 +184,7 @@ namespace isc { namespace d2 {
return ostr;
}
#line 14 "d2_parser.yy" // location.cc:296
#line 14 "d2_parser.yy" // location.cc:292
} } // isc::d2
#line 192 "location.hh" // location.cc:296
#line 189 "location.hh" // location.cc:292
#endif // !YY_D2_PARSER_LOCATION_HH_INCLUDED

32
src/bin/d2/position.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Positions for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -50,28 +51,27 @@
# endif
# endif
#line 14 "d2_parser.yy" // location.cc:296
#line 14 "d2_parser.yy" // location.cc:292
namespace isc { namespace d2 {
#line 56 "position.hh" // location.cc:296
#line 56 "position.hh" // location.cc:292
/// Abstract a position.
class position
{
public:
/// Construct a position.
explicit position (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: filename (f)
, line (l)
, column (c)
{
}
{}
/// Initialization.
void initialize (std::string* fn = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
filename = fn;
line = l;
@@ -100,15 +100,15 @@ namespace isc { namespace d2 {
/// File name to which this position refers.
std::string* filename;
/// Current line number.
unsigned int line;
unsigned line;
/// Current column number.
unsigned int column;
unsigned column;
private:
/// Compute max(min, lhs+rhs) (provided min <= lhs).
static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
static unsigned add_ (unsigned lhs, int rhs, unsigned min)
{
return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
return (0 < rhs || -static_cast<unsigned>(rhs) < lhs
? rhs + lhs
: min);
}
@@ -174,7 +174,7 @@ namespace isc { namespace d2 {
return ostr << pos.line << '.' << pos.column;
}
#line 14 "d2_parser.yy" // location.cc:296
#line 14 "d2_parser.yy" // location.cc:292
} } // isc::d2
#line 180 "position.hh" // location.cc:296
#line 179 "position.hh" // location.cc:292
#endif // !YY_D2_PARSER_POSITION_HH_INCLUDED

42
src/bin/d2/stack.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Stack handling for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,9 +41,10 @@
# include <vector>
#line 14 "d2_parser.yy" // stack.hh:132
#line 14 "d2_parser.yy" // stack.hh:131
namespace isc { namespace d2 {
#line 46 "stack.hh" // stack.hh:132
#line 46 "stack.hh" // stack.hh:131
/// A stack with random access from its top.
template <class T, class S = std::vector<T> >
class stack
{
@@ -57,20 +59,24 @@ namespace isc { namespace d2 {
seq_.reserve (200);
}
stack (unsigned int n)
stack (unsigned n)
: seq_ (n)
{}
inline
/// Random access.
///
/// Index 0 returns the topmost element.
T&
operator[] (unsigned int i)
operator[] (unsigned i)
{
return seq_[seq_.size () - 1 - i];
}
inline
/// Random access.
///
/// Index 0 returns the topmost element.
const T&
operator[] (unsigned int i) const
operator[] (unsigned i) const
{
return seq_[seq_.size () - 1 - i];
}
@@ -78,7 +84,6 @@ namespace isc { namespace d2 {
/// Steal the contents of \a t.
///
/// Close to move-semantics.
inline
void
push (T& t)
{
@@ -86,9 +91,8 @@ namespace isc { namespace d2 {
operator[](0).move (t);
}
inline
void
pop (unsigned int n = 1)
pop (unsigned n = 1)
{
for (; n; --n)
seq_.pop_back ();
@@ -100,21 +104,18 @@ namespace isc { namespace d2 {
seq_.clear ();
}
inline
typename S::size_type
size () const
{
return seq_.size ();
}
inline
const_iterator
begin () const
{
return seq_.rbegin ();
}
inline
const_iterator
end () const
{
@@ -133,25 +134,24 @@ namespace isc { namespace d2 {
class slice
{
public:
slice (const S& stack, unsigned int range)
slice (const S& stack, unsigned range)
: stack_ (stack)
, range_ (range)
{}
inline
const T&
operator [] (unsigned int i) const
operator [] (unsigned i) const
{
return stack_[range_ - i];
}
private:
const S& stack_;
unsigned int range_;
unsigned range_;
};
#line 14 "d2_parser.yy" // stack.hh:132
#line 14 "d2_parser.yy" // stack.hh:131
} } // isc::d2
#line 156 "stack.hh" // stack.hh:132
#line 155 "stack.hh" // stack.hh:131
#endif // !YY_D2_PARSER_STACK_HH_INCLUDED

1452
src/bin/dhcp4/dhcp4_parser.cc
View File

File diff suppressed because it is too large Load Diff

36
src/bin/dhcp4/dhcp4_parser.h
View File

@@ -1,8 +1,8 @@
// A Bison parser, made by GNU Bison 3.0.4.
// A Bison parser, made by GNU Bison 3.2.1.
// Skeleton interface for Bison LALR(1) parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
#ifndef YY_PARSER4_DHCP4_PARSER_H_INCLUDED
# define YY_PARSER4_DHCP4_PARSER_H_INCLUDED
// // "%code requires" blocks.
#line 17 "dhcp4_parser.yy" // lalr1.cc:377
#line 17 "dhcp4_parser.yy" // lalr1.cc:379
#include <string>
#include <cc/data.h>
@@ -52,7 +52,7 @@ using namespace isc::dhcp;
using namespace isc::data;
using namespace std;
#line 56 "dhcp4_parser.h" // lalr1.cc:377
#line 56 "dhcp4_parser.h" // lalr1.cc:379
# include <cassert>
# include <cstdlib> // std::abort
@@ -135,9 +135,9 @@ using namespace std;
# endif /* ! defined YYDEBUG */
#endif /* ! defined PARSER4_DEBUG */
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
#line 14 "dhcp4_parser.yy" // lalr1.cc:379
namespace isc { namespace dhcp {
#line 141 "dhcp4_parser.h" // lalr1.cc:377
#line 141 "dhcp4_parser.h" // lalr1.cc:379
@@ -1472,6 +1472,8 @@ namespace isc { namespace dhcp {
typedef basic_symbol<by_state> super_type;
/// Construct an empty symbol.
stack_symbol_type ();
/// Copy construct.
stack_symbol_type (const stack_symbol_type& that);
/// Steal the contents from \a sym to build this.
stack_symbol_type (state_type s, symbol_type& sym);
/// Assignment, needed by push_back.
@@ -1500,7 +1502,7 @@ namespace isc { namespace dhcp {
void yypush_ (const char* m, state_type s, symbol_type& sym);
/// Pop \a n symbols the three stacks.
void yypop_ (unsigned int n = 1);
void yypop_ (unsigned n = 1);
/// Constants.
enum
@@ -1572,12 +1574,12 @@ namespace isc { namespace dhcp {
155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
165, 166, 167, 168, 169
};
const unsigned int user_token_number_max_ = 424;
const unsigned user_token_number_max_ = 424;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
if (static_cast<int> (t) <= yyeof_)
return yyeof_;
else if (static_cast<unsigned int> (t) <= user_token_number_max_)
else if (static_cast<unsigned> (t) <= user_token_number_max_)
return translate_table[t];
else
return undef_token_;
@@ -1591,13 +1593,11 @@ namespace isc { namespace dhcp {
// basic_symbol.
template <typename Base>
inline
Dhcp4Parser::basic_symbol<Base>::basic_symbol ()
: value ()
{}
template <typename Base>
inline
Dhcp4Parser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
: Base (other)
, value ()
@@ -1638,9 +1638,7 @@ namespace isc { namespace dhcp {
}
template <typename Base>
inline
Dhcp4Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
: Base (t)
, value ()
@@ -1728,14 +1726,12 @@ namespace isc { namespace dhcp {
template <typename Base>
inline
Dhcp4Parser::basic_symbol<Base>::~basic_symbol ()
{
clear ();
}
template <typename Base>
inline
void
Dhcp4Parser::basic_symbol<Base>::clear ()
{
@@ -1787,7 +1783,6 @@ namespace isc { namespace dhcp {
}
template <typename Base>
inline
bool
Dhcp4Parser::basic_symbol<Base>::empty () const
{
@@ -1795,11 +1790,10 @@ namespace isc { namespace dhcp {
}
template <typename Base>
inline
void
Dhcp4Parser::basic_symbol<Base>::move (basic_symbol& s)
{
super_type::move(s);
super_type::move (s);
switch (this->type_get ())
{
case 186: // value
@@ -2914,9 +2908,9 @@ namespace isc { namespace dhcp {
}
#line 14 "dhcp4_parser.yy" // lalr1.cc:377
#line 14 "dhcp4_parser.yy" // lalr1.cc:379
} } // isc::dhcp
#line 2920 "dhcp4_parser.h" // lalr1.cc:377
#line 2914 "dhcp4_parser.h" // lalr1.cc:379

32
src/bin/dhcp4/location.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Locations for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,9 +41,9 @@
# include "position.hh"
#line 14 "dhcp4_parser.yy" // location.cc:296
#line 14 "dhcp4_parser.yy" // location.cc:292
namespace isc { namespace dhcp {
#line 46 "location.hh" // location.cc:296
#line 46 "location.hh" // location.cc:292
/// Abstract a location.
class location
{
@@ -52,30 +53,27 @@ namespace isc { namespace dhcp {
location (const position& b, const position& e)
: begin (b)
, end (e)
{
}
{}
/// Construct a 0-width location in \a p.
explicit location (const position& p = position ())
: begin (p)
, end (p)
{
}
{}
/// Construct a 0-width location in \a f, \a l, \a c.
explicit location (std::string* f,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: begin (f, l, c)
, end (f, l, c)
{
}
{}
/// Initialization.
void initialize (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
begin.initialize (f, l, c);
end = begin;
@@ -173,7 +171,7 @@ namespace isc { namespace dhcp {
inline std::basic_ostream<YYChar>&
operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
{
unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
ostr << loc.begin;
if (loc.end.filename
&& (!loc.begin.filename
@@ -186,7 +184,7 @@ namespace isc { namespace dhcp {
return ostr;
}
#line 14 "dhcp4_parser.yy" // location.cc:296
#line 14 "dhcp4_parser.yy" // location.cc:292
} } // isc::dhcp
#line 192 "location.hh" // location.cc:296
#line 189 "location.hh" // location.cc:292
#endif // !YY_PARSER4_LOCATION_HH_INCLUDED

32
src/bin/dhcp4/position.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Positions for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -50,28 +51,27 @@
# endif
# endif
#line 14 "dhcp4_parser.yy" // location.cc:296
#line 14 "dhcp4_parser.yy" // location.cc:292
namespace isc { namespace dhcp {
#line 56 "position.hh" // location.cc:296
#line 56 "position.hh" // location.cc:292
/// Abstract a position.
class position
{
public:
/// Construct a position.
explicit position (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: filename (f)
, line (l)
, column (c)
{
}
{}
/// Initialization.
void initialize (std::string* fn = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
filename = fn;
line = l;
@@ -100,15 +100,15 @@ namespace isc { namespace dhcp {
/// File name to which this position refers.
std::string* filename;
/// Current line number.
unsigned int line;
unsigned line;
/// Current column number.
unsigned int column;
unsigned column;
private:
/// Compute max(min, lhs+rhs) (provided min <= lhs).
static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
static unsigned add_ (unsigned lhs, int rhs, unsigned min)
{
return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
return (0 < rhs || -static_cast<unsigned>(rhs) < lhs
? rhs + lhs
: min);
}
@@ -174,7 +174,7 @@ namespace isc { namespace dhcp {
return ostr << pos.line << '.' << pos.column;
}
#line 14 "dhcp4_parser.yy" // location.cc:296
#line 14 "dhcp4_parser.yy" // location.cc:292
} } // isc::dhcp
#line 180 "position.hh" // location.cc:296
#line 179 "position.hh" // location.cc:292
#endif // !YY_PARSER4_POSITION_HH_INCLUDED

42
src/bin/dhcp4/stack.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Stack handling for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,9 +41,10 @@
# include <vector>
#line 14 "dhcp4_parser.yy" // stack.hh:132
#line 14 "dhcp4_parser.yy" // stack.hh:131
namespace isc { namespace dhcp {
#line 46 "stack.hh" // stack.hh:132
#line 46 "stack.hh" // stack.hh:131
/// A stack with random access from its top.
template <class T, class S = std::vector<T> >
class stack
{
@@ -57,20 +59,24 @@ namespace isc { namespace dhcp {
seq_.reserve (200);
}
stack (unsigned int n)
stack (unsigned n)
: seq_ (n)
{}
inline
/// Random access.
///
/// Index 0 returns the topmost element.
T&
operator[] (unsigned int i)
operator[] (unsigned i)
{
return seq_[seq_.size () - 1 - i];
}
inline
/// Random access.
///
/// Index 0 returns the topmost element.
const T&
operator[] (unsigned int i) const
operator[] (unsigned i) const
{
return seq_[seq_.size () - 1 - i];
}
@@ -78,7 +84,6 @@ namespace isc { namespace dhcp {
/// Steal the contents of \a t.
///
/// Close to move-semantics.
inline
void
push (T& t)
{
@@ -86,9 +91,8 @@ namespace isc { namespace dhcp {
operator[](0).move (t);
}
inline
void
pop (unsigned int n = 1)
pop (unsigned n = 1)
{
for (; n; --n)
seq_.pop_back ();
@@ -100,21 +104,18 @@ namespace isc { namespace dhcp {
seq_.clear ();
}
inline
typename S::size_type
size () const
{
return seq_.size ();
}
inline
const_iterator
begin () const
{
return seq_.rbegin ();
}
inline
const_iterator
end () const
{
@@ -133,25 +134,24 @@ namespace isc { namespace dhcp {
class slice
{
public:
slice (const S& stack, unsigned int range)
slice (const S& stack, unsigned range)
: stack_ (stack)
, range_ (range)
{}
inline
const T&
operator [] (unsigned int i) const
operator [] (unsigned i) const
{
return stack_[range_ - i];
}
private:
const S& stack_;
unsigned int range_;
unsigned range_;
};
#line 14 "dhcp4_parser.yy" // stack.hh:132
#line 14 "dhcp4_parser.yy" // stack.hh:131
} } // isc::dhcp
#line 156 "stack.hh" // stack.hh:132
#line 155 "stack.hh" // stack.hh:131
#endif // !YY_PARSER4_STACK_HH_INCLUDED

1479
src/bin/dhcp6/dhcp6_parser.cc
View File

File diff suppressed because it is too large Load Diff

36
src/bin/dhcp6/dhcp6_parser.h
View File

@@ -1,8 +1,8 @@
// A Bison parser, made by GNU Bison 3.0.4.
// A Bison parser, made by GNU Bison 3.2.1.
// Skeleton interface for Bison LALR(1) parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
#ifndef YY_PARSER6_DHCP6_PARSER_H_INCLUDED
# define YY_PARSER6_DHCP6_PARSER_H_INCLUDED
// // "%code requires" blocks.
#line 17 "dhcp6_parser.yy" // lalr1.cc:377
#line 17 "dhcp6_parser.yy" // lalr1.cc:379
#include <string>
#include <cc/data.h>
@@ -52,7 +52,7 @@ using namespace isc::dhcp;
using namespace isc::data;
using namespace std;
#line 56 "dhcp6_parser.h" // lalr1.cc:377
#line 56 "dhcp6_parser.h" // lalr1.cc:379
# include <cassert>
# include <cstdlib> // std::abort
@@ -135,9 +135,9 @@ using namespace std;
# endif /* ! defined YYDEBUG */
#endif /* ! defined PARSER6_DEBUG */
#line 14 "dhcp6_parser.yy" // lalr1.cc:377
#line 14 "dhcp6_parser.yy" // lalr1.cc:379
namespace isc { namespace dhcp {
#line 141 "dhcp6_parser.h" // lalr1.cc:377
#line 141 "dhcp6_parser.h" // lalr1.cc:379
@@ -1496,6 +1496,8 @@ namespace isc { namespace dhcp {
typedef basic_symbol<by_state> super_type;
/// Construct an empty symbol.
stack_symbol_type ();
/// Copy construct.
stack_symbol_type (const stack_symbol_type& that);
/// Steal the contents from \a sym to build this.
stack_symbol_type (state_type s, symbol_type& sym);
/// Assignment, needed by push_back.
@@ -1524,7 +1526,7 @@ namespace isc { namespace dhcp {
void yypush_ (const char* m, state_type s, symbol_type& sym);
/// Pop \a n symbols the three stacks.
void yypop_ (unsigned int n = 1);
void yypop_ (unsigned n = 1);
/// Constants.
enum
@@ -1596,12 +1598,12 @@ namespace isc { namespace dhcp {
155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
165, 166, 167, 168, 169, 170, 171, 172, 173, 174
};
const unsigned int user_token_number_max_ = 429;
const unsigned user_token_number_max_ = 429;
const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_)
if (static_cast<int> (t) <= yyeof_)
return yyeof_;
else if (static_cast<unsigned int> (t) <= user_token_number_max_)
else if (static_cast<unsigned> (t) <= user_token_number_max_)
return translate_table[t];
else
return undef_token_;
@@ -1615,13 +1617,11 @@ namespace isc { namespace dhcp {
// basic_symbol.
template <typename Base>
inline
Dhcp6Parser::basic_symbol<Base>::basic_symbol ()
: value ()
{}
template <typename Base>
inline
Dhcp6Parser::basic_symbol<Base>::basic_symbol (const basic_symbol& other)
: Base (other)
, value ()
@@ -1661,9 +1661,7 @@ namespace isc { namespace dhcp {
}
template <typename Base>
inline
Dhcp6Parser::basic_symbol<Base>::basic_symbol (typename Base::kind_type t, const semantic_type& v, const location_type& l)
: Base (t)
, value ()
@@ -1750,14 +1748,12 @@ namespace isc { namespace dhcp {
template <typename Base>
inline
Dhcp6Parser::basic_symbol<Base>::~basic_symbol ()
{
clear ();
}
template <typename Base>
inline
void
Dhcp6Parser::basic_symbol<Base>::clear ()
{
@@ -1808,7 +1804,6 @@ namespace isc { namespace dhcp {
}
template <typename Base>
inline
bool
Dhcp6Parser::basic_symbol<Base>::empty () const
{
@@ -1816,11 +1811,10 @@ namespace isc { namespace dhcp {
}
template <typename Base>
inline
void
Dhcp6Parser::basic_symbol<Base>::move (basic_symbol& s)
{
super_type::move(s);
super_type::move (s);
switch (this->type_get ())
{
case 192: // value
@@ -2965,9 +2959,9 @@ namespace isc { namespace dhcp {
}
#line 14 "dhcp6_parser.yy" // lalr1.cc:377
#line 14 "dhcp6_parser.yy" // lalr1.cc:379
} } // isc::dhcp
#line 2971 "dhcp6_parser.h" // lalr1.cc:377
#line 2965 "dhcp6_parser.h" // lalr1.cc:379

32
src/bin/dhcp6/location.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Locations for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,9 +41,9 @@
# include "position.hh"
#line 14 "dhcp6_parser.yy" // location.cc:296
#line 14 "dhcp6_parser.yy" // location.cc:292
namespace isc { namespace dhcp {
#line 46 "location.hh" // location.cc:296
#line 46 "location.hh" // location.cc:292
/// Abstract a location.
class location
{
@@ -52,30 +53,27 @@ namespace isc { namespace dhcp {
location (const position& b, const position& e)
: begin (b)
, end (e)
{
}
{}
/// Construct a 0-width location in \a p.
explicit location (const position& p = position ())
: begin (p)
, end (p)
{
}
{}
/// Construct a 0-width location in \a f, \a l, \a c.
explicit location (std::string* f,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: begin (f, l, c)
, end (f, l, c)
{
}
{}
/// Initialization.
void initialize (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
begin.initialize (f, l, c);
end = begin;
@@ -173,7 +171,7 @@ namespace isc { namespace dhcp {
inline std::basic_ostream<YYChar>&
operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
{
unsigned int end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
ostr << loc.begin;
if (loc.end.filename
&& (!loc.begin.filename
@@ -186,7 +184,7 @@ namespace isc { namespace dhcp {
return ostr;
}
#line 14 "dhcp6_parser.yy" // location.cc:296
#line 14 "dhcp6_parser.yy" // location.cc:292
} } // isc::dhcp
#line 192 "location.hh" // location.cc:296
#line 189 "location.hh" // location.cc:292
#endif // !YY_PARSER6_LOCATION_HH_INCLUDED

32
src/bin/dhcp6/position.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Positions for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -50,28 +51,27 @@
# endif
# endif
#line 14 "dhcp6_parser.yy" // location.cc:296
#line 14 "dhcp6_parser.yy" // location.cc:292
namespace isc { namespace dhcp {
#line 56 "position.hh" // location.cc:296
#line 56 "position.hh" // location.cc:292
/// Abstract a position.
class position
{
public:
/// Construct a position.
explicit position (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: filename (f)
, line (l)
, column (c)
{
}
{}
/// Initialization.
void initialize (std::string* fn = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
filename = fn;
line = l;
@@ -100,15 +100,15 @@ namespace isc { namespace dhcp {
/// File name to which this position refers.
std::string* filename;
/// Current line number.
unsigned int line;
unsigned line;
/// Current column number.
unsigned int column;
unsigned column;
private:
/// Compute max(min, lhs+rhs) (provided min <= lhs).
static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
static unsigned add_ (unsigned lhs, int rhs, unsigned min)
{
return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
return (0 < rhs || -static_cast<unsigned>(rhs) < lhs
? rhs + lhs
: min);
}
@@ -174,7 +174,7 @@ namespace isc { namespace dhcp {
return ostr << pos.line << '.' << pos.column;
}
#line 14 "dhcp6_parser.yy" // location.cc:296
#line 14 "dhcp6_parser.yy" // location.cc:292
} } // isc::dhcp
#line 180 "position.hh" // location.cc:296
#line 179 "position.hh" // location.cc:292
#endif // !YY_PARSER6_POSITION_HH_INCLUDED

42
src/bin/dhcp6/stack.hh
View File

@@ -1,8 +1,9 @@
// A Bison parser, made by GNU Bison 3.0.4.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Stack handling for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -40,9 +41,10 @@
# include <vector>
#line 14 "dhcp6_parser.yy" // stack.hh:132
#line 14 "dhcp6_parser.yy" // stack.hh:131
namespace isc { namespace dhcp {
#line 46 "stack.hh" // stack.hh:132
#line 46 "stack.hh" // stack.hh:131
/// A stack with random access from its top.
template <class T, class S = std::vector<T> >
class stack
{
@@ -57,20 +59,24 @@ namespace isc { namespace dhcp {
seq_.reserve (200);
}
stack (unsigned int n)
stack (unsigned n)
: seq_ (n)
{}
inline
/// Random access.
///
/// Index 0 returns the topmost element.
T&
operator[] (unsigned int i)
operator[] (unsigned i)
{
return seq_[seq_.size () - 1 - i];
}
inline
/// Random access.
///
/// Index 0 returns the topmost element.
const T&
operator[] (unsigned int i) const
operator[] (unsigned i) const
{
return seq_[seq_.size () - 1 - i];
}
@@ -78,7 +84,6 @@ namespace isc { namespace dhcp {
/// Steal the contents of \a t.
///
/// Close to move-semantics.
inline
void
push (T& t)
{
@@ -86,9 +91,8 @@ namespace isc { namespace dhcp {
operator[](0).move (t);
}
inline
void
pop (unsigned int n = 1)
pop (unsigned n = 1)
{
for (; n; --n)
seq_.pop_back ();
@@ -100,21 +104,18 @@ namespace isc { namespace dhcp {
seq_.clear ();
}
inline
typename S::size_type
size () const
{
return seq_.size ();
}
inline
const_iterator
begin () const
{
return seq_.rbegin ();
}
inline
const_iterator
end () const
{
@@ -133,25 +134,24 @@ namespace isc { namespace dhcp {
class slice
{
public:
slice (const S& stack, unsigned int range)
slice (const S& stack, unsigned range)
: stack_ (stack)
, range_ (range)
{}
inline
const T&
operator [] (unsigned int i) const
operator [] (unsigned i) const
{
return stack_[range_ - i];
}
private:
const S& stack_;
unsigned int range_;
unsigned range_;
};
#line 14 "dhcp6_parser.yy" // stack.hh:132
#line 14 "dhcp6_parser.yy" // stack.hh:131
} } // isc::dhcp
#line 156 "stack.hh" // stack.hh:132
#line 155 "stack.hh" // stack.hh:131
#endif // !YY_PARSER6_STACK_HH_INCLUDED

4
src/bin/netconf/location.hh
View File

@@ -1,5 +1,5 @@
// Generated 201810092120
// A Bison parser, made by GNU Bison 3.0.5.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Locations for Bison parsers in C++

16
src/bin/netconf/netconf_parser.cc
View File

@@ -1,4 +1,4 @@
// A Bison parser, made by GNU Bison 3.0.5.
// A Bison parser, made by GNU Bison 3.2.1.
// Skeleton implementation for Bison LALR(1) parsers in C++
@@ -372,49 +372,49 @@ namespace isc { namespace netconf {
{
case 45: // "constant string"
#line 107 "netconf_parser.yy" // lalr1.cc:635
#line 107 ""netconf_parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< std::string > (); }
#line 378 "netconf_parser.cc" // lalr1.cc:635
break;
case 46: // "integer"
#line 107 "netconf_parser.yy" // lalr1.cc:635
#line 107 ""netconf_parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< int64_t > (); }
#line 385 "netconf_parser.cc" // lalr1.cc:635
break;
case 47: // "floating point"
#line 107 "netconf_parser.yy" // lalr1.cc:635
#line 107 ""netconf_parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< double > (); }
#line 392 "netconf_parser.cc" // lalr1.cc:635
break;
case 48: // "boolean"
#line 107 "netconf_parser.yy" // lalr1.cc:635
#line 107 ""netconf_parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< bool > (); }
#line 399 "netconf_parser.cc" // lalr1.cc:635
break;
case 57: // value
#line 107 "netconf_parser.yy" // lalr1.cc:635
#line 107 ""netconf_parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< ElementPtr > (); }
#line 406 "netconf_parser.cc" // lalr1.cc:635
break;
case 60: // map_value
#line 107 "netconf_parser.yy" // lalr1.cc:635
#line 107 ""netconf_parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< ElementPtr > (); }
#line 413 "netconf_parser.cc" // lalr1.cc:635
break;
case 119: // socket_type_value
#line 107 "netconf_parser.yy" // lalr1.cc:635
#line 107 ""netconf_parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< ElementPtr > (); }
#line 420 "netconf_parser.cc" // lalr1.cc:635
break;

2
src/bin/netconf/netconf_parser.h
View File

@@ -1,4 +1,4 @@
// A Bison parser, made by GNU Bison 3.0.5.
// A Bison parser, made by GNU Bison 3.2.1.
// Skeleton interface for Bison LALR(1) parsers in C++

4
src/bin/netconf/position.hh
View File

@@ -1,5 +1,5 @@
// Generated 201810092120
// A Bison parser, made by GNU Bison 3.0.5.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Positions for Bison parsers in C++

4
src/bin/netconf/stack.hh
View File

@@ -1,5 +1,5 @@
// Generated 201810092120
// A Bison parser, made by GNU Bison 3.0.5.
// Generated 201811151337
// A Bison parser, made by GNU Bison 3.2.1.
// Stack handling for Bison parsers in C++

4
src/lib/eval/location.hh
View File

@@ -1,5 +1,5 @@
// Generated 201809161042
// A Bison parser, made by GNU Bison 3.0.5.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Locations for Bison parsers in C++

30
src/lib/eval/parser.cc
View File

@@ -1,4 +1,4 @@
// A Bison parser, made by GNU Bison 3.0.5.
// A Bison parser, made by GNU Bison 3.2.1.
// Skeleton implementation for Bison LALR(1) parsers in C++
@@ -429,98 +429,98 @@ namespace isc { namespace eval {
{
case 50: // "constant string"
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< std::string > (); }
#line 435 "parser.cc" // lalr1.cc:635
break;
case 51: // "integer"
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< std::string > (); }
#line 442 "parser.cc" // lalr1.cc:635
break;
case 52: // "constant hexstring"
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< std::string > (); }
#line 449 "parser.cc" // lalr1.cc:635
break;
case 53: // "option name"
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< std::string > (); }
#line 456 "parser.cc" // lalr1.cc:635
break;
case 54: // "ip address"
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< std::string > (); }
#line 463 "parser.cc" // lalr1.cc:635
break;
case 60: // integer_expr
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< uint32_t > (); }
#line 470 "parser.cc" // lalr1.cc:635
break;
case 61: // option_code
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< uint16_t > (); }
#line 477 "parser.cc" // lalr1.cc:635
break;
case 62: // option_repr_type
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< TokenOption::RepresentationType > (); }
#line 484 "parser.cc" // lalr1.cc:635
break;
case 63: // nest_level
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< int8_t > (); }
#line 491 "parser.cc" // lalr1.cc:635
break;
case 64: // pkt_metadata
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< TokenPkt::MetadataType > (); }
#line 498 "parser.cc" // lalr1.cc:635
break;
case 65: // enterprise_id
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< uint32_t > (); }
#line 505 "parser.cc" // lalr1.cc:635
break;
case 66: // pkt4_field
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< TokenPkt4::FieldType > (); }
#line 512 "parser.cc" // lalr1.cc:635
break;
case 67: // pkt6_field
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< TokenPkt6::FieldType > (); }
#line 519 "parser.cc" // lalr1.cc:635
break;
case 68: // relay6_field
#line 111 "parser.yy" // lalr1.cc:635
#line 111 ""parser.yy"" // lalr1.cc:635
{ yyoutput << yysym.value.template as< TokenRelay6Field::FieldType > (); }
#line 526 "parser.cc" // lalr1.cc:635
break;

2
src/lib/eval/parser.h
View File

@@ -1,4 +1,4 @@
// A Bison parser, made by GNU Bison 3.0.5.
// A Bison parser, made by GNU Bison 3.2.1.
// Skeleton interface for Bison LALR(1) parsers in C++

4
src/lib/eval/position.hh
View File

@@ -1,5 +1,5 @@
// Generated 201809161042
// A Bison parser, made by GNU Bison 3.0.5.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Positions for Bison parsers in C++

4
src/lib/eval/stack.hh
View File

@@ -1,5 +1,5 @@
// Generated 201809161042
// A Bison parser, made by GNU Bison 3.0.5.
// Generated 201811151336
// A Bison parser, made by GNU Bison 3.2.1.
// Stack handling for Bison parsers in C++