[asterisk-commits] murf: branch murf/fast-ast r42057 - in
/team/murf/fast-ast: ./ funcs/ pbx/ael...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Sep 5 13:34:53 MST 2006
Author: murf
Date: Tue Sep 5 15:34:52 2006
New Revision: 42057
URL: http://svn.digium.com/view/asterisk?rev=42057&view=rev
Log:
pushing in some updates so I can merge in updates
Added:
team/murf/fast-ast/pbx/ael/ael-test/ael-test15/
- copied from r41545, trunk/pbx/ael/ael-test/ael-test15/
team/murf/fast-ast/pbx/ael/ael-test/ael-test15/extensions.ael (props changed)
- copied unchanged from r41545, trunk/pbx/ael/ael-test/ael-test15/extensions.ael
team/murf/fast-ast/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2 (props changed)
- copied unchanged from r41545, trunk/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test15 (props changed)
- copied unchanged from r41545, trunk/pbx/ael/ael-test/ref.ael-test15
Modified:
team/murf/fast-ast/ (props changed)
team/murf/fast-ast/.cleancount
team/murf/fast-ast/funcs/func_strings.c
team/murf/fast-ast/pbx/ael/ael-test/ael-test3/extensions.ael
team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test3
team/murf/fast-ast/pbx/ael/ael.flex
team/murf/fast-ast/pbx/ael/ael_lex.c
Propchange: team/murf/fast-ast/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 5 15:34:52 2006
@@ -1,1 +1,1 @@
-/trunk:1-41514
+/trunk:1-41559
Modified: team/murf/fast-ast/.cleancount
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/.cleancount?rev=42057&r1=42056&r2=42057&view=diff
==============================================================================
--- team/murf/fast-ast/.cleancount (original)
+++ team/murf/fast-ast/.cleancount Tue Sep 5 15:34:52 2006
@@ -1,1 +1,1 @@
-22
+23
Modified: team/murf/fast-ast/funcs/func_strings.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/funcs/func_strings.c?rev=42057&r1=42056&r2=42057&view=diff
==============================================================================
--- team/murf/fast-ast/funcs/func_strings.c (original)
+++ team/murf/fast-ast/funcs/func_strings.c Tue Sep 5 15:34:52 2006
@@ -130,10 +130,10 @@
regerror(errcode, ®exbuf, buf, len);
ast_log(LOG_WARNING, "Malformed input %s(%s): %s\n", cmd, parse, buf);
return -1;
- } else {
- if (!regexec(®exbuf, args.str, 0, NULL, 0))
- strcpy(buf, "1");
- }
+ }
+
+ strcpy(buf, regexec(®exbuf, args.str, 0, NULL, 0) ? "0" : "1");
+
regfree(®exbuf);
return 0;
@@ -141,8 +141,8 @@
static struct ast_custom_function regex_function = {
.name = "REGEX",
- .synopsis =
- "Regular Expression: Returns 1 if data matches regular expression.",
+ .synopsis = "Regular Expression",
+ .desc = "Returns 1 if data matches regular expression, or 0 otherwise.",
.syntax = "REGEX(\"<regular expression>\" <data>)",
.read = regex,
};
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ael-test15/extensions.ael
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ael-test15/extensions.ael
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ael-test15/extensions.ael
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/murf/fast-ast/pbx/ael/ael-test/ael-test3/extensions.ael
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/pbx/ael/ael-test/ael-test3/extensions.ael?rev=42057&r1=42056&r2=42057&view=diff
==============================================================================
--- team/murf/fast-ast/pbx/ael/ael-test/ael-test3/extensions.ael (original)
+++ team/murf/fast-ast/pbx/ael/ael-test/ael-test3/extensions.ael Tue Sep 5 15:34:52 2006
@@ -3178,6 +3178,6 @@
// now include the telemarketer torture scripts!
-#include "/etc/asterisk/telemarket_torture.ael2"
-
-
+#include "telemarket_torture.ael2"
+
+
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
------------------------------------------------------------------------------
svn:executable = *
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test15
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test15
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test15
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test3
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test3?rev=42057&r1=42056&r2=42057&view=diff
==============================================================================
--- team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test3 (original)
+++ team/murf/fast-ast/pbx/ael/ael-test/ref.ael-test3 Tue Sep 5 15:34:52 2006
@@ -2,17 +2,17 @@
(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/pbx_ael.c line:3747 func: pbx_load_module Starting AEL load process.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3754 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include1.ael2, 78 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include2.ael2, 98 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include3.ael2, 57 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include5.ael2, 56 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file ./include4.ael2, 87 chars
-LOG: lev:2 file:ael.flex line:422 func: ael_yylex --Read in included file /etc/asterisk/telemarket_torture.ael2, 28036 chars
-LOG: lev:2 file:../pbx/pbx_ael.c line:3757 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3760 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3762 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3765 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:../pbx/pbx_ael.c line:3768 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse line:458 func: main 172 contexts, 858 extensions, 2326 priorities
+LOG: lev:2 file:../pbx/pbx_ael.c line:3797 func: pbx_load_module Starting AEL load process.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3804 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include1.ael2, 78 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include2.ael2, 98 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include3.ael2, 57 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include5.ael2, 56 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./include4.ael2, 87 chars
+LOG: lev:2 file:ael.flex line:431 func: ael_yylex --Read in included file ./telemarket_torture.ael2, 28036 chars
+LOG: lev:2 file:../pbx/pbx_ael.c line:3807 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3810 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3812 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3815 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:../pbx/pbx_ael.c line:3818 func: pbx_load_module AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse line:479 func: main 172 contexts, 858 extensions, 2326 priorities
Modified: team/murf/fast-ast/pbx/ael/ael.flex
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/pbx/ael/ael.flex?rev=42057&r1=42056&r2=42057&view=diff
==============================================================================
--- team/murf/fast-ast/pbx/ael/ael.flex (original)
+++ team/murf/fast-ast/pbx/ael/ael.flex Tue Sep 5 15:34:52 2006
@@ -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
/* prefix used for various globally-visible functions and variables.
* This renames also yywrap, but since we do not use it, we just
@@ -213,6 +213,13 @@
switches { STORE_POS; return KW_SWITCHES;}
eswitches { STORE_POS; return KW_ESWITCHES;}
includes { STORE_POS; return KW_INCLUDES;}
+"/*" { BEGIN(comment); my_col += 2; }
+
+<comment>[^*\n]* { my_col += yyleng; }
+<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); }
\n { my_lineno++; my_col = 1; }
[ ]+ { my_col += yyleng; }
Modified: team/murf/fast-ast/pbx/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/pbx/ael/ael_lex.c?rev=42057&r1=42056&r2=42057&view=diff
==============================================================================
--- team/murf/fast-ast/pbx/ael/ael_lex.c (original)
+++ team/murf/fast-ast/pbx/ael/ael_lex.c Tue Sep 5 15:34:52 2006
@@ -16,6 +16,7 @@
/* First, we deal with platform-specific or compiler-specific issues. */
+#include "asterisk.h"
/* begin standard C headers. */
#include <stdio.h>
#include <string.h>
@@ -355,32 +356,32 @@
};
static yyconst flex_int16_t yy_accept[234] =
{ 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 56, 56,
- 62, 61, 43, 41, 42, 44, 44, 10, 4, 5,
- 8, 44, 9, 6, 7, 13, 44, 44, 44, 44,
- 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
- 44, 2, 11, 3, 61, 46, 45, 61, 47, 61,
- 52, 53, 54, 61, 61, 48, 49, 50, 61, 51,
- 56, 57, 58, 43, 42, 44, 44, 1, 14, 12,
- 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
- 44, 21, 44, 44, 44, 44, 44, 44, 44, 44,
- 44, 0, 46, 45, 0, 47, 46, 45, 47, 0,
-
- 52, 53, 54, 0, 52, 53, 54, 0, 48, 49,
- 50, 0, 51, 48, 49, 50, 51, 56, 57, 58,
- 59, 58, 60, 44, 14, 14, 44, 44, 44, 44,
- 44, 44, 44, 44, 32, 44, 44, 44, 44, 44,
- 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
- 44, 44, 34, 44, 44, 44, 26, 44, 44, 27,
- 25, 44, 44, 44, 28, 44, 44, 44, 44, 44,
- 44, 44, 44, 44, 30, 37, 44, 44, 44, 44,
- 44, 44, 44, 44, 17, 44, 44, 44, 44, 44,
- 33, 44, 44, 44, 44, 44, 44, 44, 22, 44,
-
- 44, 44, 23, 44, 29, 20, 44, 44, 15, 44,
- 35, 44, 18, 44, 44, 36, 44, 44, 44, 16,
- 31, 44, 44, 40, 24, 38, 0, 39, 19, 0,
- 0, 55, 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 41, 41,
+ 62, 61, 48, 46, 47, 49, 49, 9, 3, 4,
+ 7, 49, 8, 5, 6, 12, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 1, 10, 2, 61, 51, 50, 61, 52, 61,
+ 57, 58, 59, 61, 61, 53, 54, 55, 61, 56,
+ 41, 42, 43, 48, 47, 49, 49, 40, 13, 11,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 20, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 0, 51, 50, 0, 52, 51, 50, 52, 0,
+
+ 57, 58, 59, 0, 57, 58, 59, 0, 53, 54,
+ 55, 0, 56, 53, 54, 55, 56, 41, 42, 43,
+ 44, 43, 45, 49, 13, 13, 49, 49, 49, 49,
+ 49, 49, 49, 49, 31, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 33, 49, 49, 49, 25, 49, 49, 26,
+ 24, 49, 49, 49, 27, 49, 49, 49, 49, 49,
+ 49, 49, 49, 49, 29, 36, 49, 49, 49, 49,
+ 49, 49, 49, 49, 16, 49, 49, 49, 49, 49,
+ 32, 49, 49, 49, 49, 49, 49, 49, 21, 49,
+
+ 49, 49, 22, 49, 28, 19, 49, 49, 14, 49,
+ 34, 49, 17, 49, 49, 35, 49, 49, 49, 15,
+ 30, 49, 49, 39, 23, 37, 0, 38, 18, 0,
+ 0, 60, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -888,11 +889,13 @@
#define argg 3
#define comment 4
+#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
* down here because we want the user's section 1 to have been scanned first.
* The user has a chance to override it with an option.
*/
#include <unistd.h>
+#endif
#ifndef YY_EXTRA_TYPE
#define YY_EXTRA_TYPE void *
@@ -935,6 +938,8 @@
YYLTYPE * yylloc_r;
}; /* end struct yyguts_t */
+
+static int yy_init_globals (yyscan_t yyscanner );
/* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/
@@ -1086,9 +1091,11 @@
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
-extern int ael_yylex (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
-
-#define YY_DECL int ael_yylex (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
+extern int ael_yylex \
+ (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
+
+#define YY_DECL int ael_yylex \
+ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
#endif /* !YY_DECL */
/* Code executed at the beginning of each rule, after yytext and yyleng
@@ -1118,7 +1125,7 @@
#line 173 "ael.flex"
-#line 1122 "ael_lex.c"
+#line 1128 "ael_lex.c"
yylval = yylval_param;
@@ -1210,222 +1217,249 @@
case 1:
YY_RULE_SETUP
#line 175 "ael.flex"
-{BEGIN(comment);my_col+=yyleng;}
+{ STORE_POS; return LC;}
YY_BREAK
case 2:
YY_RULE_SETUP
+#line 176 "ael.flex"
+{ STORE_POS; return RC;}
+ YY_BREAK
+case 3:
+YY_RULE_SETUP
#line 177 "ael.flex"
-{ STORE_POS; return LC;}
- YY_BREAK
-case 3:
+{ STORE_POS; return LP;}
+ YY_BREAK
+case 4:
YY_RULE_SETUP
#line 178 "ael.flex"
-{ STORE_POS; return RC;}
- YY_BREAK
-case 4:
+{ STORE_POS; return RP;}
+ YY_BREAK
+case 5:
YY_RULE_SETUP
#line 179 "ael.flex"
-{ STORE_POS; return LP;}
- YY_BREAK
-case 5:
+{ STORE_POS; return SEMI;}
+ YY_BREAK
+case 6:
YY_RULE_SETUP
#line 180 "ael.flex"
-{ STORE_POS; return RP;}
- YY_BREAK
-case 6:
+{ STORE_POS; return EQ;}
+ YY_BREAK
+case 7:
YY_RULE_SETUP
#line 181 "ael.flex"
-{ STORE_POS; return SEMI;}
- YY_BREAK
-case 7:
+{ STORE_POS; return COMMA;}
+ YY_BREAK
+case 8:
YY_RULE_SETUP
#line 182 "ael.flex"
-{ STORE_POS; return EQ;}
- YY_BREAK
-case 8:
+{ STORE_POS; return COLON;}
+ YY_BREAK
+case 9:
YY_RULE_SETUP
#line 183 "ael.flex"
-{ STORE_POS; return COMMA;}
- YY_BREAK
-case 9:
+{ STORE_POS; return AMPER;}
+ YY_BREAK
+case 10:
YY_RULE_SETUP
#line 184 "ael.flex"
-{ STORE_POS; return COLON;}
- YY_BREAK
-case 10:
+{ STORE_POS; return BAR;}
+ YY_BREAK
+case 11:
YY_RULE_SETUP
#line 185 "ael.flex"
-{ STORE_POS; return AMPER;}
- YY_BREAK
-case 11:
+{ STORE_POS; return EXTENMARK;}
+ YY_BREAK
+case 12:
YY_RULE_SETUP
#line 186 "ael.flex"
-{ STORE_POS; return BAR;}
- YY_BREAK
-case 12:
+{ STORE_POS; return AT;}
+ YY_BREAK
+case 13:
YY_RULE_SETUP
#line 187 "ael.flex"
-{ STORE_POS; return EXTENMARK;}
- YY_BREAK
-case 13:
+{/*comment*/}
+ YY_BREAK
+case 14:
YY_RULE_SETUP
#line 188 "ael.flex"
-{ STORE_POS; return AT;}
- YY_BREAK
-case 14:
+{ STORE_POS; return KW_CONTEXT;}
+ YY_BREAK
+case 15:
YY_RULE_SETUP
#line 189 "ael.flex"
-{/*comment*/}
- YY_BREAK
-case 15:
+{ STORE_POS; return KW_ABSTRACT;}
+ YY_BREAK
+case 16:
YY_RULE_SETUP
#line 190 "ael.flex"
-{ STORE_POS; return KW_CONTEXT;}
- YY_BREAK
-case 16:
+{ STORE_POS; return KW_MACRO;};
+ YY_BREAK
+case 17:
YY_RULE_SETUP
#line 191 "ael.flex"
-{ STORE_POS; return KW_ABSTRACT;}
- YY_BREAK
-case 17:
+{ STORE_POS; return KW_GLOBALS;}
+ YY_BREAK
+case 18:
YY_RULE_SETUP
#line 192 "ael.flex"
-{ STORE_POS; return KW_MACRO;};
- YY_BREAK
-case 18:
+{ STORE_POS; return KW_IGNOREPAT;}
+ YY_BREAK
+case 19:
YY_RULE_SETUP
#line 193 "ael.flex"
-{ STORE_POS; return KW_GLOBALS;}
- YY_BREAK
-case 19:
+{ STORE_POS; return KW_SWITCH;}
+ YY_BREAK
+case 20:
YY_RULE_SETUP
#line 194 "ael.flex"
-{ STORE_POS; return KW_IGNOREPAT;}
- YY_BREAK
-case 20:
+{ STORE_POS; return KW_IF;}
+ YY_BREAK
+case 21:
YY_RULE_SETUP
#line 195 "ael.flex"
-{ STORE_POS; return KW_SWITCH;}
- YY_BREAK
-case 21:
+{ STORE_POS; return KW_IFTIME;}
+ YY_BREAK
+case 22:
YY_RULE_SETUP
#line 196 "ael.flex"
-{ STORE_POS; return KW_IF;}
- YY_BREAK
-case 22:
+{ STORE_POS; return KW_RANDOM;}
+ YY_BREAK
+case 23:
YY_RULE_SETUP
#line 197 "ael.flex"
-{ STORE_POS; return KW_IFTIME;}
- YY_BREAK
-case 23:
+{ STORE_POS; return KW_REGEXTEN;}
+ YY_BREAK
+case 24:
YY_RULE_SETUP
#line 198 "ael.flex"
-{ STORE_POS; return KW_RANDOM;}
- YY_BREAK
-case 24:
+{ STORE_POS; return KW_HINT;}
+ YY_BREAK
+case 25:
YY_RULE_SETUP
#line 199 "ael.flex"
-{ STORE_POS; return KW_REGEXTEN;}
- YY_BREAK
-case 25:
+{ STORE_POS; return KW_ELSE;}
+ YY_BREAK
+case 26:
YY_RULE_SETUP
#line 200 "ael.flex"
-{ STORE_POS; return KW_HINT;}
- YY_BREAK
-case 26:
+{ STORE_POS; return KW_GOTO;}
+ YY_BREAK
+case 27:
YY_RULE_SETUP
#line 201 "ael.flex"
-{ STORE_POS; return KW_ELSE;}
- YY_BREAK
-case 27:
+{ STORE_POS; return KW_JUMP;}
+ YY_BREAK
+case 28:
YY_RULE_SETUP
#line 202 "ael.flex"
-{ STORE_POS; return KW_GOTO;}
- YY_BREAK
-case 28:
+{ STORE_POS; return KW_RETURN;}
+ YY_BREAK
+case 29:
YY_RULE_SETUP
#line 203 "ael.flex"
-{ STORE_POS; return KW_JUMP;}
- YY_BREAK
-case 29:
+{ STORE_POS; return KW_BREAK;}
+ YY_BREAK
+case 30:
YY_RULE_SETUP
#line 204 "ael.flex"
-{ STORE_POS; return KW_RETURN;}
- YY_BREAK
-case 30:
+{ STORE_POS; return KW_CONTINUE;}
+ YY_BREAK
+case 31:
YY_RULE_SETUP
#line 205 "ael.flex"
-{ STORE_POS; return KW_BREAK;}
- YY_BREAK
-case 31:
+{ STORE_POS; return KW_FOR;}
+ YY_BREAK
+case 32:
YY_RULE_SETUP
#line 206 "ael.flex"
-{ STORE_POS; return KW_CONTINUE;}
- YY_BREAK
-case 32:
+{ STORE_POS; return KW_WHILE;}
+ YY_BREAK
+case 33:
YY_RULE_SETUP
#line 207 "ael.flex"
-{ STORE_POS; return KW_FOR;}
- YY_BREAK
-case 33:
+{ STORE_POS; return KW_CASE;}
+ YY_BREAK
+case 34:
YY_RULE_SETUP
#line 208 "ael.flex"
-{ STORE_POS; return KW_WHILE;}
- YY_BREAK
-case 34:
+{ STORE_POS; return KW_DEFAULT;}
+ YY_BREAK
+case 35:
YY_RULE_SETUP
#line 209 "ael.flex"
-{ STORE_POS; return KW_CASE;}
- YY_BREAK
-case 35:
+{ STORE_POS; return KW_PATTERN;}
+ YY_BREAK
+case 36:
YY_RULE_SETUP
#line 210 "ael.flex"
-{ STORE_POS; return KW_DEFAULT;}
- YY_BREAK
-case 36:
+{ STORE_POS; return KW_CATCH;}
+ YY_BREAK
+case 37:
YY_RULE_SETUP
#line 211 "ael.flex"
-{ STORE_POS; return KW_PATTERN;}
- YY_BREAK
-case 37:
+{ STORE_POS; return KW_SWITCHES;}
+ YY_BREAK
+case 38:
YY_RULE_SETUP
#line 212 "ael.flex"
-{ STORE_POS; return KW_CATCH;}
- YY_BREAK
-case 38:
+{ STORE_POS; return KW_ESWITCHES;}
+ YY_BREAK
+case 39:
YY_RULE_SETUP
#line 213 "ael.flex"
-{ STORE_POS; return KW_SWITCHES;}
- YY_BREAK
-case 39:
+{ STORE_POS; return KW_INCLUDES;}
+ YY_BREAK
+case 40:
YY_RULE_SETUP
#line 214 "ael.flex"
-{ STORE_POS; return KW_ESWITCHES;}
- YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 215 "ael.flex"
-{ STORE_POS; return KW_INCLUDES;}
+{ BEGIN(comment); my_col += 2; }
YY_BREAK
case 41:
-/* rule 41 can match eol */
+YY_RULE_SETUP
+#line 216 "ael.flex"
+{ my_col += yyleng; }
+ YY_BREAK
+case 42:
+/* rule 42 can match eol */
YY_RULE_SETUP
#line 217 "ael.flex"
-{ my_lineno++; my_col = 1; }
- YY_BREAK
-case 42:
+{ ++my_lineno; my_col=1;}
+ YY_BREAK
+case 43:
YY_RULE_SETUP
#line 218 "ael.flex"
{ my_col += yyleng; }
YY_BREAK
-case 43:
+case 44:
+/* rule 44 can match eol */
YY_RULE_SETUP
#line 219 "ael.flex"
+{ ++my_lineno; my_col=1;}
+ YY_BREAK
+case 45:
+YY_RULE_SETUP
+#line 220 "ael.flex"
+{ my_col += 2; BEGIN(INITIAL); }
+ YY_BREAK
+case 46:
+/* rule 46 can match eol */
+YY_RULE_SETUP
+#line 222 "ael.flex"
+{ my_lineno++; my_col = 1; }
+ YY_BREAK
+case 47:
+YY_RULE_SETUP
+#line 223 "ael.flex"
+{ my_col += yyleng; }
+ YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 224 "ael.flex"
{ my_col += (yyleng*8)-(my_col%8); }
YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 221 "ael.flex"
+case 49:
+YY_RULE_SETUP
+#line 226 "ael.flex"
{
STORE_POS;
yylval->str = strdup(yytext);
@@ -1440,10 +1474,10 @@
* A comma at the top level is valid here, unlike in argg where it
* is an argument separator so it must be returned as a token.
*/
-case 45:
-/* rule 45 can match eol */
-YY_RULE_SETUP
-#line 237 "ael.flex"
+case 50:
+/* rule 50 can match eol */
+YY_RULE_SETUP
+#line 242 "ael.flex"
{
if ( pbcpop(')') ) { /* error */
STORE_LOC;
@@ -1466,10 +1500,10 @@
}
}
YY_BREAK
-case 46:
-/* rule 46 can match eol */
-YY_RULE_SETUP
-#line 259 "ael.flex"
+case 51:
+/* rule 51 can match eol */
+YY_RULE_SETUP
+#line 264 "ael.flex"
{
char c = yytext[yyleng-1];
if (c == '(')
@@ -1478,10 +1512,10 @@
yymore();
}
YY_BREAK
-case 47:
-/* rule 47 can match eol */
-YY_RULE_SETUP
-#line 267 "ael.flex"
+case 52:
+/* rule 52 can match eol */
+YY_RULE_SETUP
+#line 272 "ael.flex"
{
char c = yytext[yyleng-1];
if ( pbcpop(c)) { /* error */
@@ -1503,10 +1537,10 @@
* of the (external) call, which happens when parencount == 0
* before the decrement.
*/
-case 48:
-/* rule 48 can match eol */
-YY_RULE_SETUP
-#line 289 "ael.flex"
+case 53:
+/* rule 53 can match eol */
+YY_RULE_SETUP
+#line 294 "ael.flex"
{
char c = yytext[yyleng-1];
if (c == '(')
@@ -1515,10 +1549,10 @@
yymore();
}
YY_BREAK
-case 49:
-/* rule 49 can match eol */
-YY_RULE_SETUP
-#line 297 "ael.flex"
+case 54:
+/* rule 54 can match eol */
+YY_RULE_SETUP
+#line 302 "ael.flex"
{
if ( pbcpop(')') ) { /* error */
STORE_LOC;
@@ -1543,10 +1577,10 @@
}
}
YY_BREAK
-case 50:
-/* rule 50 can match eol */
-YY_RULE_SETUP
-#line 321 "ael.flex"
+case 55:
+/* rule 55 can match eol */
+YY_RULE_SETUP
+#line 326 "ael.flex"
{
if( parencount != 0) { /* printf("Folding in a comma!\n"); */
yymore();
@@ -1561,10 +1595,10 @@
}
}
YY_BREAK
-case 51:
-/* rule 51 can match eol */
-YY_RULE_SETUP
-#line 335 "ael.flex"
+case 56:
+/* rule 56 can match eol */
+YY_RULE_SETUP
+#line 340 "ael.flex"
{
char c = yytext[yyleng-1];
if ( pbcpop(c) ) { /* error */
@@ -1582,20 +1616,20 @@
* or in the first and second operand of a 'for'. As above, match
* commas and use ';' as a separator (hence return it as a separate token).
*/
-case 52:
-/* rule 52 can match eol */
-YY_RULE_SETUP
-#line 352 "ael.flex"
+case 57:
+/* rule 57 can match eol */
+YY_RULE_SETUP
+#line 357 "ael.flex"
{
char c = yytext[yyleng-1];
yymore();
pbcpush(c);
}
YY_BREAK
-case 53:
-/* rule 53 can match eol */
-YY_RULE_SETUP
-#line 358 "ael.flex"
+case 58:
+/* rule 58 can match eol */
+YY_RULE_SETUP
+#line 363 "ael.flex"
{
char c = yytext[yyleng-1];
if ( pbcpop(c) ) { /* error */
@@ -1608,10 +1642,10 @@
yymore();
}
YY_BREAK
-case 54:
-/* rule 54 can match eol */
-YY_RULE_SETUP
-#line 370 "ael.flex"
+case 59:
+/* rule 59 can match eol */
+YY_RULE_SETUP
+#line 375 "ael.flex"
{
STORE_LOC;
yylval->str = strdup(yytext);
@@ -1621,10 +1655,10 @@
return word;
}
YY_BREAK
-case 55:
-/* rule 55 can match eol */
-YY_RULE_SETUP
-#line 379 "ael.flex"
+case 60:
+/* rule 60 can match eol */
+YY_RULE_SETUP
+#line 384 "ael.flex"
{
FILE *in1;
char fnamebuf[1024],*p1,*p2;
@@ -1688,39 +1722,12 @@
}
}
YY_BREAK
-case 56:
-YY_RULE_SETUP
-#line 443 "ael.flex"
-{mycol+=yyleng;}
- YY_BREAK
-case 57:
-/* rule 57 can match eol */
-YY_RULE_SETUP
-#line 444 "ael.flex"
-{++my_lineno;my_col = 1;}
- YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 445 "ael.flex"
-{mycol+=yyleng;}
- YY_BREAK
-case 59:
-/* rule 59 can match eol */
-YY_RULE_SETUP
-#line 446 "ael.flex"
-{++my_lineno;my_col = 1;}
- YY_BREAK
-case 60:
-YY_RULE_SETUP
-#line 447 "ael.flex"
-{mycol+=yyleng;BEGIN(INITIAL);}
- YY_BREAK
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(paren):
case YY_STATE_EOF(semic):
case YY_STATE_EOF(argg):
case YY_STATE_EOF(comment):
-#line 450 "ael.flex"
+#line 447 "ael.flex"
{
if ( --include_stack_index < 0 ) {
yyterminate();
@@ -1736,10 +1743,10 @@
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 463 "ael.flex"
+#line 460 "ael.flex"
ECHO;
YY_BREAK
-#line 1743 "ael_lex.c"
+#line 1749 "ael_lex.c"
case YY_END_OF_BUFFER:
{
@@ -1925,7 +1932,7 @@
else
{
- size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -2490,10 +2497,10 @@
* @note If you want to scan bytes that may contain NUL values, then use
* ael_yy_scan_bytes() instead.
*/
-YY_BUFFER_STATE ael_yy_scan_string (yyconst char * str , yyscan_t yyscanner)
+YY_BUFFER_STATE ael_yy_scan_string (yyconst char * yy_str , yyscan_t yyscanner)
{
- return ael_yy_scan_bytes(str,strlen(str) ,yyscanner);
+ return ael_yy_scan_bytes(yy_str,strlen(yy_str) ,yyscanner);
}
/** Setup the input buffer state to scan the given bytes. The next call to ael_yylex() will
@@ -2875,7 +2882,7 @@
#undef YY_DECL_IS_OURS
#undef YY_DECL
#endif
-#line 463 "ael.flex"
+#line 460 "ael.flex"
More information about the asterisk-commits
mailing list