[5017] flex/bison files regenerated

src/bin/dhcp4/dhcp4_parser.h

@@ -352,89 +352,95 @@ namespace isc { namespace dhcp {
         TOKEN_DHCP4 = 265,
         TOKEN_INTERFACES_CONFIG = 266,
         TOKEN_INTERFACES = 267,
-        TOKEN_LEASE_DATABASE = 268,
-        TOKEN_HOSTS_DATABASE = 269,
-        TOKEN_TYPE = 270,
-        TOKEN_USER = 271,
-        TOKEN_PASSWORD = 272,
-        TOKEN_HOST = 273,
-        TOKEN_PERSIST = 274,
-        TOKEN_LFC_INTERVAL = 275,
-        TOKEN_READONLY = 276,
-        TOKEN_VALID_LIFETIME = 277,
-        TOKEN_RENEW_TIMER = 278,
-        TOKEN_REBIND_TIMER = 279,
-        TOKEN_DECLINE_PROBATION_PERIOD = 280,
-        TOKEN_SUBNET4 = 281,
-        TOKEN_SUBNET_4O6_INTERFACE = 282,
-        TOKEN_SUBNET_4O6_SUBNET = 283,
-        TOKEN_OPTION_DEF = 284,
-        TOKEN_OPTION_DATA = 285,
-        TOKEN_NAME = 286,
-        TOKEN_DATA = 287,
-        TOKEN_CODE = 288,
-        TOKEN_SPACE = 289,
-        TOKEN_CSV_FORMAT = 290,
-        TOKEN_RECORD_TYPES = 291,
-        TOKEN_ENCAPSULATE = 292,
-        TOKEN_ARRAY = 293,
-        TOKEN_POOLS = 294,
-        TOKEN_POOL = 295,
-        TOKEN_SUBNET = 296,
-        TOKEN_INTERFACE = 297,
-        TOKEN_INTERFACE_ID = 298,
-        TOKEN_ID = 299,
-        TOKEN_RAPID_COMMIT = 300,
-        TOKEN_RESERVATION_MODE = 301,
-        TOKEN_HOST_RESERVATION_IDENTIFIERS = 302,
-        TOKEN_CLIENT_CLASSES = 303,
-        TOKEN_TEST = 304,
-        TOKEN_CLIENT_CLASS = 305,
-        TOKEN_RESERVATIONS = 306,
-        TOKEN_DUID = 307,
-        TOKEN_HW_ADDRESS = 308,
-        TOKEN_CIRCUIT_ID = 309,
-        TOKEN_CLIENT_ID = 310,
-        TOKEN_HOSTNAME = 311,
-        TOKEN_RELAY = 312,
-        TOKEN_IP_ADDRESS = 313,
-        TOKEN_HOOKS_LIBRARIES = 314,
-        TOKEN_LIBRARY = 315,
-        TOKEN_PARAMETERS = 316,
-        TOKEN_EXPIRED_LEASES_PROCESSING = 317,
-        TOKEN_SERVER_ID = 318,
-        TOKEN_IDENTIFIER = 319,
-        TOKEN_HTYPE = 320,
-        TOKEN_TIME = 321,
-        TOKEN_ENTERPRISE_ID = 322,
-        TOKEN_DHCP4O6_PORT = 323,
-        TOKEN_VERSION = 324,
-        TOKEN_CONTROL_SOCKET = 325,
-        TOKEN_SOCKET_TYPE = 326,
-        TOKEN_SOCKET_NAME = 327,
-        TOKEN_DHCP_DDNS = 328,
-        TOKEN_LOGGING = 329,
-        TOKEN_LOGGERS = 330,
-        TOKEN_OUTPUT_OPTIONS = 331,
-        TOKEN_OUTPUT = 332,
-        TOKEN_DEBUGLEVEL = 333,
-        TOKEN_SEVERITY = 334,
-        TOKEN_DHCP6 = 335,
-        TOKEN_DHCPDDNS = 336,
-        TOKEN_TOPLEVEL_JSON = 337,
-        TOKEN_TOPLEVEL_DHCP4 = 338,
-        TOKEN_SUB_DHCP4 = 339,
-        TOKEN_SUB_INTERFACES4 = 340,
-        TOKEN_SUB_SUBNET4 = 341,
-        TOKEN_SUB_POOL4 = 342,
-        TOKEN_SUB_RESERVATION = 343,
-        TOKEN_SUB_OPTION_DEF = 344,
-        TOKEN_SUB_OPTION_DATA = 345,
-        TOKEN_SUB_HOOKS_LIBRARY = 346,
-        TOKEN_STRING = 347,
-        TOKEN_INTEGER = 348,
-        TOKEN_FLOAT = 349,
-        TOKEN_BOOLEAN = 350
+        TOKEN_ECHO_CLIENT_ID = 268,
+        TOKEN_MATCH_CLIENT_ID = 269,
+        TOKEN_NEXT_SERVER = 270,
+        TOKEN_SERVER_HOSTNAME = 271,
+        TOKEN_BOOT_FILE_NAME = 272,
+        TOKEN_LEASE_DATABASE = 273,
+        TOKEN_HOSTS_DATABASE = 274,
+        TOKEN_TYPE = 275,
+        TOKEN_USER = 276,
+        TOKEN_PASSWORD = 277,
+        TOKEN_HOST = 278,
+        TOKEN_PERSIST = 279,
+        TOKEN_LFC_INTERVAL = 280,
+        TOKEN_READONLY = 281,
+        TOKEN_VALID_LIFETIME = 282,
+        TOKEN_RENEW_TIMER = 283,
+        TOKEN_REBIND_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_DATA = 291,
+        TOKEN_NAME = 292,
+        TOKEN_DATA = 293,
+        TOKEN_CODE = 294,
+        TOKEN_SPACE = 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_RESERVATION_MODE = 307,
+        TOKEN_HOST_RESERVATION_IDENTIFIERS = 308,
+        TOKEN_CLIENT_CLASSES = 309,
+        TOKEN_TEST = 310,
+        TOKEN_CLIENT_CLASS = 311,
+        TOKEN_RESERVATIONS = 312,
+        TOKEN_DUID = 313,
+        TOKEN_HW_ADDRESS = 314,
+        TOKEN_CIRCUIT_ID = 315,
+        TOKEN_CLIENT_ID = 316,
+        TOKEN_HOSTNAME = 317,
+        TOKEN_RELAY = 318,
+        TOKEN_IP_ADDRESS = 319,
+        TOKEN_HOOKS_LIBRARIES = 320,
+        TOKEN_LIBRARY = 321,
+        TOKEN_PARAMETERS = 322,
+        TOKEN_EXPIRED_LEASES_PROCESSING = 323,
+        TOKEN_SERVER_ID = 324,
+        TOKEN_IDENTIFIER = 325,
+        TOKEN_HTYPE = 326,
+        TOKEN_TIME = 327,
+        TOKEN_ENTERPRISE_ID = 328,
+        TOKEN_DHCP4O6_PORT = 329,
+        TOKEN_VERSION = 330,
+        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_DHCP6 = 341,
+        TOKEN_DHCPDDNS = 342,
+        TOKEN_TOPLEVEL_JSON = 343,
+        TOKEN_TOPLEVEL_DHCP4 = 344,
+        TOKEN_SUB_DHCP4 = 345,
+        TOKEN_SUB_INTERFACES4 = 346,
+        TOKEN_SUB_SUBNET4 = 347,
+        TOKEN_SUB_POOL4 = 348,
+        TOKEN_SUB_RESERVATION = 349,
+        TOKEN_SUB_OPTION_DEF = 350,
+        TOKEN_SUB_OPTION_DATA = 351,
+        TOKEN_SUB_HOOKS_LIBRARY = 352,
+        TOKEN_STRING = 353,
+        TOKEN_INTEGER = 354,
+        TOKEN_FLOAT = 355,
+        TOKEN_BOOLEAN = 356
       };
     };
 
