[asterisk-commits] murf: branch 1.6.0 r141116 - in /branches/1.6.0: ./ pbx/ael/ael-test/ pbx/ael...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Sep 4 18:47:51 CDT 2008
Author: murf
Date: Thu Sep 4 18:47:51 2008
New Revision: 141116
URL: http://svn.digium.com/view/asterisk?view=rev&rev=141116
Log:
Merged revisions 141115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r141115 | murf | 2008-09-04 17:31:41 -0600 (Thu, 04 Sep 2008) | 78 lines
Merged revisions 141094 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141094 | murf | 2008-09-04 17:15:07 -0600 (Thu, 04 Sep 2008) | 70 lines
(closes issue #13357)
Reported by: pj
Tested by: murf
(closes issue #13416)
Reported by: yarns
Tested by: murf
If you find this message overly verbose, relax, it's probably
not meant for you. This message is meant for probably only
two people in the whole world: me, or the poor schnook that
has to maintain this code because I'm either dead or unavailable
at the moment.
This fix solves two reports, both having to do with embedding
a function call in a ${} construct. It was tricky because the
funccall syntax has parenthesis () in it. And up till now,
the 'word' token in the flex stuff didn't allow that, because
it would tend to steal the LP and RP tokens. To be truthful,
the "word" token was the trickiest, most unstable thing in
the whole lexer. I was lucky it made this long without complaints.
I had to choose every character in the pattern with extreme
care, and I knew that someday I'd have to revisit it. Well,
the day has come.
So, my brilliant idea (and I'm being modest), was to use the
surrounding ${} construct to make a state machine and capture
everything in it, no matter what it contains. But, I have to now
treat the word token like I did with comments, in that I turn
the whole thing into a state-machine sort of spec, with new
contexts "curlystate", "wordstate", and "brackstate".
Wait a minute, "brackstate"? Yes, well, it didn't take very many
regression tests to point out if I do this for ${} constructs,
I also have to do it with the $[] constructs, too.
I had to create a separate pcbstack2 and pcbstack3 because
these constructs can occur inside macro argument lists, and
when we have two state machines operating on the same structures
we'd get problems otherwise. I guess I could have stopped at
pcbstack2 and had the brackstate stuff share it, but it doesn't
hurt to be safe. So, the pcbpush and pcbpop routines also now
have versions for "2" and "3".
I had to add the {KEYWORD} construct to the initial pattern for
"word", because previously word would match stuff like "default7",
because it was a longer match than the keyword "default". But,
not any more, because the word pattern only matches only one or
two characters now, and it will always lose. So, I made it the
winner again by making an optional match on any of the keywords
before it's normal pattern.
I added another regression test to make sure we don't
lose this in future edits, and had to fix just one regression,
where it no longer reports a 'cascaded' error, which I guess
is a plus.
I've given some thought as to whether to apply these fixes to
1.4 and the 1.6.x releases, vs trunk; I decided to put it in
1.4 because one of the bug reports was against 1.4; and it
is unexpected that AEL cannot handle this situation. It actually
reduced the amount of useless "cascade" error messages that
appeared in the regressions (by one line, ehhem). There is
a possible side-effect in that it does now do more careful
checking of what's in those ${} constructs, as far as matching
parens, and brackets are concerned. Some users may find a an
insidious problem and correct it this way. This should be
exceedingly rare, I hope.
........
................
Added:
branches/1.6.0/pbx/ael/ael-test/ael-vtest25/
- copied from r141115, trunk/pbx/ael/ael-test/ael-vtest25/
branches/1.6.0/pbx/ael/ael-test/ael-vtest25/extensions.ael
- copied unchanged from r141115, trunk/pbx/ael/ael-test/ael-vtest25/extensions.ael
branches/1.6.0/pbx/ael/ael-test/ref.ael-vtest25
- copied unchanged from r141115, trunk/pbx/ael/ael-test/ref.ael-vtest25
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/pbx/ael/ael-test/ref.ael-test6
branches/1.6.0/res/ael/ael.flex
branches/1.6.0/res/ael/ael_lex.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/pbx/ael/ael-test/ref.ael-test6
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/ael/ael-test/ref.ael-test6?view=diff&rev=141116&r1=141115&r2=141116
==============================================================================
--- branches/1.6.0/pbx/ael/ael-test/ref.ael-test6 (original)
+++ branches/1.6.0/pbx/ael/ael-test/ref.ael-test6 Thu Sep 4 18:47:51 2008
@@ -2,23 +2,22 @@
(If you find progress and other non-error messages irritating, you can use -q to suppress them)
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c line:113 func: pbx_load_module Starting AEL load process.
-LOG: lev:4 file:ael.flex line:288 func: ael_yylex File=./extensions.ael, line=165, column=49: Mismatched '}' in expression!
-LOG: lev:4 file:ael.y line:772 func: ael_yyerror ==== File: ./extensions.ael, Line 165, Cols: 51-51: Error: syntax error, unexpected '=', expecting ')'
-LOG: lev:4 file:ael.flex line:288 func: ael_yylex File=./extensions.ael, line=174, column=49: Mismatched '}' in expression!
-LOG: lev:4 file:ael.y line:772 func: ael_yyerror ==== File: ./extensions.ael, Line 174, Cols: 51-51: Error: syntax error, unexpected '=', expecting ')'
-LOG: lev:4 file:ael.flex line:288 func: ael_yylex File=./extensions.ael, line=222, column=41: Mismatched '}' in expression!
-LOG: lev:4 file:ael.y line:772 func: ael_yyerror ==== File: ./extensions.ael, Line 222, Cols: 43-43: Error: syntax error, unexpected '=', expecting ')'
-LOG: lev:4 file:ael.y line:772 func: ael_yyerror ==== File: ./extensions.ael, Line 291, Cols: 21-28: Error: syntax error, unexpected word, expecting '(' or ';' or '=' or ':'
-LOG: lev:4 file:ael.y line:772 func: ael_yyerror ==== File: ./extensions.ael, Line 291, Cols: 32-32: Error: syntax error, unexpected '|', expecting '(' or ';' or '=' or ':'
-LOG: lev:2 file:pbx_ael.c line:126 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 116-125: The macro dialout does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 129-182: The macro stdexten does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 184-191: The macro uvm does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 193-200: The macro bvm does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 202-207: The macro checkdnd does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 209-216: The macro checkcf does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 218-230: The macro checkcfb does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c line:671 func: check_macro_returns Warning: file ./extensions.ael, line 688-694: The macro check-psd-exists does not end with a return; I will insert one.
-LOG: lev:4 file:pbx_ael.c line:139 func: pbx_load_module Sorry, but 5 syntax errors and 0 semantic errors were detected. It doesn't make sense to compile.
-LOG: lev:4 file:ael2_parse line:531 func: main 0 contexts, 0 extensions, 0 priorities
+LOG: lev:2 file:pbx_ael.c line:115 func: pbx_load_module Starting AEL load process.
+LOG: lev:4 file:ael.flex line:437 func: ael_yylex File=./extensions.ael, line=165, column=49: Mismatched '}' in expression!
+LOG: lev:4 file:ael.y line:777 func: ael_yyerror ==== File: ./extensions.ael, Line 165, Cols: 52-52: Error: syntax error, unexpected '=', expecting ')'
+LOG: lev:4 file:ael.flex line:437 func: ael_yylex File=./extensions.ael, line=174, column=49: Mismatched '}' in expression!
+LOG: lev:4 file:ael.y line:777 func: ael_yyerror ==== File: ./extensions.ael, Line 174, Cols: 52-52: Error: syntax error, unexpected '=', expecting ')'
+LOG: lev:4 file:ael.flex line:437 func: ael_yylex File=./extensions.ael, line=222, column=41: Mismatched '}' in expression!
+LOG: lev:4 file:ael.y line:777 func: ael_yyerror ==== File: ./extensions.ael, Line 222, Cols: 44-44: Error: syntax error, unexpected '=', expecting ')'
+LOG: lev:4 file:ael.y line:777 func: ael_yyerror ==== File: ./extensions.ael, Line 291, Cols: 22-33: Error: syntax error, unexpected word, expecting '(' or ';' or '=' or ':'
+LOG: lev:2 file:pbx_ael.c line:128 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c line:672 func: check_macro_returns Warning: file ./extensions.ael, line 116-125: The macro dialout does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c line:672 func: check_macro_returns Warning: file ./extensions.ael, line 129-182: The macro stdexten does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c line:672 func: check_macro_returns Warning: file ./extensions.ael, line 184-191: The macro uvm does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c line:672 func: check_macro_returns Warning: file ./extensions.ael, line 193-200: The macro bvm does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c line:672 func: check_macro_returns Warning: file ./extensions.ael, line 202-207: The macro checkdnd does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c line:672 func: check_macro_returns Warning: file ./extensions.ael, line 209-216: The macro checkcf does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c line:672 func: check_macro_returns Warning: file ./extensions.ael, line 218-230: The macro checkcfb does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c line:672 func: check_macro_returns Warning: file ./extensions.ael, line 688-694: The macro check-psd-exists does not end with a return; I will insert one.
+LOG: lev:4 file:pbx_ael.c line:144 func: pbx_load_module Sorry, but 4 syntax errors and 0 semantic errors were detected. It doesn't make sense to compile.
+LOG: lev:4 file:ael2_parse line:520 func: main 0 contexts, 0 extensions, 0 priorities
Modified: branches/1.6.0/res/ael/ael.flex
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/ael/ael.flex?view=diff&rev=141116&r1=141115&r2=141116
==============================================================================
--- branches/1.6.0/res/ael/ael.flex (original)
+++ branches/1.6.0/res/ael/ael.flex Thu Sep 4 18:47:51 2008
@@ -26,7 +26,7 @@
*
* %x describes the contexts we have: paren, semic and argg, plus INITIAL
*/
-%x paren semic argg comment
+%x paren semic argg comment curlystate wordstate brackstate
/* prefix used for various globally-visible functions and variables.
* This renames also yywrap, but since we do not use it, we just
@@ -60,7 +60,7 @@
%option bison-locations
%{
-#include <asterisk.h"
+#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/types.h>
@@ -85,8 +85,26 @@
static int pbcpos = 0;
static void pbcpush(char x);
static int pbcpop(char x);
-
static int parencount = 0;
+
+/*
+ * A similar stack to keep track of matching brackets ( [ { } ] ) in word tokens surrounded by ${ ... }
+ */
+static char pbcstack2[400]; /* XXX missing size checks */
+static int pbcpos2 = 0;
+static void pbcpush2(char x);
+static int pbcpop2(char x);
+static int parencount2 = 0;
+
+/*
+ * A similar stack to keep track of matching brackets ( [ { } ] ) in word tokens surrounded by $[ ... ]
+ */
+static char pbcstack3[400]; /* XXX missing size checks */
+static int pbcpos3 = 0;
+static void pbcpush3(char x);
+static int pbcpop3(char x);
+static int parencount3 = 0;
+
/*
* current line, column and filename, updated as we read the input.
@@ -177,6 +195,7 @@
#endif
%}
+KEYWORD (context|abstract|extend|macro|globals|local|ignorepat|switch|if|ifTime|random|regexten|hint|else|goto|jump|return|break|continue|for|while|case|default|pattern|catch|switches|eswitches|includes)
NOPARENS ([^()\[\]\{\}]|\\[()\[\]\{\}])*
@@ -235,19 +254,143 @@
<comment>[^*\n]*\n { ++my_lineno; my_col=1;}
<comment>"*"+[^*/\n]* { my_col += yyleng; }
<comment>"*"+[^*/\n]*\n { ++my_lineno; my_col=1;}
-<comment>"*/" { my_col += 2; BEGIN(INITIAL); }
+<comment>"*/" { my_col += 2; BEGIN(INITIAL); } /* the nice thing about comments is that you know exactly what ends them */
\n { my_lineno++; my_col = 1; }
[ ]+ { my_col += yyleng; }
[\t]+ { my_col += (yyleng*8)-(my_col%8); }
-([-a-zA-Z0-9'"_/.\<\>\*\\\+!$#\[\]]|{HIBIT})([-a-zA-Z0-9'"_/.!\*\\\+\<\>\{\}$#\[\]]|{HIBIT})* {
+({KEYWORD}?[-a-zA-Z0-9'"_/.\<\>\*\+!$#\[\]]|{HIBIT}|(\\.)|(\$\{)|(\$\[)) {
+ /* boy did I open a can of worms when I changed the lexical token "word".
+ all the above keywords can be used as a beginning to a "word".-
+ before, a "word" would match a longer sequence than the above
+ keywords, and all would be well. But now "word" is a single char
+ and feeds into a statemachine sort of sequence from there on. So...
+ I added the {KEYWORD}? to the beginning of the word match sequence */
+
+ if (!strcmp(yytext,"${")) {
+ parencount2 = 0;
+ pbcpos2 = 0;
+ pbcpush2('{'); /* push '{' so the last pcbpop (parencount2 = -1) will succeed */
+ BEGIN(curlystate);
+ yymore();
+ } else if (!strcmp(yytext,"$[")) {
+ parencount3 = 0;
+ pbcpos3 = 0;
+ pbcpush3('['); /* push '[' so the last pcbpop (parencount3 = -1) will succeed */
+ BEGIN(brackstate);
+ yymore();
+ } else {
+ BEGIN(wordstate);
+ yymore();
+ }
+ }
+
+<wordstate>[-a-zA-Z0-9'"_/.\<\>\*\+!$#\[\]] { yymore(); /* Keep going */ }
+<wordstate>{HIBIT} { yymore(); /* Keep going */ }
+<wordstate>(\\.) { yymore(); /* Keep Going */ }
+<wordstate>(\$\{) { /* the beginning of a ${} construct. prepare and pop into curlystate */
+ parencount2 = 0;
+ pbcpos2 = 0;
+ pbcpush2('{'); /* push '{' so the last pcbpop (parencount2 = -1) will succeed */
+ BEGIN(curlystate);
+ yymore();
+ }
+<wordstate>(\$\[) { /* the beginning of a $[] construct. prepare and pop into brackstate */
+ parencount3 = 0;
+ pbcpos3 = 0;
+ pbcpush3('['); /* push '[' so the last pcbpop (parencount3 = -1) will succeed */
+ BEGIN(brackstate);
+ yymore();
+ }
+<wordstate>([^a-zA-Z0-9\x80-\xff\x2d'"_/.\<\>\*\+!$#\[\]]) {
+ /* a non-word constituent char, like a space, tab, curly, paren, etc */
+ char c = yytext[yyleng-1];
STORE_POS;
yylval->str = strdup(yytext);
- prev_word = yylval->str;
+ yylval->str[yyleng-1] = 0;
+ unput(c); /* put this ending char back in the stream */
+ BEGIN(0);
return word;
}
+
+<curlystate>{NOPARENS}\} {
+ if ( pbcpop2('}') ) { /* error */
+ STORE_LOC;
+ ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ')' in expression: %s !\n", my_file, my_lineno, my_col, yytext);
+ BEGIN(0);
+ yylval->str = strdup(yytext);
+ return word;
+ }
+ parencount2--;
+ if ( parencount2 >= 0) {
+ yymore();
+ } else {
+ BEGIN(wordstate); /* Finished with the current ${} construct. Return to word gathering state */
+ yymore();
+ }
+ }
+
+<curlystate>{NOPARENS}[\(\[\{] {
+ char c = yytext[yyleng-1];
+ if (c == '{')
+ parencount2++;
+ pbcpush2(c);
+ yymore();
+ }
+
+<curlystate>{NOPARENS}[\]\)] {
+ char c = yytext[yyleng-1];
+ if ( pbcpop2(c)) { /* error */
+ STORE_LOC;
+ ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched '%c' in expression!\n",
+ my_file, my_lineno, my_col, c);
+ BEGIN(0);
+ yylval->str = strdup(yytext);
+ return word;
+ }
+ yymore();
+ }
+
+
+<brackstate>{NOPARENS}\] {
+ if ( pbcpop3(']') ) { /* error */
+ STORE_LOC;
+ ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched ')' in expression: %s !\n", my_file, my_lineno, my_col, yytext);
+ BEGIN(0);
+ yylval->str = strdup(yytext);
+ return word;
+ }
+ parencount3--;
+ if ( parencount3 >= 0) {
+ yymore();
+ } else {
+ BEGIN(wordstate); /* Finished with the current ${} construct. Return to word gathering state */
+ yymore();
+ }
+ }
+
+<brackstate>{NOPARENS}[\(\[\{] {
+ char c = yytext[yyleng-1];
+ if (c == '[')
+ parencount3++;
+ pbcpush3(c);
+ yymore();
+ }
+
+<brackstate>{NOPARENS}[\}\)] {
+ char c = yytext[yyleng-1];
+ if ( pbcpop3(c)) { /* error */
+ STORE_LOC;
+ ast_log(LOG_ERROR,"File=%s, line=%d, column=%d: Mismatched '%c' in expression!\n",
+ my_file, my_lineno, my_col, c);
+ BEGIN(0);
+ yylval->str = strdup(yytext);
+ return word;
+ }
+ yymore();
+ }
/*
@@ -500,6 +643,38 @@
return 1; /* error */
}
+static void pbcpush2(char x)
+{
+ pbcstack2[pbcpos2++] = x;
+}
+
+static int pbcpop2(char x)
+{
+ if ( ( x == ')' && pbcstack2[pbcpos2-1] == '(' )
+ || ( x == ']' && pbcstack2[pbcpos2-1] == '[' )
+ || ( x == '}' && pbcstack2[pbcpos2-1] == '{' )) {
+ pbcpos2--;
+ return 0;
+ }
+ return 1; /* error */
+}
+
+static void pbcpush3(char x)
+{
+ pbcstack3[pbcpos3++] = x;
+}
+
+static int pbcpop3(char x)
+{
+ if ( ( x == ')' && pbcstack3[pbcpos3-1] == '(' )
+ || ( x == ']' && pbcstack3[pbcpos3-1] == '[' )
+ || ( x == '}' && pbcstack3[pbcpos3-1] == '{' )) {
+ pbcpos3--;
+ return 0;
+ }
+ return 1; /* error */
+}
+
static int c_prevword(void)
{
char *c = prev_word;
Modified: branches/1.6.0/res/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/ael/ael_lex.c?view=diff&rev=141116&r1=141115&r2=141116
==============================================================================
--- branches/1.6.0/res/ael/ael_lex.c (original)
+++ branches/1.6.0/res/ael/ael_lex.c Thu Sep 4 18:47:51 2008
@@ -32,7 +32,7 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L
+#if __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
@@ -357,8 +357,8 @@
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 63
-#define YY_END_OF_BUFFER 64
+#define YY_NUM_RULES 75
+#define YY_END_OF_BUFFER 76
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -366,35 +366,39 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[244] =
+static yyconst flex_int16_t yy_accept[285] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 43, 43,
- 64, 63, 50, 48, 49, 51, 51, 9, 3, 4,
- 7, 51, 8, 5, 6, 12, 51, 51, 51, 51,
+ 0, 0, 0, 0, 0, 0, 76, 75, 50, 48,
+ 49, 51, 51, 51, 9, 3, 4, 7, 51, 8,
+ 5, 6, 12, 75, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 1, 10, 2, 63, 53, 52, 63, 54,
- 63, 59, 60, 61, 63, 63, 55, 56, 57, 63,
- 58, 43, 44, 45, 50, 49, 51, 51, 42, 13,
- 11, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 22, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 0, 53, 52, 0, 54, 53,
-
- 52, 54, 0, 59, 60, 61, 0, 59, 60, 61,
- 0, 55, 56, 57, 0, 58, 55, 56, 57, 58,
- 43, 44, 45, 46, 45, 47, 51, 13, 13, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 33, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 35, 51, 51,
- 51, 27, 51, 51, 51, 28, 26, 51, 51, 51,
- 29, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 31, 38, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 19, 17, 51, 51, 51, 51, 51, 34,
-
- 51, 51, 51, 51, 51, 51, 16, 51, 23, 51,
- 51, 51, 24, 51, 30, 21, 51, 51, 14, 51,
- 36, 51, 18, 51, 51, 37, 51, 51, 51, 15,
- 32, 51, 51, 41, 25, 39, 0, 40, 20, 0,
- 0, 62, 0
+ 1, 10, 2, 75, 65, 64, 75, 66, 75, 71,
+ 72, 73, 75, 75, 67, 68, 69, 75, 70, 43,
+ 44, 45, 75, 59, 60, 75, 58, 57, 52, 52,
+ 57, 53, 75, 62, 63, 75, 61, 50, 49, 0,
+ 51, 42, 13, 11, 0, 0, 0, 0, 0, 0,
+
+ 0, 0, 0, 0, 0, 0, 22, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 65, 64,
+ 0, 66, 65, 64, 66, 0, 71, 72, 73, 0,
+ 71, 72, 73, 0, 67, 68, 69, 0, 70, 67,
+ 68, 69, 70, 43, 44, 45, 46, 45, 47, 0,
+ 59, 60, 0, 58, 59, 60, 58, 56, 55, 54,
+ 0, 62, 63, 0, 61, 62, 63, 61, 0, 13,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 33,
+ 0, 0, 0, 51, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 35, 0,
+
+ 0, 0, 27, 0, 0, 0, 28, 26, 0, 0,
+ 0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 31, 38, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 19, 17, 0, 0, 0, 0, 0,
+ 34, 0, 0, 0, 0, 0, 0, 16, 0, 23,
+ 0, 0, 0, 24, 0, 30, 21, 0, 0, 14,
+ 0, 36, 0, 18, 0, 0, 37, 0, 51, 0,
+ 15, 32, 0, 0, 41, 25, 39, 0, 40, 20,
+ 0, 0, 74, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -402,340 +406,360 @@
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 4, 5, 6, 7, 5, 1, 8, 5, 9,
- 10, 11, 5, 12, 5, 5, 13, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 14, 15, 5,
- 16, 17, 1, 18, 5, 5, 5, 5, 5, 5,
+ 1, 4, 5, 6, 7, 8, 1, 9, 5, 10,
+ 11, 12, 5, 13, 5, 5, 14, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 15, 16, 5,
+ 17, 18, 1, 19, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 19, 5, 5, 5, 5, 5, 5,
- 20, 21, 22, 1, 5, 1, 23, 24, 25, 26,
-
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 5, 39, 40, 41, 42, 5, 43, 44,
- 5, 5, 45, 46, 47, 1, 1, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 48
+ 5, 5, 5, 20, 5, 5, 5, 5, 5, 5,
+ 21, 22, 23, 1, 5, 1, 24, 25, 26, 27,
+
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 5, 40, 41, 42, 43, 5, 44, 45,
+ 5, 5, 46, 47, 48, 1, 1, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49
} ;
-static yyconst flex_int32_t yy_meta[49] =
+static yyconst flex_int32_t yy_meta[50] =
{ 0,
- 1, 1, 2, 1, 3, 4, 3, 1, 1, 1,
- 5, 1, 3, 1, 1, 1, 3, 1, 3, 3,
+ 1, 1, 2, 1, 3, 4, 3, 3, 1, 1,
+ 1, 5, 1, 3, 1, 1, 1, 3, 1, 3,
+ 3, 1, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 1, 3, 3
+ 3, 3, 3, 3, 3, 1, 1, 1, 1
} ;
-static yyconst flex_int16_t yy_base[257] =
+static yyconst flex_int16_t yy_base[304] =
{ 0,
- 0, 0, 40, 43, 82, 121, 160, 199, 48, 55,
- 320, 986, 317, 986, 314, 0, 286, 986, 986, 986,
- 986, 43, 986, 986, 299, 986, 291, 275, 32, 286,
- 33, 275, 34, 280, 46, 268, 272, 285, 284, 49,
- 263, 275, 986, 986, 986, 74, 986, 986, 90, 986,
- 238, 986, 986, 986, 277, 316, 986, 986, 986, 355,
- 986, 301, 986, 67, 301, 298, 0, 265, 0, 402,
- 986, 260, 269, 65, 259, 266, 253, 248, 249, 250,
- 251, 243, 246, 262, 244, 254, 243, 252, 251, 234,
- 238, 52, 242, 241, 104, 986, 986, 138, 986, 143,
-
- 177, 182, 440, 986, 986, 986, 479, 518, 557, 596,
- 635, 986, 986, 986, 674, 986, 713, 752, 791, 830,
- 268, 986, 104, 986, 105, 986, 245, 0, 877, 228,
- 245, 240, 241, 224, 241, 236, 231, 234, 0, 233,
- 219, 214, 223, 215, 217, 212, 226, 206, 202, 216,
- 214, 198, 198, 204, 203, 197, 202, 0, 204, 101,
- 191, 0, 191, 195, 207, 0, 0, 193, 187, 183,
- 0, 189, 181, 190, 179, 171, 175, 188, 185, 168,
- 183, 0, 0, 157, 164, 162, 170, 168, 159, 162,
- 157, 153, 0, 0, 139, 142, 135, 138, 137, 0,
-
- 136, 136, 116, 114, 114, 124, 0, 110, 0, 108,
- 118, 108, 0, 113, 0, 112, 111, 93, 0, 106,
- 0, 96, 0, 86, 61, 0, 62, 49, 118, 0,
- 0, 46, 38, 0, 0, 0, 169, 0, 0, 0,
- 51, 986, 986, 923, 928, 933, 938, 941, 946, 951,
- 956, 961, 965, 970, 975, 980
+ 0, 0, 40, 43, 82, 121, 160, 199, 55, 56,
+ 60, 74, 247, 296, 90, 104, 432, 1023, 429, 1023,
+ 426, 1023, 397, 31, 1023, 1023, 1023, 1023, 43, 1023,
+ 1023, 410, 1023, 0, 401, 382, 36, 389, 34, 378,
+ 38, 380, 80, 368, 372, 385, 381, 66, 357, 369,
+ 1023, 1023, 1023, 138, 1023, 1023, 143, 1023, 336, 1023,
+ 1023, 1023, 375, 414, 1023, 1023, 1023, 453, 1023, 396,
+ 1023, 104, 177, 1023, 1023, 182, 1023, 1023, 1023, 78,
+ 0, 1023, 231, 1023, 1023, 262, 1023, 393, 390, 356,
+ 1023, 1023, 0, 1023, 348, 360, 92, 350, 354, 337,
+
+ 333, 333, 333, 334, 329, 333, 344, 326, 335, 320,
+ 327, 322, 299, 303, 93, 302, 301, 280, 1023, 1023,
+ 314, 1023, 328, 344, 358, 492, 1023, 1023, 1023, 531,
+ 570, 609, 648, 687, 1023, 1023, 1023, 726, 1023, 765,
+ 804, 843, 882, 329, 1023, 143, 1023, 144, 1023, 392,
+ 1023, 1023, 397, 1023, 431, 436, 470, 1023, 1023, 1023,
+ 475, 1023, 1023, 484, 1023, 514, 523, 553, 305, 0,
+ 288, 305, 299, 297, 280, 297, 292, 287, 289, 0,
+ 291, 276, 250, 257, 250, 252, 247, 258, 241, 238,
+ 251, 248, 232, 232, 236, 235, 228, 233, 0, 234,
+
+ 113, 218, 0, 217, 209, 220, 0, 0, 207, 200,
+ 196, 0, 203, 199, 208, 197, 189, 193, 206, 203,
+ 186, 203, 0, 0, 181, 187, 184, 192, 190, 181,
+ 187, 186, 186, 0, 0, 171, 171, 160, 164, 166,
+ 0, 169, 169, 152, 147, 143, 149, 0, 138, 0,
+ 139, 149, 138, 0, 140, 0, 135, 134, 109, 0,
+ 112, 0, 111, 0, 105, 80, 0, 82, 61, 76,
+ 0, 0, 46, 30, 0, 0, 0, 170, 0, 0,
+ 0, 50, 1023, 1023, 930, 935, 940, 945, 950, 955,
+ 960, 965, 970, 975, 980, 985, 989, 994, 999, 1004,
+
+ 1009, 1012, 1017
} ;
-static yyconst flex_int16_t yy_def[257] =
+static yyconst flex_int16_t yy_def[304] =
{ 0,
- 243, 1, 244, 244, 245, 245, 246, 246, 247, 247,
- 243, 243, 243, 243, 243, 248, 248, 243, 243, 243,
- 243, 248, 243, 243, 243, 243, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 243, 243, 243, 249, 243, 243, 249, 243,
- 250, 243, 243, 243, 250, 251, 243, 243, 243, 251,
- 243, 252, 243, 253, 243, 243, 248, 248, 248, 254,
- 243, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 249, 243, 243, 249, 243, 249,
-
- 249, 249, 250, 243, 243, 243, 250, 250, 250, 250,
- 251, 243, 243, 243, 251, 243, 251, 251, 251, 251,
- 252, 243, 253, 243, 253, 243, 248, 255, 254, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
-
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 248, 248, 248, 248,
- 248, 248, 248, 248, 248, 248, 243, 248, 248, 256,
- 256, 243, 0, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243
+ 284, 1, 285, 285, 286, 286, 287, 287, 288, 288,
+ 289, 289, 290, 290, 291, 291, 284, 284, 284, 284,
+ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
+ 284, 284, 284, 292, 284, 284, 284, 284, 284, 284,
+ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
+ 284, 284, 284, 293, 284, 284, 293, 284, 294, 284,
+ 284, 284, 294, 295, 284, 284, 284, 295, 284, 296,
+ 284, 297, 298, 284, 284, 298, 284, 284, 284, 284,
+ 299, 284, 300, 284, 284, 300, 284, 284, 284, 284,
+ 284, 284, 301, 284, 284, 284, 284, 284, 284, 284,
+
+ 284, 284, 284, 284, 284, 284, 302, 284, 284, 284,
+ 284, 284, 284, 284, 284, 284, 284, 293, 284, 284,
+ 293, 284, 293, 293, 293, 294, 284, 284, 284, 294,
+ 294, 294, 294, 295, 284, 284, 284, 295, 284, 295,
+ 295, 295, 295, 296, 284, 297, 284, 297, 284, 298,
+ 284, 284, 298, 284, 298, 298, 298, 284, 284, 284,
+ 300, 284, 284, 300, 284, 300, 300, 300, 284, 301,
+ 284, 284, 284, 284, 284, 284, 284, 284, 284, 302,
+ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
+ 284, 284, 284, 284, 284, 284, 284, 284, 302, 284,
+
+ 284, 284, 302, 284, 284, 284, 302, 302, 284, 284,
+ 284, 302, 284, 284, 284, 284, 284, 284, 284, 284,
+ 284, 284, 302, 302, 284, 284, 284, 284, 284, 284,
+ 284, 284, 284, 302, 302, 284, 284, 284, 284, 284,
+ 302, 284, 284, 284, 284, 284, 284, 302, 284, 302,
+ 284, 284, 284, 302, 284, 302, 302, 284, 284, 302,
+ 284, 302, 284, 302, 284, 284, 302, 284, 284, 284,
+ 302, 302, 284, 284, 302, 302, 302, 284, 302, 302,
+ 303, 303, 284, 0, 284, 284, 284, 284, 284, 284,
+ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
+
+ 284, 284, 284
} ;
-static yyconst flex_int16_t yy_nxt[1035] =
+static yyconst flex_int16_t yy_nxt[1073] =
{ 0,
- 12, 13, 14, 15, 16, 16, 17, 18, 19, 20,
- 16, 21, 22, 23, 24, 25, 16, 26, 16, 16,
- 16, 16, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 16, 37, 38, 16, 16, 39, 40, 41,
- 16, 16, 42, 16, 43, 44, 45, 16, 47, 48,
- 63, 47, 48, 69, 74, 70, 242, 63, 64, 47,
- 49, 50, 47, 49, 50, 64, 77, 81, 75, 124,
- 82, 91, 78, 84, 85, 92, 79, 125, 239, 126,
- 151, 86, 96, 97, 47, 238, 50, 47, 236, 50,
- 52, 53, 152, 96, 98, 99, 54, 235, 100, 101,
-
- 234, 52, 55, 53, 132, 133, 124, 124, 233, 100,
- 98, 102, 96, 97, 243, 125, 243, 243, 96, 237,
- 99, 237, 232, 96, 98, 99, 52, 184, 53, 52,
- 53, 185, 231, 230, 100, 54, 102, 229, 228, 227,
- 52, 55, 53, 226, 225, 224, 100, 101, 96, 223,
- 99, 96, 97, 222, 221, 220, 219, 100, 98, 102,
- 218, 217, 96, 98, 99, 52, 216, 53, 57, 58,
- 237, 59, 237, 215, 240, 214, 213, 212, 211, 57,
- 60, 61, 100, 210, 102, 96, 97, 96, 209, 99,
- 96, 97, 208, 207, 206, 205, 96, 98, 99, 204,
-
- 203, 96, 98, 99, 57, 202, 61, 57, 58, 201,
- 59, 200, 199, 198, 197, 196, 195, 194, 57, 60,
- 61, 96, 193, 99, 192, 191, 96, 190, 99, 189,
- 188, 187, 186, 183, 182, 181, 180, 179, 178, 177,
- 176, 175, 174, 57, 173, 61, 104, 105, 172, 171,
- 170, 169, 106, 168, 167, 166, 165, 104, 107, 105,
- 164, 163, 162, 161, 160, 159, 158, 157, 156, 155,
- 122, 154, 153, 150, 149, 148, 147, 146, 145, 144,
- 143, 142, 104, 141, 105, 108, 109, 140, 139, 138,
- 137, 110, 136, 135, 134, 131, 108, 107, 109, 130,
-
- 127, 66, 65, 122, 94, 93, 90, 89, 88, 87,
- 83, 80, 76, 73, 72, 71, 68, 66, 65, 243,
- 243, 108, 243, 109, 112, 113, 243, 114, 243, 243,
- 243, 243, 243, 243, 243, 112, 115, 116, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 112, 243, 116, 117, 118, 243, 119, 243, 243, 243,
- 243, 243, 243, 243, 117, 115, 120, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 117,
-
- 243, 120, 128, 128, 243, 128, 243, 243, 243, 128,
- 128, 128, 243, 128, 243, 128, 128, 128, 243, 128,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 128, 104, 105,
- 243, 243, 243, 243, 106, 243, 243, 243, 243, 104,
- 107, 105, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 104, 243, 105, 108, 109, 243,
- 243, 243, 243, 110, 243, 243, 243, 243, 108, 107,
-
- 109, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 108, 243, 109, 104, 105, 243, 243,
- 243, 243, 106, 243, 243, 243, 243, 104, 107, 105,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 104, 243, 105, 104, 105, 243, 243, 243,
- 243, 106, 243, 243, 243, 243, 104, 107, 105, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
-
- 243, 104, 243, 105, 104, 105, 243, 243, 243, 243,
- 106, 243, 243, 243, 243, 104, 107, 105, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 104, 243, 105, 112, 113, 243, 114, 243, 243, 243,
- 243, 243, 243, 243, 112, 115, 116, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 112,
- 243, 116, 117, 118, 243, 119, 243, 243, 243, 243,
- 243, 243, 243, 117, 115, 120, 243, 243, 243, 243,
-
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 117, 243,
- 120, 112, 113, 243, 114, 243, 243, 243, 243, 243,
- 243, 243, 112, 115, 116, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 112, 243, 116,
- 112, 113, 243, 114, 243, 243, 243, 243, 243, 243,
- 243, 112, 115, 116, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 112, 243, 116, 112,
-
- 113, 243, 114, 243, 243, 243, 243, 243, 243, 243,
- 112, 115, 116, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 112, 243, 116, 112, 113,
- 243, 114, 243, 243, 243, 243, 243, 243, 243, 112,
- 115, 116, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 112, 243, 116, 128, 128, 243,
- 128, 243, 243, 243, 128, 128, 128, 243, 128, 243,
[... 1195 lines stripped ...]
More information about the asterisk-commits
mailing list