[asterisk-commits] murf: trunk r86967 - in /trunk: pbx/ael/ael-test/ res/ael/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Oct 24 08:21:30 CDT 2007
Author: murf
Date: Wed Oct 24 08:21:29 2007
New Revision: 86967
URL: http://svn.digium.com/view/asterisk?view=rev&rev=86967
Log:
closes issue #11005, where #include uses the current dir instead of the config dir (/etc/asterisk) for relative path includes for AEL
Modified:
trunk/pbx/ael/ael-test/ref.ael-ntest22
trunk/pbx/ael/ael-test/ref.ael-test2
trunk/pbx/ael/ael-test/ref.ael-test3
trunk/pbx/ael/ael-test/ref.ael-test4
trunk/res/ael/ael.flex
trunk/res/ael/ael_lex.c
Modified: trunk/pbx/ael/ael-test/ref.ael-ntest22
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ref.ael-ntest22?view=diff&rev=86967&r1=86966&r2=86967
==============================================================================
--- trunk/pbx/ael/ael-test/ref.ael-ntest22 (original)
+++ trunk/pbx/ael/ael-test/ref.ael-ntest22 Wed Oct 24 08:21:29 2007
@@ -7,17 +7,17 @@
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
LOG: lev:2 file:pbx_ael.c line:913 func: pbx_load_module Starting AEL load process.
LOG: lev:2 file:pbx_ael.c line:920 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t1/a.ael, 41 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t1/b.ael, 42 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t1/c.ael, 106 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t2/d.ael, 41 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t2/e.ael, 42 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t2/f.ael, 82 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./qq.ael, 45 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t3/g.ael, 41 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t3/h.ael, 42 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t3/i.ael, 41 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./t3/j.ael, 43 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t1/a.ael, 41 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t1/b.ael, 42 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t1/c.ael, 106 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t2/d.ael, 41 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t2/e.ael, 42 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t2/f.ael, 82 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././qq.ael, 45 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t3/g.ael, 41 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t3/h.ael, 42 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t3/i.ael, 41 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././t3/j.ael, 43 chars
LOG: lev:2 file:pbx_ael.c line:928 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:931 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
Executed ast_context_create(conts, name=a, registrar=pbx_ael);
Modified: trunk/pbx/ael/ael-test/ref.ael-test2
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ref.ael-test2?view=diff&rev=86967&r1=86966&r2=86967
==============================================================================
--- trunk/pbx/ael/ael-test/ref.ael-test2 (original)
+++ trunk/pbx/ael/ael-test/ref.ael-test2 Wed Oct 24 08:21:29 2007
@@ -4,24 +4,24 @@
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
LOG: lev:2 file:pbx_ael.c line:913 func: pbx_load_module Starting AEL load process.
LOG: lev:2 file:pbx_ael.c line:920 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./apptest.ael2, 3474 chars
-LOG: lev:3 file:ael.y line:538 func: ael_yyparse ==== File: ./apptest.ael2, Line 46, Cols: 8-11: Suggestion: Use the goto statement instead of the Goto() application call in AEL.
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././apptest.ael2, 3474 chars
+LOG: lev:3 file:ael.y line:542 func: ael_yyparse ==== File: ././apptest.ael2, Line 46, Cols: 8-11: Suggestion: Use the goto statement instead of the Goto() application call in AEL.
LOG: lev:2 file:pbx_ael.c line:928 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:1344 func: check_goto Warning: file ./apptest.ael2, line 46-46: goto: Couldn't find goto target cont|exten|prior, not even in extensions.conf!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2510 func: check_pval_item Warning: file ./apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement.
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 94-94: application call to Return affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:1344 func: check_goto Warning: file ././apptest.ael2, line 46-46: goto: Couldn't find goto target cont|exten|prior, not even in extensions.conf!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2510 func: check_pval_item Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement.
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 94-94: application call to Return affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
LOG: lev:2 file:pbx_ael.c line:931 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:933 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:936 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
Modified: trunk/pbx/ael/ael-test/ref.ael-test3
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ref.ael-test3?view=diff&rev=86967&r1=86966&r2=86967
==============================================================================
--- trunk/pbx/ael/ael-test/ref.ael-test3 (original)
+++ trunk/pbx/ael/ael-test/ref.ael-test3 Wed Oct 24 08:21:29 2007
@@ -4,12 +4,12 @@
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
LOG: lev:2 file:pbx_ael.c line:913 func: pbx_load_module Starting AEL load process.
LOG: lev:2 file:pbx_ael.c line:920 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./include1.ael2, 78 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./include2.ael2, 98 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./include3.ael2, 57 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./include5.ael2, 56 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./include4.ael2, 87 chars
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./telemarket_torture.ael2, 28036 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././include1.ael2, 78 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././include2.ael2, 98 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././include3.ael2, 57 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././include5.ael2, 56 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././include4.ael2, 87 chars
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././telemarket_torture.ael2, 28036 chars
LOG: lev:2 file:pbx_ael.c line:928 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
LOG: lev:3 file:pval.c line:670 func: check_macro_returns Warning: file ./extensions.ael, line 14-34: The macro std-exten does not end with a return; I will insert one.
LOG: lev:3 file:pval.c line:1360 func: check_goto Warning: file ./extensions.ael, line 17-17: It's bad form to have a goto in a macro to a target outside the macro!
Modified: trunk/pbx/ael/ael-test/ref.ael-test4
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael-test/ref.ael-test4?view=diff&rev=86967&r1=86966&r2=86967
==============================================================================
--- trunk/pbx/ael/ael-test/ref.ael-test4 (original)
+++ trunk/pbx/ael/ael-test/ref.ael-test4 Wed Oct 24 08:21:29 2007
@@ -4,24 +4,24 @@
(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
LOG: lev:2 file:pbx_ael.c line:913 func: pbx_load_module Starting AEL load process.
LOG: lev:2 file:pbx_ael.c line:920 func: pbx_load_module AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex line:656 func: setup_filestack --Read in included file ./apptest.ael2, 3474 chars
-LOG: lev:3 file:ael.y line:538 func: ael_yyparse ==== File: ./apptest.ael2, Line 46, Cols: 8-11: Suggestion: Use the goto statement instead of the Goto() application call in AEL.
+LOG: lev:2 file:ael.flex line:659 func: setup_filestack --Read in included file ././apptest.ael2, 3474 chars
+LOG: lev:3 file:ael.y line:542 func: ael_yyparse ==== File: ././apptest.ael2, Line 46, Cols: 8-11: Suggestion: Use the goto statement instead of the Goto() application call in AEL.
LOG: lev:2 file:pbx_ael.c line:928 func: pbx_load_module AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:1344 func: check_goto Warning: file ./apptest.ael2, line 46-46: goto: Couldn't find goto target cont|exten|prior, not even in extensions.conf!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2510 func: check_pval_item Warning: file ./apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement.
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 94-94: application call to Return affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ./apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:1344 func: check_goto Warning: file ././apptest.ael2, line 46-46: goto: Couldn't find goto target cont|exten|prior, not even in extensions.conf!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2510 func: check_pval_item Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement.
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 94-94: application call to Return affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c line:2505 func: check_pval_item Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
LOG: lev:2 file:pbx_ael.c line:931 func: pbx_load_module AEL load process: checked config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:933 func: pbx_load_module AEL load process: compiled config file name './extensions.ael'.
LOG: lev:2 file:pbx_ael.c line:936 func: pbx_load_module AEL load process: merged config file name './extensions.ael'.
Modified: trunk/res/ael/ael.flex
URL: http://svn.digium.com/view/asterisk/trunk/res/ael/ael.flex?view=diff&rev=86967&r1=86966&r2=86967
==============================================================================
--- trunk/res/ael/ael.flex (original)
+++ trunk/res/ael/ael.flex Wed Oct 24 08:21:29 2007
@@ -406,7 +406,11 @@
} else {
strncpy(fnamebuf, p1+1, p2-p1-1);
fnamebuf[p2-p1-1] = 0;
-
+ if (fnamebuf[0] != '/') {
+ char fnamebuf2[1024];
+ snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
+ ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
+ }
#ifdef SOLARIS
glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
#else
Modified: trunk/res/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/trunk/res/ael/ael_lex.c?view=diff&rev=86967&r1=86966&r2=86967
==============================================================================
--- trunk/res/ael/ael_lex.c (original)
+++ trunk/res/ael/ael_lex.c Wed Oct 24 08:21:29 2007
@@ -837,7 +837,6 @@
glob_t globbuf; /* the current globbuf */
int globbuf_pos; /* where we are in the current globbuf */
YY_BUFFER_STATE bufstate;
-
};
static struct stackelement include_stack[MAX_INCLUDE_DEPTH];
@@ -892,7 +891,7 @@
#define STORE_POS
#define STORE_LOC
#endif
-#line 895 "ael_lex.c"
+#line 894 "ael_lex.c"
#define INITIAL 0
#define paren 1
@@ -1133,10 +1132,10 @@
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 182 "ael.flex"
-
-
-#line 1139 "ael_lex.c"
+#line 181 "ael.flex"
+
+
+#line 1138 "ael_lex.c"
yylval = yylval_param;
@@ -1227,255 +1226,255 @@
case 1:
YY_RULE_SETUP
+#line 183 "ael.flex"
+{ STORE_POS; return LC;}
+ YY_BREAK
+case 2:
+YY_RULE_SETUP
#line 184 "ael.flex"
-{ STORE_POS; return LC;}
- YY_BREAK
-case 2:
+{ STORE_POS; return RC;}
+ YY_BREAK
+case 3:
YY_RULE_SETUP
#line 185 "ael.flex"
-{ STORE_POS; return RC;}
- YY_BREAK
-case 3:
+{ STORE_POS; return LP;}
+ YY_BREAK
+case 4:
YY_RULE_SETUP
#line 186 "ael.flex"
-{ STORE_POS; return LP;}
- YY_BREAK
-case 4:
+{ STORE_POS; return RP;}
+ YY_BREAK
+case 5:
YY_RULE_SETUP
#line 187 "ael.flex"
-{ STORE_POS; return RP;}
- YY_BREAK
-case 5:
+{ STORE_POS; return SEMI;}
+ YY_BREAK
+case 6:
YY_RULE_SETUP
#line 188 "ael.flex"
-{ STORE_POS; return SEMI;}
- YY_BREAK
-case 6:
+{ STORE_POS; return EQ;}
+ YY_BREAK
+case 7:
YY_RULE_SETUP
#line 189 "ael.flex"
-{ STORE_POS; return EQ;}
- YY_BREAK
-case 7:
+{ STORE_POS; return COMMA;}
+ YY_BREAK
+case 8:
YY_RULE_SETUP
#line 190 "ael.flex"
-{ STORE_POS; return COMMA;}
- YY_BREAK
-case 8:
+{ STORE_POS; return COLON;}
+ YY_BREAK
+case 9:
YY_RULE_SETUP
#line 191 "ael.flex"
-{ STORE_POS; return COLON;}
- YY_BREAK
-case 9:
+{ STORE_POS; return AMPER;}
+ YY_BREAK
+case 10:
YY_RULE_SETUP
#line 192 "ael.flex"
-{ STORE_POS; return AMPER;}
- YY_BREAK
-case 10:
+{ STORE_POS; return BAR;}
+ YY_BREAK
+case 11:
YY_RULE_SETUP
#line 193 "ael.flex"
-{ STORE_POS; return BAR;}
- YY_BREAK
-case 11:
+{ STORE_POS; return EXTENMARK;}
+ YY_BREAK
+case 12:
YY_RULE_SETUP
#line 194 "ael.flex"
-{ STORE_POS; return EXTENMARK;}
- YY_BREAK
-case 12:
+{ STORE_POS; return AT;}
+ YY_BREAK
+case 13:
YY_RULE_SETUP
#line 195 "ael.flex"
-{ STORE_POS; return AT;}
- YY_BREAK
-case 13:
+{/*comment*/}
+ YY_BREAK
+case 14:
YY_RULE_SETUP
#line 196 "ael.flex"
-{/*comment*/}
- YY_BREAK
-case 14:
+{ STORE_POS; return KW_CONTEXT;}
+ YY_BREAK
+case 15:
YY_RULE_SETUP
#line 197 "ael.flex"
-{ STORE_POS; return KW_CONTEXT;}
- YY_BREAK
-case 15:
+{ STORE_POS; return KW_ABSTRACT;}
+ YY_BREAK
+case 16:
YY_RULE_SETUP
#line 198 "ael.flex"
-{ STORE_POS; return KW_ABSTRACT;}
- YY_BREAK
-case 16:
+{ STORE_POS; return KW_MACRO;};
+ YY_BREAK
+case 17:
YY_RULE_SETUP
#line 199 "ael.flex"
-{ STORE_POS; return KW_MACRO;};
- YY_BREAK
-case 17:
+{ STORE_POS; return KW_GLOBALS;}
+ YY_BREAK
+case 18:
YY_RULE_SETUP
#line 200 "ael.flex"
-{ STORE_POS; return KW_GLOBALS;}
- YY_BREAK
-case 18:
+{ STORE_POS; return KW_LOCAL;}
+ YY_BREAK
+case 19:
YY_RULE_SETUP
#line 201 "ael.flex"
-{ STORE_POS; return KW_LOCAL;}
- YY_BREAK
-case 19:
+{ STORE_POS; return KW_IGNOREPAT;}
+ YY_BREAK
+case 20:
YY_RULE_SETUP
#line 202 "ael.flex"
-{ STORE_POS; return KW_IGNOREPAT;}
- YY_BREAK
-case 20:
+{ STORE_POS; return KW_SWITCH;}
+ YY_BREAK
+case 21:
YY_RULE_SETUP
#line 203 "ael.flex"
-{ STORE_POS; return KW_SWITCH;}
- YY_BREAK
-case 21:
+{ STORE_POS; return KW_IF;}
+ YY_BREAK
+case 22:
YY_RULE_SETUP
#line 204 "ael.flex"
-{ STORE_POS; return KW_IF;}
- YY_BREAK
-case 22:
+{ STORE_POS; return KW_IFTIME;}
+ YY_BREAK
+case 23:
YY_RULE_SETUP
#line 205 "ael.flex"
-{ STORE_POS; return KW_IFTIME;}
- YY_BREAK
-case 23:
+{ STORE_POS; return KW_RANDOM;}
+ YY_BREAK
+case 24:
YY_RULE_SETUP
#line 206 "ael.flex"
-{ STORE_POS; return KW_RANDOM;}
- YY_BREAK
-case 24:
+{ STORE_POS; return KW_REGEXTEN;}
+ YY_BREAK
+case 25:
YY_RULE_SETUP
#line 207 "ael.flex"
-{ STORE_POS; return KW_REGEXTEN;}
- YY_BREAK
-case 25:
+{ STORE_POS; return KW_HINT;}
+ YY_BREAK
+case 26:
YY_RULE_SETUP
#line 208 "ael.flex"
-{ STORE_POS; return KW_HINT;}
- YY_BREAK
-case 26:
+{ STORE_POS; return KW_ELSE;}
+ YY_BREAK
+case 27:
YY_RULE_SETUP
#line 209 "ael.flex"
-{ STORE_POS; return KW_ELSE;}
- YY_BREAK
-case 27:
+{ STORE_POS; return KW_GOTO;}
+ YY_BREAK
+case 28:
YY_RULE_SETUP
#line 210 "ael.flex"
-{ STORE_POS; return KW_GOTO;}
- YY_BREAK
-case 28:
+{ STORE_POS; return KW_JUMP;}
+ YY_BREAK
+case 29:
YY_RULE_SETUP
#line 211 "ael.flex"
-{ STORE_POS; return KW_JUMP;}
- YY_BREAK
-case 29:
+{ STORE_POS; return KW_RETURN;}
+ YY_BREAK
+case 30:
YY_RULE_SETUP
#line 212 "ael.flex"
-{ STORE_POS; return KW_RETURN;}
- YY_BREAK
-case 30:
+{ STORE_POS; return KW_BREAK;}
+ YY_BREAK
+case 31:
YY_RULE_SETUP
#line 213 "ael.flex"
-{ STORE_POS; return KW_BREAK;}
- YY_BREAK
-case 31:
+{ STORE_POS; return KW_CONTINUE;}
+ YY_BREAK
+case 32:
YY_RULE_SETUP
#line 214 "ael.flex"
-{ STORE_POS; return KW_CONTINUE;}
- YY_BREAK
-case 32:
+{ STORE_POS; return KW_FOR;}
+ YY_BREAK
+case 33:
YY_RULE_SETUP
#line 215 "ael.flex"
-{ STORE_POS; return KW_FOR;}
- YY_BREAK
-case 33:
+{ STORE_POS; return KW_WHILE;}
+ YY_BREAK
+case 34:
YY_RULE_SETUP
#line 216 "ael.flex"
-{ STORE_POS; return KW_WHILE;}
- YY_BREAK
-case 34:
+{ STORE_POS; return KW_CASE;}
+ YY_BREAK
+case 35:
YY_RULE_SETUP
#line 217 "ael.flex"
-{ STORE_POS; return KW_CASE;}
- YY_BREAK
-case 35:
+{ STORE_POS; return KW_DEFAULT;}
+ YY_BREAK
+case 36:
YY_RULE_SETUP
#line 218 "ael.flex"
-{ STORE_POS; return KW_DEFAULT;}
- YY_BREAK
-case 36:
+{ STORE_POS; return KW_PATTERN;}
+ YY_BREAK
+case 37:
YY_RULE_SETUP
#line 219 "ael.flex"
-{ STORE_POS; return KW_PATTERN;}
- YY_BREAK
-case 37:
+{ STORE_POS; return KW_CATCH;}
+ YY_BREAK
+case 38:
YY_RULE_SETUP
#line 220 "ael.flex"
-{ STORE_POS; return KW_CATCH;}
- YY_BREAK
-case 38:
+{ STORE_POS; return KW_SWITCHES;}
+ YY_BREAK
+case 39:
YY_RULE_SETUP
#line 221 "ael.flex"
-{ STORE_POS; return KW_SWITCHES;}
- YY_BREAK
-case 39:
+{ STORE_POS; return KW_ESWITCHES;}
+ YY_BREAK
+case 40:
YY_RULE_SETUP
#line 222 "ael.flex"
-{ STORE_POS; return KW_ESWITCHES;}
- YY_BREAK
-case 40:
+{ STORE_POS; return KW_INCLUDES;}
+ YY_BREAK
+case 41:
YY_RULE_SETUP
#line 223 "ael.flex"
-{ STORE_POS; return KW_INCLUDES;}
- YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 224 "ael.flex"
{ BEGIN(comment); my_col += 2; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 226 "ael.flex"
+#line 225 "ael.flex"
{ my_col += yyleng; }
YY_BREAK
case 43:
/* rule 43 can match eol */
YY_RULE_SETUP
+#line 226 "ael.flex"
+{ ++my_lineno; my_col=1;}
+ YY_BREAK
+case 44:
+YY_RULE_SETUP
#line 227 "ael.flex"
-{ ++my_lineno; my_col=1;}
- YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 228 "ael.flex"
{ my_col += yyleng; }
YY_BREAK
case 45:
/* rule 45 can match eol */
YY_RULE_SETUP
+#line 228 "ael.flex"
+{ ++my_lineno; my_col=1;}
+ YY_BREAK
+case 46:
+YY_RULE_SETUP
#line 229 "ael.flex"
-{ ++my_lineno; my_col=1;}
- YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 230 "ael.flex"
{ my_col += 2; BEGIN(INITIAL); }
YY_BREAK
case 47:
/* rule 47 can match eol */
YY_RULE_SETUP
+#line 231 "ael.flex"
+{ my_lineno++; my_col = 1; }
+ YY_BREAK
+case 48:
+YY_RULE_SETUP
#line 232 "ael.flex"
-{ my_lineno++; my_col = 1; }
- YY_BREAK
-case 48:
+{ my_col += yyleng; }
+ YY_BREAK
+case 49:
YY_RULE_SETUP
#line 233 "ael.flex"
-{ my_col += yyleng; }
- YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 234 "ael.flex"
{ my_col += (yyleng*8)-(my_col%8); }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 236 "ael.flex"
+#line 235 "ael.flex"
{
STORE_POS;
yylval->str = strdup(yytext);
@@ -1493,7 +1492,7 @@
case 51:
/* rule 51 can match eol */
YY_RULE_SETUP
-#line 252 "ael.flex"
+#line 251 "ael.flex"
{
if ( pbcpop(')') ) { /* error */
STORE_LOC;
@@ -1519,7 +1518,7 @@
case 52:
/* rule 52 can match eol */
YY_RULE_SETUP
-#line 274 "ael.flex"
+#line 273 "ael.flex"
{
char c = yytext[yyleng-1];
if (c == '(')
@@ -1531,7 +1530,7 @@
case 53:
/* rule 53 can match eol */
YY_RULE_SETUP
-#line 282 "ael.flex"
+#line 281 "ael.flex"
{
char c = yytext[yyleng-1];
if ( pbcpop(c)) { /* error */
@@ -1556,7 +1555,7 @@
case 54:
/* rule 54 can match eol */
YY_RULE_SETUP
-#line 304 "ael.flex"
+#line 303 "ael.flex"
{
char c = yytext[yyleng-1];
if (c == '(')
@@ -1568,7 +1567,7 @@
case 55:
/* rule 55 can match eol */
YY_RULE_SETUP
-#line 312 "ael.flex"
+#line 311 "ael.flex"
{
if ( pbcpop(')') ) { /* error */
STORE_LOC;
@@ -1596,7 +1595,7 @@
case 56:
/* rule 56 can match eol */
YY_RULE_SETUP
-#line 336 "ael.flex"
+#line 335 "ael.flex"
{
if( parencount != 0) { /* printf("Folding in a comma!\n"); */
yymore();
@@ -1614,7 +1613,7 @@
case 57:
/* rule 57 can match eol */
YY_RULE_SETUP
-#line 350 "ael.flex"
+#line 349 "ael.flex"
{
char c = yytext[yyleng-1];
if ( pbcpop(c) ) { /* error */
@@ -1635,7 +1634,7 @@
case 58:
/* rule 58 can match eol */
YY_RULE_SETUP
-#line 367 "ael.flex"
+#line 366 "ael.flex"
{
char c = yytext[yyleng-1];
yymore();
@@ -1645,7 +1644,7 @@
case 59:
/* rule 59 can match eol */
YY_RULE_SETUP
-#line 373 "ael.flex"
+#line 372 "ael.flex"
{
char c = yytext[yyleng-1];
if ( pbcpop(c) ) { /* error */
@@ -1661,7 +1660,7 @@
case 60:
/* rule 60 can match eol */
YY_RULE_SETUP
-#line 385 "ael.flex"
+#line 384 "ael.flex"
{
STORE_LOC;
yylval->str = strdup(yytext);
@@ -1674,7 +1673,7 @@
case 61:
/* rule 61 can match eol */
YY_RULE_SETUP
-#line 394 "ael.flex"
+#line 393 "ael.flex"
{
char fnamebuf[1024],*p1,*p2;
int glob_ret;
@@ -1691,7 +1690,11 @@
} else {
strncpy(fnamebuf, p1+1, p2-p1-1);
fnamebuf[p2-p1-1] = 0;
-
+ if (fnamebuf[0] != '/') {
+ char fnamebuf2[1024];
+ snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
+ ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
+ }
#ifdef SOLARIS
glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
#else
@@ -1720,7 +1723,7 @@
case YY_STATE_EOF(semic):
case YY_STATE_EOF(argg):
case YY_STATE_EOF(comment):
-#line 435 "ael.flex"
+#line 438 "ael.flex"
{
char fnamebuf[2048];
if (include_stack_index > 0 && include_stack[include_stack_index-1].globbuf_pos < include_stack[include_stack_index-1].globbuf.gl_pathc-1) {
@@ -1757,10 +1760,10 @@
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 469 "ael.flex"
+#line 472 "ael.flex"
ECHO;
YY_BREAK
-#line 1763 "ael_lex.c"
+#line 1766 "ael_lex.c"
case YY_END_OF_BUFFER:
{
@@ -2896,7 +2899,7 @@
#undef YY_DECL_IS_OURS
#undef YY_DECL
#endif
-#line 469 "ael.flex"
+#line 472 "ael.flex"
More information about the asterisk-commits
mailing list