put back some simplifications, this time really tested
(ael_lex.c manually deleted, runtest passed) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23782 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
2746adf5a3
commit
1058940398
|
@ -240,7 +240,7 @@ includes { STORE_POS; return KW_INCLUDES;}
|
||||||
} else {
|
} else {
|
||||||
STORE_LOC;
|
STORE_LOC;
|
||||||
yylval->str = strdup(yytext);
|
yylval->str = strdup(yytext);
|
||||||
yylval->str[strlen(yylval->str)-1] = '\0'; /* trim trailing ')' */
|
yylval->str[yyleng-1] = '\0'; /* trim trailing ')' */
|
||||||
unput(')');
|
unput(')');
|
||||||
BEGIN(0);
|
BEGIN(0);
|
||||||
return word;
|
return word;
|
||||||
|
@ -290,19 +290,13 @@ includes { STORE_POS; return KW_INCLUDES;}
|
||||||
yymore();
|
yymore();
|
||||||
} else {
|
} else {
|
||||||
STORE_LOC;
|
STORE_LOC;
|
||||||
yylval->str = strdup(yytext);
|
|
||||||
if(yyleng > 1 )
|
|
||||||
yylval->str[yyleng-1] = '\0'; /* trim trailing ')' */
|
|
||||||
BEGIN(0);
|
BEGIN(0);
|
||||||
if ( !strcmp(yylval->str,")") ) {
|
if ( !strcmp(yytext, ")") )
|
||||||
free(yylval->str);
|
|
||||||
yylval->str = 0;
|
|
||||||
my_col++; /* XXX why ? */
|
|
||||||
return RP;
|
return RP;
|
||||||
} else {
|
yylval->str = strdup(yytext);
|
||||||
unput(')');
|
yylval->str[yyleng-1] = '\0'; /* trim trailing ')' */
|
||||||
return word;
|
unput(')');
|
||||||
}
|
return word;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -321,8 +315,7 @@ includes { STORE_POS; return KW_INCLUDES;}
|
||||||
/* printf("Got argg2 word %s\n", yylval->str); */
|
/* printf("Got argg2 word %s\n", yylval->str); */
|
||||||
unput(',');
|
unput(',');
|
||||||
commaout = 1;
|
commaout = 1;
|
||||||
if (yyleng > 1 )
|
yylval->str[yyleng-1] = '\0';
|
||||||
*(yylval->str+yyleng-1)=0;
|
|
||||||
return word;
|
return word;
|
||||||
} else {
|
} else {
|
||||||
commaout = 0;
|
commaout = 0;
|
||||||
|
|
|
@ -1348,7 +1348,7 @@ YY_RULE_SETUP
|
||||||
} else {
|
} else {
|
||||||
STORE_LOC;
|
STORE_LOC;
|
||||||
yylval->str = strdup(yytext);
|
yylval->str = strdup(yytext);
|
||||||
yylval->str[strlen(yylval->str)-1] = '\0'; /* trim trailing ')' */
|
yylval->str[yyleng-1] = '\0'; /* trim trailing ')' */
|
||||||
unput(')');
|
unput(')');
|
||||||
BEGIN(0);
|
BEGIN(0);
|
||||||
return word;
|
return word;
|
||||||
|
@ -1414,26 +1414,20 @@ YY_RULE_SETUP
|
||||||
yymore();
|
yymore();
|
||||||
} else {
|
} else {
|
||||||
STORE_LOC;
|
STORE_LOC;
|
||||||
yylval->str = strdup(yytext);
|
|
||||||
if(yyleng > 1 )
|
|
||||||
yylval->str[yyleng-1] = '\0'; /* trim trailing ')' */
|
|
||||||
BEGIN(0);
|
BEGIN(0);
|
||||||
if ( !strcmp(yylval->str,")") ) {
|
if ( !strcmp(yytext, ")") )
|
||||||
free(yylval->str);
|
|
||||||
yylval->str = 0;
|
|
||||||
my_col++; /* XXX why ? */
|
|
||||||
return RP;
|
return RP;
|
||||||
} else {
|
yylval->str = strdup(yytext);
|
||||||
unput(')');
|
yylval->str[yyleng-1] = '\0'; /* trim trailing ')' */
|
||||||
return word;
|
unput(')');
|
||||||
}
|
return word;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
YY_BREAK
|
YY_BREAK
|
||||||
case 49:
|
case 49:
|
||||||
/* rule 49 can match eol */
|
/* rule 49 can match eol */
|
||||||
YY_RULE_SETUP
|
YY_RULE_SETUP
|
||||||
#line 309 "ael.flex"
|
#line 303 "ael.flex"
|
||||||
{
|
{
|
||||||
if( parencount != 0) { /* printf("Folding in a comma!\n"); */
|
if( parencount != 0) { /* printf("Folding in a comma!\n"); */
|
||||||
yymore();
|
yymore();
|
||||||
|
@ -1449,8 +1443,7 @@ YY_RULE_SETUP
|
||||||
/* printf("Got argg2 word %s\n", yylval->str); */
|
/* printf("Got argg2 word %s\n", yylval->str); */
|
||||||
unput(',');
|
unput(',');
|
||||||
commaout = 1;
|
commaout = 1;
|
||||||
if (yyleng > 1 )
|
yylval->str[yyleng-1] = '\0';
|
||||||
*(yylval->str+yyleng-1)=0;
|
|
||||||
return word;
|
return word;
|
||||||
} else {
|
} else {
|
||||||
commaout = 0;
|
commaout = 0;
|
||||||
|
@ -1463,7 +1456,7 @@ YY_RULE_SETUP
|
||||||
case 50:
|
case 50:
|
||||||
/* rule 50 can match eol */
|
/* rule 50 can match eol */
|
||||||
YY_RULE_SETUP
|
YY_RULE_SETUP
|
||||||
#line 335 "ael.flex"
|
#line 328 "ael.flex"
|
||||||
{
|
{
|
||||||
char c = yytext[yyleng-1];
|
char c = yytext[yyleng-1];
|
||||||
if ( pbcpop(c) ) { /* error */
|
if ( pbcpop(c) ) { /* error */
|
||||||
|
@ -1479,7 +1472,7 @@ YY_RULE_SETUP
|
||||||
case 51:
|
case 51:
|
||||||
/* rule 51 can match eol */
|
/* rule 51 can match eol */
|
||||||
YY_RULE_SETUP
|
YY_RULE_SETUP
|
||||||
#line 349 "ael.flex"
|
#line 342 "ael.flex"
|
||||||
{
|
{
|
||||||
char c = yytext[yyleng-1];
|
char c = yytext[yyleng-1];
|
||||||
yymore();
|
yymore();
|
||||||
|
@ -1489,7 +1482,7 @@ YY_RULE_SETUP
|
||||||
case 52:
|
case 52:
|
||||||
/* rule 52 can match eol */
|
/* rule 52 can match eol */
|
||||||
YY_RULE_SETUP
|
YY_RULE_SETUP
|
||||||
#line 355 "ael.flex"
|
#line 348 "ael.flex"
|
||||||
{
|
{
|
||||||
char c = yytext[yyleng-1];
|
char c = yytext[yyleng-1];
|
||||||
if ( pbcpop(c) ) { /* error */
|
if ( pbcpop(c) ) { /* error */
|
||||||
|
@ -1505,7 +1498,7 @@ YY_RULE_SETUP
|
||||||
case 53:
|
case 53:
|
||||||
/* rule 53 can match eol */
|
/* rule 53 can match eol */
|
||||||
YY_RULE_SETUP
|
YY_RULE_SETUP
|
||||||
#line 367 "ael.flex"
|
#line 360 "ael.flex"
|
||||||
{
|
{
|
||||||
STORE_LOC;
|
STORE_LOC;
|
||||||
yylval->str = strdup(yytext);
|
yylval->str = strdup(yytext);
|
||||||
|
@ -1519,7 +1512,7 @@ YY_RULE_SETUP
|
||||||
case 54:
|
case 54:
|
||||||
/* rule 54 can match eol */
|
/* rule 54 can match eol */
|
||||||
YY_RULE_SETUP
|
YY_RULE_SETUP
|
||||||
#line 377 "ael.flex"
|
#line 370 "ael.flex"
|
||||||
{
|
{
|
||||||
FILE *in1;
|
FILE *in1;
|
||||||
char fnamebuf[1024],*p1,*p2;
|
char fnamebuf[1024],*p1,*p2;
|
||||||
|
@ -1586,7 +1579,7 @@ case YY_STATE_EOF(INITIAL):
|
||||||
case YY_STATE_EOF(paren):
|
case YY_STATE_EOF(paren):
|
||||||
case YY_STATE_EOF(semic):
|
case YY_STATE_EOF(semic):
|
||||||
case YY_STATE_EOF(argg):
|
case YY_STATE_EOF(argg):
|
||||||
#line 439 "ael.flex"
|
#line 432 "ael.flex"
|
||||||
{
|
{
|
||||||
if ( --include_stack_index < 0 ) {
|
if ( --include_stack_index < 0 ) {
|
||||||
yyterminate();
|
yyterminate();
|
||||||
|
@ -1602,10 +1595,10 @@ case YY_STATE_EOF(argg):
|
||||||
YY_BREAK
|
YY_BREAK
|
||||||
case 55:
|
case 55:
|
||||||
YY_RULE_SETUP
|
YY_RULE_SETUP
|
||||||
#line 452 "ael.flex"
|
#line 445 "ael.flex"
|
||||||
ECHO;
|
ECHO;
|
||||||
YY_BREAK
|
YY_BREAK
|
||||||
#line 1609 "ael_lex.c"
|
#line 1602 "ael_lex.c"
|
||||||
|
|
||||||
case YY_END_OF_BUFFER:
|
case YY_END_OF_BUFFER:
|
||||||
{
|
{
|
||||||
|
@ -2735,7 +2728,7 @@ void ael_yyfree (void * ptr , yyscan_t yyscanner)
|
||||||
|
|
||||||
#define YYTABLES_NAME "yytables"
|
#define YYTABLES_NAME "yytables"
|
||||||
|
|
||||||
#line 452 "ael.flex"
|
#line 445 "ael.flex"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Reference in New Issue