more dup removal

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-27 11:43:34 +00:00
parent 98d769c7c0
commit 5591294c5e
2 changed files with 188 additions and 296 deletions

View File

@@ -277,13 +277,14 @@ includes { STORE_POS; return KW_INCLUDES;}
}
}
<argg>{NOARGG}\} {
<argg>{NOARGG}[\]\}] {
char c = yytext[yyleng-1];
/*printf("ARGG:%s\n",yytext);*/
yylloc->first_line = my_lineno;
yylloc->first_column=my_col;
if ( pbcpop('}') ) { /* error */
if ( pbcpop(c) ) { /* error */
pbcwhere(yytext, &my_lineno, &my_col);
ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched '}' in expression!\n", my_file, my_lineno, my_col);
ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched '%c' in expression!\n", my_file, my_lineno, my_col, c);
BEGIN(0);
yylloc->last_line = my_lineno;
yylloc->last_column = my_col;
@@ -293,23 +294,6 @@ includes { STORE_POS; return KW_INCLUDES;}
yymore();
}
<argg>{NOARGG}\] {
/*printf("ARGG:%s\n",yytext);*/
yylloc->first_line = my_lineno;
yylloc->first_column=my_col;
if ( pbcpop(']') ) { /* error */
pbcwhere(yytext, &my_lineno, &my_col);
ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ']' in expression!\n", my_file, my_lineno, my_col);
BEGIN(0);
yylloc->last_line = my_lineno;
yylloc->last_column = my_col;
yylval->str = strdup(yytext);
return word;
}
yymore();
}
<semic>{NOSEMIC}[\(\[\{] {
@@ -321,13 +305,14 @@ includes { STORE_POS; return KW_INCLUDES;}
pbcpush(c);
}
<semic>{NOSEMIC}\] {
<semic>{NOSEMIC}[\)\]\}] {
char c = yytext[yyleng-1];
/*printf("SEMIC:%s\n",yytext);*/
yylloc->first_line = my_lineno;
yylloc->first_column=my_col;
if ( pbcpop(']') ) { /* error */
if ( pbcpop(c) ) { /* error */
pbcwhere(yytext, &my_lineno, &my_col);
ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ']' in expression!\n", my_file, my_lineno, my_col);
ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched '%c' in expression!\n", my_file, my_lineno, my_col, c);
BEGIN(0);
yylloc->last_line = my_lineno;
yylloc->last_column= my_col;
@@ -337,38 +322,6 @@ includes { STORE_POS; return KW_INCLUDES;}
yymore();
}
<semic>{NOSEMIC}\} {
/*printf("SEMIC:%s\n",yytext);*/
yylloc->first_line = my_lineno;
yylloc->first_column=my_col;
if ( pbcpop('}') ) { /* error */
pbcwhere(yytext, &my_lineno, &my_col);
ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched '}' in expression!\n", my_file, my_lineno, my_col);
BEGIN(0);
yylloc->last_line = my_lineno;
yylloc->last_column=my_col;
yylval->str = strdup(yytext);
return word;
}
yymore();
}
<semic>{NOSEMIC}\) {
/*printf("SEMIC:%s\n",yytext);*/
yylloc->first_line = my_lineno;
yylloc->first_column=my_col;
if ( pbcpop(')') ) { /* error */
pbcwhere(yytext, &my_lineno, &my_col);
ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ')' in expression!\n", my_file, my_lineno, my_col);
BEGIN(0);
yylloc->last_line = my_lineno;
yylloc->last_column=my_col;
yylval->str = strdup(yytext);
return word;
}
yymore();
}
<semic>{NOSEMIC}; {
yylloc->first_line = my_lineno;
yylloc->first_column=my_col;