mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 13:37:55 +00:00
Code Issues Releases Wiki Activity

[4093] Applying changes to the files generated by bison.

Browse Source
This commit is contained in:
Marcin Siodelski
2015-11-19 16:02:07 +01:00
parent 00effa23d3
commit ae94eaf209
6 changed files with 300 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
src/lib/eval/lexer.cc
View File

@@ -18,7 +18,7 @@
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 39 #define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
@@ -72,6 +72,7 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t; typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t; typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t; typedef uint32_t flex_uint32_t;
typedef uint64_t flex_uint64_t;
#else #else
typedef signed char flex_int8_t; typedef signed char flex_int8_t;
typedef short int flex_int16_t; typedef short int flex_int16_t;
@@ -79,6 +80,7 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t; typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t; typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */ /* Limits of integral types. */
#ifndef INT8_MIN #ifndef INT8_MIN
@@ -109,8 +111,6 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif #endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
/* %endif */ /* %endif */
@@ -225,18 +225,11 @@ extern FILE *yyin, *yyout;
*/ */
#define YY_LESS_LINENO(n) \ #define YY_LESS_LINENO(n) \
do { \ do { \
int yyl;\ yy_size_t yyl;\
for ( yyl = n; yyl < yyleng; ++yyl )\ for ( yyl = n; yyl < yyleng; ++yyl )\
if ( yytext[yyl] == '\n' )\ if ( yytext[yyl] == '\n' )\
--yylineno;\ --yylineno;\
}while(0) }while(0)
#define YY_LINENO_REWIND_TO(dst) \
do {\
const char *p;\
for ( p = yy_cp-1; p >= (dst); --p)\
if ( *p == '\n' )\
--yylineno;\
}while(0)
/* Return all but the first "n" matched characters back to the input stream. */ /* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \ #define yyless(n) \
@@ -427,7 +420,7 @@ void yyfree (void * );
/* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */ /* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */
/* Begin user sect3 */ /* Begin user sect3 */
#define yywrap() 1 #define yywrap(n) 1
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
#define FLEX_DEBUG #define FLEX_DEBUG
@@ -445,8 +438,6 @@ int yylineno = 1;
extern char *yytext; extern char *yytext;
#define yytext_ptr yytext #define yytext_ptr yytext
/* %% [1.5] DFA */
/* %if-c-only Standard (non-C++) definition */ /* %if-c-only Standard (non-C++) definition */
static yy_state_type yy_get_previous_state (void ); static yy_state_type yy_get_previous_state (void );
@@ -462,15 +453,15 @@ static void yy_fatal_error (yyconst char msg[] );
#define YY_DO_BEFORE_ACTION \ #define YY_DO_BEFORE_ACTION \
(yytext_ptr) = yy_bp; \ (yytext_ptr) = yy_bp; \
/* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\ /* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\
yyleng = (size_t) (yy_cp - yy_bp); \ yyleng = (yy_size_t) (yy_cp - yy_bp); \
(yy_hold_char) = *yy_cp; \ (yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \ *yy_cp = '\0'; \
/* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
(yy_c_buf_p) = yy_cp; (yy_c_buf_p) = yy_cp;
/* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
#define YY_NUM_RULES 16 #define YY_NUM_RULES 18
#define YY_END_OF_BUFFER 17 #define YY_END_OF_BUFFER 19
/* This struct is not used in this scanner, /* This struct is not used in this scanner,
but its presence is necessary. */ but its presence is necessary. */
struct yy_trans_info struct yy_trans_info
@@ -478,13 +469,14 @@ struct yy_trans_info
flex_int32_t yy_verify; flex_int32_t yy_verify;
flex_int32_t yy_nxt; flex_int32_t yy_nxt;
}; };
static yyconst flex_int16_t yy_accept[44] = static yyconst flex_int16_t yy_accept[52] =
{ 0, { 0,
0, 0, 17, 15, 1, 2, 15, 10, 11, 14, 0, 0, 19, 17, 1, 2, 17, 12, 13, 16,
15, 5, 5, 15, 12, 13, 15, 15, 15, 1, 17, 17, 5, 5, 17, 14, 15, 17, 17, 17,
2, 0, 3, 5, 0, 6, 0, 0, 0, 4, 1, 2, 0, 3, 5, 0, 0, 0, 6, 0,
9, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 4, 11, 0, 0, 9, 0,
0, 8, 0 0, 0, 8, 0, 0, 7, 0, 0, 0, 10,
0
} ; } ;
static yyconst flex_int32_t yy_ec[256] = static yyconst flex_int32_t yy_ec[256] =
@@ -493,15 +485,15 @@ static yyconst flex_int32_t yy_ec[256] =
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, 1, 1, 1, 1, 1, 1, 1, 1,
1, 2, 1, 1, 1, 1, 1, 1, 4, 5, 1, 2, 1, 1, 1, 1, 1, 1, 4, 5,
6, 1, 1, 7, 8, 1, 1, 9, 10, 10, 6, 1, 1, 7, 8, 9, 1, 10, 11, 11,
10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 11, 11, 11, 11, 11, 11, 11, 1, 1, 1,
11, 1, 1, 1, 12, 12, 12, 12, 12, 12, 12, 1, 1, 1, 13, 13, 13, 13, 13, 13,
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, 13, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 1, 1,
14, 1, 15, 1, 1, 1, 16, 17, 12, 12, 15, 1, 16, 1, 1, 1, 17, 18, 13, 13,
12, 12, 18, 1, 19, 1, 1, 20, 1, 21, 19, 13, 20, 21, 22, 1, 1, 23, 1, 24,
22, 23, 1, 24, 25, 26, 27, 1, 1, 13, 25, 26, 1, 27, 28, 29, 30, 1, 1, 31,
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, 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,
@@ -519,61 +511,70 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1 1, 1, 1, 1, 1
} ; } ;
static yyconst flex_int32_t yy_meta[28] = static yyconst flex_int32_t yy_meta[32] =
{ 0, { 0,
1, 1, 2, 1, 1, 1, 1, 1, 3, 3, 1, 1, 2, 1, 1, 1, 1, 1, 1, 3,
1, 3, 1, 1, 1, 3, 3, 1, 1, 1, 3, 1, 3, 1, 1, 1, 3, 3, 3, 1,
1, 1, 1, 1, 1, 1, 1 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1
} ; } ;
static yyconst flex_int16_t yy_base[46] = static yyconst flex_int16_t yy_base[54] =
{ 0, { 0,
0, 0, 62, 63, 59, 57, 55, 63, 63, 63, 0, 0, 74, 75, 71, 69, 67, 75, 75, 75,
19, 21, 23, 47, 63, 63, 37, 33, 28, 52, 22, 13, 25, 27, 58, 75, 75, 46, 42, 37,
50, 48, 63, 26, 0, 63, 31, 24, 32, 0, 64, 62, 60, 75, 30, 44, 43, 0, 75, 38,
63, 29, 22, 24, 19, 23, 19, 63, 23, 20, 31, 40, 24, 23, 0, 75, 31, 24, 75, 22,
22, 63, 63, 36, 35 25, 20, 75, 24, 20, 75, 24, 21, 24, 75,
75, 56, 40
} ; } ;
static yyconst flex_int16_t yy_def[46] = static yyconst flex_int16_t yy_def[54] =
{ 0, { 0,
43, 1, 43, 43, 43, 43, 44, 43, 43, 43, 51, 1, 51, 51, 51, 51, 52, 51, 51, 51,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
43, 44, 43, 43, 45, 43, 43, 43, 43, 45, 51, 51, 52, 51, 51, 51, 51, 53, 51, 51,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 51, 51, 51, 51, 53, 51, 51, 51, 51, 51,
43, 43, 0, 43, 43 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
0, 51, 51
} ; } ;
static yyconst flex_int16_t yy_nxt[91] = static yyconst flex_int16_t yy_nxt[107] =
{ 0, { 0,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 4, 4, 15, 16, 17, 4, 4, 4, 4, 14, 15, 4, 4, 16, 17, 18, 4, 4, 4,
4, 18, 4, 4, 19, 4, 4, 24, 24, 24, 4, 4, 4, 4, 19, 4, 4, 20, 4, 4,
24, 24, 24, 25, 24, 24, 22, 30, 22, 42, 4, 25, 25, 26, 25, 25, 25, 25, 28, 25,
41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 25, 27, 35, 50, 49, 48, 47, 46, 45, 44,
31, 23, 21, 20, 29, 28, 27, 26, 23, 21, 43, 42, 41, 40, 39, 28, 23, 38, 23, 37,
20, 43, 3, 43, 43, 43, 43, 43, 43, 43, 36, 34, 33, 24, 22, 21, 32, 31, 30, 29,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 24, 22, 21, 51, 3, 51, 51, 51, 51, 51,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51
} ; } ;
static yyconst flex_int16_t yy_chk[91] = static yyconst flex_int16_t yy_chk[107] =
{ 0, { 0,
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, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 11, 11, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
12, 13, 13, 12, 24, 24, 44, 45, 44, 41, 1, 11, 11, 12, 13, 13, 14, 14, 13, 25,
40, 39, 37, 36, 35, 34, 33, 32, 29, 28, 25, 12, 53, 49, 48, 47, 45, 44, 42, 41,
27, 22, 21, 20, 19, 18, 17, 14, 7, 6, 40, 38, 37, 34, 33, 13, 52, 32, 52, 31,
5, 3, 43, 43, 43, 43, 43, 43, 43, 43, 30, 27, 26, 23, 22, 21, 20, 19, 18, 15,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 7, 6, 5, 3, 51, 51, 51, 51, 51, 51,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51
} ; } ;
/* Table of booleans, true if rule could match eol. */ /* Table of booleans, true if rule could match eol. */
static yyconst flex_int32_t yy_rule_can_match_eol[17] = static yyconst flex_int32_t yy_rule_can_match_eol[19] =
{ 0, { 0,
0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
static yy_state_type yy_last_accepting_state; static yy_state_type yy_last_accepting_state;
static char *yy_last_accepting_cpos; static char *yy_last_accepting_cpos;
@@ -581,10 +582,10 @@ static char *yy_last_accepting_cpos;
extern int yy_flex_debug; extern int yy_flex_debug;
int yy_flex_debug = 1; int yy_flex_debug = 1;
static yyconst flex_int16_t yy_rule_linenum[16] = static yyconst flex_int16_t yy_rule_linenum[18] =
{ 0, { 0,
83, 87, 93, 103, 109, 123, 124, 125, 126, 127, 83, 87, 93, 103, 109, 123, 124, 125, 126, 127,
128, 129, 130, 131, 133 128, 129, 130, 131, 132, 133, 135
} ; } ;
/* The intent behind this definition is that it'll catch /* The intent behind this definition is that it'll catch
@@ -651,7 +652,7 @@ static isc::eval::location loc;
// by moving it ahead by yyleng bytes. yyleng specifies the length of the // by moving it ahead by yyleng bytes. yyleng specifies the length of the
// currently matched token. // currently matched token.
#define YY_USER_ACTION loc.columns(yyleng); #define YY_USER_ACTION loc.columns(yyleng);
#line 655 "lexer.cc" #line 656 "lexer.cc"
#define INITIAL 0 #define INITIAL 0
@@ -769,7 +770,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's, /* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite(). * we now use fwrite().
*/ */
#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #define ECHO fwrite( yytext, yyleng, 1, yyout )
/* %endif */ /* %endif */
/* %if-c++-only C++ definition */ /* %if-c++-only C++ definition */
/* %endif */ /* %endif */
@@ -784,7 +785,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \ { \
int c = '*'; \ int c = '*'; \
size_t n; \ yy_size_t n; \
for ( n = 0; n < max_size && \ for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \ buf[n] = (char) c; \
@@ -890,6 +891,17 @@ YY_DECL
register char *yy_cp, *yy_bp; register char *yy_cp, *yy_bp;
register int yy_act; register int yy_act;
/* %% [7.0] user's declarations go here */
#line 76 "lexer.ll"
// Code run each time yylex is called.
loc.step();
#line 904 "lexer.cc"
if ( !(yy_init) ) if ( !(yy_init) )
{ {
(yy_init) = 1; (yy_init) = 1;
@@ -924,18 +936,6 @@ YY_DECL
yy_load_buffer_state( ); yy_load_buffer_state( );
} }
{
/* %% [7.0] user's declarations go here */
#line 76 "lexer.ll"
// Code run each time yylex is called.
loc.step();
#line 938 "lexer.cc"
while ( 1 ) /* loops until end-of-file is reached */ while ( 1 ) /* loops until end-of-file is reached */
{ {
/* %% [8.0] yymore()-related code goes here */ /* %% [8.0] yymore()-related code goes here */
@@ -954,7 +954,7 @@ YY_DECL
yy_match: yy_match:
do do
{ {
register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
if ( yy_accept[yy_current_state] ) if ( yy_accept[yy_current_state] )
{ {
(yy_last_accepting_state) = yy_current_state; (yy_last_accepting_state) = yy_current_state;
@@ -963,13 +963,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 44 ) if ( yy_current_state >= 52 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp; ++yy_cp;
} }
while ( yy_current_state != 43 ); while ( yy_current_state != 51 );
yy_cp = (yy_last_accepting_cpos); yy_cp = (yy_last_accepting_cpos);
yy_current_state = (yy_last_accepting_state); yy_current_state = (yy_last_accepting_state);
@@ -998,13 +998,13 @@ do_action: /* This label is used only to access EOF actions. */
{ {
if ( yy_act == 0 ) if ( yy_act == 0 )
fprintf( stderr, "--scanner backing up\n" ); fprintf( stderr, "--scanner backing up\n" );
else if ( yy_act < 16 ) else if ( yy_act < 18 )
fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
(long)yy_rule_linenum[yy_act], yytext ); (long)yy_rule_linenum[yy_act], yytext );
else if ( yy_act == 16 ) else if ( yy_act == 18 )
fprintf( stderr, "--accepting default rule (\"%s\")\n", fprintf( stderr, "--accepting default rule (\"%s\")\n",
yytext ); yytext );
else if ( yy_act == 17 ) else if ( yy_act == 19 )
fprintf( stderr, "--(end of buffer or a NUL)\n" ); fprintf( stderr, "--(end of buffer or a NUL)\n" );
else else
fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
@@ -1090,53 +1090,63 @@ return isc::eval::EvalParser::make_OPTION(loc);
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 125 "lexer.ll" #line 125 "lexer.ll"
return isc::eval::EvalParser::make_SUBSTRING(loc); return isc::eval::EvalParser::make_DOTTEXT(loc);
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 126 "lexer.ll" #line 126 "lexer.ll"
return isc::eval::EvalParser::make_ALL(loc); return isc::eval::EvalParser::make_DOTHEX(loc);
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 127 "lexer.ll" #line 127 "lexer.ll"
return isc::eval::EvalParser::make_LPAREN(loc); return isc::eval::EvalParser::make_SUBSTRING(loc);
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 128 "lexer.ll" #line 128 "lexer.ll"
return isc::eval::EvalParser::make_RPAREN(loc); return isc::eval::EvalParser::make_ALL(loc);
YY_BREAK YY_BREAK
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 129 "lexer.ll" #line 129 "lexer.ll"
return isc::eval::EvalParser::make_LBRACKET(loc); return isc::eval::EvalParser::make_LPAREN(loc);
YY_BREAK YY_BREAK
case 13: case 13:
YY_RULE_SETUP YY_RULE_SETUP
#line 130 "lexer.ll" #line 130 "lexer.ll"
return isc::eval::EvalParser::make_RBRACKET(loc); return isc::eval::EvalParser::make_RPAREN(loc);
YY_BREAK YY_BREAK
case 14: case 14:
YY_RULE_SETUP YY_RULE_SETUP
#line 131 "lexer.ll" #line 131 "lexer.ll"
return isc::eval::EvalParser::make_COMA(loc); return isc::eval::EvalParser::make_LBRACKET(loc);
YY_BREAK YY_BREAK
case 15: case 15:
YY_RULE_SETUP YY_RULE_SETUP
#line 133 "lexer.ll" #line 132 "lexer.ll"
driver.error (loc, "Invalid character: " + std::string(yytext)); return isc::eval::EvalParser::make_RBRACKET(loc);
YY_BREAK
case YY_STATE_EOF(INITIAL):
#line 134 "lexer.ll"
return isc::eval::EvalParser::make_END(loc);
YY_BREAK YY_BREAK
case 16: case 16:
YY_RULE_SETUP YY_RULE_SETUP
#line 133 "lexer.ll"
return isc::eval::EvalParser::make_COMA(loc);
YY_BREAK
case 17:
YY_RULE_SETUP
#line 135 "lexer.ll" #line 135 "lexer.ll"
driver.error (loc, "Invalid character: " + std::string(yytext));
YY_BREAK
case YY_STATE_EOF(INITIAL):
#line 136 "lexer.ll"
return isc::eval::EvalParser::make_END(loc);
YY_BREAK
case 18:
YY_RULE_SETUP
#line 137 "lexer.ll"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 1140 "lexer.cc" #line 1150 "lexer.cc"
case YY_END_OF_BUFFER: case YY_END_OF_BUFFER:
{ {
@@ -1267,7 +1277,6 @@ ECHO;
"fatal flex scanner internal error--no action found" ); "fatal flex scanner internal error--no action found" );
} /* end of action switch */ } /* end of action switch */
} /* end of scanning one token */ } /* end of scanning one token */
} /* end of user's declarations */
} /* end of yylex */ } /* end of yylex */
/* %ok-for-header */ /* %ok-for-header */
@@ -1342,7 +1351,7 @@ static int yy_get_next_buffer (void)
{ /* Not enough room in the buffer - grow it. */ { /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */ /* just a shorter name for the current buffer */
YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
int yy_c_buf_p_offset = int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf); (int) ((yy_c_buf_p) - b->yy_ch_buf);
@@ -1449,7 +1458,7 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 44 ) if ( yy_current_state >= 52 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1482,13 +1491,13 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 44 ) if ( yy_current_state >= 52 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 43); yy_is_jam = (yy_current_state == 51);
return yy_is_jam ? 0 : yy_current_state; return yy_is_jam ? 0 : yy_current_state;
} }
/* %if-c-only */ /* %if-c-only */
@@ -1547,7 +1556,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE: case EOB_ACT_END_OF_FILE:
{ {
if ( yywrap( ) ) if ( yywrap( ) )
return EOF; return 0;
if ( ! (yy_did_buffer_switch_on_eof) ) if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE; YY_NEW_FILE;
@@ -1711,6 +1720,17 @@ static void yy_load_buffer_state (void)
yyfree((void *) b ); yyfree((void *) b );
} }
/* %if-c-only */
#ifndef __cplusplus
extern int isatty (int );
#endif /* __cplusplus */
/* %endif */
/* %if-c++-only */
/* %endif */
/* Initializes or reinitializes a buffer. /* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer, * This function is sometimes called more than once on the same buffer,
* such as during a yyrestart() or at EOF. * such as during a yyrestart() or at EOF.
@@ -1951,8 +1971,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
/* %if-c-only */ /* %if-c-only */
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
* scan from a @e copy of @a bytes. * scan from a @e copy of @a bytes.
* @param yybytes the byte buffer to scan * @param bytes the byte buffer to scan
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * @param len the number of bytes in the buffer pointed to by @a bytes.
* *
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
@@ -1960,8 +1980,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
char *buf; char *buf;
yy_size_t n; yy_size_t n, i;
yy_size_t i;
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2; n = _yybytes_len + 2;
@@ -2224,7 +2243,7 @@ void yyfree (void * ptr )
/* %ok-for-header */ /* %ok-for-header */
#line 135 "lexer.ll" #line 137 "lexer.ll"

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

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

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

