[svn-commits] murf: branch murf/AEL2-1.2 r57439 - in /team/murf/AEL2-1.2: pbx/ pbx/ael-test...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Thu Mar 1 23:43:21 MST 2007


Author: murf
Date: Fri Mar  2 00:43:21 2007
New Revision: 57439

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57439
Log:
fixes via 9184; comma escapes, and some catch up from other fixes.

Modified:
    team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test2
    team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test3
    team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test4
    team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test7
    team/murf/AEL2-1.2/pbx/pbx_ael2.c
    team/murf/AEL2-1.2/utils/ael_main.c

Modified: team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test2
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test2?view=diff&rev=57439&r1=57438&r2=57439
==============================================================================
--- team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test2 (original)
+++ team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test2 Fri Mar  2 00:43:21 2007
@@ -2,37 +2,37 @@
 (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_ael2.c  line:3851 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael2.c  line:3858 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael2'.
+LOG: lev:2 file:pbx_ael2.c  line:3909 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael2.c  line:3916 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael2'.
 LOG: lev:2 file:ael.flex  line:429 func: ael_yylex    --Read in included file ./apptest.ael2, 3474 chars
 LOG: lev:3 file:ael.y  line:529 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_ael2.c  line:3861 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael2'.
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 5-5: The j option in the AddQueueMember application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 14-14: The j option in the Authenticate application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 19-19: The j option in the ChanIsAvail application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 22-22: The j option in the ControlPlayback application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 27-27: The j option in the Dial application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 32-32: The j option in the DUNDiLookup application call is not appropriate for AEL!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 35-35: application call to EndWhile needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 37-37: application call to ExecIf needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:4 file:pbx_ael2.c  line:1262 func: check_goto  Error: file ./apptest.ael2, line 46-46: goto:  no context cont could be found that matches the goto target!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 47-47: application call to GotoIf needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 48-48: application call to GotoIfTime needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 50-50: The j option in the HasNewVoicemail application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 51-51: The j option in the HasVoicemail application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 56-56: The j option in the LookupBlacklist application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 61-61: The j option in the MailboxExists application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 78-78: The j option in the PauseQueueMember application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 80-80: The j option in the Playback application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 82-82: The j option in the PrivacyManager application call is not appropriate for AEL!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 85-85: application call to Random needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pbx_ael2.c  line:1925 func: option_matches_j  Warning: file ./apptest.ael2, line 86-86: The k option in the Read application call is not available as an option!
-LOG: lev:3 file:pbx_ael2.c  line:1925 func: option_matches_j  Warning: file ./apptest.ael2, line 86-86: The p option in the Read application call is not available as an option!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 91-91: The j option in the RemoveQueueMember application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 104-104: The j option in the SendText application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 127-127: The j option in the Transfer application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 130-130: The j option in the UnpauseQueueMember application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 134-134: The j option in the VoiceMail application call is not appropriate for AEL!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 141-141: application call to While needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:4 file:pbx_ael2.c  line:3874 func: pbx_load_module  Sorry, but 0 syntax errors and 19 semantic errors were detected. It doesn't make sense to compile.
-LOG: lev:4 file:ael2_parse  line:456 func: main  0 contexts, 0 extensions, 0 priorities
+LOG: lev:2 file:pbx_ael2.c  line:3919 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael2'.
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 5-5: The j option in the AddQueueMember application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 14-14: The j option in the Authenticate application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 19-19: The j option in the ChanIsAvail application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 22-22: The j option in the ControlPlayback application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 27-27: The j option in the Dial application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 32-32: The j option in the DUNDiLookup application call is not appropriate for AEL!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 35-35: application call to EndWhile needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 37-37: application call to ExecIf needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pbx_ael2.c  line:1288 func: check_goto  Warning: file ./apptest.ael2, line 46-46: goto:  no context cont could be found that matches the goto target!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 47-47: application call to GotoIf needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 48-48: application call to GotoIfTime needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 50-50: The j option in the HasNewVoicemail application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 51-51: The j option in the HasVoicemail application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 56-56: The j option in the LookupBlacklist application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 61-61: The j option in the MailboxExists application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 78-78: The j option in the PauseQueueMember application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 80-80: The j option in the Playback application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 82-82: The j option in the PrivacyManager application call is not appropriate for AEL!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 85-85: application call to Random needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pbx_ael2.c  line:1977 func: option_matches_j  Warning: file ./apptest.ael2, line 86-86: The k option in the Read application call is not available as an option!
+LOG: lev:3 file:pbx_ael2.c  line:1977 func: option_matches_j  Warning: file ./apptest.ael2, line 86-86: The p option in the Read application call is not available as an option!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 91-91: The j option in the RemoveQueueMember application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 104-104: The j option in the SendText application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 127-127: The j option in the Transfer application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 130-130: The j option in the UnpauseQueueMember application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 134-134: The j option in the VoiceMail application call is not appropriate for AEL!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 141-141: application call to While needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:4 file:pbx_ael2.c  line:3932 func: pbx_load_module  Sorry, but 0 syntax errors and 18 semantic errors were detected. It doesn't make sense to compile.
+LOG: lev:4 file:ael2_parse  line:496 func: main  0 contexts, 0 extensions, 0 priorities

Modified: team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test3
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test3?view=diff&rev=57439&r1=57438&r2=57439
==============================================================================
--- team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test3 (original)
+++ team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test3 Fri Mar  2 00:43:21 2007
@@ -2,20 +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_ael2.c  line:3851 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael2.c  line:3858 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael2'.
+LOG: lev:2 file:pbx_ael2.c  line:3909 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael2.c  line:3916 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael2'.
 LOG: lev:2 file:ael.flex  line:429 func: ael_yylex    --Read in included file ./include1.ael2, 78 chars
 LOG: lev:2 file:ael.flex  line:429 func: ael_yylex    --Read in included file ./include2.ael2, 98 chars
 LOG: lev:2 file:ael.flex  line:429 func: ael_yylex    --Read in included file ./include3.ael2, 57 chars
 LOG: lev:2 file:ael.flex  line:429 func: ael_yylex    --Read in included file ./include5.ael2, 56 chars
 LOG: lev:2 file:ael.flex  line:429 func: ael_yylex    --Read in included file ./include4.ael2, 87 chars
 LOG: lev:2 file:ael.flex  line:429 func: ael_yylex    --Read in included file ./telemarket_torture.ael2, 28036 chars
-LOG: lev:2 file:pbx_ael2.c  line:3861 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael2'.
-LOG: lev:3 file:pbx_ael2.c  line:816 func: check_includes  Warning: file ./extensions.ael2, line 2747-2751: The included context 'parkedcalls' cannot be found.
-LOG: lev:3 file:pbx_ael2.c  line:816 func: check_includes  Warning: file ./extensions.ael2, line 2954-2957: The included context 'parkedcalls' cannot be found.
-LOG: lev:3 file:pbx_ael2.c  line:816 func: check_includes  Warning: file ./extensions.ael2, line 3005-3012: The included context 'parkedcalls' cannot be found.
-LOG: lev:2 file:pbx_ael2.c  line:3864 func: pbx_load_module  AEL load process: checked config file name './extensions.ael2'.
-LOG: lev:2 file:pbx_ael2.c  line:3866 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael2'.
-LOG: lev:2 file:pbx_ael2.c  line:3869 func: pbx_load_module  AEL load process: merged config file name './extensions.ael2'.
-LOG: lev:2 file:pbx_ael2.c  line:3872 func: pbx_load_module  AEL load process: verified config file name './extensions.ael2'.
-LOG: lev:4 file:ael2_parse  line:456 func: main  172 contexts, 858 extensions, 2326 priorities
+LOG: lev:2 file:pbx_ael2.c  line:3919 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael2'.
+LOG: lev:2 file:pbx_ael2.c  line:3922 func: pbx_load_module  AEL load process: checked config file name './extensions.ael2'.
+LOG: lev:2 file:pbx_ael2.c  line:3924 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael2'.
+LOG: lev:2 file:pbx_ael2.c  line:3927 func: pbx_load_module  AEL load process: merged config file name './extensions.ael2'.
+LOG: lev:2 file:pbx_ael2.c  line:3930 func: pbx_load_module  AEL load process: verified config file name './extensions.ael2'.
+LOG: lev:4 file:ael2_parse  line:496 func: main  172 contexts, 858 extensions, 2326 priorities

Modified: team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test4
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test4?view=diff&rev=57439&r1=57438&r2=57439
==============================================================================
--- team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test4 (original)
+++ team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test4 Fri Mar  2 00:43:21 2007
@@ -2,37 +2,37 @@
 (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_ael2.c  line:3851 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael2.c  line:3858 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael2'.
+LOG: lev:2 file:pbx_ael2.c  line:3909 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael2.c  line:3916 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael2'.
 LOG: lev:2 file:ael.flex  line:429 func: ael_yylex    --Read in included file ./apptest.ael2, 3474 chars
 LOG: lev:3 file:ael.y  line:529 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_ael2.c  line:3861 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael2'.
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 5-5: The j option in the AddQueueMember application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 14-14: The j option in the Authenticate application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 19-19: The j option in the ChanIsAvail application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 22-22: The j option in the ControlPlayback application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 27-27: The j option in the Dial application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 32-32: The j option in the DUNDiLookup application call is not appropriate for AEL!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 35-35: application call to EndWhile needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 37-37: application call to ExecIf needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:4 file:pbx_ael2.c  line:1262 func: check_goto  Error: file ./apptest.ael2, line 46-46: goto:  no context cont could be found that matches the goto target!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 47-47: application call to GotoIf needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 48-48: application call to GotoIfTime needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 50-50: The j option in the HasNewVoicemail application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 51-51: The j option in the HasVoicemail application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 56-56: The j option in the LookupBlacklist application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 61-61: The j option in the MailboxExists application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 78-78: The j option in the PauseQueueMember application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 80-80: The j option in the Playback application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 82-82: The j option in the PrivacyManager application call is not appropriate for AEL!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 85-85: application call to Random needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pbx_ael2.c  line:1925 func: option_matches_j  Warning: file ./apptest.ael2, line 86-86: The k option in the Read application call is not available as an option!
-LOG: lev:3 file:pbx_ael2.c  line:1925 func: option_matches_j  Warning: file ./apptest.ael2, line 86-86: The p option in the Read application call is not available as an option!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 91-91: The j option in the RemoveQueueMember application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 104-104: The j option in the SendText application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 127-127: The j option in the Transfer application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 130-130: The j option in the UnpauseQueueMember application call is not appropriate for AEL!
-LOG: lev:4 file:pbx_ael2.c  line:1906 func: option_matches_j  Error: file ./apptest.ael2, line 134-134: The j option in the VoiceMail application call is not appropriate for AEL!
-LOG: lev:3 file:pbx_ael2.c  line:2312 func: check_pval_item  Warning: file ./apptest.ael2, line 141-141: application call to While needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:4 file:pbx_ael2.c  line:3874 func: pbx_load_module  Sorry, but 0 syntax errors and 19 semantic errors were detected. It doesn't make sense to compile.
-LOG: lev:4 file:ael2_parse  line:456 func: main  0 contexts, 0 extensions, 0 priorities
+LOG: lev:2 file:pbx_ael2.c  line:3919 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael2'.
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 5-5: The j option in the AddQueueMember application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 14-14: The j option in the Authenticate application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 19-19: The j option in the ChanIsAvail application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 22-22: The j option in the ControlPlayback application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 27-27: The j option in the Dial application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 32-32: The j option in the DUNDiLookup application call is not appropriate for AEL!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 35-35: application call to EndWhile needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 37-37: application call to ExecIf needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pbx_ael2.c  line:1288 func: check_goto  Warning: file ./apptest.ael2, line 46-46: goto:  no context cont could be found that matches the goto target!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 47-47: application call to GotoIf needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 48-48: application call to GotoIfTime needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 50-50: The j option in the HasNewVoicemail application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 51-51: The j option in the HasVoicemail application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 56-56: The j option in the LookupBlacklist application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 61-61: The j option in the MailboxExists application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 78-78: The j option in the PauseQueueMember application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 80-80: The j option in the Playback application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 82-82: The j option in the PrivacyManager application call is not appropriate for AEL!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 85-85: application call to Random needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pbx_ael2.c  line:1977 func: option_matches_j  Warning: file ./apptest.ael2, line 86-86: The k option in the Read application call is not available as an option!
+LOG: lev:3 file:pbx_ael2.c  line:1977 func: option_matches_j  Warning: file ./apptest.ael2, line 86-86: The p option in the Read application call is not available as an option!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 91-91: The j option in the RemoveQueueMember application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 104-104: The j option in the SendText application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 127-127: The j option in the Transfer application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 130-130: The j option in the UnpauseQueueMember application call is not appropriate for AEL!
+LOG: lev:4 file:pbx_ael2.c  line:1958 func: option_matches_j  Error: file ./apptest.ael2, line 134-134: The j option in the VoiceMail application call is not appropriate for AEL!
+LOG: lev:3 file:pbx_ael2.c  line:2366 func: check_pval_item  Warning: file ./apptest.ael2, line 141-141: application call to While needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:4 file:pbx_ael2.c  line:3932 func: pbx_load_module  Sorry, but 0 syntax errors and 18 semantic errors were detected. It doesn't make sense to compile.
+LOG: lev:4 file:ael2_parse  line:496 func: main  0 contexts, 0 extensions, 0 priorities

Modified: team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test7
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test7?view=diff&rev=57439&r1=57438&r2=57439
==============================================================================
--- team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test7 (original)
+++ team/murf/AEL2-1.2/pbx/ael-test/ref.ael-test7 Fri Mar  2 00:43:21 2007
@@ -2,14 +2,14 @@
 (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_ael2.c  line:3825 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael2.c  line:3832 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael2'.
-LOG: lev:2 file:pbx_ael2.c  line:3835 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael2'.
-LOG: lev:4 file:pbx_ael2.c  line:2286 func: check_pval_item  Error: file ./extensions.ael2, line 98-98: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
-LOG: lev:4 file:pbx_ael2.c  line:2286 func: check_pval_item  Error: file ./extensions.ael2, line 107-107: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
-LOG: lev:3 file:pbx_ael2.c  line:2325 func: check_pval_item  Warning: file ./extensions.ael2, line 115-115: application call to LCDial not listed in applist database!
-LOG: lev:4 file:pbx_ael2.c  line:2286 func: check_pval_item  Error: file ./extensions.ael2, line 284-284: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
-LOG: lev:4 file:pbx_ael2.c  line:2286 func: check_pval_item  Error: file ./extensions.ael2, line 287-287: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
-LOG: lev:4 file:pbx_ael2.c  line:2267 func: check_pval_item  Error: file ./extensions.ael2, line 452-452: macro call to non-existent std-exten-ael !
-LOG: lev:4 file:pbx_ael2.c  line:3848 func: pbx_load_module  Sorry, but 0 syntax errors and 5 semantic errors were detected. It doesn't make sense to compile.
-LOG: lev:4 file:ael2_parse  line:456 func: main  0 contexts, 0 extensions, 0 priorities
+LOG: lev:2 file:pbx_ael2.c  line:3909 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael2.c  line:3916 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael2'.
+LOG: lev:2 file:pbx_ael2.c  line:3919 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael2'.
+LOG: lev:4 file:pbx_ael2.c  line:2340 func: check_pval_item  Error: file ./extensions.ael2, line 98-98: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
+LOG: lev:4 file:pbx_ael2.c  line:2340 func: check_pval_item  Error: file ./extensions.ael2, line 107-107: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
+LOG: lev:3 file:pbx_ael2.c  line:2379 func: check_pval_item  Warning: file ./extensions.ael2, line 115-115: application call to LCDial not listed in applist database!
+LOG: lev:4 file:pbx_ael2.c  line:2340 func: check_pval_item  Error: file ./extensions.ael2, line 284-284: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
+LOG: lev:4 file:pbx_ael2.c  line:2340 func: check_pval_item  Error: file ./extensions.ael2, line 287-287: The macro call to checkanddial has 5 arguments, but the macro definition has 7 arguments
+LOG: lev:3 file:pbx_ael2.c  line:2321 func: check_pval_item  Error: file ./extensions.ael2, line 452-452: macro call to non-existent std-exten-ael ! Hopefully it is present in extensions.conf! 
+LOG: lev:4 file:pbx_ael2.c  line:3932 func: pbx_load_module  Sorry, but 0 syntax errors and 4 semantic errors were detected. It doesn't make sense to compile.
+LOG: lev:4 file:ael2_parse  line:496 func: main  0 contexts, 0 extensions, 0 priorities

Modified: team/murf/AEL2-1.2/pbx/pbx_ael2.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/pbx/pbx_ael2.c?view=diff&rev=57439&r1=57438&r2=57439
==============================================================================
--- team/murf/AEL2-1.2/pbx/pbx_ael2.c (original)
+++ team/murf/AEL2-1.2/pbx/pbx_ael2.c Fri Mar  2 00:43:21 2007
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -145,6 +146,28 @@
 static pval *get_extension_or_contxt(pval *p);
 static pval *get_contxt(pval *p);
 static void remove_spaces_before_equals(char *str);
+static void substitute_commas(char *str);
+
+/* I am adding this code to substitute commas with vertbars in the args to apps */
+static void substitute_commas(char *str)
+{
+	char *p = str;
+	
+	while (p && *p)
+	{
+		if (*p == ',' && ((p != str && *(p-1) != '\\')
+				|| p == str))
+			*p = '|';
+		if (*p == '\\' && *(p+1) == ',') { /* learning experience: the '\,' is turned into just ',' by pbx_config; So we need to do the same */
+			char *q = p;
+			while (*q) {  /* move the ',' and everything after it up 1 char */
+				*q = *(q+1);
+				q++;
+			}
+		}
+		p++;
+	}
+}
 
 
 /* PRETTY PRINTER FOR AEL:  ============================================================================= */
@@ -204,7 +227,7 @@
 		fprintf(fin,"%s(", item->u1.str);
 		for (lp=item->u2.arglist; lp; lp=lp->next) {
 			if ( lp != item->u2.arglist )
-				fprintf(fin,", ");
+				fprintf(fin,",");
 			fprintf(fin,"%s", lp->u1.str);
 		}
 		fprintf(fin,");\n");
@@ -3272,6 +3295,7 @@
 			for (p2 = p->u2.arglist; p2; p2 = p2->next) {
 				if (p2 != p->u2.arglist )
 					strcat(buf1,"|");
+				substitute_commas(p2->u1.str);
 				strcat(buf1,p2->u1.str);
 			}
 			pr->app = strdup(p->u1.str);

Modified: team/murf/AEL2-1.2/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/utils/ael_main.c?view=diff&rev=57439&r1=57438&r2=57439
==============================================================================
--- team/murf/AEL2-1.2/utils/ael_main.c (original)
+++ team/murf/AEL2-1.2/utils/ael_main.c Fri Mar  2 00:43:21 2007
@@ -13,7 +13,9 @@
 #include <limits.h>
 
 #include "asterisk/ast_expr.h"
+#include "asterisk/channel.h"
 #include "asterisk/module.h"
+#include "asterisk/app.h"
 #include "asterisk/ael_structs.h"
 
 struct namelist
@@ -58,8 +60,10 @@
 struct namelist *create_name(char *name);
 struct namelist *create_name(char *name)
 {
-	struct namelist *x = (struct namelist *)calloc(sizeof(struct namelist),1);
-	strncpy(x->name,name,100);
+	struct namelist *x = calloc(1, sizeof(*x));
+	if (!x)
+		return NULL;
+	strncpy(x->name, name, sizeof(x->name) - 1);
 	return x;
 }
 
@@ -162,6 +166,8 @@
 
 	if( dump_extensions && dumpfile ) {
 		struct namelist *n;
+		char *data2,*data3=0;
+		int commacount = 0;
 
 		if( FIRST_TIME ) {
 			FIRST_TIME = 0;
@@ -196,11 +202,43 @@
 			filter_newlines((char*)data);
 			filter_leading_space_from_exprs((char*)data);
 
+			/* compiling turns commas into vertical bars in the app data, and also removes the backslash from before escaped commas;
+			   we have to restore the escaping backslash in front of any commas; the vertical bars are OK to leave as-is */
+			for (data2 = data; *data2; data2++) {
+				if (*data2 == ',')
+					commacount++;  /* we need to know how much bigger the string will grow-- one backslash for each comma  */
+			}
+			if (commacount) 
+			{
+				char *d3,*d4;
+				
+				data2 = (char*)malloc(strlen(data)+commacount+1);
+				data3 = data;
+				d3 = data;
+				d4 = data2;
+				while (*d3) {
+					if (*d3 == ',') {
+						*d4++ = '\\'; /* put a backslash in front of each comma */
+						*d4++ = *d3++;
+					} else
+						*d4++ = *d3++;  /* or just copy the char */
+				}
+				*d4++ = 0;  /* cap off the new string */
+				data = data2;
+			} else
+				data2 = 0;
+			
 			if( strcmp(label,"(null)") != 0  )
 				fprintf(dumpfile,"exten => %s,%d(%s),%s(%s)\n", extension, priority, label, application, (char*)data);
 			else
 				fprintf(dumpfile,"exten => %s,%d,%s(%s)\n", extension, priority, application, (char*)data);
 
+			if (data2) {
+				free(data2);
+				data2 = 0;
+				data = data3; /* restore data to pre-messedup state */
+			}
+
 		} else {
 
 			if( strcmp(label,"(null)") != 0  )
@@ -231,14 +269,16 @@
 
 struct ast_context * ast_context_create(void **extcontexts, const char *name, const char *registrar)
 {
-	struct ast_context *x = (struct ast_context *)calloc(sizeof(struct ast_context),1);
+	struct ast_context *x = calloc(1, sizeof(*x));
+	if (!x)
+		return NULL;
 	x->next = context_list;
 	context_list = x;
-	if(!no_comp)
+	if (!no_comp)
 		printf("Executed ast_context_create(conts, name=%s, registrar=%s);\n", name, registrar);
 	conts++;
-	strncpy(x->name,name,100);
-	strncpy(x->registrar,registrar,100);
+	strncpy(x->name, name, sizeof(x->name) - 1);
+	strncpy(x->registrar, registrar, sizeof(x->registrar) - 1);
 	return x;
 }
 



More information about the svn-commits mailing list