|
@@ -460,8 +460,8 @@ static void yy_fatal_error (yyconst char msg[] );
|
|
|
(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 19
|
|
|
-#define YY_END_OF_BUFFER 20
|
|
|
+#define YY_NUM_RULES 20
|
|
|
+#define YY_END_OF_BUFFER 21
|
|
|
/* This struct is not used in this scanner,
|
|
|
but its presence is necessary. */
|
|
|
struct yy_trans_info
|
|
@@ -469,14 +469,14 @@ struct yy_trans_info
|
|
|
flex_int32_t yy_verify;
|
|
|
flex_int32_t yy_nxt;
|
|
|
};
|
|
|
-static yyconst flex_int16_t yy_accept[52] =
|
|
|
+static yyconst flex_int16_t yy_accept[55] =
|
|
|
{ 0,
|
|
|
- 0, 0, 20, 18, 1, 2, 18, 13, 14, 17,
|
|
|
- 18, 12, 5, 5, 18, 15, 16, 18, 18, 18,
|
|
|
- 18, 18, 1, 2, 0, 3, 5, 0, 6, 0,
|
|
|
- 0, 0, 0, 0, 4, 11, 9, 0, 0, 0,
|
|
|
- 0, 0, 8, 0, 0, 7, 0, 0, 0, 10,
|
|
|
- 0
|
|
|
+ 0, 0, 21, 19, 1, 2, 19, 13, 14, 17,
|
|
|
+ 19, 12, 5, 5, 19, 19, 15, 16, 19, 19,
|
|
|
+ 19, 19, 19, 1, 2, 0, 3, 5, 0, 6,
|
|
|
+ 0, 0, 0, 0, 0, 0, 4, 18, 11, 9,
|
|
|
+ 0, 0, 0, 0, 0, 8, 0, 0, 7, 0,
|
|
|
+ 0, 0, 10, 0
|
|
|
} ;
|
|
|
|
|
|
static yyconst flex_int32_t yy_ec[256] =
|
|
@@ -488,13 +488,13 @@ static yyconst flex_int32_t yy_ec[256] =
|
|
|
6, 1, 1, 7, 8, 9, 1, 10, 11, 11,
|
|
|
11, 11, 11, 11, 11, 11, 11, 1, 1, 1,
|
|
|
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, 14, 1, 1,
|
|
|
- 15, 1, 16, 1, 1, 1, 17, 18, 13, 13,
|
|
|
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
|
|
|
+ 14, 14, 14, 14, 14, 14, 14, 15, 14, 14,
|
|
|
+ 16, 1, 17, 1, 18, 1, 19, 20, 13, 13,
|
|
|
|
|
|
- 19, 13, 20, 21, 22, 1, 1, 23, 1, 24,
|
|
|
- 25, 26, 1, 27, 28, 29, 30, 1, 1, 31,
|
|
|
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
|
|
+ 21, 13, 22, 23, 24, 14, 14, 25, 14, 26,
|
|
|
+ 27, 28, 14, 29, 30, 31, 32, 14, 14, 33,
|
|
|
+ 14, 14, 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,
|
|
@@ -511,71 +511,77 @@ static yyconst flex_int32_t yy_ec[256] =
|
|
|
1, 1, 1, 1, 1
|
|
|
} ;
|
|
|
|
|
|
-static yyconst flex_int32_t yy_meta[32] =
|
|
|
+static yyconst flex_int32_t yy_meta[34] =
|
|
|
{ 0,
|
|
|
- 1, 1, 2, 1, 1, 1, 1, 1, 1, 3,
|
|
|
- 3, 1, 3, 1, 1, 1, 3, 3, 3, 1,
|
|
|
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
|
|
- 1
|
|
|
+ 1, 1, 2, 1, 1, 1, 1, 3, 1, 4,
|
|
|
+ 4, 1, 4, 3, 3, 1, 1, 3, 4, 4,
|
|
|
+ 4, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
|
|
+ 3, 3, 3
|
|
|
} ;
|
|
|
|
|
|
-static yyconst flex_int16_t yy_base[54] =
|
|
|
+static yyconst flex_int16_t yy_base[58] =
|
|
|
{ 0,
|
|
|
- 0, 0, 72, 73, 69, 67, 65, 73, 73, 73,
|
|
|
- 22, 73, 24, 26, 56, 73, 73, 44, 47, 39,
|
|
|
- 34, 44, 60, 58, 56, 73, 29, 0, 73, 36,
|
|
|
- 26, 25, 35, 21, 0, 73, 73, 29, 22, 20,
|
|
|
- 23, 18, 73, 22, 18, 73, 22, 19, 22, 73,
|
|
|
- 73, 55, 38
|
|
|
+ 0, 0, 98, 99, 95, 93, 91, 99, 99, 99,
|
|
|
+ 24, 99, 26, 28, 82, 0, 99, 99, 68, 71,
|
|
|
+ 63, 58, 68, 86, 84, 82, 99, 32, 0, 99,
|
|
|
+ 64, 23, 27, 30, 29, 33, 0, 99, 61, 59,
|
|
|
+ 28, 34, 36, 38, 37, 58, 45, 40, 57, 39,
|
|
|
+ 53, 55, 56, 99, 79, 81, 54
|
|
|
} ;
|
|
|
|
|
|
-static yyconst flex_int16_t yy_def[54] =
|
|
|
+static yyconst flex_int16_t yy_def[58] =
|
|
|
{ 0,
|
|
|
- 51, 1, 51, 51, 51, 51, 52, 51, 51, 51,
|
|
|
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
|
|
|
- 51, 51, 51, 51, 52, 51, 51, 53, 51, 51,
|
|
|
- 51, 51, 51, 51, 53, 51, 51, 51, 51, 51,
|
|
|
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
|
|
|
- 0, 51, 51
|
|
|
+ 54, 1, 54, 54, 54, 54, 55, 54, 54, 54,
|
|
|
+ 54, 54, 54, 54, 54, 56, 54, 54, 56, 56,
|
|
|
+ 56, 56, 56, 54, 54, 55, 54, 54, 57, 54,
|
|
|
+ 56, 56, 56, 56, 56, 56, 57, 54, 56, 56,
|
|
|
+ 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
|
|
|
+ 56, 56, 56, 0, 54, 54, 54
|
|
|
} ;
|
|
|
|
|
|
-static yyconst flex_int16_t yy_nxt[105] =
|
|
|
+static yyconst flex_int16_t yy_nxt[133] =
|
|
|
{ 0,
|
|
|
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
|
|
|
- 14, 15, 4, 4, 16, 17, 18, 4, 4, 4,
|
|
|
- 19, 4, 4, 4, 20, 4, 4, 21, 22, 4,
|
|
|
- 4, 27, 27, 27, 27, 27, 27, 28, 27, 27,
|
|
|
- 35, 50, 49, 48, 47, 46, 45, 44, 43, 42,
|
|
|
- 41, 40, 39, 38, 28, 25, 37, 25, 36, 26,
|
|
|
- 24, 23, 34, 33, 32, 31, 30, 29, 26, 24,
|
|
|
- 23, 51, 3, 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, 51,
|
|
|
-
|
|
|
- 51, 51, 51, 51
|
|
|
+ 14, 15, 16, 16, 16, 17, 18, 4, 19, 16,
|
|
|
+ 16, 16, 20, 16, 16, 16, 21, 16, 16, 22,
|
|
|
+ 23, 16, 16, 28, 28, 28, 28, 28, 28, 38,
|
|
|
+ 29, 28, 28, 38, 38, 38, 38, 39, 42, 38,
|
|
|
+ 38, 44, 38, 38, 38, 38, 38, 37, 29, 40,
|
|
|
+ 41, 38, 51, 45, 47, 43, 46, 48, 50, 38,
|
|
|
+ 49, 38, 38, 38, 38, 38, 53, 38, 52, 26,
|
|
|
+ 38, 26, 26, 31, 31, 27, 25, 24, 36, 35,
|
|
|
+ 34, 33, 32, 30, 27, 25, 24, 54, 3, 54,
|
|
|
+
|
|
|
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
|
|
|
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
|
|
|
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
|
|
|
+ 54, 54
|
|
|
} ;
|
|
|
|
|
|
-static yyconst flex_int16_t yy_chk[105] =
|
|
|
+static yyconst flex_int16_t yy_chk[133] =
|
|
|
{ 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, 11, 11, 13, 13, 14, 14, 13, 27, 27,
|
|
|
- 53, 49, 48, 47, 45, 44, 42, 41, 40, 39,
|
|
|
- 38, 34, 33, 32, 13, 52, 31, 52, 30, 25,
|
|
|
- 24, 23, 22, 21, 20, 19, 18, 15, 7, 6,
|
|
|
- 5, 3, 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, 51, 51,
|
|
|
-
|
|
|
- 51, 51, 51, 51
|
|
|
+ 1, 1, 1, 11, 11, 13, 13, 14, 14, 32,
|
|
|
+ 13, 28, 28, 33, 41, 35, 34, 32, 35, 36,
|
|
|
+ 42, 41, 43, 45, 44, 50, 48, 57, 13, 33,
|
|
|
+ 34, 47, 50, 42, 44, 36, 43, 45, 48, 51,
|
|
|
+ 47, 52, 53, 49, 46, 40, 52, 39, 51, 55,
|
|
|
+ 31, 55, 55, 56, 56, 26, 25, 24, 23, 22,
|
|
|
+ 21, 20, 19, 15, 7, 6, 5, 3, 54, 54,
|
|
|
+
|
|
|
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
|
|
|
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
|
|
|
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
|
|
|
+ 54, 54
|
|
|
} ;
|
|
|
|
|
|
/* Table of booleans, true if rule could match eol. */
|
|
|
-static yyconst flex_int32_t yy_rule_can_match_eol[20] =
|
|
|
+static yyconst flex_int32_t yy_rule_can_match_eol[21] =
|
|
|
{ 0,
|
|
|
0, 1, 0, 0, 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 char *yy_last_accepting_cpos;
|
|
@@ -583,10 +589,10 @@ static char *yy_last_accepting_cpos;
|
|
|
extern int yy_flex_debug;
|
|
|
int yy_flex_debug = 1;
|
|
|
|
|
|
-static yyconst flex_int16_t yy_rule_linenum[19] =
|
|
|
+static yyconst flex_int16_t yy_rule_linenum[20] =
|
|
|
{ 0,
|
|
|
83, 87, 93, 103, 109, 123, 124, 125, 126, 127,
|
|
|
- 128, 129, 130, 131, 132, 133, 134, 136
|
|
|
+ 128, 129, 130, 131, 132, 133, 134, 136, 143
|
|
|
} ;
|
|
|
|
|
|
/* The intent behind this definition is that it'll catch
|
|
@@ -653,7 +659,7 @@ static isc::eval::location loc;
|
|
|
// by moving it ahead by yyleng bytes. yyleng specifies the length of the
|
|
|
// currently matched token.
|
|
|
#define YY_USER_ACTION loc.columns(yyleng);
|
|
|
-#line 657 "lexer.cc"
|
|
|
+#line 663 "lexer.cc"
|
|
|
|
|
|
#define INITIAL 0
|
|
|
|
|
@@ -901,7 +907,7 @@ YY_DECL
|
|
|
loc.step();
|
|
|
|
|
|
|
|
|
-#line 905 "lexer.cc"
|
|
|
+#line 911 "lexer.cc"
|
|
|
|
|
|
if ( !(yy_init) )
|
|
|
{
|
|
@@ -964,13 +970,13 @@ 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 >= 52 )
|
|
|
+ if ( yy_current_state >= 55 )
|
|
|
yy_c = yy_meta[(unsigned int) yy_c];
|
|
|
}
|
|
|
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
|
|
|
++yy_cp;
|
|
|
}
|
|
|
- while ( yy_current_state != 51 );
|
|
|
+ while ( yy_current_state != 54 );
|
|
|
yy_cp = (yy_last_accepting_cpos);
|
|
|
yy_current_state = (yy_last_accepting_state);
|
|
|
|
|
@@ -999,13 +1005,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 < 19 )
|
|
|
+ else if ( yy_act < 20 )
|
|
|
fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
|
|
|
(long)yy_rule_linenum[yy_act], yytext );
|
|
|
- else if ( yy_act == 19 )
|
|
|
+ else if ( yy_act == 20 )
|
|
|
fprintf( stderr, "--accepting default rule (\"%s\")\n",
|
|
|
yytext );
|
|
|
- else if ( yy_act == 20 )
|
|
|
+ else if ( yy_act == 21 )
|
|
|
fprintf( stderr, "--(end of buffer or a NUL)\n" );
|
|
|
else
|
|
|
fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
|
|
@@ -1139,20 +1145,33 @@ YY_RULE_SETUP
|
|
|
return isc::eval::EvalParser::make_COMA(loc);
|
|
|
YY_BREAK
|
|
|
case 18:
|
|
|
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
|
|
|
+(yy_c_buf_p) = yy_cp -= 1;
|
|
|
+YY_DO_BEFORE_ACTION; /* set up yytext again */
|
|
|
YY_RULE_SETUP
|
|
|
#line 136 "lexer.ll"
|
|
|
+{
|
|
|
+ // This string specifies option name starting with a letter
|
|
|
+ // and further containing letters, digits, hyphens and
|
|
|
+ // underscores.
|
|
|
+ return isc::eval::EvalParser::make_OPTION_NAME(yytext, loc);
|
|
|
+}
|
|
|
+ YY_BREAK
|
|
|
+case 19:
|
|
|
+YY_RULE_SETUP
|
|
|
+#line 143 "lexer.ll"
|
|
|
driver.error (loc, "Invalid character: " + std::string(yytext));
|
|
|
YY_BREAK
|
|
|
case YY_STATE_EOF(INITIAL):
|
|
|
-#line 137 "lexer.ll"
|
|
|
+#line 144 "lexer.ll"
|
|
|
return isc::eval::EvalParser::make_END(loc);
|
|
|
YY_BREAK
|
|
|
-case 19:
|
|
|
+case 20:
|
|
|
YY_RULE_SETUP
|
|
|
-#line 138 "lexer.ll"
|
|
|
+#line 145 "lexer.ll"
|
|
|
ECHO;
|
|
|
YY_BREAK
|
|
|
-#line 1156 "lexer.cc"
|
|
|
+#line 1175 "lexer.cc"
|
|
|
|
|
|
case YY_END_OF_BUFFER:
|
|
|
{
|
|
@@ -1464,7 +1483,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 >= 52 )
|
|
|
+ if ( yy_current_state >= 55 )
|
|
|
yy_c = yy_meta[(unsigned int) yy_c];
|
|
|
}
|
|
|
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
|
|
@@ -1497,11 +1516,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 >= 52 )
|
|
|
+ if ( yy_current_state >= 55 )
|
|
|
yy_c = yy_meta[(unsigned int) yy_c];
|
|
|
}
|
|
|
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
|
|
|
- yy_is_jam = (yy_current_state == 51);
|
|
|
+ yy_is_jam = (yy_current_state == 54);
|
|
|
|
|
|
return yy_is_jam ? 0 : yy_current_state;
|
|
|
}
|
|
@@ -2249,7 +2268,7 @@ void yyfree (void * ptr )
|
|
|
|
|
|
/* %ok-for-header */
|
|
|
|
|
|
-#line 138 "lexer.ll"
|
|
|
+#line 145 "lexer.ll"
|
|
|
|
|
|
|
|
|
|