[asterisk-commits] murf: branch murf/AEL2-1.2 r57070 -
/team/murf/AEL2-1.2/patches/diffs.AEL2.patch
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Feb 28 11:07:43 MST 2007
Author: murf
Date: Wed Feb 28 12:07:43 2007
New Revision: 57070
URL: http://svn.digium.com/view/asterisk?view=rev&rev=57070
Log:
updated the patch for AEL2 in the patches dir to reflect the changes in 57049... Errors reduced to warnings, goto from macro to a label in a catch not found, problems all fixed.
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=57070&r1=57069&r2=57070
==============================================================================
--- team/murf/AEL2-1.2/patches/diffs.AEL2.patch (original)
+++ team/murf/AEL2-1.2/patches/diffs.AEL2.patch Wed Feb 28 12:07:43 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 51457)
++++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
-+++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 51457)
+--- pbx/pbx_ael.c (.../branches/1.2) (revision 57053)
++++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
++++ pbx/applist (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
-+++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 51457)
+--- pbx/Makefile (.../branches/1.2) (revision 57053)
++++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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 51457)
-@@ -0,0 +1,4326 @@
++++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 57053)
+@@ -0,0 +1,4354 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
@@ -13906,9 +13906,10 @@
+ errs++;
+ }
+ } else {
-+ ast_log(LOG_ERROR,"Error: file %s, line %d-%d: goto: no context %s could be found that matches the goto target!\n",
++ /* here is where code would go to check for target existence in extensions.conf files */
++ ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: goto: no context %s could be found that matches the goto target!\n",
+ item->filename, item->startline, item->endline, item->u1.list->u1.str);
-+ errs++;
++ warns++; /* this is just a warning, because this context could be in extensions.conf or somewhere */
+ }
+ }
+ }
@@ -14187,9 +14188,28 @@
+ item->u2.statements == pval list of statements in context body
+ */
+ /* printf(" matching in CATCH\n"); */
-+ if ((x=match_pval(item->u2.statements))) {
-+ /* printf("CATCH: Responded with pval match %x\n", x); */
-+ return x;
++ if (!strcmp(match_exten,"*") || extension_matches(item, match_exten, item->u1.str) ) {
++ /* printf("Descending into matching catch %s => %s\n", match_exten, item->u1.str); */
++ if (strcmp(match_label,"1") == 0) {
++ if (item->u2.statements) {
++ struct pval *p5 = item->u2.statements;
++ while (p5 && p5->type == PV_LABEL) /* find the first non-label statement in this context. If it exists, there's a "1" */
++ p5 = p5->next;
++ if (p5)
++ return p5;
++ else
++ return 0;
++ }
++ else
++ return 0;
++ }
++
++ if ((x=match_pval(item->u2.statements))) {
++ /* printf("CATCH: Responded with pval match %x\n", (unsigned int)x); */
++ return x;
++ }
++ } else {
++ /* printf("Skipping catch %s\n", item->u1.str); */
+ }
+ break;
+
@@ -14368,6 +14388,7 @@
+ /* printf(" --- Got args %s, %s\n", exten, label); */
+ struct pval *ret;
+ struct pval *p3;
++ struct pval *startpt = ((curr_cont->type==PV_MACRO)?curr_cont->u3.macro_statements: curr_cont->u2.statements);
+
+ count_labels = 0;
+ return_on_context_match = 0;
@@ -14381,7 +14402,7 @@
+
+ /* the target of the goto could be in an included context!! Fancy that!! */
+ /* look for includes in the current context */
-+ for (p3=curr_cont->u2.statements; p3; p3=p3->next) {
++ for (p3=startpt; p3; p3=p3->next) {
+ if (p3->type == PV_INCLUDES) {
+ struct pval *p4;
+ for (p4=p3->u1.list; p4; p4=p4->next) {
@@ -14408,19 +14429,25 @@
+ /* printf(" --- Got args %s, %s\n", exten, label); */
+ struct pval *ret;
+ struct pval *p3;
++ struct pval *startpt;
+
+ count_labels = 0;
+ return_on_context_match = 0;
+ match_context = "*";
+ match_exten = exten;
+ match_label = label;
-+ ret = match_pval(curr_cont->u2.statements);
++ if (curr_cont->type == PV_MACRO)
++ startpt = curr_cont->u3.macro_statements;
++ else
++ startpt = curr_cont->u2.statements;
++
++ ret = match_pval(startpt);
+ if (ret)
+ return ret;
+
+ /* the target of the goto could be in an included context!! Fancy that!! */
+ /* look for includes in the current context */
-+ for (p3=curr_cont->u2.statements; p3; p3=p3->next) {
++ for (p3=startpt; p3; p3=p3->next) {
+ if (p3->type == PV_INCLUDES) {
+ struct pval *p4;
+ for (p4=p3->u1.list; p4; p4=p4->next) {
@@ -14912,9 +14939,10 @@
+ */
+ macro_def = find_macro(item->u1.str);
+ if (!macro_def) {
-+ ast_log(LOG_ERROR, "Error: file %s, line %d-%d: macro call to non-existent %s !\n",
++ /* here is a good place to check to see if the definition is in extensions.conf! */
++ ast_log(LOG_WARNING, "Error: file %s, line %d-%d: macro call to non-existent %s ! Hopefully it is present in extensions.conf! \n",
+ item->filename, item->startline, item->endline, item->u1.str);
-+ errs++;
++ warns++;
+ } else if (macro_def->type != PV_MACRO) {
+ ast_log(LOG_ERROR,"Error: file %s, line %d-%d: macro call to %s references a context, not a macro!\n",
+ item->filename, item->startline, item->endline, item->u1.str);
@@ -16982,7 +17010,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 51457)
++++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,45 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17042,7 +17070,7 @@
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 51457)
++++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,15 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17072,7 +17100,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 51457)
++++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17100,7 +17128,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 51457)
++++ pbx/ael-test/ref.ael-vtest13 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,2875 @@
+[globals]
+static=yes
@@ -19990,7 +20018,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 51457)
++++ pbx/ael-test/ael-ntest9/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,12 @@
+
+context workext {
@@ -20019,7 +20047,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 51457)
++++ pbx/ael-test/ref.ael-vtest17 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,68 @@
+
+
@@ -20102,7 +20130,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 51457)
++++ pbx/ael-test/setref (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
@@ -20126,7 +20154,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 51457)
++++ pbx/ael-test/ref.ael-test11 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,12 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20153,7 +20181,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 51457)
++++ pbx/ael-test/ref.ael-test14 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,11 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20179,7 +20207,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 51457)
++++ pbx/ael-test/ref.ael-test15 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20207,7 +20235,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 51457)
++++ pbx/ael-test/ael-test11/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,56 @@
+context test1
+{
@@ -20278,7 +20306,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 51457)
++++ pbx/ael-test/ael-test14/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,20 @@
+context test1
+{
@@ -20313,7 +20341,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 51457)
++++ pbx/ael-test/ael-test15/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,17 @@
+/* and some comments
+ would make a nice touch */
@@ -20345,7 +20373,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 51457)
++++ pbx/ael-test/runtests (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,56 @@
+#!/bin/bash
+ORIG=`mktemp /tmp/mytest.XXXXXX`
@@ -20418,7 +20446,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 51457)
++++ pbx/ael-test/ael-ntest10/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,131 @@
+macro endsess()
+{
@@ -20564,7 +20592,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 51457)
++++ pbx/ael-test/ael-ntest12/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,13 @@
+context test1
+{
@@ -20592,7 +20620,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 51457)
++++ pbx/ael-test/ael-test1/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,163 @@
+
+macro testdial(number, timeout) {
@@ -20770,7 +20798,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 51457)
++++ pbx/ael-test/ref.ael-ntest9 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,25 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20810,7 +20838,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 51457)
++++ pbx/ael-test/ael-test2/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -20833,7 +20861,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 51457)
++++ pbx/ael-test/ael-test2/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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
@@ -20994,7 +21022,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 51457)
++++ pbx/ael-test/ael-test3/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -24194,7 +24222,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 51457)
++++ pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -25023,7 +25051,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 51457)
++++ pbx/ael-test/ael-test3/include1.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -25041,7 +25069,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 51457)
++++ pbx/ael-test/ael-test3/include2.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -25060,7 +25088,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 51457)
++++ pbx/ael-test/ael-test3/include3.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -25077,7 +25105,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 51457)
++++ pbx/ael-test/ael-test3/include4.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -25094,7 +25122,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 51457)
++++ pbx/ael-test/ael-test3/include5.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -25110,7 +25138,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 51457)
++++ pbx/ael-test/ael-test4/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -25133,7 +25161,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 51457)
++++ pbx/ael-test/ael-test4/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -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
@@ -25294,7 +25322,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 51457)
++++ pbx/ael-test/ael-test5/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -26142,7 +26170,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 51457)
++++ pbx/ael-test/ael-test5/extensions.ael.orig (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -26990,7 +27018,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 51457)
++++ pbx/ael-test/ael-test6/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -27838,7 +27866,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 51457)
++++ pbx/ael-test/ael-test7/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,460 @@
+//
+// Example AEL config file
@@ -28313,7 +28341,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 51457)
++++ pbx/ael-test/ael-test8/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,27 @@
+context default
+{
@@ -28355,7 +28383,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 51457)
++++ pbx/ael-test/ref.ael-ntest10 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,129 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -28499,7 +28527,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 51457)
++++ pbx/ael-test/ael-vtest13/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -31699,7 +31727,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 51457)
++++ pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -32528,7 +32556,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 51457)
++++ pbx/ael-test/ael-vtest13/include1.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -32546,7 +32574,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 51457)
++++ pbx/ael-test/ael-vtest13/include2.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -32565,7 +32593,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 51457)
++++ pbx/ael-test/ael-vtest13/include3.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -32582,7 +32610,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 51457)
++++ pbx/ael-test/ael-vtest13/include4.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -32599,7 +32627,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 51457)
++++ pbx/ael-test/ael-vtest13/include5.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -32615,7 +32643,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 51457)
++++ pbx/ael-test/ref.ael-test1 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,21 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32651,7 +32679,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 51457)
++++ pbx/ael-test/ref.ael-ntest12 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,32 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32698,7 +32726,7 @@
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 51457)
++++ pbx/ael-test/ref.ael-test2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,38 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32751,7 +32779,7 @@
Index: pbx/ael-test/ref.ael-test3
===================================================================
--- pbx/ael-test/ref.ael-test3 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test3 (.../team/murf/AEL2-1.2) (revision 51457)
++++ pbx/ael-test/ref.ael-test3 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,21 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32787,7 +32815,7 @@
Index: pbx/ael-test/ael-vtest17/extensions.ael2
===================================================================
--- pbx/ael-test/ael-vtest17/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest17/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
++++ pbx/ael-test/ael-vtest17/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,116 @@
+context dialextens
+{
@@ -32918,7 +32946,7 @@
Index: pbx/ael-test/ref.ael-test4
===================================================================
--- pbx/ael-test/ref.ael-test4 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test4 (.../team/murf/AEL2-1.2) (revision 51457)
++++ pbx/ael-test/ref.ael-test4 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,38 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32971,7 +32999,7 @@
Index: pbx/ael-test/ref.ael-test5
===================================================================
--- pbx/ael-test/ref.ael-test5 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test5 (.../team/murf/AEL2-1.2) (revision 51457)
++++ pbx/ael-test/ref.ael-test5 (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,23 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -33008,8 +33036,8 @@
Index: ast_expr2f.c
===================================================================
---- ast_expr2f.c (.../branches/1.2) (revision 51457)
-+++ ast_expr2f.c (.../team/murf/AEL2-1.2) (revision 51457)
+--- ast_expr2f.c (.../branches/1.2) (revision 57053)
++++ ast_expr2f.c (.../team/murf/AEL2-1.2) (revision 57053)
@@ -523,34 +523,34 @@
7, -11, -11, -11, -11, -11, -11, -11, -11, -11,
-11, -11, -11, -11, -11, -11, -11, -11, -11, -11,
@@ -34184,7 +34212,7 @@
Index: doc/ael2.txt
===================================================================
--- doc/ael2.txt (.../branches/1.2) (revision 0)
-+++ doc/ael2.txt (.../team/murf/AEL2-1.2) (revision 51457)
++++ doc/ael2.txt (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,1255 @@
+The Asterisk Extension Language - v 2
+=====================================
@@ -35453,8 +35481,8 @@
Index: ast_expr2.fl
===================================================================
---- ast_expr2.fl (.../branches/1.2) (revision 51457)
-+++ ast_expr2.fl (.../team/murf/AEL2-1.2) (revision 51457)
+--- ast_expr2.fl (.../branches/1.2) (revision 57053)
++++ ast_expr2.fl (.../team/murf/AEL2-1.2) (revision 57053)
@@ -1,7 +1,25 @@
%{
+/*
@@ -35681,8 +35709,8 @@
}
Index: Makefile
===================================================================
---- Makefile (.../branches/1.2) (revision 51457)
-+++ Makefile (.../team/murf/AEL2-1.2) (revision 51457)
+--- Makefile (.../branches/1.2) (revision 57053)
++++ Makefile (.../team/murf/AEL2-1.2) (revision 57053)
@@ -563,14 +563,14 @@
exit 1; \
fi; \
@@ -35709,7 +35737,7 @@
Index: include/asterisk/argdesc.h
===================================================================
--- include/asterisk/argdesc.h (.../branches/1.2) (revision 0)
-+++ include/asterisk/argdesc.h (.../team/murf/AEL2-1.2) (revision 51457)
++++ include/asterisk/argdesc.h (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,55 @@
+#ifndef INC_ARGDESC_H
+
@@ -35779,7 +35807,7 @@
Index: include/asterisk/ael_structs.h
===================================================================
--- include/asterisk/ael_structs.h (.../branches/1.2) (revision 0)
-+++ include/asterisk/ael_structs.h (.../team/murf/AEL2-1.2) (revision 51457)
++++ include/asterisk/ael_structs.h (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,192 @@
+#ifndef _ASTERISK_AEL_STRUCTS_H
+#define _ASTERISK_AEL_STRUCTS_H
@@ -35985,8 +36013,8 @@
Index: ast_expr2.c
===================================================================
---- ast_expr2.c (.../branches/1.2) (revision 51457)
-+++ ast_expr2.c (.../team/murf/AEL2-1.2) (revision 51457)
+--- ast_expr2.c (.../branches/1.2) (revision 57053)
++++ ast_expr2.c (.../team/murf/AEL2-1.2) (revision 57053)
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.0. */
+/* A Bison parser, made by GNU Bison 2.1. */
@@ -37107,8 +37135,8 @@
return make_integer(0);
Index: ast_expr2.h
===================================================================
---- ast_expr2.h (.../branches/1.2) (revision 51457)
-+++ ast_expr2.h (.../team/murf/AEL2-1.2) (revision 51457)
+--- ast_expr2.h (.../branches/1.2) (revision 57053)
++++ ast_expr2.h (.../team/murf/AEL2-1.2) (revision 57053)
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.0. */
+/* A Bison parser, made by GNU Bison 2.1. */
@@ -37156,8 +37184,8 @@
# define YYSTYPE_IS_TRIVIAL 1
Index: ast_expr2.y
===================================================================
---- ast_expr2.y (.../branches/1.2) (revision 51457)
-+++ ast_expr2.y (.../team/murf/AEL2-1.2) (revision 51457)
+--- ast_expr2.y (.../branches/1.2) (revision 57053)
++++ ast_expr2.y (.../team/murf/AEL2-1.2) (revision 57053)
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <string.h>
@@ -37325,7 +37353,7 @@
Index: update-patch
===================================================================
--- update-patch (.../branches/1.2) (revision 0)
-+++ update-patch (.../team/murf/AEL2-1.2) (revision 51457)
++++ update-patch (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
@@ -37347,8 +37375,8 @@
Index: CREDITS
===================================================================
---- CREDITS (.../branches/1.2) (revision 51457)
-+++ CREDITS (.../team/murf/AEL2-1.2) (revision 51457)
+--- CREDITS (.../branches/1.2) (revision 57053)
++++ CREDITS (.../team/murf/AEL2-1.2) (revision 57053)
@@ -84,7 +84,7 @@
Steve Kann - new jitter buffer for IAX2
stevek at stevek.com
@@ -37360,8 +37388,8 @@
Index: configs/extensions.ael.sample
===================================================================
---- configs/extensions.ael.sample (.../branches/1.2) (revision 51457)
-+++ configs/extensions.ael.sample (.../team/murf/AEL2-1.2) (revision 51457)
+--- configs/extensions.ael.sample (.../branches/1.2) (revision 57053)
++++ configs/extensions.ael.sample (.../team/murf/AEL2-1.2) (revision 57053)
@@ -1,7 +1,308 @@
//
// Example AEL config file
@@ -37788,7 +37816,7 @@
Index: utils/ael_main.c
===================================================================
--- utils/ael_main.c (.../branches/1.2) (revision 0)
-+++ utils/ael_main.c (.../team/murf/AEL2-1.2) (revision 51457)
++++ utils/ael_main.c (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,498 @@
+#include <sys/types.h>
+#include <stdio.h>
@@ -38300,20 +38328,20 @@
Index: utils/Makefile
===================================================================
---- utils/Makefile (.../branches/1.2) (revision 51457)
-+++ utils/Makefile (.../team/murf/AEL2-1.2) (revision 51457)
-@@ -20,7 +20,7 @@
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
+--- utils/Makefile (.../branches/1.2) (revision 57053)
++++ utils/Makefile (.../team/murf/AEL2-1.2) (revision 57053)
+@@ -21,7 +21,7 @@
endif
+ # to get check_expr, add it to the TARGET list
-TARGET=stereorize streamplayer
+TARGET=stereorize streamplayer aelparse aelparse1
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
TARGET+=smsq
-@@ -63,6 +63,25 @@
+@@ -64,6 +64,25 @@
check_expr: check_expr.c ast_expr2.o ast_expr2f.o
- $(CC) $(CFLAGS) -o $@ $^
+ $(CC) $(CFLAGS) -o $@ check_expr.c ast_expr2.o ast_expr2f.o
+aelparse : ../pbx/aelflex.o ../pbx/aelbison.o ../pbx/pbx_ael2.o ael_main.o ../ast_expr2f.o ../ast_expr2.o ../pbx/argdesc.tab.o ../pbx/argdesc_lex.o
+ $(CC) $(CFLAGS) -g -o aelparse ../pbx/aelflex.o ../pbx/aelbison.o ael_main.o ../pbx/pbx_ael2.o ../ast_expr2f.o ../ast_expr2.o ../pbx/argdesc.tab.o ../pbx/argdesc_lex.o
@@ -38340,7 +38368,7 @@
Index: utils/expr2.testinput
===================================================================
--- utils/expr2.testinput (.../branches/1.2) (revision 0)
-+++ utils/expr2.testinput (.../team/murf/AEL2-1.2) (revision 51457)
++++ utils/expr2.testinput (.../team/murf/AEL2-1.2) (revision 57053)
@@ -0,0 +1,92 @@
+2 + 2
+ 2 + 2
@@ -38448,9 +38476,9 @@
Property changes on: .
___________________________________________________________________
Name: automerge
- + yessir
+ + da
Name: svnmerge-integrated
- + /branches/1.2:1-51426
+ + /branches/1.2:1-57036
Name: automerge-email
+ murf at parsetree.com
More information about the asterisk-commits
mailing list