[asterisk-commits] murf: branch murf/AEL2-1.2 r57457 -
/team/murf/AEL2-1.2/patches/diffs.AEL2.patch
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Mar 2 00:01:43 MST 2007
Author: murf
Date: Fri Mar 2 01:01:42 2007
New Revision: 57457
URL: http://svn.digium.com/view/asterisk?view=rev&rev=57457
Log:
Updated the patch
Modified:
team/murf/AEL2-1.2/patches/diffs.AEL2.patch
Modified: team/murf/AEL2-1.2/patches/diffs.AEL2.patch
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/patches/diffs.AEL2.patch?view=diff&rev=57457&r1=57456&r2=57457
==============================================================================
--- team/murf/AEL2-1.2/patches/diffs.AEL2.patch (original)
+++ team/murf/AEL2-1.2/patches/diffs.AEL2.patch Fri Mar 2 01:01:42 2007
@@ -1,7 +1,7 @@
Index: pbx/argdesc.y
===================================================================
--- pbx/argdesc.y (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,268 @@
+%{
+#include <stdio.h>
@@ -284,7 +284,7 @@
Index: pbx/ael.tab.c
===================================================================
--- pbx/ael.tab.c (.../branches/1.2) (revision 0)
-+++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,3334 @@
+/* A Bison parser, made by GNU Bison 2.1a. */
+
@@ -3633,7 +3633,7 @@
Index: pbx/ael_lex.c
===================================================================
--- pbx/ael_lex.c (.../branches/1.2) (revision 0)
-+++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,3015 @@
+#line 2 "ael_lex.c"
+
@@ -6662,8 +6662,8 @@
Index: pbx/pbx_ael.c
===================================================================
---- pbx/pbx_ael.c (.../branches/1.2) (revision 57053)
-+++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 57053)
+--- pbx/pbx_ael.c (.../branches/1.2) (revision 57439)
++++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 57439)
@@ -1258,7 +1258,6 @@
static int ael_reload(int fd, int argc, char *argv[])
@@ -6683,7 +6683,7 @@
Index: pbx/ael.tab.h
===================================================================
--- pbx/ael.tab.h (.../branches/1.2) (revision 0)
-+++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,150 @@
+/* A Bison parser, made by GNU Bison 2.1a. */
+
@@ -6848,7 +6848,7 @@
Index: pbx/argdesc.tab.c
===================================================================
--- pbx/argdesc.tab.c (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,1730 @@
+/* A Bison parser, made by GNU Bison 2.0. */
+
@@ -8593,7 +8593,7 @@
Index: pbx/ael.flex
===================================================================
--- pbx/ael.flex (.../branches/1.2) (revision 0)
-+++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,594 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
@@ -9202,7 +9202,7 @@
Index: pbx/argdesc_lex.c
===================================================================
--- pbx/argdesc_lex.c (.../branches/1.2) (revision 0)
-+++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,2141 @@
+#line 2 "argdesc_lex.c"
+
@@ -11358,7 +11358,7 @@
Index: pbx/argdesc.l
===================================================================
--- pbx/argdesc.l (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,88 @@
+%{
+#include <sys/types.h>
@@ -11461,7 +11461,7 @@
Index: pbx/argdesc.tab.h
===================================================================
--- pbx/argdesc.tab.h (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,115 @@
+/* A Bison parser, made by GNU Bison 2.0. */
+
@@ -11591,7 +11591,7 @@
Index: pbx/ael.y
===================================================================
--- pbx/ael.y (.../branches/1.2) (revision 0)
-+++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,820 @@
+%{
+/*
@@ -12426,7 +12426,7 @@
Index: pbx/applist
===================================================================
--- pbx/applist (.../branches/1.2) (revision 0)
-+++ pbx/applist (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/applist (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,142 @@
+ AddQueueMember: "Dynamically adds queue members"; args=queuename|[interface]|[:penalty#i]|[:options]; options=j; Chanvars=AQMSTATUS:ADDED | MEMBERALREADY | NOSUCHQUEUE;
+ ADSIProg: "Load Asterisk ADSI Scripts into phone"; args=scriptfile;
@@ -12582,8 +12582,8 @@
Index: pbx/Makefile
===================================================================
---- pbx/Makefile (.../branches/1.2) (revision 57053)
-+++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 57053)
+--- pbx/Makefile (.../branches/1.2) (revision 57439)
++++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 57439)
@@ -12,7 +12,7 @@
#
@@ -12641,8 +12641,8 @@
Index: pbx/pbx_ael2.c
===================================================================
--- pbx/pbx_ael2.c (.../branches/1.2) (revision 0)
-+++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 57053)
-@@ -0,0 +1,4354 @@
++++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 57439)
+@@ -0,0 +1,4378 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
@@ -12673,6 +12673,7 @@
+
+#include <sys/types.h>
+#include <stdlib.h>
++#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
@@ -12790,6 +12791,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: ============================================================================= */
@@ -12849,7 +12872,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");
@@ -15917,6 +15940,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);
@@ -17010,7 +17034,7 @@
Index: pbx/ael-test/ref.ael-test6
===================================================================
--- pbx/ael-test/ref.ael-test6 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,45 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17070,23 +17094,23 @@
Index: pbx/ael-test/ref.ael-test7
===================================================================
--- pbx/ael-test/ref.ael-test7 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,15 @@
+
+(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
Property changes on: pbx/ael-test/ref.ael-test7
___________________________________________________________________
@@ -17100,7 +17124,7 @@
Index: pbx/ael-test/ref.ael-test8
===================================================================
--- pbx/ael-test/ref.ael-test8 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17128,7 +17152,7 @@
Index: pbx/ael-test/ref.ael-vtest13
===================================================================
--- pbx/ael-test/ref.ael-vtest13 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-vtest13 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-vtest13 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,2875 @@
+[globals]
+static=yes
@@ -20018,7 +20042,7 @@
Index: pbx/ael-test/ael-ntest9/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest9/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest9/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-ntest9/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,12 @@
+
+context workext {
@@ -20047,7 +20071,7 @@
Index: pbx/ael-test/ref.ael-vtest17
===================================================================
--- pbx/ael-test/ref.ael-vtest17 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-vtest17 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-vtest17 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,68 @@
+
+
@@ -20130,7 +20154,7 @@
Index: pbx/ael-test/setref
===================================================================
--- pbx/ael-test/setref (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/setref (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/setref (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
@@ -20154,7 +20178,7 @@
Index: pbx/ael-test/ref.ael-test11
===================================================================
--- pbx/ael-test/ref.ael-test11 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test11 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-test11 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,12 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20181,7 +20205,7 @@
Index: pbx/ael-test/ref.ael-test14
===================================================================
--- pbx/ael-test/ref.ael-test14 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test14 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-test14 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,11 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20207,7 +20231,7 @@
Index: pbx/ael-test/ref.ael-test15
===================================================================
--- pbx/ael-test/ref.ael-test15 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test15 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-test15 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20235,7 +20259,7 @@
Index: pbx/ael-test/ael-test11/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test11/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test11/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test11/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,56 @@
+context test1
+{
@@ -20306,7 +20330,7 @@
Index: pbx/ael-test/ael-test14/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test14/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test14/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test14/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,20 @@
+context test1
+{
@@ -20341,7 +20365,7 @@
Index: pbx/ael-test/ael-test15/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test15/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test15/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test15/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,17 @@
+/* and some comments
+ would make a nice touch */
@@ -20373,7 +20397,7 @@
Index: pbx/ael-test/runtests
===================================================================
--- pbx/ael-test/runtests (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/runtests (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/runtests (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,56 @@
+#!/bin/bash
+ORIG=`mktemp /tmp/mytest.XXXXXX`
@@ -20446,7 +20470,7 @@
Index: pbx/ael-test/ael-ntest10/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest10/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest10/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-ntest10/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,131 @@
+macro endsess()
+{
@@ -20592,7 +20616,7 @@
Index: pbx/ael-test/ael-ntest12/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest12/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest12/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-ntest12/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,13 @@
+context test1
+{
@@ -20620,7 +20644,7 @@
Index: pbx/ael-test/ael-test1/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test1/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test1/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test1/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,163 @@
+
+macro testdial(number, timeout) {
@@ -20798,7 +20822,7 @@
Index: pbx/ael-test/ref.ael-ntest9
===================================================================
--- pbx/ael-test/ref.ael-ntest9 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest9 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-ntest9 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,25 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20838,7 +20862,7 @@
Index: pbx/ael-test/ael-test2/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test2/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test2/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test2/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -20861,7 +20885,7 @@
Index: pbx/ael-test/ael-test2/apptest.ael2
===================================================================
--- pbx/ael-test/ael-test2/apptest.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test2/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test2/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,146 @@
+// this is a quick test to see how many of the apps we can spot j options in
+// include this in a macro or extension
@@ -21022,7 +21046,7 @@
Index: pbx/ael-test/ael-test3/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test3/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test3/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -24222,7 +24246,7 @@
Index: pbx/ael-test/ael-test3/telemarket_torture.ael2
===================================================================
--- pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -25051,7 +25075,7 @@
Index: pbx/ael-test/ael-test3/include1.ael2
===================================================================
--- pbx/ael-test/ael-test3/include1.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include1.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test3/include1.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -25069,7 +25093,7 @@
Index: pbx/ael-test/ael-test3/include2.ael2
===================================================================
--- pbx/ael-test/ael-test3/include2.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include2.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test3/include2.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -25088,7 +25112,7 @@
Index: pbx/ael-test/ael-test3/include3.ael2
===================================================================
--- pbx/ael-test/ael-test3/include3.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include3.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test3/include3.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -25105,7 +25129,7 @@
Index: pbx/ael-test/ael-test3/include4.ael2
===================================================================
--- pbx/ael-test/ael-test3/include4.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include4.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test3/include4.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -25122,7 +25146,7 @@
Index: pbx/ael-test/ael-test3/include5.ael2
===================================================================
--- pbx/ael-test/ael-test3/include5.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include5.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test3/include5.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -25138,7 +25162,7 @@
Index: pbx/ael-test/ael-test4/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test4/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test4/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test4/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -25161,7 +25185,7 @@
Index: pbx/ael-test/ael-test4/apptest.ael2
===================================================================
--- pbx/ael-test/ael-test4/apptest.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test4/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test4/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,146 @@
+// this is a quick test to see how many of the apps we can spot j options in
+// include this in a macro or extension
@@ -25322,7 +25346,7 @@
Index: pbx/ael-test/ael-test5/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test5/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test5/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test5/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -26170,7 +26194,7 @@
Index: pbx/ael-test/ael-test5/extensions.ael.orig
===================================================================
--- pbx/ael-test/ael-test5/extensions.ael.orig (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test5/extensions.ael.orig (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test5/extensions.ael.orig (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -27018,7 +27042,7 @@
Index: pbx/ael-test/ael-test6/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test6/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test6/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test6/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -27866,7 +27890,7 @@
Index: pbx/ael-test/ael-test7/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test7/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test7/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test7/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,460 @@
+//
+// Example AEL config file
@@ -28341,7 +28365,7 @@
Index: pbx/ael-test/ael-test8/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test8/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test8/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-test8/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,27 @@
+context default
+{
@@ -28383,7 +28407,7 @@
Index: pbx/ael-test/ref.ael-ntest10
===================================================================
--- pbx/ael-test/ref.ael-ntest10 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest10 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-ntest10 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,129 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -28527,7 +28551,7 @@
Index: pbx/ael-test/ael-vtest13/extensions.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-vtest13/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -31727,7 +31751,7 @@
Index: pbx/ael-test/ael-vtest13/telemarket_torture.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -32556,7 +32580,7 @@
Index: pbx/ael-test/ael-vtest13/include1.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include1.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include1.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-vtest13/include1.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -32574,7 +32598,7 @@
Index: pbx/ael-test/ael-vtest13/include2.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include2.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include2.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-vtest13/include2.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -32593,7 +32617,7 @@
Index: pbx/ael-test/ael-vtest13/include3.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include3.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include3.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-vtest13/include3.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -32610,7 +32634,7 @@
Index: pbx/ael-test/ael-vtest13/include4.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include4.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include4.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-vtest13/include4.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -32627,7 +32651,7 @@
Index: pbx/ael-test/ael-vtest13/include5.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include5.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include5.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ael-vtest13/include5.ael2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -32643,7 +32667,7 @@
Index: pbx/ael-test/ref.ael-test1
===================================================================
--- pbx/ael-test/ref.ael-test1 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test1 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-test1 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,21 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32679,7 +32703,7 @@
Index: pbx/ael-test/ref.ael-ntest12
===================================================================
--- pbx/ael-test/ref.ael-ntest12 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest12 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-ntest12 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,32 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32726,46 +32750,46 @@
Index: pbx/ael-test/ref.ael-test2
===================================================================
--- pbx/ael-test/ref.ael-test2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test2 (.../team/murf/AEL2-1.2) (revision 57053)
++++ pbx/ael-test/ref.ael-test2 (.../team/murf/AEL2-1.2) (revision 57439)
@@ -0,0 +1,38 @@
+
+(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!
[... 420 lines stripped ...]
More information about the asterisk-commits
mailing list