kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 11:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

These changes allow AEL to better check ${} constructs within $[...], that are concatenated with text.

Browse Source 
I modified and added rules in ast_expr2.fl to better handle
the concatenations.

I added some default routines to ast_expr2.y so the standalone would
compile. It also looks like I haven't run this thru bison since 2.1, so
it's good to get this updated.

The Makefile has comments added now for check_expr2 and check_expr to
explain what they are for, and how to run them. 

The testexpr2s stuff has been removed, in favor of check_expr2.

expr2.testinput has been updated to include the two expressions
that inspired these changes (from mcnobody on #asterisk this morning)
The regression has been run and all looks well.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@179807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2009-03-03 18:11:34 +00:00
parent 2e4471d758
commit 604a51f341
7 changed files with 210 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
main/ast_expr2f.c
View File

@@ -351,8 +351,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
#define YY_NUM_RULES 35
#define YY_END_OF_BUFFER 36
#define YY_NUM_RULES 36
#define YY_END_OF_BUFFER 37
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -360,14 +360,14 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
static yyconst flex_int16_t yy_accept[56] =
static yyconst flex_int16_t yy_accept[58] =
{ 0,
0, 0, 0, 0, 32, 32, 36, 35, 25, 27,
19, 35, 29, 35, 17, 2, 22, 23, 15, 13,
14, 16, 28, 20, 9, 3, 8, 18, 1, 35,
31, 30, 32, 33, 33, 12, 0, 26, 29, 0,
0, 0, 0, 0, 33, 33, 37, 36, 25, 27,
19, 36, 29, 36, 17, 2, 22, 23, 15, 13,
14, 16, 28, 20, 9, 3, 8, 18, 1, 36,
32, 31, 33, 35, 35, 12, 0, 26, 29, 0,
24, 5, 28, 21, 11, 6, 7, 10, 4, 0,
31, 30, 32, 34, 0
32, 31, 33, 0, 34, 30, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -404,31 +404,31 @@ static yyconst flex_int32_t yy_ec[256] =
static yyconst flex_int32_t yy_meta[27] =
{ 0,
1, 2, 2, 2, 1, 1, 2, 2, 2, 2,
1, 2, 2, 2, 1, 1, 1, 2, 2, 2,
2, 2, 2, 2, 2, 1, 2, 2, 2, 2,
2, 1, 2, 1, 1, 1
} ;
static yyconst flex_int16_t yy_base[62] =
static yyconst flex_int16_t yy_base[64] =
{ 0,
0, 0, 5, 6, 30, 56, 60, 114, 114, 114,
40, 53, 77, 31, 114, 42, 114, 114, 114, 114,
114, 114, 34, 32, 29, 13, 28, 114, 22, 17,
114, 114, 0, 114, 22, 114, 38, 114, 0, 12,
0, 0, 5, 6, 30, 56, 66, 114, 114, 114,
46, 59, 77, 38, 114, 50, 114, 114, 114, 114,
114, 114, 42, 36, 32, 13, 31, 114, 26, 17,
114, 114, 41, 114, 25, 114, 40, 114, 0, 22,
114, 114, 0, 114, 114, 114, 114, 114, 114, 18,
114, 114, 0, 114, 114, 103, 105, 107, 109, 111,
32
114, 114, 36, 12, 114, 114, 114, 103, 105, 107,
109, 111, 32
} ;
static yyconst flex_int16_t yy_def[62] =
static yyconst flex_int16_t yy_def[64] =
{ 0,
55, 1, 56, 56, 57, 57, 55, 55, 55, 55,
55, 58, 55, 59, 55, 55, 55, 55, 55, 55,
55, 55, 13, 55, 55, 55, 55, 55, 55, 60,
55, 55, 61, 55, 55, 55, 58, 55, 13, 59,
55, 55, 23, 55, 55, 55, 55, 55, 55, 60,
55, 55, 61, 55, 0, 55, 55, 55, 55, 55,
55
57, 1, 58, 58, 59, 59, 57, 57, 57, 57,
57, 60, 57, 61, 57, 57, 57, 57, 57, 57,
57, 57, 13, 57, 57, 57, 57, 57, 57, 62,
57, 57, 63, 57, 57, 57, 60, 57, 13, 61,
57, 57, 23, 57, 57, 57, 57, 57, 57, 62,
57, 57, 63, 57, 57, 57, 0, 57, 57, 57,
57, 57, 57
} ;
static yyconst flex_int16_t yy_nxt[141] =
@@ -437,17 +437,17 @@ static yyconst flex_int16_t yy_nxt[141] =
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 8, 29, 8, 8, 13, 31, 31, 32, 32,
33, 46, 53, 55, 33, 33, 35, 47, 51, 51,
52, 52, 38, 54, 49, 33, 48, 45, 44, 43,
42, 33, 41, 33, 33, 33, 33, 38, 36, 55,
33, 33, 35, 55, 55, 55, 55, 55, 55, 55,
55, 33, 55, 55, 55, 55, 55, 33, 55, 33,
33, 33, 39, 40, 55, 55, 55, 55, 55, 55,
55, 55, 39, 55, 55, 55, 55, 55, 55, 55,
52, 52, 54, 56, 38, 33, 55, 54, 49, 48,
45, 33, 44, 33, 33, 33, 33, 43, 42, 41,
33, 33, 35, 38, 36, 57, 57, 57, 57, 57,
57, 33, 57, 57, 57, 57, 57, 33, 57, 33,
33, 33, 39, 40, 57, 57, 57, 57, 57, 57,
57, 57, 39, 57, 57, 57, 57, 57, 57, 57,
55, 55, 39, 30, 30, 34, 34, 37, 37, 39,
39, 50, 50, 7, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55
57, 57, 39, 30, 30, 34, 34, 37, 37, 39,
39, 50, 50, 7, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57
} ;
static yyconst flex_int16_t yy_chk[141] =
@@ -455,18 +455,18 @@ static yyconst flex_int16_t yy_chk[141] =
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, 3, 4, 3, 4,
5, 26, 61, 40, 5, 5, 5, 26, 30, 50,
30, 50, 37, 35, 29, 5, 27, 25, 24, 23,
16, 5, 14, 5, 5, 5, 6, 12, 11, 7,
6, 6, 6, 0, 0, 0, 0, 0, 0, 0,
5, 26, 63, 54, 5, 5, 5, 26, 30, 50,
30, 50, 53, 40, 37, 5, 35, 33, 29, 27,
25, 5, 24, 5, 5, 5, 6, 23, 16, 14,
6, 6, 6, 12, 11, 7, 0, 0, 0, 0,
0, 6, 0, 0, 0, 0, 0, 6, 0, 6,
6, 6, 13, 13, 0, 0, 0, 0, 0, 0,
0, 0, 13, 0, 0, 0, 0, 0, 0, 0,
0, 0, 13, 56, 56, 57, 57, 58, 58, 59,
59, 60, 60, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55
0, 0, 13, 58, 58, 59, 59, 60, 60, 61,
61, 62, 62, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57
} ;
/* The intent behind this definition is that it'll catch
@@ -879,13 +879,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 >= 56 )
if ( yy_current_state >= 58 )
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 != 55 );
while ( yy_current_state != 57 );
yy_cp = yyg->yy_last_accepting_cpos;
yy_current_state = yyg->yy_last_accepting_state;
@@ -1075,7 +1075,17 @@ YY_RULE_SETUP
case 30:
/* rule 30 can match eol */
YY_RULE_SETUP
#line 162 "ast_expr2.fl"
#line 161 "ast_expr2.fl"
{
curlycount = 0;
BEGIN(var);
yymore();
}
YY_BREAK
case 31:
/* rule 31 can match eol */
YY_RULE_SETUP
#line 168 "ast_expr2.fl"
{
curlycount--;
if (curlycount < 0) {
@@ -1086,18 +1096,18 @@ YY_RULE_SETUP
}
}
YY_BREAK
case 31:
/* rule 31 can match eol */
case 32:
/* rule 32 can match eol */
YY_RULE_SETUP
#line 172 "ast_expr2.fl"
#line 178 "ast_expr2.fl"
{
curlycount++;
yymore();
}
YY_BREAK
case 32:
case 33:
YY_RULE_SETUP
#line 178 "ast_expr2.fl"
#line 184 "ast_expr2.fl"
{
BEGIN(0);
SET_COLUMNS;
@@ -1105,10 +1115,19 @@ YY_RULE_SETUP
return TOKEN;
}
YY_BREAK
case 33:
/* rule 33 can match eol */
case 34:
YY_RULE_SETUP
#line 185 "ast_expr2.fl"
#line 191 "ast_expr2.fl"
{
curlycount = 0;
BEGIN(var);
yymore();
}
YY_BREAK
case 35:
/* rule 35 can match eol */
YY_RULE_SETUP
#line 197 "ast_expr2.fl"
{
char c = yytext[yyleng-1];
BEGIN(0);
@@ -1118,17 +1137,8 @@ YY_RULE_SETUP
return TOKEN;
}
YY_BREAK
case 34:
YY_RULE_SETUP
#line 194 "ast_expr2.fl"
{
curlycount = 0;
BEGIN(var);
yymore();
}
YY_BREAK
case YY_STATE_EOF(trail):
#line 200 "ast_expr2.fl"
#line 206 "ast_expr2.fl"
{
BEGIN(0);
SET_COLUMNS;
@@ -1137,12 +1147,12 @@ case YY_STATE_EOF(trail):
/*actually, if an expr is only a variable ref, this could happen a LOT */
}
YY_BREAK
case 35:
case 36:
YY_RULE_SETUP
#line 208 "ast_expr2.fl"
#line 214 "ast_expr2.fl"
ECHO;
YY_BREAK
#line 1146 "ast_expr2f.c"
#line 1156 "ast_expr2f.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(var):
yyterminate();
@@ -1438,7 +1448,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
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 >= 56 )
if ( yy_current_state >= 58 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1467,11 +1477,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
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 >= 56 )
if ( yy_current_state >= 58 )
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 == 55);
yy_is_jam = (yy_current_state == 57);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -2318,7 +2328,7 @@ void *ast_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
#line 208 "ast_expr2.fl"
#line 214 "ast_expr2.fl"