Browse Source

[5110] Merge branch 'trac5110' of ssh://git.kea.isc.org/git/kea into trac5110

Francis Dupont 8 years ago
parent
commit
b8a94662c0

+ 6 - 6
src/bin/d2/d2_parser.h

@@ -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:392
+#line 17 "d2_parser.yy" // lalr1.cc:377
 
 #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:392
+#line 56 "d2_parser.h" // lalr1.cc:377
 
 # 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:392
+#line 14 "d2_parser.yy" // lalr1.cc:377
 namespace isc { namespace d2 {
-#line 141 "d2_parser.h" // lalr1.cc:392
+#line 141 "d2_parser.h" // lalr1.cc:377
 
 
 
@@ -1552,9 +1552,9 @@ namespace isc { namespace d2 {
   }
 
 
-#line 14 "d2_parser.yy" // lalr1.cc:392
+#line 14 "d2_parser.yy" // lalr1.cc:377
 } } // isc::d2
-#line 1558 "d2_parser.h" // lalr1.cc:392
+#line 1558 "d2_parser.h" // lalr1.cc:377
 
 
 

+ 5 - 4
src/bin/d2/location.hh

@@ -1,3 +1,4 @@
+// Generated 201702011423
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++
@@ -40,9 +41,9 @@
 
 # include "position.hh"
 
-#line 14 "d2_parser.yy" // location.cc:337
+#line 14 "d2_parser.yy" // location.cc:296
 namespace isc { namespace d2 {
-#line 46 "location.hh" // location.cc:337
+#line 46 "location.hh" // location.cc:296
   /// Abstract a location.
   class location
   {
@@ -186,7 +187,7 @@ namespace isc { namespace d2 {
     return ostr;
   }
 
-#line 14 "d2_parser.yy" // location.cc:337
+#line 14 "d2_parser.yy" // location.cc:296
 } } // isc::d2
-#line 192 "location.hh" // location.cc:337
+#line 192 "location.hh" // location.cc:296
 #endif // !YY_D2_PARSER_LOCATION_HH_INCLUDED

+ 5 - 4
src/bin/d2/position.hh

@@ -1,3 +1,4 @@
+// Generated 201702011423
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++
@@ -50,9 +51,9 @@
 #  endif
 # endif
 
-#line 14 "d2_parser.yy" // location.cc:337
+#line 14 "d2_parser.yy" // location.cc:296
 namespace isc { namespace d2 {
-#line 56 "position.hh" // location.cc:337
+#line 56 "position.hh" // location.cc:296
   /// Abstract a position.
   class position
   {
@@ -174,7 +175,7 @@ namespace isc { namespace d2 {
     return ostr << pos.line << '.' << pos.column;
   }
 
-#line 14 "d2_parser.yy" // location.cc:337
+#line 14 "d2_parser.yy" // location.cc:296
 } } // isc::d2
-#line 180 "position.hh" // location.cc:337
+#line 180 "position.hh" // location.cc:296
 #endif // !YY_D2_PARSER_POSITION_HH_INCLUDED

+ 5 - 4
src/bin/d2/stack.hh

@@ -1,3 +1,4 @@
+// Generated 201702011423
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++
@@ -40,9 +41,9 @@
 
 # include <vector>
 
-#line 14 "d2_parser.yy" // stack.hh:151
+#line 14 "d2_parser.yy" // stack.hh:132
 namespace isc { namespace d2 {
-#line 46 "stack.hh" // stack.hh:151
+#line 46 "stack.hh" // stack.hh:132
   template <class T, class S = std::vector<T> >
   class stack
   {
@@ -150,8 +151,8 @@ namespace isc { namespace d2 {
     unsigned int range_;
   };
 
-#line 14 "d2_parser.yy" // stack.hh:151
+#line 14 "d2_parser.yy" // stack.hh:132
 } } // isc::d2
-#line 156 "stack.hh" // stack.hh:151
+#line 156 "stack.hh" // stack.hh:132
 
 #endif // !YY_D2_PARSER_STACK_HH_INCLUDED

File diff suppressed because it is too large
+ 361 - 310
src/bin/dhcp4/dhcp4_lexer.cc


+ 1 - 1
src/bin/dhcp4/location.hh

@@ -1,4 +1,4 @@
-// Generated 201701251415
+// Generated 201702011419
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

+ 1 - 1
src/bin/dhcp4/position.hh

@@ -1,4 +1,4 @@
-// Generated 201701251415
+// Generated 201702011419
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

+ 1 - 1
src/bin/dhcp4/stack.hh

@@ -1,4 +1,4 @@
-// Generated 201701251415
+// Generated 201702011419
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++

File diff suppressed because it is too large
+ 368 - 317
src/bin/dhcp6/dhcp6_lexer.cc


+ 1 - 1
src/bin/dhcp6/location.hh

@@ -1,4 +1,4 @@
-// Generated 201701251415
+// Generated 201702011419
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

+ 1 - 1
src/bin/dhcp6/position.hh

@@ -1,4 +1,4 @@
-// Generated 201701251415
+// Generated 201702011419
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

+ 1 - 1
src/bin/dhcp6/stack.hh

@@ -1,4 +1,4 @@
-// Generated 201701251415
+// Generated 201702011419
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++

File diff suppressed because it is too large
+ 237 - 185
src/lib/eval/lexer.cc


+ 1 - 1
src/lib/eval/location.hh

@@ -1,4 +1,4 @@
-// Generated 201611011345
+// Generated 201702011421
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

+ 1 - 1
src/lib/eval/position.hh

@@ -1,4 +1,4 @@
-// Generated 201611011345
+// Generated 201702011421
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

+ 1 - 1
src/lib/eval/stack.hh

@@ -1,4 +1,4 @@
-// Generated 201611011345
+// Generated 201702011421
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++