@@ -595,6 +601,26 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_ECHO_CLIENT_ID (const location_type& l);
+
+    static inline
+    symbol_type
+    make_MATCH_CLIENT_ID (const location_type& l);
+
+    static inline
+    symbol_type
+    make_NEXT_SERVER (const location_type& l);
+
+    static inline
+    symbol_type
+    make_SERVER_HOSTNAME (const location_type& l);
+
+    static inline
+    symbol_type
+    make_BOOT_FILE_NAME (const location_type& l);
+
+    static inline
+    symbol_type
     make_LEASE_DATABASE (const location_type& l);
 
     static inline
@@ -655,6 +681,10 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_SUBNET_4O6_INTERFACE_ID (const location_type& l);
+
+    static inline
+    symbol_type
     make_SUBNET_4O6_SUBNET (const location_type& l);
 
     static inline
@@ -1130,12 +1160,12 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 589,     ///< Last index in yytable_.
-      yynnts_ = 256,  ///< Number of nonterminal symbols.
+      yylast_ = 623,     ///< Last index in yytable_.
+      yynnts_ = 266,  ///< Number of nonterminal symbols.
       yyfinal_ = 22, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = 96  ///< Number of tokens.
+      yyntokens_ = 102  ///< Number of tokens.
     };
 
 