@@ -52,8 +52,34 @@
#line 39 "parser.yy" // lalr1.cc:413 #line 39 "parser.yy" // lalr1.cc:413
# include "eval_context.h" # include "eval_context.h"
#line 66 "parser.yy" // lalr1.cc:413
#line 57 "parser.cc" // lalr1.cc:413 namespace {
/* Convert option code specified as string to an 16 bit unsigned
representation. If the option code is not within the range of
0..65535 an error is reported. */
uint16_t
convert_option_code(const std::string& option_code,
const isc::eval::EvalParser::location_type& loc,
EvalContext& ctx) {
int n = 0;
try {
n = boost::lexical_cast<int>(option_code);
} catch (const boost::bad_lexical_cast &) {
// This can't happen...
ctx.error(loc, "Option code has invalid value in " + option_code);
}
if (n < 0 || n > 65535) {
ctx.error(loc, "Option code has invalid value in "
+ option_code + ". Allowed range: 0..65535");
}
return (static_cast<uint16_t>(n));
}
}
#line 83 "parser.cc" // lalr1.cc:413
#ifndef YY_ #ifndef YY_
@@ -139,7 +165,7 @@
#line 21 "parser.yy" // lalr1.cc:479 #line 21 "parser.yy" // lalr1.cc:479
namespace isc { namespace eval { namespace isc { namespace eval {
#line 143 "parser.cc" // lalr1.cc:479 #line 169 "parser.cc" // lalr1.cc:479
/* Return YYSTR after stripping away unnecessary quotes and /* Return YYSTR after stripping away unnecessary quotes and
backslashes, so that it's suitable for yyerror. The heuristic is backslashes, so that it's suitable for yyerror. The heuristic is
@@ -251,10 +277,10 @@ namespace isc { namespace eval {
{ {
switch (that.type_get ()) switch (that.type_get ())
{ {
case 12: // "constant string" case 14: // "constant string"
case 13: // "integer" case 15: // "integer"
case 14: // "constant hexstring" case 16: // "constant hexstring"
case 15: // TOKEN case 17: // TOKEN
value.move< std::string > (that.value); value.move< std::string > (that.value);
break; break;
@@ -273,10 +299,10 @@ namespace isc { namespace eval {
state = that.state; state = that.state;
switch (that.type_get ()) switch (that.type_get ())
{ {
case 12: // "constant string" case 14: // "constant string"
case 13: // "integer" case 15: // "integer"
case 14: // "constant hexstring" case 16: // "constant hexstring"
case 15: // TOKEN case 17: // TOKEN
value.copy< std::string > (that.value); value.copy< std::string > (that.value);
break; break;
@@ -316,32 +342,32 @@ namespace isc { namespace eval {
<< yysym.location << ": "; << yysym.location << ": ";
switch (yytype) switch (yytype)
{ {
case 12: // "constant string" case 14: // "constant string"
#line 61 "parser.yy" // lalr1.cc:636 #line 63 "parser.yy" // lalr1.cc:636
{ yyoutput << yysym.value.template as< std::string > (); } { yyoutput << yysym.value.template as< std::string > (); }
#line 324 "parser.cc" // lalr1.cc:636 #line 350 "parser.cc" // lalr1.cc:636
break; break;
case 13: // "integer" case 15: // "integer"
#line 61 "parser.yy" // lalr1.cc:636 #line 63 "parser.yy" // lalr1.cc:636
{ yyoutput << yysym.value.template as< std::string > (); } { yyoutput << yysym.value.template as< std::string > (); }
#line 331 "parser.cc" // lalr1.cc:636 #line 357 "parser.cc" // lalr1.cc:636
break; break;
case 14: // "constant hexstring" case 16: // "constant hexstring"
#line 61 "parser.yy" // lalr1.cc:636 #line 63 "parser.yy" // lalr1.cc:636
{ yyoutput << yysym.value.template as< std::string > (); } { yyoutput << yysym.value.template as< std::string > (); }
#line 338 "parser.cc" // lalr1.cc:636 #line 364 "parser.cc" // lalr1.cc:636
break; break;
case 15: // TOKEN case 17: // TOKEN
#line 61 "parser.yy" // lalr1.cc:636 #line 63 "parser.yy" // lalr1.cc:636
{ yyoutput << yysym.value.template as< std::string > (); } { yyoutput << yysym.value.template as< std::string > (); }
#line 345 "parser.cc" // lalr1.cc:636 #line 371 "parser.cc" // lalr1.cc:636
break; break;
@@ -541,10 +567,10 @@ namespace isc { namespace eval {
when using variants. */ when using variants. */
switch (yyr1_[yyn]) switch (yyr1_[yyn])
{ {
case 12: // "constant string" case 14: // "constant string"
case 13: // "integer" case 15: // "integer"
case 14: // "constant hexstring" case 16: // "constant hexstring"
case 15: // TOKEN case 17: // TOKEN
yylhs.value.build< std::string > (); yylhs.value.build< std::string > ();
break; break;
@@ -566,92 +592,90 @@ namespace isc { namespace eval {
switch (yyn) switch (yyn)
{ {
case 3: case 3:
#line 73 "parser.yy" // lalr1.cc:859 #line 104 "parser.yy" // lalr1.cc:859
{ {
TokenPtr eq(new TokenEqual()); TokenPtr eq(new TokenEqual());
ctx.expression.push_back(eq); ctx.expression.push_back(eq);
} }
#line 575 "parser.cc" // lalr1.cc:859 #line 601 "parser.cc" // lalr1.cc:859
break; break;
case 4: case 4:
#line 80 "parser.yy" // lalr1.cc:859 #line 111 "parser.yy" // lalr1.cc:859
{ {
TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ()));
ctx.expression.push_back(str); ctx.expression.push_back(str);
} }
#line 584 "parser.cc" // lalr1.cc:859 #line 610 "parser.cc" // lalr1.cc:859
break; break;
case 5: case 5:
#line 85 "parser.yy" // lalr1.cc:859 #line 116 "parser.yy" // lalr1.cc:859
{ {
TokenPtr hex(new TokenHexString(yystack_[0].value.as< std::string > ())); TokenPtr hex(new TokenHexString(yystack_[0].value.as< std::string > ()));
ctx.expression.push_back(hex); ctx.expression.push_back(hex);
} }
#line 593 "parser.cc" // lalr1.cc:859 #line 619 "parser.cc" // lalr1.cc:859
break; break;
case 6: case 6:
#line 90 "parser.yy" // lalr1.cc:859 #line 121 "parser.yy" // lalr1.cc:859
{ {
int n = 0; uint16_t numeric_code = convert_option_code(yystack_[2].value.as< std::string > (), yystack_[2].location, ctx);
try { TokenPtr opt(new TokenOption(numeric_code, TokenOption::TEXTUAL));
n = boost::lexical_cast<int>(yystack_[1].value.as< std::string > ());
} catch (const boost::bad_lexical_cast &) {
// This can't happen...
ctx.error(yystack_[1].location,
"Option code has invalid value in " + yystack_[1].value.as< std::string > ());
}
if (n < 0 || n > 65535) {
ctx.error(yystack_[1].location,
"Option code has invalid value in "
+ yystack_[1].value.as< std::string > () + ". Allowed range: 0..65535");
}
TokenPtr opt(new TokenOption(static_cast<uint16_t>(n)));
ctx.expression.push_back(opt); ctx.expression.push_back(opt);
} }
#line 615 "parser.cc" // lalr1.cc:859 #line 629 "parser.cc" // lalr1.cc:859
break; break;
case 7: case 7:
#line 108 "parser.yy" // lalr1.cc:859 #line 127 "parser.yy" // lalr1.cc:859
{
uint16_t numeric_code = convert_option_code(yystack_[2].value.as< std::string > (), yystack_[2].location, ctx);
TokenPtr opt(new TokenOption(numeric_code, TokenOption::HEXADECIMAL));
ctx.expression.push_back(opt);
}
#line 639 "parser.cc" // lalr1.cc:859
break;
case 8:
#line 133 "parser.yy" // lalr1.cc:859
{ {
TokenPtr sub(new TokenSubstring()); TokenPtr sub(new TokenSubstring());
ctx.expression.push_back(sub); ctx.expression.push_back(sub);
} }
#line 624 "parser.cc" // lalr1.cc:859 #line 648 "parser.cc" // lalr1.cc:859
break; break;
case 9: case 10:
#line 117 "parser.yy" // lalr1.cc:859 #line 142 "parser.yy" // lalr1.cc:859
{ {
TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ()));
ctx.expression.push_back(str); ctx.expression.push_back(str);
} }
#line 633 "parser.cc" // lalr1.cc:859 #line 657 "parser.cc" // lalr1.cc:859
break; break;
case 10: case 11:
#line 124 "parser.yy" // lalr1.cc:859 #line 149 "parser.yy" // lalr1.cc:859
{ {
TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ())); TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ()));
ctx.expression.push_back(str); ctx.expression.push_back(str);
} }
#line 642 "parser.cc" // lalr1.cc:859 #line 666 "parser.cc" // lalr1.cc:859
break; break;
case 11: case 12:
#line 129 "parser.yy" // lalr1.cc:859 #line 154 "parser.yy" // lalr1.cc:859
{ {
TokenPtr str(new TokenString("all")); TokenPtr str(new TokenString("all"));
ctx.expression.push_back(str); ctx.expression.push_back(str);
} }
#line 651 "parser.cc" // lalr1.cc:859 #line 675 "parser.cc" // lalr1.cc:859
break; break;
#line 655 "parser.cc" // lalr1.cc:859 #line 679 "parser.cc" // lalr1.cc:859
default: default:
break; break;
} }
@@ -913,65 +937,67 @@ namespace isc { namespace eval {
const signed char const signed char
EvalParser::yypact_[] = EvalParser::yypact_[] =
{ {
-4, -7, -2, -9, -9, -9, 7, -9, 6, 0, -4, -8, -2, -9, -9, -9, 11, -9, 12, -1,
-4, -9, -4, 3, 8, -9, -9, 4, -9, 9, -4, -9, -4, 3, 8, -9, 0, 4, -9, -9,
-1, -9, -9, 10, -9 -9, 9, -6, -9, -9, 10, -9
}; };
const unsigned char const unsigned char
EvalParser::yydefact_[] = EvalParser::yydefact_[] =
{ {
0, 0, 0, 4, 5, 8, 0, 2, 0, 0, 0, 0, 0, 4, 5, 9, 0, 2, 0, 0,
0, 1, 0, 0, 0, 3, 6, 0, 9, 0, 0, 1, 0, 0, 0, 3, 0, 0, 6, 7,
0, 11, 10, 0, 7 10, 0, 0, 12, 11, 0, 8
}; };
const signed char const signed char
EvalParser::yypgoto_[] = EvalParser::yypgoto_[] =
{ {
-9, -9, -9, -8, -9, -9 -9, -9, -9, -7, -9, -9
}; };
const signed char const signed char
EvalParser::yydefgoto_[] = EvalParser::yydefgoto_[] =
{ {
-1, 6, 7, 8, 19, 23 -1, 6, 7, 8, 21, 25
}; };
const unsigned char const unsigned char
EvalParser::yytable_[] = EvalParser::yytable_[] =
{ {
1, 2, 14, 9, 15, 21, 10, 11, 3, 12, 1, 2, 23, 14, 9, 15, 18, 19, 10, 24,
4, 5, 22, 13, 16, 17, 20, 18, 0, 24 3, 11, 4, 5, 13, 12, 16, 17, 22, 20,
0, 26
}; };
const signed char const signed char
EvalParser::yycheck_[] = EvalParser::yycheck_[] =
{ {
4, 5, 10, 10, 12, 6, 8, 0, 12, 3, 4, 5, 8, 10, 12, 12, 6, 7, 10, 15,
14, 15, 13, 13, 11, 7, 7, 13, -1, 9 14, 0, 16, 17, 15, 3, 13, 9, 9, 15,
-1, 11
}; };
const unsigned char const unsigned char
EvalParser::yystos_[] = EvalParser::yystos_[] =
{ {
0, 4, 5, 12, 14, 15, 17, 18, 19, 10, 0, 4, 5, 14, 16, 17, 19, 20, 21, 12,
8, 0, 3, 13, 19, 19, 11, 7, 13, 20, 10, 0, 3, 15, 21, 21, 13, 9, 6, 7,
7, 6, 13, 21, 9 15, 22, 9, 8, 15, 23, 11
}; };
const unsigned char const unsigned char
EvalParser::yyr1_[] = EvalParser::yyr1_[] =
{ {
0, 16, 17, 18, 19, 19, 19, 19, 19, 20, 0, 18, 19, 20, 21, 21, 21, 21, 21, 21,
21, 21 22, 23, 23
}; };
const unsigned char const unsigned char
EvalParser::yyr2_[] = EvalParser::yyr2_[] =
{ {
0, 2, 1, 3, 1, 1, 4, 8, 1, 1, 0, 2, 1, 3, 1, 1, 5, 5, 8, 1,
1, 1 1, 1, 1
}; };
@@ -982,18 +1008,18 @@ namespace isc { namespace eval {
const EvalParser::yytname_[] = const EvalParser::yytname_[] =
{ {
"\"end of file\"", "error", "$undefined", "\"==\"", "\"option\"", "\"end of file\"", "error", "$undefined", "\"==\"", "\"option\"",
"\"substring\"", "\"all\"", "\",\"", "\"(\"", "\")\"", "\"[\"", "\"]\"", "\"substring\"", "\".text\"", "\".hex\"", "\"all\"", "\",\"", "\"(\"",
"\"constant string\"", "\"integer\"", "\"constant hexstring\"", "TOKEN", "\")\"", "\"[\"", "\"]\"", "\"constant string\"", "\"integer\"",
"$accept", "expression", "bool_expr", "string_expr", "start_expr", "\"constant hexstring\"", "TOKEN", "$accept", "expression", "bool_expr",
"length_expr", YY_NULLPTR "string_expr", "start_expr", "length_expr", YY_NULLPTR
}; };
#if YYDEBUG #if YYDEBUG
const unsigned char const unsigned char
EvalParser::yyrline_[] = EvalParser::yyrline_[] =
{ {
0, 69, 69, 72, 79, 84, 89, 107, 112, 116, 0, 100, 100, 103, 110, 115, 120, 126, 132, 137,
123, 128 141, 148, 153
}; };
// Print the state stack on the debug stream. // Print the state stack on the debug stream.
@@ -1028,8 +1054,8 @@ namespace isc { namespace eval {
#line 21 "parser.yy" // lalr1.cc:1167 #line 21 "parser.yy" // lalr1.cc:1167
} } // isc::eval } } // isc::eval
#line 1032 "parser.cc" // lalr1.cc:1167 #line 1058 "parser.cc" // lalr1.cc:1167
#line 135 "parser.yy" // lalr1.cc:1168 #line 160 "parser.yy" // lalr1.cc:1168
void void
isc::eval::EvalParser::error(const location_type& loc, isc::eval::EvalParser::error(const location_type& loc,

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

@@ -325,16 +325,18 @@ namespace isc { namespace eval {
TOKEN_EQUAL = 258, TOKEN_EQUAL = 258,
TOKEN_OPTION = 259, TOKEN_OPTION = 259,
TOKEN_SUBSTRING = 260, TOKEN_SUBSTRING = 260,
TOKEN_ALL = 261, TOKEN_DOTTEXT = 261,
TOKEN_COMA = 262, TOKEN_DOTHEX = 262,
TOKEN_LPAREN = 263, TOKEN_ALL = 263,
TOKEN_RPAREN = 264, TOKEN_COMA = 264,
TOKEN_LBRACKET = 265, TOKEN_LPAREN = 265,
TOKEN_RBRACKET = 266, TOKEN_RPAREN = 266,
TOKEN_STRING = 267, TOKEN_LBRACKET = 267,
TOKEN_INTEGER = 268, TOKEN_RBRACKET = 268,
TOKEN_HEXSTRING = 269, TOKEN_STRING = 269,
TOKEN_TOKEN = 270 TOKEN_INTEGER = 270,
TOKEN_HEXSTRING = 271,
TOKEN_TOKEN = 272
}; };
}; };
@@ -457,6 +459,14 @@ namespace isc { namespace eval {
symbol_type symbol_type
make_SUBSTRING (const location_type& l); make_SUBSTRING (const location_type& l);
static inline
symbol_type
make_DOTTEXT (const location_type& l);
static inline
symbol_type
make_DOTHEX (const location_type& l);
static inline static inline
symbol_type symbol_type
make_ALL (const location_type& l); make_ALL (const location_type& l);
@@ -702,12 +712,12 @@ namespace isc { namespace eval {
enum enum
{ {
yyeof_ = 0, yyeof_ = 0,
yylast_ = 19, ///< Last index in yytable_. yylast_ = 21, ///< Last index in yytable_.
yynnts_ = 6, ///< Number of nonterminal symbols. yynnts_ = 6, ///< Number of nonterminal symbols.
yyfinal_ = 11, ///< Termination state number. yyfinal_ = 11, ///< Termination state number.
yyterror_ = 1, yyterror_ = 1,
yyerrcode_ = 256, yyerrcode_ = 256,
yyntokens_ = 16 ///< Number of tokens. yyntokens_ = 18 ///< Number of tokens.
}; };
@@ -751,9 +761,9 @@ namespace isc { namespace eval {
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15 15, 16, 17
}; };
const unsigned int user_token_number_max_ = 270; const unsigned int user_token_number_max_ = 272;
const token_number_type undef_token_ = 2; const token_number_type undef_token_ = 2;
if (static_cast<int>(t) <= yyeof_) if (static_cast<int>(t) <= yyeof_)
@@ -786,10 +796,10 @@ namespace isc { namespace eval {
{ {
switch (other.type_get ()) switch (other.type_get ())
{ {
case 12: // "constant string" case 14: // "constant string"
case 13: // "integer" case 15: // "integer"
case 14: // "constant hexstring" case 16: // "constant hexstring"
case 15: // TOKEN case 17: // TOKEN
value.copy< std::string > (other.value); value.copy< std::string > (other.value);
break; break;
@@ -810,10 +820,10 @@ namespace isc { namespace eval {
(void) v; (void) v;
switch (this->type_get ()) switch (this->type_get ())
{ {
case 12: // "constant string" case 14: // "constant string"
case 13: // "integer" case 15: // "integer"
case 14: // "constant hexstring" case 16: // "constant hexstring"
case 15: // TOKEN case 17: // TOKEN
value.copy< std::string > (v); value.copy< std::string > (v);
break; break;
@@ -865,10 +875,10 @@ namespace isc { namespace eval {
// Type destructor. // Type destructor.
switch (yytype) switch (yytype)
{ {
case 12: // "constant string" case 14: // "constant string"
case 13: // "integer" case 15: // "integer"
case 14: // "constant hexstring" case 16: // "constant hexstring"
case 15: // TOKEN case 17: // TOKEN
value.template destroy< std::string > (); value.template destroy< std::string > ();
break; break;
@@ -895,10 +905,10 @@ namespace isc { namespace eval {
super_type::move(s); super_type::move(s);
switch (this->type_get ()) switch (this->type_get ())
{ {
case 12: // "constant string" case 14: // "constant string"
case 13: // "integer" case 15: // "integer"
case 14: // "constant hexstring" case 16: // "constant hexstring"
case 15: // TOKEN case 17: // TOKEN
value.move< std::string > (s.value); value.move< std::string > (s.value);
break; break;
@@ -958,7 +968,7 @@ namespace isc { namespace eval {
yytoken_number_[] = yytoken_number_[] =
{ {
0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
265, 266, 267, 268, 269, 270 265, 266, 267, 268, 269, 270, 271, 272
}; };
return static_cast<token_type> (yytoken_number_[type]); return static_cast<token_type> (yytoken_number_[type]);
} }
@@ -987,6 +997,18 @@ namespace isc { namespace eval {
return symbol_type (token::TOKEN_SUBSTRING, l); return symbol_type (token::TOKEN_SUBSTRING, l);
} }
EvalParser::symbol_type
EvalParser::make_DOTTEXT (const location_type& l)
{
return symbol_type (token::TOKEN_DOTTEXT, l);
}
EvalParser::symbol_type
EvalParser::make_DOTHEX (const location_type& l)
{
return symbol_type (token::TOKEN_DOTHEX, l);
}
EvalParser::symbol_type EvalParser::symbol_type
EvalParser::make_ALL (const location_type& l) EvalParser::make_ALL (const location_type& l)
{ {
@@ -1050,7 +1072,7 @@ namespace isc { namespace eval {
#line 21 "parser.yy" // lalr1.cc:392 #line 21 "parser.yy" // lalr1.cc:392
} } // isc::eval } } // isc::eval
#line 1054 "parser.h" // lalr1.cc:392 #line 1076 "parser.h" // lalr1.cc:392

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

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

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

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