From: Francis Dupont Date: Fri, 24 Nov 2017 08:34:02 +0000 (+0000) Subject: [trac5374] regen flex/bison X-Git-Tag: trac5458a_base~14^2~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eac1e80838cff7fc6f5967056e3178c669e7e786;p=thirdparty%2Fkea.git [trac5374] regen flex/bison --- diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc index 52e6438dba..d5e871c95a 100644 --- a/src/lib/eval/lexer.cc +++ b/src/lib/eval/lexer.cc @@ -710,8 +710,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ (yy_c_buf_p) = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 52 -#define YY_END_OF_BUFFER 53 +#define YY_NUM_RULES 53 +#define YY_END_OF_BUFFER 54 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -719,42 +719,42 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_acclist[285] = +static const flex_int16_t yy_acclist[291] = { 0, - 53, 51, 52, 1, 51, 52, 2, 52, 51, 52, - 45, 51, 52, 46, 51, 52, 50, 51, 52, 49, - 51, 52, 51, 52, 44, 51, 52, 5, 51, 52, - 5, 51, 52, 51, 52, 51, 52, 51, 52,16390, - 51, 52,16390, 47, 51, 52, 48, 51, 52, 51, - 52,16390, 51, 52,16390, 51, 52,16390, 51, 52, - 16390, 51, 52,16390, 51, 52,16390, 51, 52,16390, - 51, 52,16390, 51, 52,16390, 51, 52,16390, 51, - 52,16390, 51, 52,16390, 51, 52,16390, 51, 52, - 16390, 51, 52,16390, 51, 52,16390, 51, 52,16390, + 54, 52, 53, 1, 52, 53, 2, 53, 52, 53, + 46, 52, 53, 47, 52, 53, 51, 52, 53, 50, + 52, 53, 52, 53, 45, 52, 53, 5, 52, 53, + 5, 52, 53, 52, 53, 52, 53, 52, 53,16390, + 52, 53,16390, 48, 52, 53, 49, 52, 53, 52, + 53,16390, 52, 53,16390, 52, 53,16390, 52, 53, + 16390, 52, 53,16390, 52, 53,16390, 52, 53,16390, + 52, 53,16390, 52, 53,16390, 52, 53,16390, 52, + 53,16390, 52, 53,16390, 52, 53,16390, 52, 53, + 16390, 52, 53,16390, 52, 53,16390, 52, 53,16390, 1, 2, 3, 5, 5, 7, 8,16390,16390, 8198, 16390,16390,16390,16390,16390,16390,16390,16390,16390,16390, - 16390,16390,16390,16390,16390,16390,16390,16390,16390, 43, 16390,16390,16390,16390,16390,16390,16390,16390,16390,16390, - 16390, 4, 7, 38,16390, 42,16390,16390,16390,16390, - 20,16390,16390,16390,16390, 15,16390,16390,16390,16390, - 16390, 21,16390,16390, 23,16390,16390, 41,16390,16390, - 16390, 17,16390,16390,16390, 19,16390,16390,16390,16390, - 16390,16390,16390,16390, 35,16390,16390,16390,16390, 24, - 16390,16390,16390,16390,16390,16390,16390,16390, 22,16390, - - 30,16390,16390,16390,16390, 14,16390,16390,16390,16390, - 16390,16390,16390,16390,16390, 25,16390, 18,16390,16390, - 16390,16390,16390,16390,16390,16390,16390,16390,16390,16390, - 26,16390, 39,16390,16390, 16,16390, 27,16390, 40, - 16390,16390,16390, 9,16390,16390, 10,16390, 11,16390, - 29,16390,16390,16390, 33,16390, 28,16390, 7,16390, - 16390, 31,16390,16390,16390, 32,16390,16390, 13,16390, - 12,16390,16390,16390,16390, 37,16390,16390, 36,16390, - 16390,16390, 34,16390 + 43,16390,16390,16390,16390,16390,16390,16390,16390,16390, + 16390,16390, 4, 7, 38,16390, 42,16390,16390,16390, + 16390, 20,16390,16390,16390,16390, 15,16390,16390,16390, + 16390,16390, 21,16390,16390, 23,16390,16390,16390, 41, + 16390,16390,16390, 17,16390,16390,16390, 19,16390,16390, + 16390,16390,16390,16390,16390,16390, 35,16390,16390,16390, + 16390, 24,16390,16390,16390,16390,16390,16390,16390,16390, + + 16390, 22,16390, 30,16390,16390,16390,16390, 14,16390, + 16390,16390,16390,16390,16390,16390,16390,16390, 25,16390, + 18,16390,16390,16390,16390,16390,16390,16390,16390,16390, + 16390,16390,16390,16390, 26,16390, 39,16390,16390, 16, + 16390, 27,16390, 40,16390,16390, 44,16390,16390, 9, + 16390,16390, 10,16390, 11,16390, 29,16390,16390,16390, + 33,16390, 28,16390, 7,16390,16390, 31,16390,16390, + 16390, 32,16390,16390, 13,16390, 12,16390,16390,16390, + 16390, 37,16390,16390, 36,16390,16390,16390, 34,16390 } ; -static const flex_int16_t yy_accept[203] = +static const flex_int16_t yy_accept[208] = { 0, 1, 1, 1, 2, 4, 7, 9, 11, 14, 17, 20, 23, 25, 28, 31, 34, 36, 38, 41, 44, @@ -763,22 +763,22 @@ static const flex_int16_t yy_accept[203] = 103, 103, 104, 105, 105, 106, 106, 106, 106, 106, 107, 108, 108, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 132, 133, 134, 135, - 136, 137, 138, 139, 140, 141, 142, 142, 143, 144, - 146, 148, 149, 150, 151, 153, 154, 155, 156, 158, - - 159, 160, 161, 162, 164, 165, 167, 168, 170, 171, - 172, 174, 175, 176, 178, 179, 180, 181, 182, 183, - 183, 184, 185, 187, 188, 189, 190, 192, 193, 194, - 195, 196, 197, 198, 199, 201, 203, 204, 205, 206, - 208, 209, 210, 211, 211, 212, 213, 214, 215, 216, - 218, 220, 221, 222, 223, 224, 225, 226, 227, 228, - 229, 230, 231, 231, 233, 235, 236, 238, 240, 242, - 243, 244, 246, 247, 249, 251, 253, 254, 255, 257, - 259, 260, 261, 262, 264, 265, 266, 268, 268, 269, - 271, 273, 274, 275, 276, 278, 279, 281, 282, 283, - - 285, 285 + 125, 126, 127, 128, 129, 130, 131, 133, 134, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 143, 144, + 145, 147, 149, 150, 151, 152, 154, 155, 156, 157, + + 159, 160, 161, 162, 163, 165, 166, 168, 169, 170, + 172, 173, 174, 176, 177, 178, 180, 181, 182, 183, + 184, 185, 185, 186, 187, 189, 190, 191, 192, 194, + 195, 196, 197, 198, 199, 200, 201, 202, 204, 206, + 207, 208, 209, 211, 212, 213, 214, 214, 215, 216, + 217, 218, 219, 221, 223, 224, 225, 226, 227, 228, + 229, 230, 231, 232, 233, 234, 235, 235, 237, 239, + 240, 242, 244, 246, 247, 249, 250, 252, 253, 255, + 257, 259, 260, 261, 263, 265, 266, 267, 268, 270, + 271, 272, 274, 274, 275, 277, 279, 280, 281, 282, + + 284, 285, 287, 288, 289, 291, 291 } ; static const YY_CHAR yy_ec[256] = @@ -822,104 +822,107 @@ static const YY_CHAR yy_meta[45] = 1, 1, 1, 1 } ; -static const flex_int16_t yy_base[207] = +static const flex_int16_t yy_base[212] = { 0, - 0, 0, 314, 315, 311, 309, 307, 315, 315, 315, - 315, 34, 315, 39, 36, 295, 293, 81, 115, 315, - 315, 24, 37, 37, 26, 277, 45, 279, 43, 48, - 270, 43, 59, 278, 106, 50, 277, 272, 300, 298, - 296, 315, 122, 137, 112, 284, 283, 0, 282, 0, - 315, 143, 150, 0, 0, 315, 263, 269, 271, 258, - 252, 251, 250, 258, 265, 244, 259, 241, 74, 249, - 248, 257, 252, 240, 239, 0, 251, 237, 243, 252, - 249, 249, 229, 248, 235, 246, 146, 0, 0, 0, - 0, 242, 242, 243, 0, 238, 225, 237, 0, 227, - - 224, 235, 226, 0, 226, 0, 217, 0, 225, 217, - 148, 231, 227, 0, 213, 211, 215, 223, 222, 154, - 221, 223, 0, 207, 204, 217, 0, 215, 214, 201, - 216, 194, 201, 213, 0, 0, 191, 208, 193, 0, - 193, 195, 204, 162, 191, 188, 190, 187, 187, 0, - 0, 197, 197, 185, 186, 184, 156, 169, 168, 174, - 165, 164, 166, 0, 0, 163, 0, 0, 0, 174, - 172, 0, 172, 0, 0, 0, 166, 170, 186, 0, - 170, 163, 155, 0, 154, 156, 0, 183, 151, 0, - 0, 160, 155, 160, 0, 140, 0, 115, 50, 0, - - 315, 208, 210, 212, 71, 215 + 0, 0, 319, 320, 316, 314, 312, 320, 320, 320, + 320, 34, 320, 39, 36, 300, 298, 81, 115, 320, + 320, 24, 37, 37, 26, 282, 45, 284, 43, 48, + 275, 43, 59, 283, 106, 50, 282, 277, 305, 303, + 301, 320, 122, 137, 112, 289, 288, 0, 287, 0, + 320, 143, 150, 0, 0, 320, 268, 274, 276, 263, + 257, 256, 255, 263, 270, 249, 264, 246, 74, 254, + 253, 262, 252, 256, 244, 243, 0, 255, 241, 247, + 256, 253, 253, 233, 252, 239, 250, 146, 0, 0, + 0, 0, 246, 246, 247, 0, 242, 229, 241, 0, + + 231, 228, 239, 230, 0, 230, 0, 237, 220, 0, + 228, 220, 148, 234, 230, 0, 216, 214, 218, 226, + 225, 154, 224, 226, 0, 210, 207, 220, 0, 218, + 217, 204, 219, 214, 196, 203, 215, 0, 0, 193, + 210, 195, 0, 195, 197, 206, 162, 193, 190, 192, + 189, 189, 0, 0, 199, 199, 186, 186, 187, 195, + 156, 172, 169, 175, 167, 165, 166, 0, 0, 164, + 0, 0, 0, 175, 0, 173, 0, 173, 0, 0, + 0, 167, 171, 187, 0, 170, 164, 156, 0, 155, + 157, 0, 183, 152, 0, 0, 161, 156, 161, 0, + + 164, 0, 124, 115, 0, 320, 208, 210, 212, 85, + 215 } ; -static const flex_int16_t yy_def[207] = +static const flex_int16_t yy_def[212] = { 0, - 201, 1, 201, 201, 201, 201, 202, 201, 201, 201, - 201, 201, 201, 201, 14, 203, 201, 201, 18, 201, - 201, 18, 18, 18, 18, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 201, 201, - 202, 201, 201, 201, 14, 203, 204, 205, 203, 206, - 201, 201, 19, 18, 19, 201, 19, 19, 19, 19, + 206, 1, 206, 206, 206, 206, 207, 206, 206, 206, + 206, 206, 206, 206, 14, 208, 206, 206, 18, 206, + 206, 18, 18, 18, 18, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 206, 206, + 207, 206, 206, 206, 14, 208, 209, 210, 208, 211, + 206, 206, 19, 18, 19, 206, 19, 19, 19, 19, 18, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 201, 205, 206, 19, + 19, 19, 19, 19, 19, 19, 19, 206, 210, 211, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 201, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 206, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 201, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 206, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 201, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 206, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 201, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 206, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 0, 201, 201, 201, 201, 201 + 19, 19, 19, 19, 19, 0, 206, 206, 206, 206, + 206 } ; -static const flex_int16_t yy_nxt[360] = +static const flex_int16_t yy_nxt[365] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15, 16, 17, 18, 19, 19, 20, 21, 4, 22, 18, 23, 24, 25, 18, 26, 27, 28, 19, 29, 30, 31, 32, 33, 34, 35, 36, 19, 37, 19, 38, 43, 43, 43, 43, 44, 45, - 45, 45, 45, 46, 201, 47, 57, 48, 58, 61, + 45, 45, 45, 46, 206, 47, 57, 48, 58, 61, 63, 47, 47, 47, 47, 47, 47, 59, 64, 70, - 72, 66, 60, 71, 88, 62, 83, 67, 201, 75, - 76, 48, 52, 52, 68, 77, 73, 84, 200, 53, - 78, 54, 54, 54, 54, 46, 102, 54, 55, 55, + 72, 66, 60, 71, 73, 62, 84, 67, 206, 76, + 77, 48, 52, 52, 68, 78, 74, 85, 89, 53, + 79, 54, 54, 54, 54, 46, 103, 54, 55, 55, - 103, 56, 53, 54, 54, 54, 54, 54, 54, 55, + 104, 56, 53, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 201, - 201, 55, 43, 43, 43, 43, 80, 55, 55, 55, - 55, 55, 55, 81, 52, 52, 82, 87, 87, 87, - 87, 201, 201, 199, 201, 120, 87, 87, 87, 87, - 135, 136, 198, 56, 144, 144, 144, 144, 174, 175, - 201, 163, 144, 144, 144, 144, 181, 181, 181, 181, - 181, 181, 181, 181, 201, 201, 197, 196, 195, 194, - 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, - - 182, 180, 179, 201, 178, 177, 176, 193, 41, 173, - 41, 41, 41, 49, 49, 47, 47, 89, 89, 89, - 172, 171, 170, 169, 168, 167, 166, 165, 164, 162, - 161, 160, 159, 158, 157, 156, 155, 154, 153, 152, - 151, 150, 149, 148, 147, 146, 145, 143, 142, 141, - 140, 139, 138, 137, 134, 133, 132, 131, 130, 129, - 128, 127, 126, 125, 124, 123, 122, 121, 119, 118, - 117, 116, 115, 114, 113, 112, 111, 110, 109, 108, - 107, 106, 105, 104, 101, 100, 99, 98, 97, 96, - 95, 94, 93, 92, 91, 90, 50, 46, 50, 42, - - 40, 39, 86, 85, 79, 74, 69, 65, 51, 50, - 42, 40, 39, 201, 3, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201 + 55, 55, 55, 55, 55, 55, 55, 55, 55, 206, + 206, 55, 43, 43, 43, 43, 81, 55, 55, 55, + 55, 55, 55, 82, 52, 52, 83, 88, 88, 88, + 88, 206, 206, 205, 206, 122, 88, 88, 88, 88, + 138, 139, 204, 56, 147, 147, 147, 147, 179, 180, + 206, 167, 147, 147, 147, 147, 186, 186, 186, 186, + 186, 186, 186, 186, 206, 206, 203, 202, 201, 200, + 199, 197, 196, 195, 194, 193, 192, 191, 190, 189, + + 188, 187, 185, 206, 184, 183, 182, 198, 41, 181, + 41, 41, 41, 49, 49, 47, 47, 90, 90, 90, + 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, + 168, 166, 165, 164, 163, 162, 161, 160, 159, 158, + 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, + 146, 145, 144, 143, 142, 141, 140, 137, 136, 135, + 134, 133, 132, 131, 130, 129, 128, 127, 126, 125, + 124, 123, 121, 120, 119, 118, 117, 116, 115, 114, + 113, 112, 111, 110, 109, 108, 107, 106, 105, 102, + 101, 100, 99, 98, 97, 96, 95, 94, 93, 92, + + 91, 50, 46, 50, 42, 40, 39, 87, 86, 80, + 75, 69, 65, 51, 50, 42, 40, 39, 206, 3, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206 } ; -static const flex_int16_t yy_chk[360] = +static const flex_int16_t yy_chk[365] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -928,8 +931,8 @@ static const flex_int16_t yy_chk[360] = 1, 1, 1, 1, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 15, 14, 22, 14, 22, 24, 25, 14, 14, 14, 14, 14, 14, 23, 25, 29, - 30, 27, 23, 29, 205, 24, 36, 27, 15, 32, - 32, 14, 18, 18, 27, 33, 30, 36, 199, 18, + 30, 27, 23, 29, 30, 24, 36, 27, 15, 32, + 32, 14, 18, 18, 27, 33, 30, 36, 210, 18, 33, 18, 18, 18, 18, 18, 69, 18, 18, 18, 69, 18, 18, 18, 18, 18, 18, 18, 18, 18, @@ -937,49 +940,50 @@ static const flex_int16_t yy_chk[360] = 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 45, 19, 43, 43, 43, 43, 35, 19, 19, 19, 19, 19, 19, 35, 52, 52, 35, 44, 44, 44, - 44, 53, 53, 198, 45, 87, 87, 87, 87, 87, - 111, 111, 196, 52, 120, 120, 120, 120, 157, 157, - 53, 144, 144, 144, 144, 144, 163, 163, 163, 163, - 181, 181, 181, 181, 188, 188, 194, 193, 192, 189, - 186, 185, 183, 182, 179, 178, 177, 173, 171, 170, - - 166, 162, 161, 188, 160, 159, 158, 188, 202, 156, - 202, 202, 202, 203, 203, 204, 204, 206, 206, 206, - 155, 154, 153, 152, 149, 148, 147, 146, 145, 143, - 142, 141, 139, 138, 137, 134, 133, 132, 131, 130, - 129, 128, 126, 125, 124, 122, 121, 119, 118, 117, - 116, 115, 113, 112, 110, 109, 107, 105, 103, 102, - 101, 100, 98, 97, 96, 94, 93, 92, 86, 85, - 84, 83, 82, 81, 80, 79, 78, 77, 75, 74, - 73, 72, 71, 70, 68, 67, 66, 65, 64, 63, - 62, 61, 60, 59, 58, 57, 49, 47, 46, 41, - - 40, 39, 38, 37, 34, 31, 28, 26, 17, 16, - 7, 6, 5, 3, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201 + 44, 53, 53, 204, 45, 88, 88, 88, 88, 88, + 113, 113, 203, 52, 122, 122, 122, 122, 161, 161, + 53, 147, 147, 147, 147, 147, 167, 167, 167, 167, + 186, 186, 186, 186, 193, 193, 201, 199, 198, 197, + 194, 191, 190, 188, 187, 184, 183, 182, 178, 176, + + 174, 170, 166, 193, 165, 164, 163, 193, 207, 162, + 207, 207, 207, 208, 208, 209, 209, 211, 211, 211, + 160, 159, 158, 157, 156, 155, 152, 151, 150, 149, + 148, 146, 145, 144, 142, 141, 140, 137, 136, 135, + 134, 133, 132, 131, 130, 128, 127, 126, 124, 123, + 121, 120, 119, 118, 117, 115, 114, 112, 111, 109, + 108, 106, 104, 103, 102, 101, 99, 98, 97, 95, + 94, 93, 87, 86, 85, 84, 83, 82, 81, 80, + 79, 78, 76, 75, 74, 73, 72, 71, 70, 68, + 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, + + 57, 49, 47, 46, 41, 40, 39, 38, 37, 34, + 31, 28, 26, 17, 16, 7, 6, 5, 3, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206 } ; /* Table of booleans, true if rule could match eol. */ -static const flex_int32_t yy_rule_can_match_eol[53] = +static const flex_int32_t yy_rule_can_match_eol[54] = { 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; extern int yy_flex_debug; int yy_flex_debug = 1; -static const flex_int16_t yy_rule_linenum[52] = +static const flex_int16_t yy_rule_linenum[53] = { 0, 106, 111, 117, 127, 133, 151, 158, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215 + 215, 216 } ; static yy_state_type *yy_state_buf=0, *yy_state_ptr=0; @@ -1045,7 +1049,7 @@ namespace { /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::eval::EvalContext::fatal(msg) -#line 1048 "lexer.cc" +#line 1052 "lexer.cc" /* noyywrap disables automatic rewinding for the next file to parse. Since we always parse only a single string, there's no need to do any wraps. And using yywrap requires linking with -lfl, which provides the default yywrap @@ -1070,8 +1074,8 @@ namespace { by moving it ahead by yyleng bytes. yyleng specifies the length of the currently matched token. */ #define YY_USER_ACTION loc.columns(evalleng); -#line 1073 "lexer.cc" -#line 1074 "lexer.cc" +#line 1077 "lexer.cc" +#line 1078 "lexer.cc" #define INITIAL 0 @@ -1376,7 +1380,7 @@ YY_DECL -#line 1379 "lexer.cc" +#line 1383 "lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1404,14 +1408,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 202 ) + if ( yy_current_state >= 207 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *(yy_state_ptr)++ = yy_current_state; ++yy_cp; } - while ( yy_current_state != 201 ); + while ( yy_current_state != 206 ); yy_find_action: /* %% [10.0] code to find the action number goes here */ @@ -1474,13 +1478,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 52 ) + else if ( yy_act < 53 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], yytext ); - else if ( yy_act == 52 ) + else if ( yy_act == 53 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", yytext ); - else if ( yy_act == 53 ) + else if ( yy_act == 54 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -1761,53 +1765,58 @@ return isc::eval::EvalParser::make_OR(loc); case 44: YY_RULE_SETUP #line 208 "lexer.ll" -return isc::eval::EvalParser::make_DOT(loc); +return isc::eval::EvalParser::make_MEMBER(loc); YY_BREAK case 45: YY_RULE_SETUP #line 209 "lexer.ll" -return isc::eval::EvalParser::make_LPAREN(loc); +return isc::eval::EvalParser::make_DOT(loc); YY_BREAK case 46: YY_RULE_SETUP #line 210 "lexer.ll" -return isc::eval::EvalParser::make_RPAREN(loc); +return isc::eval::EvalParser::make_LPAREN(loc); YY_BREAK case 47: YY_RULE_SETUP #line 211 "lexer.ll" -return isc::eval::EvalParser::make_LBRACKET(loc); +return isc::eval::EvalParser::make_RPAREN(loc); YY_BREAK case 48: YY_RULE_SETUP #line 212 "lexer.ll" -return isc::eval::EvalParser::make_RBRACKET(loc); +return isc::eval::EvalParser::make_LBRACKET(loc); YY_BREAK case 49: YY_RULE_SETUP #line 213 "lexer.ll" -return isc::eval::EvalParser::make_COMA(loc); +return isc::eval::EvalParser::make_RBRACKET(loc); YY_BREAK case 50: YY_RULE_SETUP #line 214 "lexer.ll" -return isc::eval::EvalParser::make_ANY(loc); +return isc::eval::EvalParser::make_COMA(loc); YY_BREAK case 51: YY_RULE_SETUP #line 215 "lexer.ll" +return isc::eval::EvalParser::make_ANY(loc); + YY_BREAK +case 52: +YY_RULE_SETUP +#line 216 "lexer.ll" driver.error (loc, "Invalid character: " + std::string(evaltext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 216 "lexer.ll" +#line 217 "lexer.ll" return isc::eval::EvalParser::make_END(loc); YY_BREAK -case 52: +case 53: YY_RULE_SETUP -#line 217 "lexer.ll" +#line 218 "lexer.ll" ECHO; YY_BREAK -#line 1810 "lexer.cc" +#line 1819 "lexer.cc" case YY_END_OF_BUFFER: { @@ -2093,7 +2102,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 202 ) + if ( yy_current_state >= 207 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2121,11 +2130,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 202 ) + if ( yy_current_state >= 207 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 201); + yy_is_jam = (yy_current_state == 206); if ( ! yy_is_jam ) *(yy_state_ptr)++ = yy_current_state; @@ -2891,7 +2900,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 217 "lexer.ll" +#line 218 "lexer.ll" using namespace isc::eval; diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh index 6f14287ee0..afce8e45e7 100644 --- a/src/lib/eval/location.hh +++ b/src/lib/eval/location.hh @@ -1,4 +1,4 @@ -// Generated 201710061616 +// Generated 201711240833 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc index 3d95cddcea..7714ed42b9 100644 --- a/src/lib/eval/parser.cc +++ b/src/lib/eval/parser.cc @@ -253,44 +253,44 @@ namespace isc { namespace eval { { switch (that.type_get ()) { - case 60: // option_repr_type + case 61: // option_repr_type value.move< TokenOption::RepresentationType > (that.value); break; - case 64: // pkt4_field + case 65: // pkt4_field value.move< TokenPkt4::FieldType > (that.value); break; - case 65: // pkt6_field + case 66: // pkt6_field value.move< TokenPkt6::FieldType > (that.value); break; - case 62: // pkt_metadata + case 63: // pkt_metadata value.move< TokenPkt::MetadataType > (that.value); break; - case 66: // relay6_field + case 67: // relay6_field value.move< TokenRelay6Field::FieldType > (that.value); break; - case 61: // nest_level + case 62: // nest_level value.move< int8_t > (that.value); break; - case 48: // "constant string" - case 49: // "integer" - case 50: // "constant hexstring" - case 51: // "option name" - case 52: // "ip address" + case 49: // "constant string" + case 50: // "integer" + case 51: // "constant hexstring" + case 52: // "option name" + case 53: // "ip address" value.move< std::string > (that.value); break; - case 59: // option_code + case 60: // option_code value.move< uint16_t > (that.value); break; - case 58: // integer_expr - case 63: // enterprise_id + case 59: // integer_expr + case 64: // enterprise_id value.move< uint32_t > (that.value); break; @@ -309,44 +309,44 @@ namespace isc { namespace eval { state = that.state; switch (that.type_get ()) { - case 60: // option_repr_type + case 61: // option_repr_type value.copy< TokenOption::RepresentationType > (that.value); break; - case 64: // pkt4_field + case 65: // pkt4_field value.copy< TokenPkt4::FieldType > (that.value); break; - case 65: // pkt6_field + case 66: // pkt6_field value.copy< TokenPkt6::FieldType > (that.value); break; - case 62: // pkt_metadata + case 63: // pkt_metadata value.copy< TokenPkt::MetadataType > (that.value); break; - case 66: // relay6_field + case 67: // relay6_field value.copy< TokenRelay6Field::FieldType > (that.value); break; - case 61: // nest_level + case 62: // nest_level value.copy< int8_t > (that.value); break; - case 48: // "constant string" - case 49: // "integer" - case 50: // "constant hexstring" - case 51: // "option name" - case 52: // "ip address" + case 49: // "constant string" + case 50: // "integer" + case 51: // "constant hexstring" + case 52: // "option name" + case 53: // "ip address" value.copy< std::string > (that.value); break; - case 59: // option_code + case 60: // option_code value.copy< uint16_t > (that.value); break; - case 58: // integer_expr - case 63: // enterprise_id + case 59: // integer_expr + case 64: // enterprise_id value.copy< uint32_t > (that.value); break; @@ -386,100 +386,100 @@ namespace isc { namespace eval { << yysym.location << ": "; switch (yytype) { - case 48: // "constant string" + case 49: // "constant string" -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 394 "parser.cc" // lalr1.cc:636 break; - case 49: // "integer" + case 50: // "integer" -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 401 "parser.cc" // lalr1.cc:636 break; - case 50: // "constant hexstring" + case 51: // "constant hexstring" -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 408 "parser.cc" // lalr1.cc:636 break; - case 51: // "option name" + case 52: // "option name" -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 415 "parser.cc" // lalr1.cc:636 break; - case 52: // "ip address" + case 53: // "ip address" -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 422 "parser.cc" // lalr1.cc:636 break; - case 58: // integer_expr + case 59: // integer_expr -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< uint32_t > (); } #line 429 "parser.cc" // lalr1.cc:636 break; - case 59: // option_code + case 60: // option_code -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< uint16_t > (); } #line 436 "parser.cc" // lalr1.cc:636 break; - case 60: // option_repr_type + case 61: // option_repr_type -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< TokenOption::RepresentationType > (); } #line 443 "parser.cc" // lalr1.cc:636 break; - case 61: // nest_level + case 62: // nest_level -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< int8_t > (); } #line 450 "parser.cc" // lalr1.cc:636 break; - case 62: // pkt_metadata + case 63: // pkt_metadata -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< TokenPkt::MetadataType > (); } #line 457 "parser.cc" // lalr1.cc:636 break; - case 63: // enterprise_id + case 64: // enterprise_id -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< uint32_t > (); } #line 464 "parser.cc" // lalr1.cc:636 break; - case 64: // pkt4_field + case 65: // pkt4_field -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< TokenPkt4::FieldType > (); } #line 471 "parser.cc" // lalr1.cc:636 break; - case 65: // pkt6_field + case 66: // pkt6_field -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< TokenPkt6::FieldType > (); } #line 478 "parser.cc" // lalr1.cc:636 break; - case 66: // relay6_field + case 67: // relay6_field -#line 109 "parser.yy" // lalr1.cc:636 +#line 110 "parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< TokenRelay6Field::FieldType > (); } #line 485 "parser.cc" // lalr1.cc:636 break; @@ -681,44 +681,44 @@ namespace isc { namespace eval { when using variants. */ switch (yyr1_[yyn]) { - case 60: // option_repr_type + case 61: // option_repr_type yylhs.value.build< TokenOption::RepresentationType > (); break; - case 64: // pkt4_field + case 65: // pkt4_field yylhs.value.build< TokenPkt4::FieldType > (); break; - case 65: // pkt6_field + case 66: // pkt6_field yylhs.value.build< TokenPkt6::FieldType > (); break; - case 62: // pkt_metadata + case 63: // pkt_metadata yylhs.value.build< TokenPkt::MetadataType > (); break; - case 66: // relay6_field + case 67: // relay6_field yylhs.value.build< TokenRelay6Field::FieldType > (); break; - case 61: // nest_level + case 62: // nest_level yylhs.value.build< int8_t > (); break; - case 48: // "constant string" - case 49: // "integer" - case 50: // "constant hexstring" - case 51: // "option name" - case 52: // "ip address" + case 49: // "constant string" + case 50: // "integer" + case 51: // "constant hexstring" + case 52: // "option name" + case 53: // "ip address" yylhs.value.build< std::string > (); break; - case 59: // option_code + case 60: // option_code yylhs.value.build< uint16_t > (); break; - case 58: // integer_expr - case 63: // enterprise_id + case 59: // integer_expr + case 64: // enterprise_id yylhs.value.build< uint32_t > (); break; @@ -740,7 +740,7 @@ namespace isc { namespace eval { switch (yyn) { case 6: -#line 129 "parser.yy" // lalr1.cc:859 +#line 130 "parser.yy" // lalr1.cc:859 { TokenPtr neg(new TokenNot()); ctx.expression.push_back(neg); @@ -749,7 +749,7 @@ namespace isc { namespace eval { break; case 7: -#line 134 "parser.yy" // lalr1.cc:859 +#line 135 "parser.yy" // lalr1.cc:859 { TokenPtr neg(new TokenAnd()); ctx.expression.push_back(neg); @@ -758,7 +758,7 @@ namespace isc { namespace eval { break; case 8: -#line 139 "parser.yy" // lalr1.cc:859 +#line 140 "parser.yy" // lalr1.cc:859 { TokenPtr neg(new TokenOr()); ctx.expression.push_back(neg); @@ -767,7 +767,7 @@ namespace isc { namespace eval { break; case 9: -#line 144 "parser.yy" // lalr1.cc:859 +#line 145 "parser.yy" // lalr1.cc:859 { TokenPtr eq(new TokenEqual()); ctx.expression.push_back(eq); @@ -776,7 +776,7 @@ namespace isc { namespace eval { break; case 10: -#line 149 "parser.yy" // lalr1.cc:859 +#line 150 "parser.yy" // lalr1.cc:859 { TokenPtr opt(new TokenOption(yystack_[3].value.as< uint16_t > (), TokenOption::EXISTS)); ctx.expression.push_back(opt); @@ -785,7 +785,7 @@ namespace isc { namespace eval { break; case 11: -#line 154 "parser.yy" // lalr1.cc:859 +#line 155 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V4: @@ -809,7 +809,7 @@ namespace isc { namespace eval { break; case 12: -#line 174 "parser.yy" // lalr1.cc:859 +#line 175 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V6: @@ -827,7 +827,7 @@ namespace isc { namespace eval { break; case 13: -#line 188 "parser.yy" // lalr1.cc:859 +#line 189 "parser.yy" // lalr1.cc:859 { // Expression: vendor-class[1234].exists // @@ -840,7 +840,7 @@ namespace isc { namespace eval { break; case 14: -#line 197 "parser.yy" // lalr1.cc:859 +#line 198 "parser.yy" // lalr1.cc:859 { // Expression: vendor[1234].exists // @@ -853,7 +853,7 @@ namespace isc { namespace eval { break; case 15: -#line 206 "parser.yy" // lalr1.cc:859 +#line 207 "parser.yy" // lalr1.cc:859 { // Expression vendor[1234].option[123].exists // @@ -867,43 +867,62 @@ namespace isc { namespace eval { break; case 16: -#line 218 "parser.yy" // lalr1.cc:859 +#line 217 "parser.yy" // lalr1.cc:859 + { + // Expression member('foo') + // + // This token will check if the packet is a member of + // the specified client class. + // To avoid loops at evaluation only already known and + // built-in classes are allowed. + std::string cc = yystack_[1].value.as< std::string > (); + if (!ctx.isClientClassKnown(cc)) { + error(yystack_[1].location, "Unknown client class '" + cc + "'"); + } + TokenPtr member(new TokenMember(cc)); + ctx.expression.push_back(member) + } +#line 886 "parser.cc" // lalr1.cc:859 + break; + + case 17: +#line 234 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(str); } -#line 876 "parser.cc" // lalr1.cc:859 +#line 895 "parser.cc" // lalr1.cc:859 break; - case 17: -#line 223 "parser.yy" // lalr1.cc:859 + case 18: +#line 239 "parser.yy" // lalr1.cc:859 { TokenPtr hex(new TokenHexString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(hex); } -#line 885 "parser.cc" // lalr1.cc:859 +#line 904 "parser.cc" // lalr1.cc:859 break; - case 18: -#line 228 "parser.yy" // lalr1.cc:859 + case 19: +#line 244 "parser.yy" // lalr1.cc:859 { TokenPtr ip(new TokenIpAddress(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(ip); } -#line 894 "parser.cc" // lalr1.cc:859 +#line 913 "parser.cc" // lalr1.cc:859 break; - case 19: -#line 233 "parser.yy" // lalr1.cc:859 + case 20: +#line 249 "parser.yy" // lalr1.cc:859 { TokenPtr opt(new TokenOption(yystack_[3].value.as< uint16_t > (), yystack_[0].value.as< TokenOption::RepresentationType > ())); ctx.expression.push_back(opt); } -#line 903 "parser.cc" // lalr1.cc:859 +#line 922 "parser.cc" // lalr1.cc:859 break; - case 20: -#line 238 "parser.yy" // lalr1.cc:859 + case 21: +#line 254 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V4: @@ -923,11 +942,11 @@ namespace isc { namespace eval { error(yystack_[5].location, "relay4 can only be used in DHCPv4."); } } -#line 927 "parser.cc" // lalr1.cc:859 +#line 946 "parser.cc" // lalr1.cc:859 break; - case 21: -#line 259 "parser.yy" // lalr1.cc:859 + case 22: +#line 275 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V6: @@ -941,20 +960,20 @@ namespace isc { namespace eval { error(yystack_[10].location, "relay6 can only be used in DHCPv6."); } } -#line 945 "parser.cc" // lalr1.cc:859 +#line 964 "parser.cc" // lalr1.cc:859 break; - case 22: -#line 274 "parser.yy" // lalr1.cc:859 + case 23: +#line 290 "parser.yy" // lalr1.cc:859 { TokenPtr pkt_metadata(new TokenPkt(yystack_[0].value.as< TokenPkt::MetadataType > ())); ctx.expression.push_back(pkt_metadata); } -#line 954 "parser.cc" // lalr1.cc:859 +#line 973 "parser.cc" // lalr1.cc:859 break; - case 23: -#line 279 "parser.yy" // lalr1.cc:859 + case 24: +#line 295 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V4: @@ -968,11 +987,11 @@ namespace isc { namespace eval { error(yystack_[2].location, "pkt4 can only be used in DHCPv4."); } } -#line 972 "parser.cc" // lalr1.cc:859 +#line 991 "parser.cc" // lalr1.cc:859 break; - case 24: -#line 293 "parser.yy" // lalr1.cc:859 + case 25: +#line 309 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V6: @@ -986,11 +1005,11 @@ namespace isc { namespace eval { error(yystack_[2].location, "pkt6 can only be used in DHCPv6."); } } -#line 990 "parser.cc" // lalr1.cc:859 +#line 1009 "parser.cc" // lalr1.cc:859 break; - case 25: -#line 307 "parser.yy" // lalr1.cc:859 + case 26: +#line 323 "parser.yy" // lalr1.cc:859 { switch (ctx.getUniverse()) { case Option::V6: @@ -1004,38 +1023,38 @@ namespace isc { namespace eval { error(yystack_[5].location, "relay6 can only be used in DHCPv6."); } } -#line 1008 "parser.cc" // lalr1.cc:859 +#line 1027 "parser.cc" // lalr1.cc:859 break; - case 26: -#line 322 "parser.yy" // lalr1.cc:859 + case 27: +#line 338 "parser.yy" // lalr1.cc:859 { TokenPtr sub(new TokenSubstring()); ctx.expression.push_back(sub); } -#line 1017 "parser.cc" // lalr1.cc:859 +#line 1036 "parser.cc" // lalr1.cc:859 break; - case 27: -#line 327 "parser.yy" // lalr1.cc:859 + case 28: +#line 343 "parser.yy" // lalr1.cc:859 { TokenPtr conc(new TokenConcat()); ctx.expression.push_back(conc); } -#line 1026 "parser.cc" // lalr1.cc:859 +#line 1045 "parser.cc" // lalr1.cc:859 break; - case 28: -#line 332 "parser.yy" // lalr1.cc:859 + case 29: +#line 348 "parser.yy" // lalr1.cc:859 { TokenPtr cond(new TokenIfElse()); ctx.expression.push_back(cond); } -#line 1035 "parser.cc" // lalr1.cc:859 +#line 1054 "parser.cc" // lalr1.cc:859 break; - case 29: -#line 337 "parser.yy" // lalr1.cc:859 + case 30: +#line 353 "parser.yy" // lalr1.cc:859 { // expression: vendor.enterprise // @@ -1044,11 +1063,11 @@ namespace isc { namespace eval { TokenPtr vendor(new TokenVendor(ctx.getUniverse(), 0, TokenVendor::ENTERPRISE_ID)); ctx.expression.push_back(vendor); } -#line 1048 "parser.cc" // lalr1.cc:859 +#line 1067 "parser.cc" // lalr1.cc:859 break; - case 30: -#line 346 "parser.yy" // lalr1.cc:859 + case 31: +#line 362 "parser.yy" // lalr1.cc:859 { // expression: vendor-class.enterprise // @@ -1058,11 +1077,11 @@ namespace isc { namespace eval { TokenVendor::ENTERPRISE_ID)); ctx.expression.push_back(vendor); } -#line 1062 "parser.cc" // lalr1.cc:859 +#line 1081 "parser.cc" // lalr1.cc:859 break; - case 31: -#line 356 "parser.yy" // lalr1.cc:859 + case 32: +#line 372 "parser.yy" // lalr1.cc:859 { // This token will search for vendor option with // specified enterprise-id. If found, will search @@ -1071,11 +1090,11 @@ namespace isc { namespace eval { TokenPtr opt(new TokenVendor(ctx.getUniverse(), yystack_[8].value.as< uint32_t > (), yystack_[0].value.as< TokenOption::RepresentationType > (), yystack_[3].value.as< uint16_t > ())); ctx.expression.push_back(opt); } -#line 1075 "parser.cc" // lalr1.cc:859 +#line 1094 "parser.cc" // lalr1.cc:859 break; - case 32: -#line 365 "parser.yy" // lalr1.cc:859 + case 33: +#line 381 "parser.yy" // lalr1.cc:859 { // expression: vendor-class[1234].data // @@ -1088,11 +1107,11 @@ namespace isc { namespace eval { TokenVendor::DATA, 0)); ctx.expression.push_back(vendor_class); } -#line 1092 "parser.cc" // lalr1.cc:859 +#line 1111 "parser.cc" // lalr1.cc:859 break; - case 33: -#line 378 "parser.yy" // lalr1.cc:859 + case 34: +#line 394 "parser.yy" // lalr1.cc:859 { // expression: vendor-class[1234].data[5] // @@ -1105,247 +1124,247 @@ namespace isc { namespace eval { TokenVendor::DATA, index)); ctx.expression.push_back(vendor_class); } -#line 1109 "parser.cc" // lalr1.cc:859 +#line 1128 "parser.cc" // lalr1.cc:859 break; - case 34: -#line 391 "parser.yy" // lalr1.cc:859 + case 35: +#line 407 "parser.yy" // lalr1.cc:859 { TokenPtr integer(new TokenInteger(yystack_[0].value.as< uint32_t > ())); ctx.expression.push_back(integer); } -#line 1118 "parser.cc" // lalr1.cc:859 +#line 1137 "parser.cc" // lalr1.cc:859 break; - case 35: -#line 398 "parser.yy" // lalr1.cc:859 + case 36: +#line 414 "parser.yy" // lalr1.cc:859 { yylhs.value.as< uint32_t > () = ctx.convertUint32(yystack_[0].value.as< std::string > (), yystack_[0].location); } -#line 1126 "parser.cc" // lalr1.cc:859 +#line 1145 "parser.cc" // lalr1.cc:859 break; - case 36: -#line 404 "parser.yy" // lalr1.cc:859 + case 37: +#line 420 "parser.yy" // lalr1.cc:859 { yylhs.value.as< uint16_t > () = ctx.convertOptionCode(yystack_[0].value.as< std::string > (), yystack_[0].location); } -#line 1134 "parser.cc" // lalr1.cc:859 +#line 1153 "parser.cc" // lalr1.cc:859 break; - case 37: -#line 408 "parser.yy" // lalr1.cc:859 + case 38: +#line 424 "parser.yy" // lalr1.cc:859 { yylhs.value.as< uint16_t > () = ctx.convertOptionName(yystack_[0].value.as< std::string > (), yystack_[0].location); } -#line 1142 "parser.cc" // lalr1.cc:859 +#line 1161 "parser.cc" // lalr1.cc:859 break; - case 38: -#line 414 "parser.yy" // lalr1.cc:859 + case 39: +#line 430 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenOption::RepresentationType > () = TokenOption::TEXTUAL; } -#line 1150 "parser.cc" // lalr1.cc:859 +#line 1169 "parser.cc" // lalr1.cc:859 break; - case 39: -#line 418 "parser.yy" // lalr1.cc:859 + case 40: +#line 434 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenOption::RepresentationType > () = TokenOption::HEXADECIMAL; } -#line 1158 "parser.cc" // lalr1.cc:859 +#line 1177 "parser.cc" // lalr1.cc:859 break; - case 40: -#line 424 "parser.yy" // lalr1.cc:859 + case 41: +#line 440 "parser.yy" // lalr1.cc:859 { yylhs.value.as< int8_t > () = ctx.convertNestLevelNumber(yystack_[0].value.as< std::string > (), yystack_[0].location); } -#line 1166 "parser.cc" // lalr1.cc:859 +#line 1185 "parser.cc" // lalr1.cc:859 break; - case 41: -#line 433 "parser.yy" // lalr1.cc:859 + case 42: +#line 449 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt::MetadataType > () = TokenPkt::IFACE; } -#line 1174 "parser.cc" // lalr1.cc:859 +#line 1193 "parser.cc" // lalr1.cc:859 break; - case 42: -#line 437 "parser.yy" // lalr1.cc:859 + case 43: +#line 453 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt::MetadataType > () = TokenPkt::SRC; } -#line 1182 "parser.cc" // lalr1.cc:859 +#line 1201 "parser.cc" // lalr1.cc:859 break; - case 43: -#line 441 "parser.yy" // lalr1.cc:859 + case 44: +#line 457 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt::MetadataType > () = TokenPkt::DST; } -#line 1190 "parser.cc" // lalr1.cc:859 +#line 1209 "parser.cc" // lalr1.cc:859 break; - case 44: -#line 445 "parser.yy" // lalr1.cc:859 + case 45: +#line 461 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt::MetadataType > () = TokenPkt::LEN; } -#line 1198 "parser.cc" // lalr1.cc:859 +#line 1217 "parser.cc" // lalr1.cc:859 break; - case 45: -#line 451 "parser.yy" // lalr1.cc:859 + case 46: +#line 467 "parser.yy" // lalr1.cc:859 { yylhs.value.as< uint32_t > () = ctx.convertUint32(yystack_[0].value.as< std::string > (), yystack_[0].location); } -#line 1206 "parser.cc" // lalr1.cc:859 +#line 1225 "parser.cc" // lalr1.cc:859 break; - case 46: -#line 455 "parser.yy" // lalr1.cc:859 + case 47: +#line 471 "parser.yy" // lalr1.cc:859 { yylhs.value.as< uint32_t > () = 0; } -#line 1214 "parser.cc" // lalr1.cc:859 +#line 1233 "parser.cc" // lalr1.cc:859 break; - case 47: -#line 461 "parser.yy" // lalr1.cc:859 + case 48: +#line 477 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::CHADDR; } -#line 1222 "parser.cc" // lalr1.cc:859 +#line 1241 "parser.cc" // lalr1.cc:859 break; - case 48: -#line 465 "parser.yy" // lalr1.cc:859 + case 49: +#line 481 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::HLEN; } -#line 1230 "parser.cc" // lalr1.cc:859 +#line 1249 "parser.cc" // lalr1.cc:859 break; - case 49: -#line 469 "parser.yy" // lalr1.cc:859 + case 50: +#line 485 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::HTYPE; } -#line 1238 "parser.cc" // lalr1.cc:859 +#line 1257 "parser.cc" // lalr1.cc:859 break; - case 50: -#line 473 "parser.yy" // lalr1.cc:859 + case 51: +#line 489 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::CIADDR; } -#line 1246 "parser.cc" // lalr1.cc:859 +#line 1265 "parser.cc" // lalr1.cc:859 break; - case 51: -#line 477 "parser.yy" // lalr1.cc:859 + case 52: +#line 493 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::GIADDR; } -#line 1254 "parser.cc" // lalr1.cc:859 +#line 1273 "parser.cc" // lalr1.cc:859 break; - case 52: -#line 481 "parser.yy" // lalr1.cc:859 + case 53: +#line 497 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::YIADDR; } -#line 1262 "parser.cc" // lalr1.cc:859 +#line 1281 "parser.cc" // lalr1.cc:859 break; - case 53: -#line 485 "parser.yy" // lalr1.cc:859 + case 54: +#line 501 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::SIADDR; } -#line 1270 "parser.cc" // lalr1.cc:859 +#line 1289 "parser.cc" // lalr1.cc:859 break; - case 54: -#line 489 "parser.yy" // lalr1.cc:859 + case 55: +#line 505 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::MSGTYPE; } -#line 1278 "parser.cc" // lalr1.cc:859 +#line 1297 "parser.cc" // lalr1.cc:859 break; - case 55: -#line 493 "parser.yy" // lalr1.cc:859 + case 56: +#line 509 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt4::FieldType > () = TokenPkt4::TRANSID; } -#line 1286 "parser.cc" // lalr1.cc:859 +#line 1305 "parser.cc" // lalr1.cc:859 break; - case 56: -#line 499 "parser.yy" // lalr1.cc:859 + case 57: +#line 515 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt6::FieldType > () = TokenPkt6::MSGTYPE; } -#line 1294 "parser.cc" // lalr1.cc:859 +#line 1313 "parser.cc" // lalr1.cc:859 break; - case 57: -#line 503 "parser.yy" // lalr1.cc:859 + case 58: +#line 519 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenPkt6::FieldType > () = TokenPkt6::TRANSID; } -#line 1302 "parser.cc" // lalr1.cc:859 +#line 1321 "parser.cc" // lalr1.cc:859 break; - case 58: -#line 509 "parser.yy" // lalr1.cc:859 + case 59: +#line 525 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenRelay6Field::FieldType > () = TokenRelay6Field::PEERADDR; } -#line 1310 "parser.cc" // lalr1.cc:859 +#line 1329 "parser.cc" // lalr1.cc:859 break; - case 59: -#line 513 "parser.yy" // lalr1.cc:859 + case 60: +#line 529 "parser.yy" // lalr1.cc:859 { yylhs.value.as< TokenRelay6Field::FieldType > () = TokenRelay6Field::LINKADDR; } -#line 1318 "parser.cc" // lalr1.cc:859 +#line 1337 "parser.cc" // lalr1.cc:859 break; - case 60: -#line 519 "parser.yy" // lalr1.cc:859 + case 61: +#line 535 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(str); } -#line 1327 "parser.cc" // lalr1.cc:859 +#line 1346 "parser.cc" // lalr1.cc:859 break; - case 61: -#line 526 "parser.yy" // lalr1.cc:859 + case 62: +#line 542 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); ctx.expression.push_back(str); } -#line 1336 "parser.cc" // lalr1.cc:859 +#line 1355 "parser.cc" // lalr1.cc:859 break; - case 62: -#line 531 "parser.yy" // lalr1.cc:859 + case 63: +#line 547 "parser.yy" // lalr1.cc:859 { TokenPtr str(new TokenString("all")); ctx.expression.push_back(str); } -#line 1345 "parser.cc" // lalr1.cc:859 +#line 1364 "parser.cc" // lalr1.cc:859 break; -#line 1349 "parser.cc" // lalr1.cc:859 +#line 1368 "parser.cc" // lalr1.cc:859 default: break; } @@ -1600,163 +1619,165 @@ namespace isc { namespace eval { } - const signed char EvalParser::yypact_ninf_ = -110; + const signed char EvalParser::yypact_ninf_ = -114; const signed char EvalParser::yytable_ninf_ = -1; const short int EvalParser::yypact_[] = { - 32, 39, 87, 29, 39, 39, 40, 51, 76, 30, - 44, 92, 102, 111, 106, 90, 94, -110, -110, -110, - -110, -110, 67, 35, -110, 104, 116, 117, 97, 105, - -110, -110, 27, -110, -37, -37, 83, 47, -4, 87, - 87, 39, 46, -36, 88, -36, 93, 39, 39, 87, - -37, -37, 83, -36, -36, -110, -110, -110, 125, 126, - -110, 127, -110, -110, -110, -110, -110, -110, -110, -110, - -110, -110, -110, -110, -110, -110, -110, 108, 110, -3, - -110, -110, -110, -110, -110, 129, -110, 131, -110, -110, - 141, -110, 133, 134, 135, 136, 137, 138, 139, 140, - 112, 87, 87, 142, 143, 144, 146, 147, 148, 149, - 22, 65, 6, -110, 118, 153, 132, -14, 1, 109, - 109, 54, 122, 159, -110, -110, -110, -110, -110, -110, - 155, -110, -110, -110, -28, -110, 87, -110, 156, 157, - -110, 158, 160, -37, -110, -110, 169, 171, 128, -37, - -37, -37, 161, -110, -110, 163, 164, 165, 166, 167, - -110, 168, 170, 172, 75, 84, 109, 109, -110, -110, - -110, -110 + 18, 25, 72, 32, 25, 25, 14, 26, 37, 70, + 80, 84, 99, 105, 110, 100, 33, 90, -114, -114, + -114, -114, -114, 38, 116, -114, 101, 121, 122, 117, + 118, -114, -114, 73, -114, -38, -38, 89, 91, 47, + 59, 72, 72, 25, 20, -31, 95, -31, 96, 25, + 25, 72, -38, -38, 89, -31, -31, -114, -114, -114, + 127, 128, -114, 129, 142, -114, -114, -114, -114, -114, + -114, -114, -114, -114, -114, -114, -114, -114, -114, -114, + 112, 113, -3, -114, -114, -114, -114, -114, 131, -114, + 134, -114, -114, 145, -114, 136, 137, 138, 139, 140, + 141, 143, 144, -114, 107, 72, 72, 146, 147, 148, + 149, 150, 151, 152, 5, 76, 13, -114, 123, 158, + 135, -14, 1, 66, 66, 29, 125, 163, -114, -114, + -114, -114, -114, -114, 159, -114, -114, -114, -30, -114, + 72, -114, 160, 161, -114, 162, 164, -38, -114, -114, + 169, 174, 130, -38, -38, -38, 165, -114, -114, 166, + 167, 168, 170, 171, -114, 172, 173, 175, 108, 111, + 66, 66, -114, -114, -114, -114 }; const unsigned char EvalParser::yydefact_[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 16, 35, 17, - 18, 2, 4, 0, 34, 0, 0, 0, 0, 0, - 3, 1, 0, 6, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 36, 37, 0, 0, - 40, 0, 41, 42, 43, 44, 22, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 23, 0, 0, 0, - 56, 57, 24, 46, 45, 0, 30, 0, 29, 7, - 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 17, 36, + 18, 19, 2, 4, 0, 35, 0, 0, 0, 0, + 0, 3, 1, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 38, 39, 10, 19, 11, 20, - 0, 58, 59, 25, 0, 27, 0, 13, 32, 0, - 14, 0, 0, 0, 62, 61, 0, 0, 0, 0, - 0, 0, 0, 26, 28, 0, 0, 0, 0, 0, - 33, 0, 0, 0, 0, 0, 0, 0, 12, 21, - 15, 31 + 0, 0, 0, 0, 0, 0, 0, 5, 37, 38, + 0, 0, 41, 0, 0, 42, 43, 44, 45, 23, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 24, + 0, 0, 0, 57, 58, 25, 47, 46, 0, 31, + 0, 30, 7, 8, 9, 0, 0, 0, 0, 0, + 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 61, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 39, 40, + 10, 20, 11, 21, 0, 59, 60, 26, 0, 28, + 0, 13, 33, 0, 14, 0, 0, 0, 63, 62, + 0, 0, 0, 0, 0, 0, 0, 27, 29, 0, + 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, + 0, 0, 12, 22, 15, 32 }; const short int EvalParser::yypgoto_[] = { - -110, -110, -110, 4, -2, -110, -34, -109, 130, -110, - 8, -110, -110, -110, -110, -110 + -114, -114, -114, 4, -2, -114, -35, -113, 133, -114, + -40, -114, -114, -114, -114, -114 }; const short int EvalParser::yydefgoto_[] = { - -1, 3, 21, 22, 23, 24, 58, 127, 61, 66, - 85, 76, 82, 133, 114, 146 + -1, 3, 22, 23, 24, 25, 60, 131, 63, 69, + 88, 79, 85, 137, 118, 150 }; const unsigned char EvalParser::yytable_[] = { - 30, 59, 129, 47, 48, 137, 144, 83, 32, 33, - 139, 129, 56, 84, 57, 130, 92, 93, 131, 132, - 140, 145, 67, 68, 69, 70, 71, 72, 73, 31, - 138, 55, 102, 47, 48, 74, 75, 77, 78, 124, - 125, 126, 4, 49, 5, 79, 37, 91, 6, 7, - 8, 89, 90, 87, 34, 169, 171, 169, 171, 9, - 38, 95, 96, 141, 10, 35, 131, 132, 62, 63, - 64, 65, 11, 47, 48, 12, 13, 14, 1, 2, - 15, 16, 124, 125, 128, 80, 81, 17, 18, 19, - 36, 20, 124, 125, 168, 39, 25, 26, 27, 115, - 116, 124, 125, 170, 43, 40, 44, 9, 45, 152, - 46, 53, 10, 44, 41, 156, 157, 158, 50, 54, - 11, 46, 42, 12, 13, 14, 124, 125, 28, 29, - 51, 52, 60, 86, 147, 17, 18, 19, 88, 20, - 97, 98, 99, 100, 103, 101, 104, 47, 105, 106, - 107, 108, 109, 134, 110, 111, 112, 135, 117, 118, - 119, 113, 120, 121, 122, 123, 138, 136, 142, 143, - 148, 149, 150, 153, 151, 154, 159, 155, 160, 161, - 162, 163, 94, 164, 165, 0, 166, 0, 167 + 31, 61, 133, 49, 50, 148, 141, 90, 33, 34, + 143, 133, 58, 86, 59, 98, 99, 95, 96, 87, + 149, 144, 134, 128, 129, 130, 135, 136, 4, 35, + 5, 142, 32, 106, 6, 7, 8, 9, 145, 80, + 81, 36, 135, 136, 49, 50, 10, 82, 45, 94, + 46, 11, 37, 92, 93, 173, 175, 173, 175, 12, + 83, 84, 13, 14, 15, 1, 2, 16, 17, 65, + 66, 67, 68, 38, 18, 19, 20, 57, 21, 49, + 50, 26, 27, 28, 128, 129, 70, 71, 72, 73, + 74, 75, 76, 10, 128, 129, 132, 39, 11, 77, + 78, 40, 41, 119, 120, 47, 12, 48, 42, 13, + 14, 15, 156, 43, 29, 30, 52, 44, 160, 161, + 162, 18, 19, 20, 51, 21, 128, 129, 172, 128, + 129, 174, 55, 56, 46, 48, 53, 54, 151, 62, + 64, 89, 91, 100, 101, 102, 103, 107, 104, 105, + 108, 49, 109, 110, 111, 112, 113, 117, 114, 138, + 115, 116, 139, 121, 122, 123, 124, 125, 126, 127, + 142, 140, 146, 157, 147, 152, 153, 154, 158, 155, + 159, 163, 164, 165, 166, 0, 167, 97, 168, 169, + 170, 0, 171 }; const short int EvalParser::yycheck_[] = { - 2, 35, 111, 6, 7, 19, 34, 43, 4, 5, - 9, 120, 49, 49, 51, 9, 50, 51, 12, 13, - 19, 49, 26, 27, 28, 29, 30, 31, 32, 0, - 44, 4, 35, 6, 7, 39, 40, 39, 40, 17, - 18, 19, 3, 8, 5, 41, 16, 49, 9, 10, - 11, 47, 48, 45, 14, 164, 165, 166, 167, 20, - 16, 53, 54, 9, 25, 14, 12, 13, 21, 22, - 23, 24, 33, 6, 7, 36, 37, 38, 46, 47, - 41, 42, 17, 18, 19, 39, 40, 48, 49, 50, - 14, 52, 17, 18, 19, 3, 9, 10, 11, 101, - 102, 17, 18, 19, 14, 3, 16, 20, 14, 143, - 16, 14, 25, 16, 3, 149, 150, 151, 14, 14, - 33, 16, 16, 36, 37, 38, 17, 18, 41, 42, - 14, 14, 49, 45, 136, 48, 49, 50, 45, 52, - 15, 15, 15, 35, 15, 35, 15, 6, 15, 15, - 15, 15, 15, 35, 16, 16, 16, 4, 16, 16, - 16, 49, 16, 16, 16, 16, 44, 35, 9, 14, - 14, 14, 14, 4, 14, 4, 15, 49, 15, 15, - 15, 15, 52, 16, 16, -1, 16, -1, 16 + 2, 36, 115, 6, 7, 35, 20, 47, 4, 5, + 9, 124, 50, 44, 52, 55, 56, 52, 53, 50, + 50, 20, 9, 18, 19, 20, 13, 14, 3, 15, + 5, 45, 0, 36, 9, 10, 11, 12, 9, 41, + 42, 15, 13, 14, 6, 7, 21, 43, 15, 51, + 17, 26, 15, 49, 50, 168, 169, 170, 171, 34, + 40, 41, 37, 38, 39, 47, 48, 42, 43, 22, + 23, 24, 25, 3, 49, 50, 51, 4, 53, 6, + 7, 9, 10, 11, 18, 19, 27, 28, 29, 30, + 31, 32, 33, 21, 18, 19, 20, 17, 26, 40, + 41, 17, 3, 105, 106, 15, 34, 17, 3, 37, + 38, 39, 147, 3, 42, 43, 15, 17, 153, 154, + 155, 49, 50, 51, 8, 53, 18, 19, 20, 18, + 19, 20, 15, 15, 17, 17, 15, 15, 140, 50, + 49, 46, 46, 16, 16, 16, 4, 16, 36, 36, + 16, 6, 16, 16, 16, 16, 16, 50, 17, 36, + 17, 17, 4, 17, 17, 17, 17, 17, 17, 17, + 45, 36, 9, 4, 15, 15, 15, 15, 4, 15, + 50, 16, 16, 16, 16, -1, 16, 54, 17, 17, + 17, -1, 17 }; const unsigned char EvalParser::yystos_[] = { - 0, 46, 47, 54, 3, 5, 9, 10, 11, 20, - 25, 33, 36, 37, 38, 41, 42, 48, 49, 50, - 52, 55, 56, 57, 58, 9, 10, 11, 41, 42, - 57, 0, 56, 56, 14, 14, 14, 16, 16, 3, - 3, 3, 16, 14, 16, 14, 16, 6, 7, 8, - 14, 14, 14, 14, 14, 4, 49, 51, 59, 59, - 49, 61, 21, 22, 23, 24, 62, 26, 27, 28, - 29, 30, 31, 32, 39, 40, 64, 57, 57, 56, - 39, 40, 65, 43, 49, 63, 45, 63, 45, 56, - 56, 57, 59, 59, 61, 63, 63, 15, 15, 15, - 35, 35, 35, 15, 15, 15, 15, 15, 15, 15, - 16, 16, 16, 49, 67, 57, 57, 16, 16, 16, - 16, 16, 16, 16, 17, 18, 19, 60, 19, 60, - 9, 12, 13, 66, 35, 4, 35, 19, 44, 9, - 19, 9, 9, 14, 34, 49, 68, 57, 14, 14, - 14, 14, 59, 4, 4, 49, 59, 59, 59, 15, - 15, 15, 15, 15, 16, 16, 16, 16, 19, 60, - 19, 60 + 0, 47, 48, 55, 3, 5, 9, 10, 11, 12, + 21, 26, 34, 37, 38, 39, 42, 43, 49, 50, + 51, 53, 56, 57, 58, 59, 9, 10, 11, 42, + 43, 58, 0, 57, 57, 15, 15, 15, 3, 17, + 17, 3, 3, 3, 17, 15, 17, 15, 17, 6, + 7, 8, 15, 15, 15, 15, 15, 4, 50, 52, + 60, 60, 50, 62, 49, 22, 23, 24, 25, 63, + 27, 28, 29, 30, 31, 32, 33, 40, 41, 65, + 58, 58, 57, 40, 41, 66, 44, 50, 64, 46, + 64, 46, 57, 57, 58, 60, 60, 62, 64, 64, + 16, 16, 16, 4, 36, 36, 36, 16, 16, 16, + 16, 16, 16, 16, 17, 17, 17, 50, 68, 58, + 58, 17, 17, 17, 17, 17, 17, 17, 18, 19, + 20, 61, 20, 61, 9, 13, 14, 67, 36, 4, + 36, 20, 45, 9, 20, 9, 9, 15, 35, 50, + 69, 58, 15, 15, 15, 15, 60, 4, 4, 50, + 60, 60, 60, 16, 16, 16, 16, 16, 17, 17, + 17, 17, 20, 61, 20, 61 }; const unsigned char EvalParser::yyr1_[] = { - 0, 53, 54, 54, 55, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 57, 57, 57, 57, - 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, - 57, 57, 57, 57, 57, 58, 59, 59, 60, 60, - 61, 62, 62, 62, 62, 63, 63, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 65, 65, 66, 66, - 67, 68, 68 + 0, 54, 55, 55, 56, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 59, 60, 60, 61, + 61, 62, 63, 63, 63, 63, 64, 64, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 66, 66, 67, + 67, 68, 69, 69 }; const unsigned char EvalParser::yyr2_[] = { 0, 2, 2, 2, 1, 3, 2, 3, 3, 3, - 6, 6, 11, 6, 6, 11, 1, 1, 1, 6, - 6, 11, 3, 3, 3, 6, 8, 6, 8, 3, - 3, 11, 6, 9, 1, 1, 1, 1, 1, 1, + 6, 6, 11, 6, 6, 11, 4, 1, 1, 1, + 6, 6, 11, 3, 3, 3, 6, 8, 6, 8, + 3, 3, 11, 6, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1 + 1, 1, 1, 1 }; @@ -1768,31 +1789,32 @@ namespace isc { namespace eval { { "\"end of file\"", "error", "$undefined", "\"(\"", "\")\"", "\"not\"", "\"and\"", "\"or\"", "\"==\"", "\"option\"", "\"relay4\"", "\"relay6\"", - "\"peeraddr\"", "\"linkaddr\"", "\"[\"", "\"]\"", "\".\"", "\"text\"", - "\"hex\"", "\"exists\"", "\"pkt\"", "\"iface\"", "\"src\"", "\"dst\"", - "\"len\"", "\"pkt4\"", "\"mac\"", "\"hlen\"", "\"htype\"", "\"ciaddr\"", - "\"giaddr\"", "\"yiaddr\"", "\"siaddr\"", "\"substring\"", "\"all\"", - "\",\"", "\"concat\"", "\"ifelse\"", "\"pkt6\"", "\"msgtype\"", - "\"transid\"", "\"vendor-class\"", "\"vendor\"", "\"*\"", "\"data\"", - "\"enterprise\"", "\"top-level bool\"", "\"top-level string\"", - "\"constant string\"", "\"integer\"", "\"constant hexstring\"", - "\"option name\"", "\"ip address\"", "$accept", "start", "expression", - "bool_expr", "string_expr", "integer_expr", "option_code", - "option_repr_type", "nest_level", "pkt_metadata", "enterprise_id", - "pkt4_field", "pkt6_field", "relay6_field", "start_expr", "length_expr", YY_NULLPTR + "\"member\"", "\"peeraddr\"", "\"linkaddr\"", "\"[\"", "\"]\"", "\".\"", + "\"text\"", "\"hex\"", "\"exists\"", "\"pkt\"", "\"iface\"", "\"src\"", + "\"dst\"", "\"len\"", "\"pkt4\"", "\"mac\"", "\"hlen\"", "\"htype\"", + "\"ciaddr\"", "\"giaddr\"", "\"yiaddr\"", "\"siaddr\"", "\"substring\"", + "\"all\"", "\",\"", "\"concat\"", "\"ifelse\"", "\"pkt6\"", + "\"msgtype\"", "\"transid\"", "\"vendor-class\"", "\"vendor\"", "\"*\"", + "\"data\"", "\"enterprise\"", "\"top-level bool\"", + "\"top-level string\"", "\"constant string\"", "\"integer\"", + "\"constant hexstring\"", "\"option name\"", "\"ip address\"", "$accept", + "start", "expression", "bool_expr", "string_expr", "integer_expr", + "option_code", "option_repr_type", "nest_level", "pkt_metadata", + "enterprise_id", "pkt4_field", "pkt6_field", "relay6_field", + "start_expr", "length_expr", YY_NULLPTR }; #if EVALDEBUG const unsigned short int EvalParser::yyrline_[] = { - 0, 118, 118, 119, 124, 127, 128, 133, 138, 143, - 148, 153, 173, 187, 196, 205, 217, 222, 227, 232, - 237, 258, 273, 278, 292, 306, 321, 326, 331, 336, - 345, 355, 364, 377, 390, 397, 403, 407, 413, 417, - 423, 432, 436, 440, 444, 450, 454, 460, 464, 468, - 472, 476, 480, 484, 488, 492, 498, 502, 508, 512, - 518, 525, 530 + 0, 119, 119, 120, 125, 128, 129, 134, 139, 144, + 149, 154, 174, 188, 197, 206, 216, 233, 238, 243, + 248, 253, 274, 289, 294, 308, 322, 337, 342, 347, + 352, 361, 371, 380, 393, 406, 413, 419, 423, 429, + 433, 439, 448, 452, 456, 460, 466, 470, 476, 480, + 484, 488, 492, 496, 500, 504, 508, 514, 518, 524, + 528, 534, 541, 546 }; // Print the state stack on the debug stream. @@ -1827,8 +1849,8 @@ namespace isc { namespace eval { #line 14 "parser.yy" // lalr1.cc:1167 } } // isc::eval -#line 1831 "parser.cc" // lalr1.cc:1167 -#line 537 "parser.yy" // lalr1.cc:1168 +#line 1853 "parser.cc" // lalr1.cc:1167 +#line 553 "parser.yy" // lalr1.cc:1168 void isc::eval::EvalParser::error(const location_type& loc, diff --git a/src/lib/eval/parser.h b/src/lib/eval/parser.h index 5f2042f2bf..7b8614a2ad 100644 --- a/src/lib/eval/parser.h +++ b/src/lib/eval/parser.h @@ -366,47 +366,48 @@ namespace isc { namespace eval { TOKEN_OPTION = 264, TOKEN_RELAY4 = 265, TOKEN_RELAY6 = 266, - TOKEN_PEERADDR = 267, - TOKEN_LINKADDR = 268, - TOKEN_LBRACKET = 269, - TOKEN_RBRACKET = 270, - TOKEN_DOT = 271, - TOKEN_TEXT = 272, - TOKEN_HEX = 273, - TOKEN_EXISTS = 274, - TOKEN_PKT = 275, - TOKEN_IFACE = 276, - TOKEN_SRC = 277, - TOKEN_DST = 278, - TOKEN_LEN = 279, - TOKEN_PKT4 = 280, - TOKEN_CHADDR = 281, - TOKEN_HLEN = 282, - TOKEN_HTYPE = 283, - TOKEN_CIADDR = 284, - TOKEN_GIADDR = 285, - TOKEN_YIADDR = 286, - TOKEN_SIADDR = 287, - TOKEN_SUBSTRING = 288, - TOKEN_ALL = 289, - TOKEN_COMA = 290, - TOKEN_CONCAT = 291, - TOKEN_IFELSE = 292, - TOKEN_PKT6 = 293, - TOKEN_MSGTYPE = 294, - TOKEN_TRANSID = 295, - TOKEN_VENDOR_CLASS = 296, - TOKEN_VENDOR = 297, - TOKEN_ANY = 298, - TOKEN_DATA = 299, - TOKEN_ENTERPRISE = 300, - TOKEN_TOPLEVEL_BOOL = 301, - TOKEN_TOPLEVEL_STRING = 302, - TOKEN_STRING = 303, - TOKEN_INTEGER = 304, - TOKEN_HEXSTRING = 305, - TOKEN_OPTION_NAME = 306, - TOKEN_IP_ADDRESS = 307 + TOKEN_MEMBER = 267, + TOKEN_PEERADDR = 268, + TOKEN_LINKADDR = 269, + TOKEN_LBRACKET = 270, + TOKEN_RBRACKET = 271, + TOKEN_DOT = 272, + TOKEN_TEXT = 273, + TOKEN_HEX = 274, + TOKEN_EXISTS = 275, + TOKEN_PKT = 276, + TOKEN_IFACE = 277, + TOKEN_SRC = 278, + TOKEN_DST = 279, + TOKEN_LEN = 280, + TOKEN_PKT4 = 281, + TOKEN_CHADDR = 282, + TOKEN_HLEN = 283, + TOKEN_HTYPE = 284, + TOKEN_CIADDR = 285, + TOKEN_GIADDR = 286, + TOKEN_YIADDR = 287, + TOKEN_SIADDR = 288, + TOKEN_SUBSTRING = 289, + TOKEN_ALL = 290, + TOKEN_COMA = 291, + TOKEN_CONCAT = 292, + TOKEN_IFELSE = 293, + TOKEN_PKT6 = 294, + TOKEN_MSGTYPE = 295, + TOKEN_TRANSID = 296, + TOKEN_VENDOR_CLASS = 297, + TOKEN_VENDOR = 298, + TOKEN_ANY = 299, + TOKEN_DATA = 300, + TOKEN_ENTERPRISE = 301, + TOKEN_TOPLEVEL_BOOL = 302, + TOKEN_TOPLEVEL_STRING = 303, + TOKEN_STRING = 304, + TOKEN_INTEGER = 305, + TOKEN_HEXSTRING = 306, + TOKEN_OPTION_NAME = 307, + TOKEN_IP_ADDRESS = 308 }; }; @@ -569,6 +570,10 @@ namespace isc { namespace eval { symbol_type make_RELAY6 (const location_type& l); + static inline + symbol_type + make_MEMBER (const location_type& l); + static inline symbol_type make_PEERADDR (const location_type& l); @@ -938,12 +943,12 @@ namespace isc { namespace eval { enum { yyeof_ = 0, - yylast_ = 188, ///< Last index in yytable_. + yylast_ = 192, ///< Last index in yytable_. yynnts_ = 16, ///< Number of nonterminal symbols. - yyfinal_ = 31, ///< Termination state number. + yyfinal_ = 32, ///< Termination state number. yyterror_ = 1, yyerrcode_ = 256, - yyntokens_ = 53 ///< Number of tokens. + yyntokens_ = 54 ///< Number of tokens. }; @@ -990,9 +995,9 @@ namespace isc { namespace eval { 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, 50, 51, 52 + 45, 46, 47, 48, 49, 50, 51, 52, 53 }; - const unsigned int user_token_number_max_ = 307; + const unsigned int user_token_number_max_ = 308; const token_number_type undef_token_ = 2; if (static_cast(t) <= yyeof_) @@ -1025,44 +1030,44 @@ namespace isc { namespace eval { { switch (other.type_get ()) { - case 60: // option_repr_type + case 61: // option_repr_type value.copy< TokenOption::RepresentationType > (other.value); break; - case 64: // pkt4_field + case 65: // pkt4_field value.copy< TokenPkt4::FieldType > (other.value); break; - case 65: // pkt6_field + case 66: // pkt6_field value.copy< TokenPkt6::FieldType > (other.value); break; - case 62: // pkt_metadata + case 63: // pkt_metadata value.copy< TokenPkt::MetadataType > (other.value); break; - case 66: // relay6_field + case 67: // relay6_field value.copy< TokenRelay6Field::FieldType > (other.value); break; - case 61: // nest_level + case 62: // nest_level value.copy< int8_t > (other.value); break; - case 48: // "constant string" - case 49: // "integer" - case 50: // "constant hexstring" - case 51: // "option name" - case 52: // "ip address" + case 49: // "constant string" + case 50: // "integer" + case 51: // "constant hexstring" + case 52: // "option name" + case 53: // "ip address" value.copy< std::string > (other.value); break; - case 59: // option_code + case 60: // option_code value.copy< uint16_t > (other.value); break; - case 58: // integer_expr - case 63: // enterprise_id + case 59: // integer_expr + case 64: // enterprise_id value.copy< uint32_t > (other.value); break; @@ -1083,44 +1088,44 @@ namespace isc { namespace eval { (void) v; switch (this->type_get ()) { - case 60: // option_repr_type + case 61: // option_repr_type value.copy< TokenOption::RepresentationType > (v); break; - case 64: // pkt4_field + case 65: // pkt4_field value.copy< TokenPkt4::FieldType > (v); break; - case 65: // pkt6_field + case 66: // pkt6_field value.copy< TokenPkt6::FieldType > (v); break; - case 62: // pkt_metadata + case 63: // pkt_metadata value.copy< TokenPkt::MetadataType > (v); break; - case 66: // relay6_field + case 67: // relay6_field value.copy< TokenRelay6Field::FieldType > (v); break; - case 61: // nest_level + case 62: // nest_level value.copy< int8_t > (v); break; - case 48: // "constant string" - case 49: // "integer" - case 50: // "constant hexstring" - case 51: // "option name" - case 52: // "ip address" + case 49: // "constant string" + case 50: // "integer" + case 51: // "constant hexstring" + case 52: // "option name" + case 53: // "ip address" value.copy< std::string > (v); break; - case 59: // option_code + case 60: // option_code value.copy< uint16_t > (v); break; - case 58: // integer_expr - case 63: // enterprise_id + case 59: // integer_expr + case 64: // enterprise_id value.copy< uint32_t > (v); break; @@ -1228,44 +1233,44 @@ namespace isc { namespace eval { // Type destructor. switch (yytype) { - case 60: // option_repr_type + case 61: // option_repr_type value.template destroy< TokenOption::RepresentationType > (); break; - case 64: // pkt4_field + case 65: // pkt4_field value.template destroy< TokenPkt4::FieldType > (); break; - case 65: // pkt6_field + case 66: // pkt6_field value.template destroy< TokenPkt6::FieldType > (); break; - case 62: // pkt_metadata + case 63: // pkt_metadata value.template destroy< TokenPkt::MetadataType > (); break; - case 66: // relay6_field + case 67: // relay6_field value.template destroy< TokenRelay6Field::FieldType > (); break; - case 61: // nest_level + case 62: // nest_level value.template destroy< int8_t > (); break; - case 48: // "constant string" - case 49: // "integer" - case 50: // "constant hexstring" - case 51: // "option name" - case 52: // "ip address" + case 49: // "constant string" + case 50: // "integer" + case 51: // "constant hexstring" + case 52: // "option name" + case 53: // "ip address" value.template destroy< std::string > (); break; - case 59: // option_code + case 60: // option_code value.template destroy< uint16_t > (); break; - case 58: // integer_expr - case 63: // enterprise_id + case 59: // integer_expr + case 64: // enterprise_id value.template destroy< uint32_t > (); break; @@ -1292,44 +1297,44 @@ namespace isc { namespace eval { super_type::move(s); switch (this->type_get ()) { - case 60: // option_repr_type + case 61: // option_repr_type value.move< TokenOption::RepresentationType > (s.value); break; - case 64: // pkt4_field + case 65: // pkt4_field value.move< TokenPkt4::FieldType > (s.value); break; - case 65: // pkt6_field + case 66: // pkt6_field value.move< TokenPkt6::FieldType > (s.value); break; - case 62: // pkt_metadata + case 63: // pkt_metadata value.move< TokenPkt::MetadataType > (s.value); break; - case 66: // relay6_field + case 67: // relay6_field value.move< TokenRelay6Field::FieldType > (s.value); break; - case 61: // nest_level + case 62: // nest_level value.move< int8_t > (s.value); break; - case 48: // "constant string" - case 49: // "integer" - case 50: // "constant hexstring" - case 51: // "option name" - case 52: // "ip address" + case 49: // "constant string" + case 50: // "integer" + case 51: // "constant hexstring" + case 52: // "option name" + case 53: // "ip address" value.move< std::string > (s.value); break; - case 59: // option_code + case 60: // option_code value.move< uint16_t > (s.value); break; - case 58: // integer_expr - case 63: // enterprise_id + case 59: // integer_expr + case 64: // enterprise_id value.move< uint32_t > (s.value); break; @@ -1393,7 +1398,7 @@ namespace isc { namespace eval { 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, - 305, 306, 307 + 305, 306, 307, 308 }; return static_cast (yytoken_number_[type]); } @@ -1458,6 +1463,12 @@ namespace isc { namespace eval { return symbol_type (token::TOKEN_RELAY6, l); } + EvalParser::symbol_type + EvalParser::make_MEMBER (const location_type& l) + { + return symbol_type (token::TOKEN_MEMBER, l); + } + EvalParser::symbol_type EvalParser::make_PEERADDR (const location_type& l) { @@ -1707,7 +1718,7 @@ namespace isc { namespace eval { #line 14 "parser.yy" // lalr1.cc:377 } } // isc::eval -#line 1711 "parser.h" // lalr1.cc:377 +#line 1722 "parser.h" // lalr1.cc:377 diff --git a/src/lib/eval/position.hh b/src/lib/eval/position.hh index 29b1748dfa..8292fb4f0e 100644 --- a/src/lib/eval/position.hh +++ b/src/lib/eval/position.hh @@ -1,4 +1,4 @@ -// Generated 201710061616 +// Generated 201711240833 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/lib/eval/stack.hh b/src/lib/eval/stack.hh index fc91799529..cc15969074 100644 --- a/src/lib/eval/stack.hh +++ b/src/lib/eval/stack.hh @@ -1,4 +1,4 @@ -// Generated 201710061616 +// Generated 201711240833 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++