@@ -1187,9 +1217,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
+      95,    96,    97,    98,    99,   100,   101
     };
-    const unsigned int user_token_number_max_ = 350;
+    const unsigned int user_token_number_max_ = 356;
     const token_number_type undef_token_ = 2;
 
     if (static_cast<int>(t) <= yyeof_)
@@ -1222,24 +1252,24 @@ namespace isc { namespace dhcp {
   {
       switch (other.type_get ())
     {
-      case 108: // value
-      case 315: // version_value
+      case 114: // value
+      case 331: // version_value
         value.copy< ElementPtr > (other.value);
         break;
 
-      case 95: // "boolean"
+      case 101: // "boolean"
         value.copy< bool > (other.value);
         break;
 
-      case 94: // "floating point"
+      case 100: // "floating point"
         value.copy< double > (other.value);
         break;
 
-      case 93: // "integer"
+      case 99: // "integer"
         value.copy< int64_t > (other.value);
         break;
 
-      case 92: // "constant string"
+      case 98: // "constant string"
         value.copy< std::string > (other.value);
         break;
 
@@ -1260,24 +1290,24 @@ namespace isc { namespace dhcp {
     (void) v;
       switch (this->type_get ())
     {
-      case 108: // value
-      case 315: // version_value
+      case 114: // value
+      case 331: // version_value
         value.copy< ElementPtr > (v);
         break;
 
-      case 95: // "boolean"
+      case 101: // "boolean"
         value.copy< bool > (v);
         break;
 
-      case 94: // "floating point"
+      case 100: // "floating point"
         value.copy< double > (v);
         break;
 
-      case 93: // "integer"
+      case 99: // "integer"
         value.copy< int64_t > (v);
         break;
 
-      case 92: // "constant string"
+      case 98: // "constant string"
         value.copy< std::string > (v);
         break;
 
@@ -1357,24 +1387,24 @@ namespace isc { namespace dhcp {
     // Type destructor.
     switch (yytype)
     {
-      case 108: // value
-      case 315: // version_value
+      case 114: // value
+      case 331: // version_value
         value.template destroy< ElementPtr > ();
         break;
 
-      case 95: // "boolean"
+      case 101: // "boolean"
         value.template destroy< bool > ();
         break;
 
-      case 94: // "floating point"
+      case 100: // "floating point"
         value.template destroy< double > ();
         break;
 
-      case 93: // "integer"
+      case 99: // "integer"
         value.template destroy< int64_t > ();
         break;
 
-      case 92: // "constant string"
+      case 98: // "constant string"
         value.template destroy< std::string > ();
         break;
 
@@ -1401,24 +1431,24 @@ namespace isc { namespace dhcp {
     super_type::move(s);
       switch (this->type_get ())
     {
-      case 108: // value
-      case 315: // version_value
+      case 114: // value
+      case 331: // version_value
         value.move< ElementPtr > (s.value);
         break;
 
-      case 95: // "boolean"
+      case 101: // "boolean"
         value.move< bool > (s.value);
         break;
 
-      case 94: // "floating point"
+      case 100: // "floating point"
         value.move< double > (s.value);
         break;
 
-      case 93: // "integer"
+      case 99: // "integer"
         value.move< int64_t > (s.value);
         break;
 
-      case 92: // "constant string"
+      case 98: // "constant string"
         value.move< std::string > (s.value);
         break;
 
@@ -1486,7 +1516,8 @@ namespace isc { namespace dhcp {
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
      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
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356
     };
     return static_cast<token_type> (yytoken_number_[type]);
   }
@@ -1558,6 +1589,36 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_ECHO_CLIENT_ID (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_ECHO_CLIENT_ID, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_MATCH_CLIENT_ID (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MATCH_CLIENT_ID, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_NEXT_SERVER (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_NEXT_SERVER, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_SERVER_HOSTNAME (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_SERVER_HOSTNAME, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_BOOT_FILE_NAME (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_BOOT_FILE_NAME, l);
+  }
+
+  Dhcp4Parser::symbol_type
   Dhcp4Parser::make_LEASE_DATABASE (const location_type& l)
   {
     return symbol_type (token::TOKEN_LEASE_DATABASE, l);
@@ -1648,6 +1709,12 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_SUBNET_4O6_INTERFACE_ID (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_SUBNET_4O6_INTERFACE_ID, l);
+  }
+
+  Dhcp4Parser::symbol_type
   Dhcp4Parser::make_SUBNET_4O6_SUBNET (const location_type& l)
   {
     return symbol_type (token::TOKEN_SUBNET_4O6_SUBNET, l);
@@ -2058,7 +2125,7 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp4_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2062 "dhcp4_parser.h" // lalr1.cc:377
+#line 2129 "dhcp4_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp6/dhcp6_lexer.cc

@@ -36,7 +36,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 1
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -136,13 +136,25 @@ typedef unsigned int flex_uint32_t;
 /* %if-c++-only */
 /* %endif */
 
-/* TODO: this is always defined, so inline it */
-#define yyconst const
+#ifdef __cplusplus
 
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define yynoreturn __attribute__((__noreturn__))
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
 #else
-#define yynoreturn
+#define yyconst
 #endif
 
 /* %not-for-header */
@@ -217,7 +229,7 @@ typedef size_t yy_size_t;
 #endif
 
 /* %if-not-reentrant */
-extern int parser6_leng;
+extern yy_size_t parser6_leng;
 /* %endif */
 
 /* %if-c-only */
@@ -266,7 +278,7 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	int yy_buf_size;
+	yy_size_t yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
@@ -327,7 +339,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 /* %endif */
 /* %ok-for-header */
 
@@ -356,10 +368,10 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 /* yy_hold_char holds the character lost when parser6_text is formed. */
 static char yy_hold_char;
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int parser6_leng;
+yy_size_t parser6_leng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = NULL;
+static char *yy_c_buf_p = (char *) 0;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
@@ -387,7 +399,7 @@ static void parser6__init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE parser6__scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE parser6__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE parser6__scan_bytes (yyconst char *bytes,int len  );
+YY_BUFFER_STATE parser6__scan_bytes (yyconst char *bytes,yy_size_t len  );
 
 /* %endif */
 
@@ -429,7 +441,7 @@ void parser6_free (void *  );
 
 typedef unsigned char YY_CHAR;
 
-FILE *parser6_in = NULL, *parser6_out = NULL;
+FILE *parser6_in = (FILE *) 0, *parser6_out = (FILE *) 0;
 
 typedef int yy_state_type;
 
@@ -450,7 +462,10 @@ extern char *parser6_text;
 static yy_state_type yy_get_previous_state (void );
 static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
 static int yy_get_next_buffer (void );
-static void yynoreturn yy_fatal_error (yyconst char* msg  );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* %endif */
 
@@ -460,7 +475,7 @@ static void yynoreturn yy_fatal_error (yyconst char* msg  );
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
 /* %% [2.0] code to fiddle parser6_text and parser6_leng for yymore() goes here \ */\
-	parser6_leng = (int) (yy_cp - yy_bp); \
+	parser6_leng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 /* %% [3.0] code to copy yytext_ptr to parser6_text[] goes here, if %array \ */\
@@ -1056,7 +1071,7 @@ static yyconst flex_int16_t yy_rule_linenum[106] =
 #define YY_RESTORE_YY_MORE_OFFSET
 char *parser6_text;
 #line 1 "dhcp6_lexer.ll"
-/* Copyright (C) 2015-2016 Internet Systems Consortium, Inc. ("ISC")
+/* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
 
    This Source Code Form is subject to the terms of the Mozilla Public
    License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1115,7 +1130,7 @@ unsigned int comment_start_line = 0;
 // by moving it ahead by parser6_leng bytes. parser6_leng specifies the length of the
 // currently matched token.
 #define YY_USER_ACTION  driver.loc_.columns(parser6_leng);
-#line 1119 "dhcp6_lexer.cc"
+#line 1134 "dhcp6_lexer.cc"
 
 #define INITIAL 0
 #define COMMENT 1
@@ -1171,7 +1186,7 @@ FILE *parser6_get_out (void );
 
 void parser6_set_out  (FILE * _out_str  );
 
-			int parser6_get_leng (void );
+yy_size_t parser6_get_leng (void );
 
 char *parser6_get_text (void );
 
@@ -1245,7 +1260,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( parser6_text, (size_t) parser6_leng, 1, parser6_out )) {} } while (0)
+#define ECHO do { if (fwrite( parser6_text, parser6_leng, 1, parser6_out )) {} } while (0)
 /* %endif */
 /* %if-c++-only C++ definition */
 /* %endif */
@@ -1273,7 +1288,7 @@ static int input (void );
 	else \
 		{ \
 		errno=0; \
-		while ( (result = (int) fread(buf, 1, max_size, parser6_in))==0 && ferror(parser6_in)) \
+		while ( (result = fread(buf, 1, max_size, parser6_in))==0 && ferror(parser6_in)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1441,7 +1456,7 @@ YY_DECL
     }
 
 
-#line 1445 "dhcp6_lexer.cc"
+#line 1460 "dhcp6_lexer.cc"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1473,7 +1488,7 @@ yy_match:
 				if ( yy_current_state >= 759 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
 		while ( yy_current_state != 758 );
@@ -2641,7 +2656,7 @@ YY_RULE_SETUP
             }
             break;
         default:
-            if ((c > 0) && (c < 0x20)) {
+            if ((c >= 0) && (c < 0x20)) {
                 // impossible condition
                 driver.error(driver.loc_, "Invalid control in \"" + raw + "\"");
             }
@@ -2795,7 +2810,7 @@ YY_RULE_SETUP
 #line 1069 "dhcp6_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 2799 "dhcp6_lexer.cc"
+#line 2814 "dhcp6_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2998,7 +3013,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -3012,7 +3027,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -3025,7 +3040,7 @@ static int yy_get_next_buffer (void)
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = NULL;
+				b->yy_ch_buf = 0;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -3115,7 +3130,7 @@ static int yy_get_next_buffer (void)
 			if ( yy_current_state >= 759 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 		}
 
 	return yy_current_state;
@@ -3148,7 +3163,7 @@ static int yy_get_next_buffer (void)
 		if ( yy_current_state >= 759 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 758);
 
 		return yy_is_jam ? 0 : yy_current_state;
@@ -3188,7 +3203,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -3212,7 +3227,7 @@ static int yy_get_next_buffer (void)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( parser6_wrap( ) )
-						return 0;
+						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -3528,7 +3543,7 @@ static void parser6_ensure_buffer_stack (void)
 /* %if-c++-only */
 /* %endif */
 {
-	int num_to_alloc;
+	yy_size_t num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -3536,7 +3551,7 @@ static void parser6_ensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+		num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
 		(yy_buffer_stack) = (struct yy_buffer_state**)parser6_alloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
@@ -3585,7 +3600,7 @@ YY_BUFFER_STATE parser6__scan_buffer  (char * base, yy_size_t  size )
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
-		return NULL;
+		return 0;
 
 	b = (YY_BUFFER_STATE) parser6_alloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
@@ -3594,7 +3609,7 @@ YY_BUFFER_STATE parser6__scan_buffer  (char * base, yy_size_t  size )
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = NULL;
+	b->yy_input_file = 0;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
@@ -3619,7 +3634,7 @@ YY_BUFFER_STATE parser6__scan_buffer  (char * base, yy_size_t  size )
 YY_BUFFER_STATE parser6__scan_string (yyconst char * yystr )
 {
     
-	return parser6__scan_bytes(yystr,(int) strlen(yystr) );
+	return parser6__scan_bytes(yystr,strlen(yystr) );
 }
 /* %endif */
 
@@ -3631,7 +3646,7 @@ YY_BUFFER_STATE parser6__scan_string (yyconst char * yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE parser6__scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+YY_BUFFER_STATE parser6__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
@@ -3639,7 +3654,7 @@ YY_BUFFER_STATE parser6__scan_bytes  (yyconst char * yybytes, int  _yybytes_len
 	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = (yy_size_t) _yybytes_len + 2;
+	n = _yybytes_len + 2;
 	buf = (char *) parser6_alloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in parser6__scan_bytes()" );
@@ -3667,7 +3682,7 @@ YY_BUFFER_STATE parser6__scan_bytes  (yyconst char * yybytes, int  _yybytes_len
 #endif
 
 /* %if-c-only */
-static void yynoreturn yy_fatal_error (yyconst char* msg )
+static void yy_fatal_error (yyconst char* msg )
 {
 			(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
@@ -3727,7 +3742,7 @@ FILE *parser6_get_out  (void)
 /** Get the length of the current token.
  * 
  */
-int parser6_get_leng  (void)
+yy_size_t parser6_get_leng  (void)
 {
         return parser6_leng;
 }
@@ -3794,10 +3809,10 @@ static int yy_init_globals (void)
      * This function is called from parser6_lex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = NULL;
+    (yy_buffer_stack) = 0;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = NULL;
+    (yy_c_buf_p) = (char *) 0;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -3806,8 +3821,8 @@ static int yy_init_globals (void)
     parser6_in = stdin;
     parser6_out = stdout;
 #else
-    parser6_in = NULL;
-    parser6_out = NULL;
+    parser6_in = (FILE *) 0;
+    parser6_out = (FILE *) 0;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
@@ -3870,7 +3885,7 @@ static int yy_flex_strlen (yyconst char * s )
 
 void *parser6_alloc (yy_size_t  size )
 {
-			return malloc(size);
+			return (void *) malloc( size );
 }
 
 void *parser6_realloc  (void * ptr, yy_size_t  size )
@@ -3883,7 +3898,7 @@ void *parser6_realloc  (void * ptr, yy_size_t  size )
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return realloc(ptr, size);
+	return (void *) realloc( (char *) ptr, size );
 }
 
 void parser6_free (void * ptr )

src/bin/dhcp6/location.hh

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

src/bin/dhcp6/position.hh

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

src/bin/dhcp6/stack.hh

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