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

- fix miscalculation in column numbers when multiple tabs

Browse Source 
or empty lines are involved;
- change linku1() to return the head of the list (unused at the moment);
- ignore the source line number in runtests as they change with the
  source and cause mismatches in the comparison with the reference output.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-28 14:17:03 +00:00
parent 43bfe82828
commit 799126216e
5 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pbx/ael/ael-test/runtests
View File

@@ -1,9 +1,12 @@
#!/bin/bash #!/bin/bash
ORIG=`mktemp /tmp/mytest.XXXXXX`
NEW=`mktemp /tmp/mytest.XXXXXX`
for i in ael-test*; do for i in ael-test*; do
echo -n Test: $i.................. echo -n Test: $i..................
(cd $i; ../../../../utils/aelparse -n -d | grep -v -i 'seconds' > ../res.$i) (cd $i; ../../../../utils/aelparse -n -d | grep -v -i 'seconds' > ../res.$i)
if (diff -q res.$i ref.$i > /dev/null 2>&1 ) then sed 's/line:[0-9]*//; /^Executed.*/d' < res.$i > $NEW
sed 's/line:[0-9]*//; /^Executed.*/d' < ref.$i > $ORIG
if (diff -q $NEW $ORIG > /dev/null 2>&1 ) then
echo PASSED echo PASSED
rm res.$i rm res.$i
else else
@@ -12,3 +15,4 @@ for i in ael-test*; do
fi fi
done done
rm $NEW $ORIG

4
pbx/ael/ael.flex
View File

@@ -213,9 +213,9 @@ switches { STORE_POS; return KW_SWITCHES;}
eswitches { STORE_POS; return KW_ESWITCHES;} eswitches { STORE_POS; return KW_ESWITCHES;}
includes { STORE_POS; return KW_INCLUDES;} includes { STORE_POS; return KW_INCLUDES;}
\n { my_lineno++; my_col = 0; } \n { my_lineno++; my_col = 1; }
[ ]+ { my_col += yyleng; } [ ]+ { my_col += yyleng; }
[\t]+ { my_col += 8-(my_col%8); } [\t]+ { my_col += (yyleng*8)-(my_col%8); }
[-a-zA-Z0-9'"_/.\<\>\*\+!$#\[\]][-a-zA-Z0-9'"_/.!\*\+\<\>\{\}$#\[\]]* { [-a-zA-Z0-9'"_/.\<\>\*\+!$#\[\]][-a-zA-Z0-9'"_/.!\*\+\<\>\{\}$#\[\]]* {
STORE_POS; STORE_POS;

7
pbx/ael/ael.tab.c
View File

@@ -185,7 +185,7 @@
static pval *npval(pvaltype type, int first_line, int last_line, static pval *npval(pvaltype type, int first_line, int last_line,
int first_column, int last_column); int first_column, int last_column);
static void linku1(pval *head, pval *tail); static pval * linku1(pval *head, pval *tail);
void reset_parencount(yyscan_t yyscanner); void reset_parencount(yyscan_t yyscanner);
void reset_semicount(yyscan_t yyscanner); void reset_semicount(yyscan_t yyscanner);
@@ -3521,14 +3521,17 @@ static struct pval *npval2(pvaltype type, YYLTYPE *first, YYLTYPE *last)
} }
/* append second element to the list in the first one */ /* append second element to the list in the first one */
static void linku1(pval *head, pval *tail) static pval * linku1(pval *head, pval *tail)
{ {
if (!head)
return tail;
if (!head->next) { if (!head->next) {
head->next = tail; head->next = tail;
} else { } else {
head->u1_last->next = tail; head->u1_last->next = tail;
} }
head->u1_last = tail; head->u1_last = tail;
return head;
} }

7
pbx/ael/ael.y
View File

@@ -32,7 +32,7 @@
static pval *npval(pvaltype type, int first_line, int last_line, static pval *npval(pvaltype type, int first_line, int last_line,
int first_column, int last_column); int first_column, int last_column);
static void linku1(pval *head, pval *tail); static pval * linku1(pval *head, pval *tail);
void reset_parencount(yyscan_t yyscanner); void reset_parencount(yyscan_t yyscanner);
void reset_semicount(yyscan_t yyscanner); void reset_semicount(yyscan_t yyscanner);
@@ -959,13 +959,16 @@ static struct pval *npval2(pvaltype type, YYLTYPE *first, YYLTYPE *last)
} }
/* append second element to the list in the first one */ /* append second element to the list in the first one */
static void linku1(pval *head, pval *tail) static pval * linku1(pval *head, pval *tail)
{ {
if (!head)
return tail;
if (!head->next) { if (!head->next) {
head->next = tail; head->next = tail;
} else { } else {
head->u1_last->next = tail; head->u1_last->next = tail;
} }
head->u1_last = tail; head->u1_last = tail;
return head;
} }

4
pbx/ael/ael_lex.c
View File

@@ -1309,7 +1309,7 @@ case 40:
/* rule 40 can match eol */ /* rule 40 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 216 "ael.flex" #line 216 "ael.flex"
{ my_lineno++; my_col = 0; } { my_lineno++; my_col = 1; }
YY_BREAK YY_BREAK
case 41: case 41:
YY_RULE_SETUP YY_RULE_SETUP
@@ -1319,7 +1319,7 @@ YY_RULE_SETUP
case 42: case 42:
YY_RULE_SETUP YY_RULE_SETUP
#line 218 "ael.flex" #line 218 "ael.flex"
{ my_col += 8-(my_col%8); } { my_col += (yyleng*8)-(my_col%8); }
YY_BREAK YY_BREAK
case 43: case 43:
YY_RULE_SETUP YY_RULE_SETUP