Adding support for "urgent" voicemail messages. Messages which are
[asterisk/asterisk.git] / pbx / pbx_ael.c
index d2fdd72..22ec241 100644 (file)
@@ -1,4 +1,4 @@
-/*
+/* 
  * Asterisk -- An open source telephony toolkit.
  *
  * Copyright (C) 2006, Digium, Inc.
  * 
  */
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <regex.h>
+/*** MODULEINFO
+       <depend>res_ael_share</depend>
+ ***/
 
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <ctype.h>
+#include <regex.h>
+#include <sys/stat.h>
+
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
@@ -41,37 +41,23 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/app.h"
 #include "asterisk/callerid.h"
+#include "asterisk/hashtab.h"
 #include "asterisk/ael_structs.h"
+#include "asterisk/pval.h"
 #ifdef AAL_ARGCHECK
 #include "asterisk/argdesc.h"
 #endif
 
-static char expr_output[2096];
-
 /* these functions are in ../ast_expr2.fl */
 
-       
-#ifdef __AST_DEBUG_MALLOC
-static void FREE(void *ptr)
-{
-       free(ptr);
-}
-#else
-#define FREE free
-#endif
-
 #define DEBUG_READ   (1 << 0)
 #define DEBUG_TOKENS (1 << 1)
 #define DEBUG_MACROS (1 << 2)
 #define DEBUG_CONTEXTS (1 << 3)
 
-static int aeldebug = 0;
-
-static char *dtext = "Asterisk Extension Language Compiler v2";
 static char *config = "extensions.ael";
 static char *registrar = "pbx_ael";
-
-static int errs, warns, notes;
+static int pbx_load_module(void);
 
 #ifndef AAL_ARGCHECK
 /* for the time being, short circuit all the AAL related structures
@@ -79,12 +65,6 @@ static int errs, warns, notes;
    development, this code can be properly re-instated 
 */
 
-/* null definitions for structs passed down the infrastructure */
-struct argapp
-{
-       struct argapp *next;
-};
-
 #endif
 
 #ifdef AAL_ARGCHECK
@@ -94,3337 +74,42 @@ int ael_is_funcname(char *name);
 #endif
 
 int check_app_args(pval *appcall, pval *arglist, struct argapp *app);
-void check_pval(pval *item, struct argapp *apps);
-void check_pval_item(pval *item, struct argapp *apps);
+void check_pval(pval *item, struct argapp *apps, int in_globals);
+void check_pval_item(pval *item, struct argapp *apps, int in_globals);
 void check_switch_expr(pval *item, struct argapp *apps);
 void ast_expr_register_extra_error_info(char *errmsg);
 void ast_expr_clear_extra_error_info(void);
-int  ast_expr(char *expr, char *buf, int length);
 struct pval *find_macro(char *name);
 struct pval *find_context(char *name);
 struct pval *find_context(char *name);
 struct pval *find_macro(char *name);
 struct ael_priority *new_prio(void);
 struct ael_extension *new_exten(void);
-void linkprio(struct ael_extension *exten, struct ael_priority *prio);
 void destroy_extensions(struct ael_extension *exten);
-void linkexten(struct ael_extension *exten, struct ael_extension *add);
-void gen_prios(struct ael_extension *exten, char *label, pval *statement, struct ael_extension *mother_exten );
 void set_priorities(struct ael_extension *exten);
-void add_extensions(struct ael_extension *exten, struct ast_context *context);
-void ast_compile_ael2(struct ast_context **local_contexts, struct pval *root);
+void add_extensions(struct ael_extension *exten);
+void ast_compile_ael2(struct ast_context **local_contexts, struct ast_hashtab *local_table, struct pval *root);
 void destroy_pval(pval *item);
 void destroy_pval_item(pval *item);
 int is_float(char *arg );
 int is_int(char *arg );
 int is_empty(char *arg);
-static pval *current_db;
-static pval *current_context;
-static pval *current_extension;
-static const char *description(void);
-static const char *key(void);
-
-static char *match_context;
-static char *match_exten;
-static char *match_label;
-static int in_abstract_context;
-static int count_labels; /* true, put matcher in label counting mode */
-static int label_count;  /* labels are only meant to be counted in a context or exten */
-static int return_on_context_match;
-static pval *last_matched_label;
-struct pval *match_pval(pval *item);
-static void check_timerange(pval *p);
-static void check_dow(pval *DOW);
-static void check_day(pval *DAY);
-static void check_month(pval *MON);
-static void check_expr2_input(pval *expr, char *str);
-static int extension_matches(pval *here, char *exten, char *pattern);
-static void check_goto(pval *item);
-static void find_pval_goto_item(pval *item, int lev);
-static void find_pval_gotos(pval *item, int lev);
-
-
-/* PRETTY PRINTER FOR AEL:  ============================================================================= */
-
-void print_pval(FILE *fin, pval *item, int depth)
-{
-       int i;
-       pval *lp;
-       
-       for (i=0; i<depth; i++) {
-               fprintf(fin, "\t"); /* depth == indentation */
-       }
-       
-       switch ( item->type ) {
-       case PV_WORD:
-               fprintf(fin,"%s;\n", item->u1.str); /* usually, words are encapsulated in something else */
-               break;
-               
-       case PV_MACRO:
-               fprintf(fin,"macro %s(", item->u1.str);
-               for (lp=item->u2.arglist; lp; lp=lp->next) {
-                       if (lp != item->u2.arglist )
-                               fprintf(fin,", ");
-                       fprintf(fin,"%s", lp->u1.str);
-               }
-               fprintf(fin,") {\n");
-               print_pval_list(fin,item->u3.macro_statements,depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"};\n\n");
-               break;
-                       
-       case PV_CONTEXT:
-               if ( item->u3.abstract )
-                       fprintf(fin,"abstract context %s {\n", item->u1.str);
-               else
-                       fprintf(fin,"context %s {\n", item->u1.str);
-               print_pval_list(fin,item->u2.statements,depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"};\n\n");
-               break;
-                       
-       case PV_MACRO_CALL:
-               fprintf(fin,"&%s(", item->u1.str);
-               for (lp=item->u2.arglist; lp; lp=lp->next) {
-                       if ( lp != item->u2.arglist )
-                               fprintf(fin,", ");
-                       fprintf(fin,"%s", lp->u1.str);
-               }
-               fprintf(fin,");\n");
-               break;
-                       
-       case PV_APPLICATION_CALL:
-               fprintf(fin,"%s(", item->u1.str);
-               for (lp=item->u2.arglist; lp; lp=lp->next) {
-                       if ( lp != item->u2.arglist )
-                               fprintf(fin,", ");
-                       fprintf(fin,"%s", lp->u1.str);
-               }
-               fprintf(fin,");\n");
-               break;
-                       
-       case PV_CASE:
-               fprintf(fin,"case %s:\n", item->u1.str);
-               print_pval_list(fin,item->u2.statements, depth+1);
-               break;
-                       
-       case PV_PATTERN:
-               fprintf(fin,"pattern %s:\n", item->u1.str);
-               print_pval_list(fin,item->u2.statements, depth+1);
-               break;
-                       
-       case PV_DEFAULT:
-               fprintf(fin,"default:\n");
-               print_pval_list(fin,item->u2.statements, depth+1);
-               break;
-                       
-       case PV_CATCH:
-               fprintf(fin,"catch %s {\n", item->u1.str);
-               print_pval_list(fin,item->u2.statements, depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"};\n");
-               break;
-                       
-       case PV_SWITCHES:
-               fprintf(fin,"switches {\n");
-               print_pval_list(fin,item->u1.list,depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"};\n");
-               break;
-                       
-       case PV_ESWITCHES:
-               fprintf(fin,"eswitches {\n");
-               print_pval_list(fin,item->u1.list,depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"};\n");
-               break;
-                       
-       case PV_INCLUDES:
-               fprintf(fin,"includes {\n");
-               for (lp=item->u1.list; lp; lp=lp->next) {
-                       for (i=0; i<depth+1; i++) {
-                               fprintf(fin,"\t"); /* depth == indentation */
-                       }
-                       fprintf(fin,"%s", lp->u1.str); /* usually, words are encapsulated in something else */
-                       if ( lp->u2.arglist )
-                               fprintf(fin,"|%s|%s|%s|%s", 
-                                               lp->u2.arglist->u1.str,
-                                               lp->u2.arglist->next->u1.str,
-                                               lp->u2.arglist->next->next->u1.str,
-                                               lp->u2.arglist->next->next->next->u1.str
-                                       );
-                       fprintf(fin,";\n"); /* usually, words are encapsulated in something else */
-               }
-               
-               print_pval_list(fin,item->u1.list,depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"};\n");
-               break;
-                       
-       case PV_STATEMENTBLOCK:
-               fprintf(fin,"{\n");
-               print_pval_list(fin,item->u1.list, depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"};\n");
-               break;
-                       
-       case PV_VARDEC:
-               fprintf(fin,"%s=%s;\n", item->u1.str, item->u2.val);
-               break;
-                       
-       case PV_GOTO:
-               fprintf(fin,"goto %s", item->u1.list->u1.str);
-               if ( item->u1.list->next )
-                       fprintf(fin,"|%s", item->u1.list->next->u1.str);
-               if ( item->u1.list->next && item->u1.list->next->next )
-                       fprintf(fin,"|%s", item->u1.list->next->next->u1.str);
-               fprintf(fin,"\n");
-               break;
-                       
-       case PV_LABEL:
-               fprintf(fin,"%s:\n", item->u1.str);
-               break;
-                       
-       case PV_FOR:
-               fprintf(fin,"for (%s; %s; %s)\n", item->u1.for_init, item->u2.for_test, item->u3.for_inc);
-               print_pval_list(fin,item->u4.for_statements,depth+1);
-               break;
-                       
-       case PV_WHILE:
-               fprintf(fin,"while (%s)\n", item->u1.str);
-               print_pval_list(fin,item->u2.statements,depth+1);
-               break;
-                       
-       case PV_BREAK:
-               fprintf(fin,"break;\n");
-               break;
-                       
-       case PV_RETURN:
-               fprintf(fin,"return;\n");
-               break;
-                       
-       case PV_CONTINUE:
-               fprintf(fin,"continue;\n");
-               break;
-                       
-       case PV_RANDOM:
-       case PV_IFTIME:
-       case PV_IF:
-               if ( item->type == PV_IFTIME ) {
-                       
-                       fprintf(fin,"ifTime ( %s|%s|%s|%s )\n", 
-                                       item->u1.list->u1.str, 
-                                       item->u1.list->next->u1.str, 
-                                       item->u1.list->next->next->u1.str, 
-                                       item->u1.list->next->next->next->u1.str
-                                       );
-               } else if ( item->type == PV_RANDOM ) {
-                       fprintf(fin,"random ( %s )\n", item->u1.str );
-               } else
-                       fprintf(fin,"if ( %s )\n", item->u1.str);
-               if ( item->u2.statements && item->u2.statements->next ) {
-                       for (i=0; i<depth; i++) {
-                               fprintf(fin,"\t"); /* depth == indentation */
-                       }
-                       fprintf(fin,"{\n");
-                       print_pval_list(fin,item->u2.statements,depth+1);
-                       for (i=0; i<depth; i++) {
-                               fprintf(fin,"\t"); /* depth == indentation */
-                       }
-                       if ( item->u3.else_statements )
-                               fprintf(fin,"}\n");
-                       else
-                               fprintf(fin,"};\n");
-               } else if (item->u2.statements ) {
-                       print_pval_list(fin,item->u2.statements,depth+1);
-               } else {
-                       if (item->u3.else_statements )
-                               fprintf(fin, " {} ");
-                       else
-                               fprintf(fin, " {}; ");
-               }
-               if ( item->u3.else_statements ) {
-                       for (i=0; i<depth; i++) {
-                               fprintf(fin,"\t"); /* depth == indentation */
-                       }
-                       fprintf(fin,"else\n");
-                       print_pval_list(fin,item->u3.else_statements, depth);
-               }
-               break;
-                       
-       case PV_SWITCH:
-               fprintf(fin,"switch( %s ) {\n", item->u1.str);
-               print_pval_list(fin,item->u2.statements,depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"}\n");
-               break;
-                       
-       case PV_EXTENSION:
-               if ( item->u4.regexten )
-                       fprintf(fin, "regexten ");
-               if ( item->u3.hints )
-                       fprintf(fin,"hints(%s) ", item->u3.hints);
-               
-               fprintf(fin,"%s => \n", item->u1.str);
-               print_pval_list(fin,item->u2.statements,depth+1);
-               break;
-                       
-       case PV_IGNOREPAT:
-               fprintf(fin,"ignorepat => %s\n", item->u1.str);
-               break;
-                       
-       case PV_GLOBALS:
-               fprintf(fin,"globals {\n");
-               print_pval_list(fin,item->u1.statements,depth+1);
-               for (i=0; i<depth; i++) {
-                       fprintf(fin,"\t"); /* depth == indentation */
-               }
-               fprintf(fin,"}\n");
-               break;
-       }
-}
-
-void print_pval_list(FILE *fin, pval *item, int depth)
-{
-       pval *i;
-       
-       for (i=item; i; i=i->next) {
-               print_pval(fin, i, depth);
-       }
-}
-
-void ael2_print(char *fname, pval *tree)
-{
-       FILE *fin = fopen(fname,"w");
-       if ( !fin ) {
-               ast_log(LOG_ERROR, "Couldn't open %s for writing.\n", fname);
-               return;
-       }
-       print_pval_list(fin, tree, 0);
-       fclose(fin);
-}
-
-
-/* EMPTY TEMPLATE FUNCS FOR AEL TRAVERSAL:  ============================================================================= */
-
-void traverse_pval_template(pval *item, int depth);
-void traverse_pval_item_template(pval *item, int depth);
-
-
-void traverse_pval_item_template(pval *item, int depth)/* depth comes in handy for a pretty print (indentation),
-                                                                                                                 but you may not need it */
-{
-       pval *lp;
-       
-       switch ( item->type ) {
-       case PV_WORD:
-               /* fields: item->u1.str == string associated with this (word). */
-               break;
-               
-       case PV_MACRO:
-               /* fields: item->u1.str     == name of macro
-                          item->u2.arglist == pval list of PV_WORD arguments of macro, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-
-                                  item->u3.macro_statements == pval list of statements in macro body.
-               */
-               for (lp=item->u2.arglist; lp; lp=lp->next) {
-               
-               }
-               traverse_pval_item_template(item->u3.macro_statements,depth+1);
-               break;
-                       
-       case PV_CONTEXT:
-               /* fields: item->u1.str     == name of context
-                          item->u2.statements == pval list of statements in context body
-                                  item->u3.abstract == int 1 if an abstract keyword were present
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               break;
-                       
-       case PV_MACRO_CALL:
-               /* fields: item->u1.str     == name of macro to call
-                          item->u2.arglist == pval list of PV_WORD arguments of macro call, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-               */
-               for (lp=item->u2.arglist; lp; lp=lp->next) {
-               }
-               break;
-                       
-       case PV_APPLICATION_CALL:
-               /* fields: item->u1.str     == name of application to call
-                          item->u2.arglist == pval list of PV_WORD arguments of macro call, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-               */
-               for (lp=item->u2.arglist; lp; lp=lp->next) {
-               }
-               break;
-                       
-       case PV_CASE:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               break;
-                       
-       case PV_PATTERN:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               break;
-                       
-       case PV_DEFAULT:
-               /* fields: 
-                          item->u2.statements == pval list of statements under the case
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               break;
-                       
-       case PV_CATCH:
-               /* fields: item->u1.str     == name of extension to catch
-                          item->u2.statements == pval list of statements in context body
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               break;
-                       
-       case PV_SWITCHES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-               */
-               traverse_pval_item_template(item->u1.list,depth+1);
-               break;
-                       
-       case PV_ESWITCHES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-               */
-               traverse_pval_item_template(item->u1.list,depth+1);
-               break;
-                       
-       case PV_INCLUDES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-                          item->u2.arglist  == pval list of 4 PV_WORD elements for time values
-               */
-               traverse_pval_item_template(item->u1.list,depth+1);
-               traverse_pval_item_template(item->u2.arglist,depth+1);
-               break;
-                       
-       case PV_STATEMENTBLOCK:
-               /* fields: item->u1.list     == pval list of statements in block, one per entry in the list
-               */
-               traverse_pval_item_template(item->u1.list,depth+1);
-               break;
-                       
-       case PV_VARDEC:
-               /* fields: item->u1.str     == variable name
-                          item->u2.val     == variable value to assign
-               */
-               break;
-                       
-       case PV_GOTO:
-               /* fields: item->u1.list     == pval list of PV_WORD target names, up to 3, in order as given by user.
-                          item->u1.list->u1.str  == where the data on a PV_WORD will always be.
-               */
-               
-               if ( item->u1.list->next )
-                       ;
-               if ( item->u1.list->next && item->u1.list->next->next )
-                       ;
-               
-               break;
-                       
-       case PV_LABEL:
-               /* fields: item->u1.str     == label name
-               */
-               break;
-                       
-       case PV_FOR:
-               /* fields: item->u1.for_init     == a string containing the initalizer
-                          item->u2.for_test     == a string containing the loop test
-                          item->u3.for_inc      == a string containing the loop increment
-
-                                  item->u4.for_statements == a pval list of statements in the for ()
-               */
-               traverse_pval_item_template(item->u4.for_statements,depth+1);
-               break;
-                       
-       case PV_WHILE:
-               /* fields: item->u1.str        == the while conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the while ()
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               break;
-                       
-       case PV_BREAK:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_RETURN:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_CONTINUE:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_IFTIME:
-               /* fields: item->u1.list        == there are 4 linked PV_WORDs here.
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               if ( item->u3.else_statements ) {
-                       traverse_pval_item_template(item->u3.else_statements,depth+1);
-               }
-               break;
-                       
-       case PV_RANDOM:
-               /* fields: item->u1.str        == the random number expression, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               if ( item->u3.else_statements ) {
-                       traverse_pval_item_template(item->u3.else_statements,depth+1);
-               }
-               break;
-                       
-       case PV_IF:
-               /* fields: item->u1.str        == the if conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               if ( item->u3.else_statements ) {
-                       traverse_pval_item_template(item->u3.else_statements,depth+1);
-               }
-               break;
-                       
-       case PV_SWITCH:
-               /* fields: item->u1.str        == the switch expression
-
-                                  item->u2.statements == a pval list of statements in the switch, 
-                                                                                       (will be case statements, most likely!)
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               break;
-                       
-       case PV_EXTENSION:
-               /* fields: item->u1.str        == the extension name, label, whatever it's called
-
-                                  item->u2.statements == a pval list of statements in the extension
-                                  item->u3.hints      == a char * hint argument
-                                  item->u4.regexten   == an int boolean. non-zero says that regexten was specified
-               */
-               traverse_pval_item_template(item->u2.statements,depth+1);
-               break;
-                       
-       case PV_IGNOREPAT:
-               /* fields: item->u1.str        == the ignorepat data
-               */
-               break;
-                       
-       case PV_GLOBALS:
-               /* fields: item->u1.statements     == pval list of statements, usually vardecs
-               */
-               traverse_pval_item_template(item->u1.statements,depth+1);
-               break;
-       }
-}
-
-void traverse_pval_template(pval *item, int depth) /* depth comes in handy for a pretty print (indentation),
-                                                                                                         but you may not need it */
-{
-       pval *i;
-       
-       for (i=item; i; i=i->next) {
-               traverse_pval_item_template(i, depth);
-       }
-}
-
-
-/* SEMANTIC CHECKING FOR AEL:  ============================================================================= */
-
-/*   (not all that is syntactically legal is good! */
-
-
-
-static int extension_matches(pval *here, char *exten, char *pattern)
-{
-       int err1;
-       regex_t preg;
-       
-       /* simple case, they match exactly, the pattern and exten name */
-       if( !strcmp(pattern,exten) == 0 )
-               return 1;
-       
-       if ( pattern[0] == '_' ) {
-               char reg1[2000];
-               char *p,*r=reg1;
-               
-               if ( strlen(pattern)*5 >= 2000 ) /* safety valve */ {
-                       ast_log(LOG_ERROR,"Error: The pattern %s is way too big. Pattern matching cancelled.\n",
-                                       pattern);
-                       return 0;
-               }
-               /* form a regular expression from the pattern, and then match it against exten */
-               *r++ = '^'; /* what if the extension is a pattern ?? */
-               *r++ = '_'; /* what if the extension is a pattern ?? */
-               *r++ = '?';
-               for (p=pattern+1; *p; p++) {
-                       switch ( *p ) {
-                       case 'X':
-                               *r++ = '[';
-                               *r++ = '0';
-                               *r++ = '-';
-                               *r++ = '9';
-                               *r++ = 'X';
-                               *r++ = ']';
-                               break;
-                               
-                       case 'Z':
-                               *r++ = '[';
-                               *r++ = '1';
-                               *r++ = '-';
-                               *r++ = '9';
-                               *r++ = 'Z';
-                               *r++ = ']';
-                               break;
-                               
-                       case 'N':
-                               *r++ = '[';
-                               *r++ = '2';
-                               *r++ = '-';
-                               *r++ = '9';
-                               *r++ = 'N';
-                               *r++ = ']';
-                               break;
-                               
-                       case '[':
-                               while ( *p && *p != ']' ) {
-                                       *r++ = *p++;
-                               }
-                               if ( *p != ']') {
-                                       ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The extension pattern '%s' is missing a closing bracket \n",
-                                                       here->filename, here->startline, here->endline, pattern);
-                               }
-                               break;
-                               
-                       case '.':
-                       case '!':
-                               *r++ = '.';
-                               *r++ = '*';
-                               break;
-                       case '*':
-                               *r++ = '\\';
-                               *r++ = '*';
-                               break;
-                       default:
-                               *r++ = *p;
-                               break;
-                               
-                       }
-               }
-               *r++ = '$'; /* what if the extension is a pattern ?? */
-               *r++ = *p++; /* put in the closing null */
-               err1 = regcomp(&preg, reg1, REG_NOSUB|REG_EXTENDED);
-               if ( err1 ) {
-                       char errmess[500];
-                       regerror(err1,&preg,errmess,sizeof(errmess));
-                       regfree(&preg);
-                       ast_log(LOG_WARNING, "Regcomp of %s failed, error code %d\n",
-                                       reg1, err1);
-                       return 0;
-               }
-               err1 = regexec(&preg, exten, 0, 0, 0);
-               regfree(&preg);
-               
-               if ( err1 ) {
-                       /* ast_log(LOG_NOTICE,"*****************************[%d]Extension %s did not match %s(%s)\n",
-                          err1,exten, pattern, reg1); */
-                       return 0; /* no match */
-               } else {
-                       /* ast_log(LOG_NOTICE,"*****************************Extension %s matched %s\n",
-                          exten, pattern); */
-                       return 1;
-               }
-               
-               
-       } else {
-               if ( strcmp(exten,pattern) == 0 ) {
-                       return 1;
-               } else
-                       return 0;
-       }
-}
-
-
-static void check_expr2_input(pval *expr, char *str)
-{
-       int spaces = strspn(str,"\t \n");
-       if ( !strncmp(str+spaces,"$[",2) ) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The expression '%s' is redundantly wrapped in '$[ ]'. \n",
-                               expr->filename, expr->startline, expr->endline, str);
-               warns++;
-       }
-}
-
-static void check_timerange(pval *p)
-{
-       char times[200];
-       char *e;
-       int s1, s2;
-       int e1, e2;
-
-
-       strncpy(times, p->u1.str, sizeof(times));
-       /* Star is all times */
-       if (ast_strlen_zero(times) || !strcmp(times, "*")) {
-               return;
-       }
-       /* Otherwise expect a range */
-       e = strchr(times, '-');
-       if (!e) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The time range format (%s) requires a '-' surrounded by two 24-hour times of day!\n",
-                               p->filename, p->startline, p->endline, times);
-               warns++;
-               return;
-       }
-       *e = '\0';
-       e++;
-       while (*e && !isdigit(*e)) 
-               e++;
-       if (!*e) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The time range format (%s) is missing the end time!\n",
-                               p->filename, p->startline, p->endline, p->u1.str);
-               warns++;
-       }
-       if (sscanf(times, "%d:%d", &s1, &s2) != 2) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The start time (%s) isn't quite right!\n",
-                               p->filename, p->startline, p->endline, times);
-               warns++;
-       }
-       if (sscanf(e, "%d:%d", &e1, &e2) != 2) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The end time (%s) isn't quite right!\n",
-                               p->filename, p->startline, p->endline, times);
-               warns++;
-       }
-
-       s1 = s1 * 30 + s2/2;
-       if ((s1 < 0) || (s1 >= 24*30)) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The start time (%s) is out of range!\n",
-                               p->filename, p->startline, p->endline, times);
-               warns++;
-       }
-       e1 = e1 * 30 + e2/2;
-       if ((e1 < 0) || (e1 >= 24*30)) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The end time (%s) is out of range!\n",
-                               p->filename, p->startline, p->endline, e);
-               warns++;
-       }
-       return;
-}
-
-static char *days[] =
-{
-       "sun",
-       "mon",
-       "tue",
-       "wed",
-       "thu",
-       "fri",
-       "sat",
-};
-
-/*! \brief  get_dow: Get day of week */
-static void check_dow(pval *DOW)
-{
-       char dow[200];
-       char *c;
-       /* The following line is coincidence, really! */
-       int s, e;
-       
-       strncpy(dow,DOW->u1.str,sizeof(dow));
-       /* Check for all days */
-       if (ast_strlen_zero(dow) || !strcmp(dow, "*"))
-               return;
-       /* Get start and ending days */
-       c = strchr(dow, '-');
-       if (c) {
-               *c = '\0';
-               c++;
-       } else
-               c = NULL;
-       /* Find the start */
-       s = 0;
-       while ((s < 7) && strcasecmp(dow, days[s])) s++;
-       if (s >= 7) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The day (%s) must be one of 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', or 'sat'!\n",
-                               DOW->filename, DOW->startline, DOW->endline, dow);
-               warns++;
-       }
-       if (c) {
-               e = 0;
-               while ((e < 7) && strcasecmp(c, days[e])) e++;
-               if (e >= 7) {
-                       ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The end day (%s) must be one of 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', or 'sat'!\n",
-                                       DOW->filename, DOW->startline, DOW->endline, c);
-                       warns++;
-               }
-       } else
-               e = s;
-}
-
-static void check_day(pval *DAY)
-{
-       char day[200];
-       char *c;
-       /* The following line is coincidence, really! */
-       int s, e;
-
-       strncpy(day,DAY->u1.str,sizeof(day));
-       /* Check for all days */
-       if (ast_strlen_zero(day) || !strcmp(day, "*")) {
-               return;
-       }
-       /* Get start and ending days */
-       c = strchr(day, '-');
-       if (c) {
-               *c = '\0';
-               c++;
-       }
-       /* Find the start */
-       if (sscanf(day, "%d", &s) != 1) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The start day of month (%s) must be a number!\n",
-                               DAY->filename, DAY->startline, DAY->endline, day);
-               warns++;
-       }
-       else if ((s < 1) || (s > 31)) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The start day of month (%s) must be a number in the range [1-31]!\n",
-                               DAY->filename, DAY->startline, DAY->endline, day);
-               warns++;
-       }
-       s--;
-       if (c) {
-               if (sscanf(c, "%d", &e) != 1) {
-                       ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The end day of month (%s) must be a number!\n",
-                                       DAY->filename, DAY->startline, DAY->endline, c);
-                       warns++;
-               }
-               else if ((e < 1) || (e > 31)) {
-                       ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The end day of month (%s) must be a number in the range [1-31]!\n",
-                                       DAY->filename, DAY->startline, DAY->endline, day);
-                       warns++;
-               }
-               e--;
-       } else
-               e = s;
-}
-
-static char *months[] =
-{
-       "jan",
-       "feb",
-       "mar",
-       "apr",
-       "may",
-       "jun",
-       "jul",
-       "aug",
-       "sep",
-       "oct",
-       "nov",
-       "dec",
-};
-
-static void check_month(pval *MON)
-{
-       char mon[200];
-       char *c;
-       /* The following line is coincidence, really! */
-       int s, e;
-
-       strncpy(mon,MON->u1.str,sizeof(mon));
-       /* Check for all days */
-       if (ast_strlen_zero(mon) || !strcmp(mon, "*")) 
-               return ;
-       /* Get start and ending days */
-       c = strchr(mon, '-');
-       if (c) {
-               *c = '\0';
-               c++;
-       }
-       /* Find the start */
-       s = 0;
-       while ((s < 12) && strcasecmp(mon, months[s])) s++;
-       if (s >= 12) {
-               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The start month (%s) must be a one of: 'jan', 'feb', ..., 'dec'!\n",
-                               MON->filename, MON->startline, MON->endline, mon);
-               warns++;
-       }
-       if (c) {
-               e = 0;
-               while ((e < 12) && strcasecmp(mon, months[e])) e++;
-               if (e >= 12) {
-                       ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The end month (%s) must be a one of: 'jan', 'feb', ..., 'dec'!\n",
-                                       MON->filename, MON->startline, MON->endline, c);
-                       warns++;
-               }
-       } else
-               e = s;
-}
-
-/* general purpose goto finder */
-
-
-static void check_goto(pval *item)
-{
-       /* check for the target of the goto-- does it exist? */
-       if ( !(item->u1.list)->next && !(item->u1.list)->u1.str ) {
-               ast_log(LOG_ERROR,"Error: file %s, line %d-%d: goto:  empty label reference found!\n",
-                               item->filename, item->startline, item->endline);
-               errs++;
-       }
-       
-       /* just one item-- the label should be in the current extension */
-       
-       if (item->u1.list && !item->u1.list->next && !strstr((item->u1.list)->u1.str,"${")) {
-               struct pval *x = find_label_in_current_extension((char*)((item->u1.list)->u1.str));
-               /* printf("Calling find_label_in_current_extension with args %s\n",
-                  (char*)((item->u1.list)->u1.str)); */
-               if (!x) {
-                       ast_log(LOG_ERROR,"Error: file %s, line %d-%d: goto:  no label %s exists in the current extension!\n",
-                                       item->filename, item->startline, item->endline, item->u1.list->u1.str);
-                       errs++;
-               }
-               else
-                       return;
-       }
-       
-       /* TWO items */
-       if (item->u1.list->next && !item->u1.list->next->next) {
-               /* two items */
-               /* printf("Calling find_label_in_current_context with args %s, %s\n",
-                  (char*)((item->u1.list)->u1.str), (char *)item->u1.list->next->u1.str); */
-               if (!strstr((item->u1.list)->u1.str,"${") 
-                       && !strstr(item->u1.list->next->u1.str,"${") ) /* Don't try to match variables */ {
-                       struct pval *x = find_label_in_current_context((char *)item->u1.list->u1.str, (char *)item->u1.list->next->u1.str);
-                       if (!x) {
-                               ast_log(LOG_ERROR,"Error: file %s, line %d-%d: goto:  no label %s|%s exists in the current context, or any of its inclusions!\n",
-                                               item->filename, item->startline, item->endline, item->u1.list->u1.str, item->u1.list->next->u1.str );
-                               errs++;
-                       }
-                       else
-                               return;
-               }
-       }
-       
-       /* All 3 items! */
-       if (item->u1.list->next && item->u1.list->next->next) {
-               /* all three */
-               pval *first = item->u1.list;
-               pval *second = item->u1.list->next;
-               pval *third = item->u1.list->next->next;
-               
-               /* printf("Calling find_label_in_current_context with args %s, %s, %s\n",
-                  (char*)first->u1.str, (char*)second->u1.str, (char*)third->u1.str); */
-               if (!strstr((item->u1.list)->u1.str,"${") 
-                       && !strstr(item->u1.list->next->u1.str,"${")
-                       && !strstr(item->u1.list->next->next->u1.str,"${")) /* Don't try to match variables */ {
-                       struct pval *x = find_label_in_current_db((char*)first->u1.str, (char*)second->u1.str, (char*)third->u1.str);
-                       if (!x) {
-                               struct pval *p3;
-                               struct pval *found = 0;
-                               struct pval *that_context = find_context(item->u1.list->u1.str);
-                               
-                               /* the target of the goto could be in an included context!! Fancy that!! */
-                               /* look for includes in the current context */
-                               if (that_context) {
-                                       for (p3=that_context->u2.statements; p3; p3=p3->next) {
-                                               if (p3->type == PV_INCLUDES) {
-                                                       struct pval *p4;
-                                                       for (p4=p3->u1.list; p4; p4=p4->next) {
-                                                               /* for each context pointed to, find it, then find a context/label that matches the
-                                                                  target here! */
-                                                               char *incl_context = p4->u1.str;
-                                                               /* find a matching context name */
-                                                               struct pval *that_other_context = find_context(incl_context);
-                                                               if (that_other_context) {
-                                                                       struct pval *context_save = current_context;
-                                                                       struct pval *x3;
-                                                                       current_context = that_other_context;
-                                                                       x3 = find_label_in_current_context((char *)item->u1.list->next->u1.str, (char *)item->u1.list->next->next->u1.str);
-                                                                       current_context = context_save;
-                                                                       if (x3) {
-                                                                               found = x3;
-                                                                               break;
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                                       if (!found) {
-                                               ast_log(LOG_ERROR,"Error: file %s, line %d-%d: goto:  no label %s|%s exists in the context %s or its inclusions!\n",
-                                                               item->filename, item->startline, item->endline, item->u1.list->next->u1.str, item->u1.list->next->next->u1.str, item->u1.list->u1.str );
-                                               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",
-                                                       item->filename, item->startline, item->endline, item->u1.list->u1.str);
-                                       errs++;
-                               }
-                       }
-               }
-       }
-}
-       
-
-static void find_pval_goto_item(pval *item, int lev)
-{
-       struct pval *p4;
-       if (lev>100) {
-               ast_log(LOG_ERROR,"find_pval_goto in infinite loop!\n\n");
-               return;
-       }
-       
-       switch ( item->type ) {
-       case PV_MACRO:
-               /* fields: item->u1.str     == name of macro
-                          item->u2.arglist == pval list of PV_WORD arguments of macro, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-
-                                  item->u3.macro_statements == pval list of statements in macro body.
-               */
-                       
-               /* printf("Descending into matching macro %s\n", match_context); */
-               find_pval_gotos(item->u2.statements,lev+1); /* if we're just searching for a context, don't bother descending into them */
-               
-               break;
-                       
-       case PV_CONTEXT:
-               /* fields: item->u1.str     == name of context
-                          item->u2.statements == pval list of statements in context body
-                                  item->u3.abstract == int 1 if an abstract keyword were present
-               */
-               break;
-
-       case PV_CASE:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               find_pval_gotos(item->u2.statements,lev+1);
-               break;
-                       
-       case PV_PATTERN:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               find_pval_gotos(item->u2.statements,lev+1);
-               break;
-                       
-       case PV_DEFAULT:
-               /* fields: 
-                          item->u2.statements == pval list of statements under the case
-               */
-               find_pval_gotos(item->u2.statements,lev+1);
-               break;
-                       
-       case PV_CATCH:
-               /* fields: item->u1.str     == name of extension to catch
-                          item->u2.statements == pval list of statements in context body
-               */
-               find_pval_gotos(item->u2.statements,lev+1);
-               break;
-                       
-       case PV_STATEMENTBLOCK:
-               /* fields: item->u1.list     == pval list of statements in block, one per entry in the list
-               */
-               find_pval_gotos(item->u1.list,lev+1);
-               break;
-                       
-       case PV_GOTO:
-               /* fields: item->u1.list     == pval list of PV_WORD target names, up to 3, in order as given by user.
-                          item->u1.list->u1.str  == where the data on a PV_WORD will always be.
-               */
-               check_goto(item);  /* THE WHOLE FUNCTION OF THIS ENTIRE ROUTINE!!!! */
-               break;
-                       
-       case PV_INCLUDES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-               */
-               for (p4=item->u1.list; p4; p4=p4->next) {
-                       /* for each context pointed to, find it, then find a context/label that matches the
-                          target here! */
-                       char *incl_context = p4->u1.str;
-                       /* find a matching context name */
-                       struct pval *that_context = find_context(incl_context);
-                       if (that_context) {
-                               find_pval_gotos(that_context,lev+1); /* keep working up the includes */
-                       }
-               }
-               break;
-               
-       case PV_FOR:
-               /* fields: item->u1.for_init     == a string containing the initalizer
-                          item->u2.for_test     == a string containing the loop test
-                          item->u3.for_inc      == a string containing the loop increment
-
-                                  item->u4.for_statements == a pval list of statements in the for ()
-               */
-               find_pval_gotos(item->u4.for_statements,lev+1);
-               break;
-                       
-       case PV_WHILE:
-               /* fields: item->u1.str        == the while conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the while ()
-               */
-               find_pval_gotos(item->u2.statements,lev+1);
-               break;
-                       
-       case PV_RANDOM:
-               /* fields: item->u1.str        == the random number expression, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-                fall thru to PV_IF */
-               
-       case PV_IFTIME:
-               /* fields: item->u1.list        == the time values, 4 of them, as PV_WORD structs in a list
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               fall thru to PV_IF*/
-       case PV_IF:
-               /* fields: item->u1.str        == the if conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               find_pval_gotos(item->u2.statements,lev+1);
-
-               if (item->u3.else_statements) {
-                       find_pval_gotos(item->u3.else_statements,lev+1);
-               }
-               break;
-                       
-       case PV_SWITCH:
-               /* fields: item->u1.str        == the switch expression
-
-                                  item->u2.statements == a pval list of statements in the switch, 
-                                                                                       (will be case statements, most likely!)
-               */
-               find_pval_gotos(item->u3.else_statements,lev+1);
-               break;
-                       
-       case PV_EXTENSION:
-               /* fields: item->u1.str        == the extension name, label, whatever it's called
-
-                                  item->u2.statements == a pval list of statements in the extension
-                                  item->u3.hints      == a char * hint argument
-                                  item->u4.regexten   == an int boolean. non-zero says that regexten was specified
-               */
-
-               find_pval_gotos(item->u2.statements,lev+1);
-               break;
-
-       default:
-               break;
-       }
-}
-
-static void find_pval_gotos(pval *item,int lev)
-{
-       pval *i;
-
-       for (i=item; i; i=i->next) {
-               
-               find_pval_goto_item(i, lev);
-       }
-}
-
-
-
-/* general purpose label finder */
-static struct pval *match_pval_item(pval *item)
-{
-       pval *x;
-       
-       switch ( item->type ) {
-       case PV_MACRO:
-               /* fields: item->u1.str     == name of macro
-                          item->u2.arglist == pval list of PV_WORD arguments of macro, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-
-                                  item->u3.macro_statements == pval list of statements in macro body.
-               */
-               if (!strcmp(match_context,"*") || !strcmp(item->u1.str, match_context)) {
-                       if (return_on_context_match && !strcmp(item->u1.str, match_context)) {
-                               /* printf("Returning on matching macro %s\n", match_context); */
-                               return item;
-                       }
-                       
-                       
-                       if (!return_on_context_match) {
-                               /* printf("Descending into matching macro %s\n", match_context); */
-                               if ((x=match_pval(item->u2.statements))) /* if we're just searching for a context, don't bother descending into them */ {
-                                       return x;
-                               }
-                       }
-               } else {
-                       /* printf("Skipping context/macro %s\n", item->u1.str); */
-               }
-               
-               break;
-                       
-       case PV_CONTEXT:
-               /* fields: item->u1.str     == name of context
-                          item->u2.statements == pval list of statements in context body
-                                  item->u3.abstract == int 1 if an abstract keyword were present
-               */
-               if (!strcmp(match_context,"*") || !strcmp(item->u1.str, match_context)) {
-                       if (return_on_context_match && !strcmp(item->u1.str, match_context)) {
-                               /* printf("Returning on matching context %s\n", match_context); */
-                               return item;
-                       }
-                       
-                       
-                       if (!return_on_context_match ) {
-                               /* printf("Descending into matching context %s\n", match_context); */
-                               if ((x=match_pval(item->u2.statements))) /* if we're just searching for a context, don't bother descending into them */ {
-                                       return x;
-                               }
-                       }
-               } else {
-                       /* printf("Skipping context/macro %s\n", item->u1.str); */
-               }
-               break;
-
-       case PV_CASE:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               if ((x=match_pval(item->u2.statements))) {
-                       return x;
-               }
-               break;
-                       
-       case PV_PATTERN:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               if ((x=match_pval(item->u2.statements))) {
-                       return x;
-               }
-               break;
-                       
-       case PV_DEFAULT:
-               /* fields: 
-                          item->u2.statements == pval list of statements under the case
-               */
-               if ((x=match_pval(item->u2.statements))) {
-                       return x;
-               }
-               break;
-                       
-       case PV_CATCH:
-               /* fields: item->u1.str     == name of extension to catch
-                          item->u2.statements == pval list of statements in context body
-               */
-               if ((x=match_pval(item->u2.statements))) {
-                       return x;
-               }
-               break;
-                       
-       case PV_STATEMENTBLOCK:
-               /* fields: item->u1.list     == pval list of statements in block, one per entry in the list
-               */
-               if ((x=match_pval(item->u1.list))) {
-                       return x;
-               }
-               break;
-                       
-       case PV_LABEL:
-               /* fields: item->u1.str     == label name
-               */
-               /* printf("PV_LABEL %s (cont=%s, exten=%s\n", 
-                  item->u1.str, current_context->u1.str, current_extension->u1.str); */
-               
-               if (count_labels) {
-                       if (!strcmp(match_label, item->u1.str)) {
-                               label_count++;
-                               last_matched_label = item;
-                       }
-                       
-               } else {
-                       if (!strcmp(match_label, item->u1.str)) {
-                               return item;
-                       }
-               }
-               break;
-                       
-       case PV_FOR:
-               /* fields: item->u1.for_init     == a string containing the initalizer
-                          item->u2.for_test     == a string containing the loop test
-                          item->u3.for_inc      == a string containing the loop increment
-
-                                  item->u4.for_statements == a pval list of statements in the for ()
-               */
-               if ((x=match_pval(item->u4.for_statements))) {
-                       return x;
-               }
-               break;
-                       
-       case PV_WHILE:
-               /* fields: item->u1.str        == the while conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the while ()
-               */
-               if ((x=match_pval(item->u2.statements))) {
-                       return x;
-               }
-               break;
-                       
-       case PV_RANDOM:
-               /* fields: item->u1.str        == the random number expression, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-                fall thru to PV_IF */
-               
-       case PV_IFTIME:
-               /* fields: item->u1.list        == the time values, 4 of them, as PV_WORD structs in a list
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               fall thru to PV_IF*/
-       case PV_IF:
-               /* fields: item->u1.str        == the if conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               if ((x=match_pval(item->u2.statements))) {
-                       return x;
-               }
-               if (item->u3.else_statements) {
-                       if ((x=match_pval(item->u3.else_statements))) {
-                               return x;
-                       }
-               }
-               break;
-                       
-       case PV_SWITCH:
-               /* fields: item->u1.str        == the switch expression
-
-                                  item->u2.statements == a pval list of statements in the switch, 
-                                                                                       (will be case statements, most likely!)
-               */
-               if ((x=match_pval(item->u3.else_statements))) {
-                       return x;
-               }
-               break;
-                       
-       case PV_EXTENSION:
-               /* fields: item->u1.str        == the extension name, label, whatever it's called
-
-                                  item->u2.statements == a pval list of statements in the extension
-                                  item->u3.hints      == a char * hint argument
-                                  item->u4.regexten   == an int boolean. non-zero says that regexten was specified
-               */
-               if (!strcmp(match_exten,"*") || extension_matches(item, match_exten, item->u1.str) ) {
-                       /* printf("Descending into matching exten %s\n", match_exten); */
-                       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))) {
-                               return x;
-                       }
-               } else {
-                       /* printf("Skipping exten %s\n", item->u1.str); */
-               }
-               break;
-       default:
-               break;
-       }
-       return 0;
-}
-
-struct pval *match_pval(pval *item)
-{
-       pval *i;
-
-       for (i=item; i; i=i->next) {
-               pval *x;
-               
-               if ((x = match_pval_item(i)))
-                       return x; /* cut the search short */
-       }
-       return 0;
-}
-
-
-int count_labels_in_current_context(char *label)
-{
-       label_count = 0;
-       count_labels = 1;
-       return_on_context_match = 0;
-       match_pval(current_context->u2.statements);
-       
-       return label_count;
-}
-
-struct pval *find_label_in_current_context(char *exten, char *label)
-{
-       /* printf("  --- Got args %s, %s\n", exten, label); */
-       struct pval *ret;
-       struct pval *p3;
-       
-       count_labels = 0;
-       return_on_context_match = 0;
-       match_context = "*";
-       match_exten = exten;
-       match_label = label;
-       ret =  match_pval(current_context->u2.statements);
-       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=current_context->u2.statements; p3; p3=p3->next) {
-               if (p3->type == PV_INCLUDES) {
-                       struct pval *p4;
-                       for (p4=p3->u1.list; p4; p4=p4->next) {
-                               /* for each context pointed to, find it, then find a context/label that matches the
-                                  target here! */
-                               char *incl_context = p4->u1.str;
-                               /* find a matching context name */
-                               struct pval *that_context = find_context(incl_context);
-                               if (that_context) {
-                                       struct pval *context_save = current_context;
-                                       struct pval *x3;
-                                       current_context = that_context;
-                                       x3 = find_label_in_current_context(exten, label);
-                                       current_context = context_save;
-                                       if (x3) {
-                                               return x3;
-                                       }
-                               }
-                       }
-               }
-       }
-       return 0;
-}
-
-struct pval *find_label_in_current_extension(char *label)
-{
-       /* printf("  --- Got args %s\n", label); */
-       count_labels = 0;
-       return_on_context_match = 0;
-       match_context = "*";
-       match_exten = "*";
-       match_label = label;
-       if (! current_extension) /* macros have no current extension, the whole thing is one extension... */
-               return match_pval(current_context->u3.macro_statements);
-       return match_pval(current_extension->u2.statements);
-}
-
-struct pval *find_label_in_current_db(char *context, char *exten, char *label)
-{
-       /* printf("  --- Got args %s, %s, %s\n", context, exten, label); */
-       count_labels = 0;
-       return_on_context_match = 0;
-
-       match_context = context;
-       match_exten = exten;
-       match_label = label;
-       
-       return match_pval(current_db);
-}
-
-
-struct pval *find_macro(char *name)
-{
-       return_on_context_match = 1;
-       count_labels = 0;
-       match_context = name;
-       match_exten = "*";  /* don't really need to set these, shouldn't be reached */
-       match_label = "*";
-       return match_pval(current_db);
-}
-
-struct pval *find_context(char *name)
-{
-       return_on_context_match = 1;
-       count_labels = 0;
-       match_context = name;
-       match_exten = "*";  /* don't really need to set these, shouldn't be reached */
-       match_label = "*";
-       return match_pval(current_db);
-}
-
-int is_float(char *arg )
-{
-       char *s;
-       for (s=arg; *s; s++) {
-               if (*s != '.' && (*s < '0' || *s > '9'))
-                       return 0;
-       }
-       return 1;
-}
-int is_int(char *arg )
-{
-       char *s;
-       for (s=arg; *s; s++) {
-               if (*s < '0' || *s > '9')
-                       return 0;
-       }
-       return 1;
-}
-int is_empty(char *arg)
-{
-       if (!arg)
-               return 1;
-       if (*arg == 0)
-               return 1;
-       while (*arg) {
-               if (*arg != ' ' && *arg != '\t')
-                       return 0;
-               arg++;
-       }
-       return 1;
-}
-
-#ifdef AAL_ARGCHECK
-int option_matches_j( struct argdesc *should, pval *is, struct argapp *app)
-{
-       struct argchoice *ac;
-       char opcop[400],*q,*p;
-       
-       switch (should->dtype) {
-       case ARGD_OPTIONSET:
-               if ( strstr(is->u1.str,"${") )
-                       return 0;  /* no checking anything if there's a var reference in there! */
-                       
-               strncpy(opcop,is->u1.str,sizeof(opcop));
-
-               for (q=opcop;*q;q++) { /* erase the innards of X(innard) type arguments, so we don't get confused later */
-                       if ( *q == '(' ) {
-                               p = q+1;
-                               while (*p && *p != ')' )
-                                       *p++ = '+';
-                               q = p+1;
-                       }
-               }
-               
-               for (ac=app->opts; ac; ac=ac->next) {
-                       if (strlen(ac->name)>1  && strchr(ac->name,'(') == 0 && strcmp(ac->name,is->u1.str) == 0) /* multichar option, no parens, and a match? */
-                               return 0;
-               }
-               for (ac=app->opts; ac; ac=ac->next) {
-                       if (strlen(ac->name)==1  ||  strchr(ac->name,'(')) {
-                               char *p = strchr(opcop,ac->name[0]);  /* wipe out all matched options in the user-supplied string */
-                               
-                               if (p && *p == 'j') {
-                                       ast_log(LOG_ERROR, "Error: file %s, line %d-%d: The j option in the %s application call is not appropriate for AEL!\n",
-                                                       is->filename, is->startline, is->endline, app->name);
-                                       errs++;
-                               }
-                               
-                               if (p) {
-                                       *p = '+';
-                                       if (ac->name[1] == '(') {
-                                               if (*(p+1) != '(') {
-                                                       ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The %c option in the %s application call should have an (argument), but doesn't!\n",
-                                                                       is->filename, is->startline, is->endline, ac->name[0], app->name);
-                                                       warns++;
-                                               }
-                                       }
-                               }
-                       }
-               }
-               for (q=opcop; *q; q++) {
-                       if ( *q != '+' && *q != '(' && *q != ')') {
-                               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The %c option in the %s application call is not available as an option!\n",
-                                               is->filename, is->startline, is->endline, *q, app->name);
-                               warns++;
-                       }
-               }
-               return 1;
-               break;
-       default:
-               return 0;
-       }
-       
-}
-
-int option_matches( struct argdesc *should, pval *is, struct argapp *app)
-{
-       struct argchoice *ac;
-       char opcop[400];
-       
-       switch (should->dtype) {
-       case ARGD_STRING:
-               if (is_empty(is->u1.str) && should->type == ARGD_REQUIRED)
-                       return 0;
-               if (is->u1.str && strlen(is->u1.str) > 0) /* most will match */
-                       return 1;
-               break;
-               
-       case ARGD_INT:
-               if (is_int(is->u1.str))
-                       return 1;
-               else
-                       return 0;
-               break;
-               
-       case ARGD_FLOAT:
-               if (is_float(is->u1.str))
-                       return 1;
-               else
-                       return 0;
-               break;
-               
-       case ARGD_ENUM:
-               if( !is->u1.str || strlen(is->u1.str) == 0 )
-                       return 1; /* a null arg in the call will match an enum, I guess! */
-               for (ac=should->choices; ac; ac=ac->next) {
-                       if (strcmp(ac->name,is->u1.str) == 0)
-                               return 1;
-               }
-               return 0;
-               break;
-               
-       case ARGD_OPTIONSET:
-               strncpy(opcop,is->u1.str,sizeof(opcop));
-               
-               for (ac=app->opts; ac; ac=ac->next) {
-                       if (strlen(ac->name)>1  && strchr(ac->name,'(') == 0 && strcmp(ac->name,is->u1.str) == 0) /* multichar option, no parens, and a match? */
-                               return 1;
-               }
-               for (ac=app->opts; ac; ac=ac->next) {
-                       if (strlen(ac->name)==1  ||  strchr(ac->name,'(')) {
-                               char *p = strchr(opcop,ac->name[0]);  /* wipe out all matched options in the user-supplied string */
-                               
-                               if (p) {
-                                       *p = '+';
-                                       if (ac->name[1] == '(') {
-                                               if (*(p+1) == '(') {
-                                                       char *q = p+1;
-                                                       while (*q && *q != ')') {
-                                                               *q++ = '+';
-                                                       }
-                                                       *q = '+';
-                                               }
-                                       }
-                               }
-                       }
-               }
-               return 1;
-               break;
-       case ARGD_VARARG:
-               return 1; /* matches anything */
-               break;
-       }
-       return 1; /* unless some for-sure match or non-match returns, then it must be close enough ... */
-}
-#endif
-
-int check_app_args(pval* appcall, pval *arglist, struct argapp *app)
-{
-#ifdef AAL_ARGCHECK
-       struct argdesc *ad = app->args;
-       pval *pa;
-       int z;
-       
-       for (pa = arglist; pa; pa=pa->next) {
-               if (!ad) {
-                       ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: Extra argument %s not in application call to %s !\n",
-                                       arglist->filename, arglist->startline, arglist->endline, pa->u1.str, app->name);
-                       warns++;
-                       return 1;
-               } else {
-                       /* find the first entry in the ad list that will match */
-                       do {
-                               if ( ad->dtype == ARGD_VARARG ) /* once we hit the VARARG, all bets are off. Discontinue the comparisons */
-                                       break;
-                               
-                               z= option_matches( ad, pa, app);
-                               if (!z) {
-                                       if ( !arglist )
-                                               arglist=appcall;
-                                       
-                                       if (ad->type == ARGD_REQUIRED) {
-                                               ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: Required argument %s not in application call to %s !\n",
-                                                               arglist->filename, arglist->startline, arglist->endline, ad->dtype==ARGD_OPTIONSET?"options":ad->name, app->name);
-                                               warns++;
-                                               return 1;
-                                       }
-                               } else if (z && ad->dtype == ARGD_OPTIONSET) {
-                                       option_matches_j( ad, pa, app);
-                               }
-                               ad = ad->next;
-                       } while (ad && !z);
-               }
-       }
-       /* any app nodes left, that are not optional? */
-       for ( ; ad; ad=ad->next) {
-               if (ad->type == ARGD_REQUIRED && ad->dtype != ARGD_VARARG) {
-                       if ( !arglist ) 
-                               arglist=appcall;
-                       ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: Required argument %s not in application call to %s !\n",
-                                       arglist->filename, arglist->startline, arglist->endline, ad->dtype==ARGD_OPTIONSET?"options":ad->name, app->name);
-                       warns++;
-                       return 1;
-               }
-       }
-       return 0;
-#else
-       return 0;
-#endif
-}
-
-void check_switch_expr(pval *item, struct argapp *apps)
-{
-#ifdef AAL_ARGCHECK
-       /* get and clean the variable name */
-       char buff1[1024],*p;
-       struct argapp *a,*a2;
-       struct appsetvar *v,*v2;
-       struct argchoice *c;
-       pval *t;
-       
-       p = item->u1.str;
-       while (p && *p && (*p == ' ' || *p == '\t' || *p == '$' || *p == '{' ) )
-               p++;
-       
-       strncpy(buff1,p,sizeof(buff1));
-       while (strlen(buff1) > 0 && ( buff1[strlen(buff1)-1] == '}' || buff1[strlen(buff1)-1] == ' ' || buff1[strlen(buff1)-1] == '\t'))
-               buff1[strlen(buff1)-1] = 0;
-       /* buff1 now contains the variable name */
-       v = 0;
-       for (a=apps; a; a=a->next) {
-               for (v=a->setvars;v;v=v->next) {
-                       if (strcmp(v->name,buff1) == 0) {
-                               break;
-                       }
-               }
-               if ( v )
-                       break;
-       }
-       if (v && v->vals) {
-               /* we have a match, to a variable that has a set of determined values */
-               int def= 0;
-               int pat = 0;
-               int f1 = 0;
-               
-               /* first of all, does this switch have a default case ? */
-               for (t=item->u2.statements; t; t=t->next) {
-                       if (t->type == PV_DEFAULT) {
-                               def =1;
-                               break;
-                       }
-                       if (t->type == PV_PATTERN) {
-                               pat++;
-                       }
-               }
-               if (def || pat) /* nothing to check. All cases accounted for! */
-                       return;
-               for (c=v->vals; c; c=c->next) {
-                       f1 = 0;
-                       for (t=item->u2.statements; t; t=t->next) {
-                               if (t->type == PV_CASE || t->type == PV_PATTERN) {
-                                       if (!strcmp(t->u1.str,c->name)) {
-                                               f1 = 1;
-                                               break;
-                                       }
-                               }
-                       }
-                       if (!f1) {
-                               ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: switch with expression(%s) does not handle the case of %s !\n",
-                                               item->filename, item->startline, item->endline, item->u1.str, c->name);
-                               warns++;
-                       }
-               }
-               /* next, is there an app call in the current exten, that would set this var? */
-               f1 = 0;
-               t = current_extension->u2.statements;
-               if ( t && t->type == PV_STATEMENTBLOCK )
-                       t = t->u1.statements;
-               for (; t && t != item; t=t->next) {
-                       if (t->type == PV_APPLICATION_CALL) {
-                               /* find the application that matches the u1.str */
-                               for (a2=apps; a2; a2=a2->next) {
-                                       if (strcasecmp(a2->name, t->u1.str)==0) {
-                                               for (v2=a2->setvars; v2; v2=v2->next) {
-                                                       if (strcmp(v2->name, buff1) == 0) {
-                                                               /* found an app that sets the var */
-                                                               f1 = 1;
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                                       if (f1)
-                                               break;
-                               }
-                       }
-                       if (f1)
-                               break;
-               }
-                               
-               /* see if it sets the var */
-               if (!f1) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: Couldn't find an application call in this extension that sets the  expression (%s) value!\n",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       warns++;
-               }
-       }
-#endif
-}
-
-static void check_context_names(void)
-{
-       pval *i,*j;
-       for (i=current_db; i; i=i->next) {
-               if (i->type == PV_CONTEXT || i->type == PV_MACRO) {
-                       for (j=i->next; j; j=j->next) {
-                               if ( j->type == PV_CONTEXT || j->type == PV_MACRO ) {
-                                       if ( !strcmp(i->u1.str, j->u1.str) )
-                                       {
-                                               ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: The context name (%s) is also declared in file %s, line %d-%d!\n",
-                                                               i->filename, i->startline, i->endline, i->u1.str,  j->filename, j->startline, j->endline);
-                                               warns++;
-                                       }
-                               }
-                       }
-               }
-       }
-}
-
-static void check_abstract_reference(pval *abstract_context)
-{
-       pval *i,*j;
-       /* find some context includes that reference this context */
-       
-
-       /* otherwise, print out a warning */
-       for (i=current_db; i; i=i->next) {
-               if (i->type == PV_CONTEXT) {
-                       for (j=i->u2. statements; j; j=j->next) {
-                               if ( j->type == PV_INCLUDES ) {
-                                       struct pval *p4;
-                                       for (p4=j->u1.list; p4; p4=p4->next) {
-                                               /* for each context pointed to, find it, then find a context/label that matches the
-                                                  target here! */
-                                               if ( !strcmp(p4->u1.str, abstract_context->u1.str) )
-                                                       return; /* found a match! */
-                                       }
-                               }
-                       }
-               }
-       }
-       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: Couldn't find a reference to this abstract context (%s) in any other context!\n",
-                       abstract_context->filename, abstract_context->startline, abstract_context->endline, abstract_context->u1.str);
-       warns++;
-}
-
-
-void check_pval_item(pval *item, struct argapp *apps)
-{
-       pval *lp;
-#ifdef AAL_ARGCHECK
-       struct argapp *app, *found;
-#endif
-       struct pval *macro_def;
-       struct pval *app_def;
-       
-       char errmsg[4096];
-       char *strp;
-       
-       switch (item->type) {
-       case PV_WORD:
-               /* fields: item->u1.str == string associated with this (word).
-                          item->u2.arglist  == pval list of 4 PV_WORD elements for time values (only in PV_INCLUDES) */
-               break;
-               
-       case PV_MACRO:
-               /* fields: item->u1.str     == name of macro
-                          item->u2.arglist == pval list of PV_WORD arguments of macro, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-
-                                  item->u3.macro_statements == pval list of statements in macro body.
-               */
-               in_abstract_context = 0;
-               current_context = item;
-               current_extension = 0;
-               for (lp=item->u2.arglist; lp; lp=lp->next) {
-               
-               }
-               check_pval(item->u3.macro_statements, apps);
-               break;
-                       
-       case PV_CONTEXT:
-               /* fields: item->u1.str     == name of context
-                          item->u2.statements == pval list of statements in context body
-                                  item->u3.abstract == int 1 if an abstract keyword were present
-               */
-               current_context = item;
-               current_extension = 0;
-               if ( item->u3.abstract ) {
-                       in_abstract_context = 1;
-                       check_abstract_reference(item);
-               } else
-                       in_abstract_context = 0;
-               check_pval(item->u2.statements, apps);
-               break;
-                       
-       case PV_MACRO_CALL:
-               /* fields: item->u1.str     == name of macro to call
-                          item->u2.arglist == pval list of PV_WORD arguments of macro call, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-               */
-               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",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       errs++;
-               } 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);
-                       errs++;
-               } else {
-                       /* macro_def is a MACRO, so do the args match in number? */
-                       int hereargs = 0;
-                       int thereargs = 0;
-                       
-                       for (lp=item->u2.arglist; lp; lp=lp->next) {
-                               hereargs++;
-                       }
-                       for (lp=macro_def->u2.arglist; lp; lp=lp->next) {
-                               thereargs++;
-                       }
-                       if (hereargs != thereargs ) {
-                               ast_log(LOG_ERROR, "Error: file %s, line %d-%d: The macro call to %s has %d arguments, but the macro definition has %d arguments\n",
-                                               item->filename, item->startline, item->endline, item->u1.str, hereargs, thereargs);
-                               errs++;
-                       }
-               }
-               break;
-                       
-       case PV_APPLICATION_CALL:
-               /* fields: item->u1.str     == name of application to call
-                          item->u2.arglist == pval list of PV_WORD arguments of macro call, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-               */
-               /* Need to check to see if the application is available! */
-               app_def = find_context(item->u1.str);
-               if (app_def && app_def->type == PV_MACRO) {
-                       ast_log(LOG_ERROR,"Error: file %s, line %d-%d: application call to %s references an existing macro, but had no & preceding it!\n",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       errs++;
-               }
-               if (strcasecmp(item->u1.str,"GotoIf") == 0
-                       || strcasecmp(item->u1.str,"GotoIfTime") == 0
-                       || strcasecmp(item->u1.str,"while") == 0
-                       || strcasecmp(item->u1.str,"endwhile") == 0
-                       || strcasecmp(item->u1.str,"random") == 0
-                       || strcasecmp(item->u1.str,"execIf") == 0 ) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: application call to %s needs to be re-written using AEL if, while, goto, etc. keywords instead!\n",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       warns++;
-               }
-#ifdef AAL_ARGCHECK
-               found = 0;
-               for (app=apps; app; app=app->next) {
-                       if (strcasecmp(app->name, item->u1.str) == 0) {
-                               found =app;
-                               break;
-                       }
-               }
-               if (!found) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: application call to %s not listed in applist database!\n",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       warns++;
-               } else
-                       check_app_args(item, item->u2.arglist, app);
-#endif
-               break;
-               
-       case PV_CASE:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               /* Make sure sequence of statements under case is terminated with  goto, return, or break */
-               /* find the last statement */
-               check_pval(item->u2.statements, apps);
-               break;
-                       
-       case PV_PATTERN:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               /* Make sure sequence of statements under case is terminated with  goto, return, or break */
-               /* find the last statement */
-               
-               check_pval(item->u2.statements, apps);
-               break;
-                       
-       case PV_DEFAULT:
-               /* fields: 
-                          item->u2.statements == pval list of statements under the case
-               */
-
-               check_pval(item->u2.statements, apps);
-               break;
-                       
-       case PV_CATCH:
-               /* fields: item->u1.str     == name of extension to catch
-                          item->u2.statements == pval list of statements in context body
-               */
-               check_pval(item->u2.statements, apps);
-               break;
-                       
-       case PV_SWITCHES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-               */
-               check_pval(item->u1.list, apps);
-               break;
-                       
-       case PV_ESWITCHES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-               */
-               check_pval(item->u1.list, apps);
-               break;
-                       
-       case PV_INCLUDES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-               */
-               check_pval(item->u1.list, apps);
-               for (lp=item->u1.list; lp; lp=lp->next){
-                       char *incl_context = lp->u1.str;
-                       struct pval *that_context = find_context(incl_context);
-
-                       if ( lp->u2.arglist ) {
-                               check_timerange(lp->u2.arglist);
-                               check_dow(lp->u2.arglist->next);
-                               check_day(lp->u2.arglist->next->next);
-                               check_month(lp->u2.arglist->next->next->next);
-                       }
-                       
-                       if (that_context) {
-                               find_pval_gotos(that_context->u2.statements,0);
-                               
-                       }
-               }
-               break;
-                       
-       case PV_STATEMENTBLOCK:
-               /* fields: item->u1.list     == pval list of statements in block, one per entry in the list
-               */
-               check_pval(item->u1.list, apps);
-               break;
-                       
-       case PV_VARDEC:
-               /* fields: item->u1.str     == variable name
-                          item->u2.val     == variable value to assign
-               */
-               /* the RHS of a vardec is encapsulated in a $[] expr. Is it legal? */
-               snprintf(errmsg,sizeof(errmsg), "file %s, line %d, columns %d-%d, variable declaration expr '%s':", config, item->startline, item->startcol, item->endcol, item->u2.val);
-               ast_expr_register_extra_error_info(errmsg);
-               ast_expr(item->u2.val, expr_output, sizeof(expr_output));
-               ast_expr_clear_extra_error_info();
-               if ( strpbrk(item->u2.val,"~!-+<>=*/&^") && !strstr(item->u2.val,"${") ) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: expression %s has operators, but no variables. Interesting...\n",
-                                       item->filename, item->startline, item->endline, item->u2.val);
-                       warns++;
-               }
-               check_expr2_input(item,item->u2.val);
-               break;
-                       
-       case PV_GOTO:
-               /* fields: item->u1.list     == pval list of PV_WORD target names, up to 3, in order as given by user.
-                          item->u1.list->u1.str  == where the data on a PV_WORD will always be.
-               */
-               /* don't check goto's in abstract contexts */
-               if ( in_abstract_context )
-                       break;
-               
-               check_goto(item);
-               break;
-                       
-       case PV_LABEL:
-               /* fields: item->u1.str     == label name
-               */
-               if ( strspn(item->u1.str, "0123456789") == strlen(item->u1.str) ) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: label '%s' is numeric, this is bad practice!\n",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       warns++;
-               }
-               break;
-                       
-       case PV_FOR:
-               /* fields: item->u1.for_init     == a string containing the initalizer
-                          item->u2.for_test     == a string containing the loop test
-                          item->u3.for_inc      == a string containing the loop increment
-
-                                  item->u4.for_statements == a pval list of statements in the for ()
-               */
-               snprintf(errmsg,sizeof(errmsg),"file %s, line %d, columns %d-%d, for test expr '%s':", config, item->startline, item->startcol, item->endcol, item->u2.for_test);
-               ast_expr_register_extra_error_info(errmsg);
-
-               strp = strchr(item->u1.for_init, '=');
-               if (strp) {
-                       ast_expr(strp+1, expr_output, sizeof(expr_output));
-               }
-               ast_expr(item->u2.for_test, expr_output, sizeof(expr_output));
-               strp = strchr(item->u3.for_inc, '=');
-               if (strp) {
-                       ast_expr(strp+1, expr_output, sizeof(expr_output));
-               }
-               if ( strpbrk(item->u2.for_test,"~!-+<>=*/&^") && !strstr(item->u2.for_test,"${") ) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: expression %s has operators, but no variables. Interesting...\n",
-                                       item->filename, item->startline, item->endline, item->u2.for_test);
-                       warns++;
-               }
-               if ( strpbrk(item->u3.for_inc,"~!-+<>=*/&^") && !strstr(item->u3.for_inc,"${") ) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: expression %s has operators, but no variables. Interesting...\n",
-                                       item->filename, item->startline, item->endline, item->u3.for_inc);
-                       warns++;
-               }
-               check_expr2_input(item,item->u2.for_test);
-               check_expr2_input(item,item->u3.for_inc);
-               
-               ast_expr_clear_extra_error_info();
-               check_pval(item->u4.for_statements, apps);
-               break;
-                       
-       case PV_WHILE:
-               /* fields: item->u1.str        == the while conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the while ()
-               */
-               snprintf(errmsg,sizeof(errmsg),"file %s, line %d, columns %d-%d, while expr '%s':", config, item->startline, item->startcol, item->endcol, item->u1.str);
-               ast_expr_register_extra_error_info(errmsg);
-               ast_expr(item->u1.str, expr_output, sizeof(expr_output));
-               ast_expr_clear_extra_error_info();
-               if ( strpbrk(item->u1.str,"~!-+<>=*/&^") && !strstr(item->u1.str,"${") ) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: expression %s has operators, but no variables. Interesting...\n",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       warns++;
-               }
-               check_expr2_input(item,item->u1.str);
-               check_pval(item->u2.statements, apps);
-               break;
-                       
-       case PV_BREAK:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_RETURN:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_CONTINUE:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_RANDOM:
-               /* fields: item->u1.str        == the random number expression, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               snprintf(errmsg,sizeof(errmsg),"file %s, line %d, columns %d-%d, random expr '%s':", config, item->startline, item->startcol, item->endcol, item->u1.str);
-               ast_expr_register_extra_error_info(errmsg);
-               ast_expr(item->u1.str, expr_output, sizeof(expr_output));
-               ast_expr_clear_extra_error_info();
-               if ( strpbrk(item->u1.str,"~!-+<>=*/&^") && !strstr(item->u1.str,"${") ) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: random expression '%s' has operators, but no variables. Interesting...\n",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       warns++;
-               }
-               check_expr2_input(item,item->u1.str);
-               check_pval(item->u2.statements, apps);
-               if (item->u3.else_statements) {
-                       check_pval(item->u3.else_statements, apps);
-               }
-               break;
-
-       case PV_IFTIME:
-               /* fields: item->u1.list        == the if time values, 4 of them, each in PV_WORD, linked list 
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               if ( item->u2.arglist ) {
-                       check_timerange(item->u1.list);
-                       check_dow(item->u1.list->next);
-                       check_day(item->u1.list->next->next);
-                       check_month(item->u1.list->next->next->next);
-               }
-
-               check_pval(item->u2.statements, apps);
-               if (item->u3.else_statements) {
-                       check_pval(item->u3.else_statements, apps);
-               }
-               break;
-                       
-       case PV_IF:
-               /* fields: item->u1.str        == the if conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               snprintf(errmsg,sizeof(errmsg),"file %s, line %d, columns %d-%d, if expr '%s':", config, item->startline, item->startcol, item->endcol, item->u1.str);
-               ast_expr_register_extra_error_info(errmsg);
-               ast_expr(item->u1.str, expr_output, sizeof(expr_output));
-               ast_expr_clear_extra_error_info();
-               if ( strpbrk(item->u1.str,"~!-+<>=*/&^") && !strstr(item->u1.str,"${") ) {
-                       ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: expression '%s' has operators, but no variables. Interesting...\n",
-                                       item->filename, item->startline, item->endline, item->u1.str);
-                       warns++;
-               }
-               check_expr2_input(item,item->u1.str);
-               check_pval(item->u2.statements, apps);
-               if (item->u3.else_statements) {
-                       check_pval(item->u3.else_statements, apps);
-               }
-               break;
-                       
-       case PV_SWITCH:
-               /* fields: item->u1.str        == the switch expression
-
-                                  item->u2.statements == a pval list of statements in the switch, 
-                                                                                       (will be case statements, most likely!)
-               */
-               /* we can check the switch expression, see if it matches any of the app variables...
-           if it does, then, are all the possible cases accounted for? */
-               check_switch_expr(item, apps);
-               check_pval(item->u2.statements, apps);
-               break;
-                       
-       case PV_EXTENSION:
-               /* fields: item->u1.str        == the extension name, label, whatever it's called
-
-                                  item->u2.statements == a pval list of statements in the extension
-                                  item->u3.hints      == a char * hint argument
-                                  item->u4.regexten   == an int boolean. non-zero says that regexten was specified
-               */
-               current_extension = item ;
-               
-               check_pval(item->u2.statements, apps);
-               break;
-                       
-       case PV_IGNOREPAT:
-               /* fields: item->u1.str        == the ignorepat data
-               */
-               break;
-                       
-       case PV_GLOBALS:
-               /* fields: item->u1.statements     == pval list of statements, usually vardecs
-               */
-               in_abstract_context = 0;
-               check_pval(item->u1.statements, apps);
-               break;
-       default:
-               break;
-       }
-}
-
-void check_pval(pval *item, struct argapp *apps)
-{
-       pval *i;
-
-       /* checks to do:
-          1. Do goto's point to actual labels? 
-          2. Do macro calls reference a macro?
-          3. Does the number of macro args match the definition?
-          4. Is a macro call missing its & at the front?
-          5. Application calls-- we could check syntax for existing applications,
-             but I need some some sort of universal description bnf for a general
-                 sort of method for checking arguments, in number, maybe even type, at least. 
-                 Don't want to hand code checks for hundreds of applications.
-       */
-       
-       for (i=item; i; i=i->next) {
-               check_pval_item(i,apps);
-       }
-}
-
-void ael2_semantic_check(pval *item, int *arg_errs, int *arg_warns, int *arg_notes)
-{
-       
-#ifdef AAL_ARGCHECK
-       int argapp_errs =0;
-       char *rfilename;
-#endif
-       struct argapp *apps=0;
-
-#ifdef AAL_ARGCHECK
-       rfilename = alloca(10 + strlen(ast_config_AST_VAR_DIR));
-       sprintf(rfilename, "%s/applist", ast_config_AST_VAR_DIR);
-       
-       apps = argdesc_parse(rfilename, &argapp_errs); /* giveth */
-#endif
-       current_db = item;
-       errs = warns = notes = 0;
-
-       check_context_names();
-       check_pval(item, apps);
-
-#ifdef AAL_ARGCHECK
-       argdesc_destroy(apps);  /* taketh away */
-#endif
-       current_db = 0;
-
-       *arg_errs = errs;
-       *arg_warns = warns;
-       *arg_notes = notes;
-}
-
-/* =============================================================================================== */
-/* "CODE" GENERATOR -- Convert the AEL representation to asterisk extension language */
-/* =============================================================================================== */
-
-static int control_statement_count = 0;
-
-struct ael_priority *new_prio(void)
-{
-       struct ael_priority *x = (struct ael_priority *)calloc(sizeof(struct ael_priority),1);
-       return x;
-}
-
-struct ael_extension *new_exten(void)
-{
-       struct ael_extension *x = (struct ael_extension *)calloc(sizeof(struct ael_extension),1);
-       return x;
-}
-
-void linkprio(struct ael_extension *exten, struct ael_priority *prio)
-{
-       if (!exten->plist) {
-               exten->plist = prio;
-               exten->plist_last = prio;
-       } else {
-               exten->plist_last->next = prio;
-               exten->plist_last = prio;
-       }
-}
-
-void destroy_extensions(struct ael_extension *exten)
-{
-       struct ael_extension *ne, *nen;
-       for (ne=exten; ne; ne=nen) {
-               struct ael_priority *pe, *pen;
-               
-               if (ne->name)
-                       free(ne->name);
-               
-               if (ne->hints)
-                       free(ne->hints);
-               
-               for (pe=ne->plist; pe; pe=pen) {
-                       pen = pe->next;
-                       if (pe->app)
-                               free(pe->app);
-                       pe->app = 0;
-                       if (pe->appargs)
-                               free(pe->appargs);
-                       pe->appargs = 0;
-                       pe->origin = 0;
-                       pe->goto_true = 0;
-                       pe->goto_false = 0;
-                       free(pe);
-               }
-               nen = ne->next_exten;
-               ne->next_exten = 0;
-               ne->plist =0;
-               ne->plist_last = 0;
-               ne->next_exten = 0;
-               ne->loop_break = 0;
-               ne->loop_continue = 0;
-               free(ne);
-       }
-}
-
-void linkexten(struct ael_extension *exten, struct ael_extension *add)
-{
-       add->next_exten = exten->next_exten; /* this will reverse the order. Big deal. */
-       exten->next_exten = add;
-}
-
-void gen_prios(struct ael_extension *exten, char *label, pval *statement, struct ael_extension *mother_exten )
-{
-       pval *p,*p2,*p3;
-       struct ael_priority *pr;
-       struct ael_priority *for_init, *for_test, *for_inc, *for_loop, *for_end;
-       struct ael_priority *while_test, *while_loop, *while_end;
-       struct ael_priority *switch_test, *switch_end, *fall_thru;
-       struct ael_priority *if_test, *if_end, *if_skip, *if_false;
-#ifdef OLD_RAND_ACTION
-       struct ael_priority *rand_test, *rand_end, *rand_skip;
-#endif
-       char buf1[2000];
-       char buf2[2000];
-       char *strp, *strp2;
-       char new_label[2000];
-       int default_exists;
-       struct ael_priority *loop_break_save;
-       struct ael_priority *loop_continue_save;
-       struct ael_extension *switch_case;
-       
-       for (p=statement; p; p=p->next) {
-               switch (p->type) {
-               case PV_VARDEC:
-                       pr = new_prio();
-                       pr->type = AEL_APPCALL;
-                       snprintf(buf1,sizeof(buf1),"%s=$[%s]", p->u1.str, p->u2.val);
-                       pr->app = strdup("Set");
-                       pr->appargs = strdup(buf1);
-                       pr->origin = p;
-                       linkprio(exten, pr);
-                       break;
-
-               case PV_GOTO:
-                       pr = new_prio();
-                       pr->type = AEL_APPCALL;
-                       if (!p->u1.list->next) /* just one */ {
-                               pr->app = strdup("Goto");
-                               if (!mother_exten)
-                                       pr->appargs = strdup(p->u1.list->u1.str);
-                               else {  /* for the case of simple within-extension gotos in case/pattern/default statement blocks: */ 
-                                       snprintf(buf1,sizeof(buf1),"%s|%s", mother_exten->name, p->u1.list->u1.str);
-                                       pr->appargs = strdup(buf1);
-                               }
-                               
-                       } else if (p->u1.list->next && !p->u1.list->next->next) /* two */ {
-                               snprintf(buf1,sizeof(buf1),"%s|%s", p->u1.list->u1.str, p->u1.list->next->u1.str);
-                               pr->app = strdup("Goto");
-                               pr->appargs = strdup(buf1);
-                       } else if (p->u1.list->next && p->u1.list->next->next) {
-                               snprintf(buf1,sizeof(buf1),"%s|%s|%s", p->u1.list->u1.str, 
-                                               p->u1.list->next->u1.str,
-                                               p->u1.list->next->next->u1.str);
-                               pr->app = strdup("Goto");
-                               pr->appargs = strdup(buf1);
-                       }
-                       pr->origin = p;
-                       linkprio(exten, pr);
-                       break;
-
-               case PV_LABEL:
-                       pr = new_prio();
-                       pr->type = AEL_LABEL;
-                       pr->origin = p;
-                       linkprio(exten, pr);
-                       break;
-
-               case PV_FOR:
-                       control_statement_count++;
-                       loop_break_save = exten->loop_break; /* save them, then restore before leaving */
-                       loop_continue_save = exten->loop_continue;
-                       snprintf(new_label,sizeof(new_label),"for-%s-%d", label, control_statement_count);
-                       for_init = new_prio();
-                       for_inc = new_prio();
-                       for_test = new_prio();
-                       for_loop = new_prio();
-                       for_end = new_prio();
-                       for_init->type = AEL_APPCALL;
-                       for_inc->type = AEL_APPCALL;
-                       for_test->type = AEL_FOR_CONTROL;
-                       for_test->goto_false = for_end;
-                       for_loop->type = AEL_CONTROL1; /* simple goto */
-                       for_end->type = AEL_APPCALL;
-                       for_init->app = strdup("Set");
-                       
-                       strcpy(buf2,p->u1.for_init);
-                       strp = strchr(buf2, '=');
-                       strp2 = strchr(p->u1.for_init, '=');
-                       if (strp) {
-                               *(strp+1) = 0;
-                               strcat(buf2,"$[");
-                               strncat(buf2,strp2+1, sizeof(buf2)-strlen(strp2+1)-2);
-                               strcat(buf2,"]");
-                               for_init->appargs = strdup(buf2);
-                       } else
-                               for_init->appargs = strdup(p->u1.for_init);
-
-                       for_inc->app = strdup("Set");
-
-                       strcpy(buf2,p->u3.for_inc);
-                       strp = strchr(buf2, '=');
-                       strp2 = strchr(p->u3.for_inc, '=');
-                       if (strp) {
-                               *(strp+1) = 0;
-                               strcat(buf2,"$[");
-                               strncat(buf2,strp2+1, sizeof(buf2)-strlen(strp2+1)-2);
-                               strcat(buf2,"]");
-                               for_inc->appargs = strdup(buf2);
-                       } else
-                               for_inc->appargs = strdup(p->u3.for_inc);
-                       snprintf(buf1,sizeof(buf1),"$[%s]",p->u2.for_test);
-                       for_test->app = 0;
-                       for_test->appargs = strdup(buf1);
-                       for_loop->goto_true = for_test;
-                       snprintf(buf1,sizeof(buf1),"Finish for-%s-%d", label, control_statement_count);
-                       for_end->app = strdup("NoOp");
-                       for_end->appargs = strdup(buf1);
-                       /* link & load! */
-                       linkprio(exten, for_init);
-                       linkprio(exten, for_test);
-                       
-                       /* now, put the body of the for loop here */
-                       exten->loop_break = for_end;
-                       exten->loop_continue = for_test;
-                       
-                       gen_prios(exten, new_label, p->u4.for_statements, mother_exten); /* this will link in all the statements here */
-                       
-                       linkprio(exten, for_inc);
-                       linkprio(exten, for_loop);
-                       linkprio(exten, for_end);
-                       
-                       
-                       exten->loop_break = loop_break_save;
-                       exten->loop_continue = loop_continue_save;
-                       for_loop->origin = p;
-                       break;
-
-               case PV_WHILE:
-                       control_statement_count++;
-                       loop_break_save = exten->loop_break; /* save them, then restore before leaving */
-                       loop_continue_save = exten->loop_continue;
-                       snprintf(new_label,sizeof(new_label),"while-%s-%d", label, control_statement_count);
-                       while_test = new_prio();
-                       while_loop = new_prio();
-                       while_end = new_prio();
-                       while_test->type = AEL_FOR_CONTROL;
-                       while_test->goto_false = while_end;
-                       while_loop->type = AEL_CONTROL1; /* simple goto */
-                       while_end->type = AEL_APPCALL;
-                       snprintf(buf1,sizeof(buf1),"$[%s]",p->u1.str);
-                       while_test->app = 0;
-                       while_test->appargs = strdup(buf1);
-                       while_loop->goto_true = while_test;
-                       snprintf(buf1,sizeof(buf1),"Finish while-%s-%d", label, control_statement_count);
-                       while_end->app = strdup("NoOp");
-                       while_end->appargs = strdup(buf1);
-
-                       linkprio(exten, while_test);
-                       
-                       /* now, put the body of the for loop here */
-                       exten->loop_break = while_end;
-                       exten->loop_continue = while_test;
-                       
-                       gen_prios(exten, new_label, p->u2.statements, mother_exten); /* this will link in all the while body statements here */
-
-                       linkprio(exten, while_loop);
-                       linkprio(exten, while_end);
-                       
-                       
-                       exten->loop_break = loop_break_save;
-                       exten->loop_continue = loop_continue_save;
-                       while_loop->origin = p;
-                       break;
-
-               case PV_SWITCH:
-                       control_statement_count++;
-                       loop_break_save = exten->loop_break; /* save them, then restore before leaving */
-                       loop_continue_save = exten->loop_continue;
-                       snprintf(new_label,sizeof(new_label),"sw-%s-%d", label, control_statement_count);
-
-                       switch_test = new_prio();
-                       switch_end = new_prio();
-                       switch_test->type = AEL_APPCALL;
-                       switch_end->type = AEL_APPCALL;
-                       snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",control_statement_count, p->u1.str);
-                       switch_test->app = strdup("Goto");
-                       switch_test->appargs = strdup(buf1);
-                       snprintf(buf1,sizeof(buf1),"Finish switch-%s-%d", label, control_statement_count);
-                       switch_end->app = strdup("NoOp");
-                       switch_end->appargs = strdup(buf1);
-                       switch_end->origin = p;
-                       switch_end->exten = exten;
-
-                       linkprio(exten, switch_test);
-                       linkprio(exten, switch_end);
-                       
-                       exten->loop_break = switch_end;
-                       exten->loop_continue = 0;
-                       default_exists = 0;
-                       
-                       for (p2=p->u2.statements; p2; p2=p2->next) {
-                               /* now, for each case/default put the body of the for loop here */
-                               if (p2->type == PV_CASE) {
-                                       /* ok, generate a extension and link it in */
-                                       switch_case = new_exten();
-                                       /* the break/continue locations are inherited from parent */
-                                       switch_case->loop_break = exten->loop_break;
-                                       switch_case->loop_continue = exten->loop_continue;
-                                       
-                                       linkexten(exten,switch_case);
-                                       snprintf(buf1,sizeof(buf1),"sw-%d-%s", control_statement_count, p2->u1.str);
-                                       switch_case->name = strdup(buf1);
-                                       snprintf(new_label,sizeof(new_label),"sw-%s-%s-%d", label, p2->u1.str, control_statement_count);
-                                       
-                                       gen_prios(switch_case, new_label, p2->u2.statements, exten); /* this will link in all the case body statements here */
-
-                                       /* here is where we write code to "fall thru" to the next case... if there is one... */
-                                       for (p3=p2->u2.statements; p3; p3=p3->next) {
-                                               if (!p3->next)
-                                                       break;
-                                       }
-                                       /* p3 now points the last statement... */
-                                       if (!p3 || ( p3->type != PV_GOTO && p3->type != PV_BREAK && p3->type != PV_RETURN) ) {
-                                               /* is there a following CASE/PATTERN/DEFAULT? */
-                                               if (p2->next && p2->next->type == PV_CASE) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",control_statement_count, p2->next->u1.str);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (p2->next && p2->next->type == PV_PATTERN) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"_sw-%d-%s|1",control_statement_count, p2->next->u1.str);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (p2->next && p2->next->type == PV_DEFAULT) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"_sw-%d-.|1",control_statement_count);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (!p2->next) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_CONTROL1;
-                                                       fall_thru->goto_true = switch_end;
-                                                       fall_thru->app = strdup("Goto");
-                                                       linkprio(switch_case, fall_thru);
-                                               }
-                                       }
-                                       if (switch_case->return_needed) {
-                                               char buf[2000];
-                                               struct ael_priority *np2 = new_prio();
-                                               np2->type = AEL_APPCALL;
-                                               np2->app = strdup("NoOp");
-                                               snprintf(buf,sizeof(buf),"End of Extension %s", switch_case->name);
-                                               np2->appargs = strdup(buf);
-                                               linkprio(switch_case, np2);
-                                               switch_case-> return_target = np2;
-                                       }
-                               } else if (p2->type == PV_PATTERN) {
-                                       /* ok, generate a extension and link it in */
-                                       switch_case = new_exten();
-                                       /* the break/continue locations are inherited from parent */
-                                       switch_case->loop_break = exten->loop_break;
-                                       switch_case->loop_continue = exten->loop_continue;
-                                       
-                                       linkexten(exten,switch_case);
-                                       snprintf(buf1,sizeof(buf1),"_sw-%d-%s", control_statement_count, p2->u1.str);
-                                       switch_case->name = strdup(buf1);
-                                       snprintf(new_label,sizeof(new_label),"sw-%s-%s-%d", label, p2->u1.str, control_statement_count);
-                                       
-                                       gen_prios(switch_case, new_label, p2->u2.statements, exten); /* this will link in all the while body statements here */
-                                       /* here is where we write code to "fall thru" to the next case... if there is one... */
-                                       for (p3=p2->u2.statements; p3; p3=p3->next) {
-                                               if (!p3->next)
-                                                       break;
-                                       }
-                                       /* p3 now points the last statement... */
-                                       if (!p3 || ( p3->type != PV_GOTO && p3->type != PV_BREAK && p3->type != PV_RETURN)) {
-                                               /* is there a following CASE/PATTERN/DEFAULT? */
-                                               if (p2->next && p2->next->type == PV_CASE) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",control_statement_count, p2->next->u1.str);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (p2->next && p2->next->type == PV_PATTERN) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"_sw-%d-%s|1",control_statement_count, p2->next->u1.str);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (p2->next && p2->next->type == PV_DEFAULT) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"_sw-%d-.|1",control_statement_count);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (!p2->next) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_CONTROL1;
-                                                       fall_thru->goto_true = switch_end;
-                                                       fall_thru->app = strdup("Goto");
-                                                       linkprio(switch_case, fall_thru);
-                                               }
-                                       }
-                                       if (switch_case->return_needed) {
-                                               char buf[2000];
-                                               struct ael_priority *np2 = new_prio();
-                                               np2->type = AEL_APPCALL;
-                                               np2->app = strdup("NoOp");
-                                               snprintf(buf,sizeof(buf),"End of Extension %s", switch_case->name);
-                                               np2->appargs = strdup(buf);
-                                               linkprio(switch_case, np2);
-                                               switch_case-> return_target = np2;
-                                       }
-                               } else if (p2->type == PV_DEFAULT) {
-                                       default_exists++;
-                                       /* ok, generate a extension and link it in */
-                                       switch_case = new_exten();
-                                       /* the break/continue locations are inherited from parent */
-                                       switch_case->loop_break = exten->loop_break;
-                                       switch_case->loop_continue = exten->loop_continue;
-                                       linkexten(exten,switch_case);
-                                       snprintf(buf1,sizeof(buf1),"_sw-%d-.", control_statement_count);
-                                       switch_case->name = strdup(buf1);
-                                       
-                                       snprintf(new_label,sizeof(new_label),"sw-%s-default-%d", label, control_statement_count);
-                                       
-                                       gen_prios(switch_case, new_label, p2->u2.statements, exten); /* this will link in all the while body statements here */
-                                       
-                                       /* here is where we write code to "fall thru" to the next case... if there is one... */
-                                       for (p3=p2->u2.statements; p3; p3=p3->next) {
-                                               if (!p3->next)
-                                                       break;
-                                       }
-                                       /* p3 now points the last statement... */
-                                       if (!p3 || (p3->type != PV_GOTO && p3->type != PV_BREAK && p3->type != PV_RETURN)) {
-                                               /* is there a following CASE/PATTERN/DEFAULT? */
-                                               if (p2->next && p2->next->type == PV_CASE) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"sw-%d-%s|1",control_statement_count, p2->next->u1.str);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (p2->next && p2->next->type == PV_PATTERN) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"_sw-%d-%s|1",control_statement_count, p2->next->u1.str);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (p2->next && p2->next->type == PV_DEFAULT) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_APPCALL;
-                                                       fall_thru->app = strdup("Goto");
-                                                       snprintf(buf1,sizeof(buf1),"_sw-%d-.|1",control_statement_count);
-                                                       fall_thru->appargs = strdup(buf1);
-                                                       linkprio(switch_case, fall_thru);
-                                               } else if (!p2->next) {
-                                                       fall_thru = new_prio();
-                                                       fall_thru->type = AEL_CONTROL1;
-                                                       fall_thru->goto_true = switch_end;
-                                                       fall_thru->app = strdup("Goto");
-                                                       linkprio(switch_case, fall_thru);
-                                               }
-                                       }
-                                       if (switch_case->return_needed) {
-                                               char buf[2000];
-                                               struct ael_priority *np2 = new_prio();
-                                               np2->type = AEL_APPCALL;
-                                               np2->app = strdup("NoOp");
-                                               snprintf(buf,sizeof(buf),"End of Extension %s", switch_case->name);
-                                               np2->appargs = strdup(buf);
-                                               linkprio(switch_case, np2);
-                                               switch_case-> return_target = np2;
-                                       }
-                               } else {
-                                       /* what could it be??? */
-                               }
-                       }
-                       
-                       exten->loop_break = loop_break_save;
-                       exten->loop_continue = loop_continue_save;
-                       switch_test->origin = p;
-                       switch_end->origin = p;
-                       break;
-
-               case PV_MACRO_CALL:
-                       pr = new_prio();
-                       pr->type = AEL_APPCALL;
-                       snprintf(buf1,sizeof(buf1),"%s", p->u1.str);
-                       for (p2 = p->u2.arglist; p2; p2 = p2->next) {
-                               strcat(buf1,"|");
-                               strcat(buf1,p2->u1.str);
-                       }
-                       pr->app = strdup("Macro");
-                       pr->appargs = strdup(buf1);
-                       pr->origin = p;
-                       linkprio(exten, pr);
-                       break;
-
-               case PV_APPLICATION_CALL:
-                       pr = new_prio();
-                       pr->type = AEL_APPCALL;
-                       buf1[0] = 0;
-                       for (p2 = p->u2.arglist; p2; p2 = p2->next) {
-                               if (p2 != p->u2.arglist )
-                                       strcat(buf1,"|");
-                               strcat(buf1,p2->u1.str);
-                       }
-                       pr->app = strdup(p->u1.str);
-                       pr->appargs = strdup(buf1);
-                       pr->origin = p;
-                       linkprio(exten, pr);
-                       break;
-
-               case PV_BREAK:
-                       pr = new_prio();
-                       pr->type = AEL_CONTROL1; /* simple goto */
-                       pr->goto_true = exten->loop_break;
-                       pr->origin = p;
-                       linkprio(exten, pr);
-                       break;
-
-               case PV_RETURN: /* hmmmm */
-                       pr = new_prio();
-                       pr->type = AEL_RETURN; /* simple goto */
-                       exten->return_needed++;
-                       pr->app = strdup("Goto");
-                       pr->appargs = strdup("");
-                       pr->origin = p;
-                       linkprio(exten, pr);
-                       break;
-
-               case PV_CONTINUE:
-                       pr = new_prio();
-                       pr->type = AEL_CONTROL1; /* simple goto */
-                       pr->goto_true = exten->loop_continue;
-                       pr->origin = p;
-                       linkprio(exten, pr);
-                       break;
-
-#ifdef OLD_RAND_ACTION
-               case PV_RANDOM:
-                       control_statement_count++;
-                       snprintf(new_label,sizeof(new_label),"rand-%s-%d", label, control_statement_count);
-                       rand_test = new_prio();
-                       rand_test->type = AEL_RAND_CONTROL;
-                       snprintf(buf1,sizeof(buf1),"$[%s]",
-                                        p->u1.str );
-                       rand_test->app = 0;
-                       rand_test->appargs = strdup(buf1);
-                       rand_test->origin = p;
-                       
-                       rand_end = new_prio();
-                       rand_end->type = AEL_APPCALL;
-                       snprintf(buf1,sizeof(buf1),"Finish rand-%s-%d", label, control_statement_count);
-                       rand_end->app = strdup("NoOp");
-                       rand_end->appargs = strdup(buf1);
-                       
-                       rand_skip = new_prio();
-                       rand_skip->type = AEL_CONTROL1; /* simple goto */
-                       rand_skip->goto_true = rand_end;
-                       rand_skip->origin  = p;
-
-                       rand_test->goto_true = rand_skip; /* +1, really */
-
-                       linkprio(exten, rand_test);
-                       
-                       if (p->u3.else_statements) {
-                               gen_prios(exten, new_label, p->u3.else_statements, mother_exten); /* this will link in all the else statements here */
-                       }
-                       
-                       linkprio(exten, rand_skip);
-                       
-                       gen_prios(exten, new_label, p->u2.statements, mother_exten); /* this will link in all the "true" statements here */
-
-                       linkprio(exten, rand_end);
-                       
-                       break;
-#endif                 
-
-               case PV_IFTIME:
-                       control_statement_count++;
-                       snprintf(new_label,sizeof(new_label),"iftime-%s-%d", label, control_statement_count);
-                       
-                       if_test = new_prio();
-                       if_test->type = AEL_IFTIME_CONTROL;
-                       snprintf(buf1,sizeof(buf1),"%s|%s|%s|%s",
-                                        p->u1.list->u1.str, 
-                                        p->u1.list->next->u1.str, 
-                                        p->u1.list->next->next->u1.str, 
-                                        p->u1.list->next->next->next->u1.str);
-                       if_test->app = 0;
-                       if_test->appargs = strdup(buf1);
-                       if_test->origin = p;
-
-                       if_end = new_prio();
-                       if_end->type = AEL_APPCALL;
-                       snprintf(buf1,sizeof(buf1),"Finish iftime-%s-%d", label, control_statement_count);
-                       if_end->app = strdup("NoOp");
-                       if_end->appargs = strdup(buf1);
-
-                       if (p->u3.else_statements) {
-                               if_skip = new_prio();
-                               if_skip->type = AEL_CONTROL1; /* simple goto */
-                               if_skip->goto_true = if_end;
-                               if_skip->origin  = p;
-
-                       } else {
-                               if_skip = 0;
-
-                               if_test->goto_false = if_end;
-                       }
-
-                       if_false = new_prio();
-                       if_false->type = AEL_CONTROL1;
-                       if (p->u3.else_statements) {
-                               if_false->goto_true = if_skip; /* +1 */
-                       } else {
-                               if_false->goto_true = if_end;
-                       }
-                       
-                       /* link & load! */
-                       linkprio(exten, if_test);
-                       linkprio(exten, if_false);
-                       
-                       /* now, put the body of the if here */
-                       
-                       gen_prios(exten, new_label, p->u2.statements, mother_exten); /* this will link in all the statements here */
-                       
-                       if (p->u3.else_statements) {
-                               linkprio(exten, if_skip);
-                               gen_prios(exten, new_label, p->u3.else_statements, mother_exten); /* this will link in all the statements here */
-
-                       }
-                       
-                       linkprio(exten, if_end);
-                       
-                       break;
-
-               case PV_RANDOM:
-               case PV_IF:
-                       control_statement_count++;
-                       snprintf(new_label,sizeof(new_label),"if-%s-%d", label, control_statement_count);
-                       
-                       if_test = new_prio();
-                       if_end = new_prio();
-                       if_test->type = AEL_IF_CONTROL;
-                       if_end->type = AEL_APPCALL;
-                       if ( p->type == PV_RANDOM )
-                               snprintf(buf1,sizeof(buf1),"$[${RAND(0,99)} < (%s)]",p->u1.str);
-                       else
-                               snprintf(buf1,sizeof(buf1),"$[%s]",p->u1.str);
-                       if_test->app = 0;
-                       if_test->appargs = strdup(buf1);
-                       snprintf(buf1,sizeof(buf1),"Finish if-%s-%d", label, control_statement_count);
-                       if_end->app = strdup("NoOp");
-                       if_end->appargs = strdup(buf1);
-                       if_test->origin = p;
-                       
-                       if (p->u3.else_statements) {
-                               if_skip = new_prio();
-                               if_skip->type = AEL_CONTROL1; /* simple goto */
-                               if_skip->goto_true = if_end;
-                               if_test->goto_false = if_skip;;
-                       } else {
-                               if_skip = 0;
-                               if_test->goto_false = if_end;;
-                       }
-                       
-                       /* link & load! */
-                       linkprio(exten, if_test);
-                       
-                       /* now, put the body of the if here */
-                       
-                       gen_prios(exten, new_label, p->u2.statements, mother_exten); /* this will link in all the statements here */
-                       
-                       if (p->u3.else_statements) {
-                               linkprio(exten, if_skip);
-                               gen_prios(exten, new_label, p->u3.else_statements, mother_exten); /* this will link in all the statements here */
-
-                       }
-                       
-                       linkprio(exten, if_end);
-                       
-                       break;
-
-               case PV_STATEMENTBLOCK:
-                       gen_prios(exten, label, p->u1.list, mother_exten ); /* recurse into the block */
-                       break;
-
-               case PV_CATCH:
-                       control_statement_count++;
-                       /* generate an extension with name of catch, put all catch stats
-                          into this exten! */
-                       switch_case = new_exten();
-                       linkexten(exten,switch_case);
-                       switch_case->name = strdup(p->u1.str);
-                       snprintf(new_label,sizeof(new_label),"catch-%s-%d",p->u1.str, control_statement_count);
-                       
-                       gen_prios(switch_case, new_label, p->u2.statements,mother_exten); /* this will link in all the catch body statements here */
-                       if (switch_case->return_needed) {
-                               char buf[2000];
-                               struct ael_priority *np2 = new_prio();
-                               np2->type = AEL_APPCALL;
-                               np2->app = strdup("NoOp");
-                               snprintf(buf,sizeof(buf),"End of Extension %s", switch_case->name);
-                               np2->appargs = strdup(buf);
-                               linkprio(switch_case, np2);
-                               switch_case-> return_target = np2;
-                       }
-
-                       break;
-               default:
-                       break;
-               }
-       }
-}
-
-void set_priorities(struct ael_extension *exten)
-{
-       int i;
-       struct ael_priority *pr;
-       do {
-               if (exten->regexten)
-                       i=2;
-               else
-                       i=1;
-               
-               for (pr=exten->plist; pr; pr=pr->next) {
-                       pr->priority_num = i;
-                       
-                       if (!pr->origin || (pr->origin && pr->origin->type != PV_LABEL) ) /* Labels don't show up in the dialplan,
-                                                                                                 but we want them to point to the right
-                                                                                                 priority, which would be the next line
-                                                                                                 after the label; */
-                               i++;
-               }
-               
-               exten = exten->next_exten;
-       } while ( exten );
-}
-
-void add_extensions(struct ael_extension *exten, struct ast_context *context)
-{
-       struct ael_priority *pr;
-       char *label=0;
-       do {
-               struct ael_priority *last = 0;
-               
-               if (exten->hints) {
-                       if (ast_add_extension2(context, 0 /*no replace*/, exten->name, PRIORITY_HINT, NULL, NULL, 
-                                                                 exten->hints, NULL, FREE, registrar)) {
-                               ast_log(LOG_WARNING, "Unable to add step at priority 'hint' of extension '%s'\n",
-                                               exten->name);
-                       }
-                       
-               }
-               
-               for (pr=exten->plist; pr; pr=pr->next) {
-                       char app[2000];
-                       char appargs[2000];
-
-                       /* before we can add the extension, we need to prep the app/appargs;
-                          the CONTROL types need to be done after the priority numbers are calculated.
-                       */
-                       if (pr->type == AEL_LABEL) /* don't try to put labels in the dialplan! */ {
-                               last = pr;
-                               continue;
-                       }
-                       
-                       if (pr->app)
-                               strcpy(app, pr->app);
-                       else
-                               app[0] = 0;
-                       if (pr->appargs )
-                               strcpy(appargs, pr->appargs);
-                       else
-                               appargs[0] = 0;
-                       switch( pr->type ) {
-                       case AEL_APPCALL:
-                               /* easy case. Everything is all set up */
-                               break;
-                               
-                       case AEL_CONTROL1: /* FOR loop, WHILE loop, BREAK, CONTINUE, IF, IFTIME */
-                               /* simple, unconditional goto. */
-                               strcpy(app,"Goto");
-                               if (pr->goto_true->origin && pr->goto_true->origin->type == PV_SWITCH ) {
-                                       snprintf(appargs,sizeof(appargs),"%s|%d", pr->goto_true->exten->name, pr->goto_true->priority_num);
-                               } else if (pr->goto_true->origin && pr->goto_true->origin->type == PV_IFTIME && pr->goto_true->origin->u3.else_statements ) {
-                                       snprintf(appargs,sizeof(appargs),"%d", pr->goto_true->priority_num+1);
-                               } else
-                                       snprintf(appargs,sizeof(appargs),"%d", pr->goto_true->priority_num);
-                               break;
-                               
-                       case AEL_FOR_CONTROL:  /* WHILE loop test, FOR loop test */
-                               strcpy(app,"GotoIf");
-                               snprintf(appargs,sizeof(appargs),"%s?%d:%d", pr->appargs, pr->priority_num+1, pr->goto_false->priority_num);
-                               break;
-                               
-                       case AEL_IF_CONTROL:
-                               strcpy(app,"GotoIf");
-                               if (pr->origin->u3.else_statements )
-                                       snprintf(appargs,sizeof(appargs),"%s?%d:%d", pr->appargs, pr->priority_num+1, pr->goto_false->priority_num+1);
-                               else
-                                       snprintf(appargs,sizeof(appargs),"%s?%d:%d", pr->appargs, pr->priority_num+1, pr->goto_false->priority_num);
-                               break;
-
-                       case AEL_RAND_CONTROL:
-                               strcpy(app,"Random");
-                               snprintf(appargs,sizeof(appargs),"%s:%d", pr->appargs, pr->goto_true->priority_num+1);
-                               break;
-
-                       case AEL_IFTIME_CONTROL:
-                               strcpy(app,"GotoIfTime");
-                               snprintf(appargs,sizeof(appargs),"%s?%d", pr->appargs, pr->priority_num+2);
-                               break;
-
-                       case AEL_RETURN:
-                               strcpy(app,"Goto");
-                               snprintf(appargs,sizeof(appargs), "%d", exten->return_target->priority_num);
-                               break;
-                               
-                       default:
-                               break;
-                       }
-                       if (last && last->type == AEL_LABEL ) {
-                               label = last->origin->u1.str;
-                       }
-                       else
-                               label = 0;
-                       
-                       
-                       if (ast_add_extension2(context, 0 /*no replace*/, exten->name, pr->priority_num, (label?label:NULL), NULL, 
-                                                                 app, strdup(appargs), FREE, registrar)) {
-                               ast_log(LOG_WARNING, "Unable to add step at priority '%d' of extension '%s'\n", pr->priority_num, 
-                                               exten->name);
-                       }
-                       last = pr;
-               }
-               exten = exten->next_exten;
-       } while ( exten );
-}
-
-
-void ast_compile_ael2(struct ast_context **local_contexts, struct pval *root)
-{
-       pval *p,*p2;
-       struct ast_context *context;
-       char buf[2000];
-       struct ael_extension *exten;
-       
-       for (p=root; p; p=p->next ) {
-               pval *lp;
-               int argc;
-               
-               switch (p->type) {
-               case PV_MACRO:
-                       strcpy(buf,"macro-");
-                       strcat(buf,p->u1.str);
-                       context = ast_context_create(local_contexts, buf, registrar);
-                       
-                       exten = new_exten();
-                       exten->name = strdup("s");
-                       argc = 1;
-                       for (lp=p->u2.arglist; lp; lp=lp->next) {
-                               /* for each arg, set up a "Set" command */
-                               struct ael_priority *np2 = new_prio();
-                               np2->type = AEL_APPCALL;
-                               np2->app = strdup("Set");
-                               snprintf(buf,sizeof(buf),"%s=${ARG%d}", lp->u1.str, argc++);
-                               np2->appargs = strdup(buf);
-                               linkprio(exten, np2);
-                       }
-                       
-                       /* CONTAINS APPCALLS, CATCH, just like extensions... */
-                       gen_prios(exten, p->u1.str, p->u3.macro_statements, 0 );
-                       if (exten->return_needed) {
-                               struct ael_priority *np2 = new_prio();
-                               np2->type = AEL_APPCALL;
-                               np2->app = strdup("NoOp");
-                               snprintf(buf,sizeof(buf),"End of Macro %s-%s",p->u1.str, exten->name);
-                               np2->appargs = strdup(buf);
-                               linkprio(exten, np2);
-                               exten-> return_target = np2;
-                       }
-                       
-                       set_priorities(exten);
-                       add_extensions(exten, context);
-                       destroy_extensions(exten);
-                       break;
-                       
-               case PV_GLOBALS:
-                       /* just VARDEC elements */
-                       for (p2=p->u1.list; p2; p2=p2->next) {
-                               char buf2[2000];
-                               snprintf(buf2,sizeof(buf2),"%s=%s", p2->u1.str, p2->u2.val);
-                               pbx_builtin_setvar(NULL, buf2);
-                       }
-                       break;
-                       
-               case PV_CONTEXT:
-                       context = ast_context_create(local_contexts, p->u1.str, registrar);
-
-                       /* contexts contain: ignorepat, includes, switches, eswitches, extensions,  */
-                       for (p2=p->u2.statements; p2; p2=p2->next) {
-                               pval *p3;
-                               
-                               switch (p2->type) {
-                               case PV_EXTENSION:
-                                       exten = new_exten();
-                                       exten->name = strdup(p2->u1.str);
-                                       if ( p2->u3.hints )
-                                               exten->hints = strdup(p2->u3.hints);
-                                       exten->regexten = p2->u4.regexten;
-                                       gen_prios(exten, p->u1.str, p2->u2.statements, 0 );
-                                       if (exten->return_needed) {
-                                               struct ael_priority *np2 = new_prio();
-                                               np2->type = AEL_APPCALL;
-                                               np2->app = strdup("NoOp");
-                                               snprintf(buf,sizeof(buf),"End of Extension %s", exten->name);
-                                               np2->appargs = strdup(buf);
-                                               linkprio(exten, np2);
-                                               exten-> return_target = np2;
-                                       }
-                                       /* is the last priority in the extension a label? Then add a trailing no-op */
-                                       if ( exten->plist_last->type == AEL_LABEL ) {
-                                               struct ael_priority *np2 = new_prio();
-                                               np2->type = AEL_APPCALL;
-                                               np2->app = strdup("NoOp");
-                                               snprintf(buf,sizeof(buf),"A NoOp to follow a trailing label %s", exten->plist_last->origin->u1.str);
-                                               np2->appargs = strdup(buf);
-                                               linkprio(exten, np2);
-                                       }
 
-                                       set_priorities(exten);
-                                       add_extensions(exten, context);
-                                       destroy_extensions(exten);
-                                       break;
-                                       
-                               case PV_IGNOREPAT:
-                                       ast_context_add_ignorepat2(context, p2->u1.str, registrar);
-                                       break;
-                                       
-                               case PV_INCLUDES:
-                                       for (p3 = p2->u1.list; p3 ;p3=p3->next) {
-                                               if ( p3->u2.arglist ) {
-                                                       snprintf(buf,sizeof(buf), "%s|%s|%s|%s|%s", 
-                                                                        p3->u1.str,
-                                                                        p3->u2.arglist->u1.str,
-                                                                        p3->u2.arglist->next->u1.str,
-                                                                        p3->u2.arglist->next->next->u1.str,
-                                                                        p3->u2.arglist->next->next->next->u1.str);
-                                                       ast_context_add_include2(context, buf, registrar);
-                                               } else
-                                                       ast_context_add_include2(context, p3->u1.str, registrar);
-                                       }
-                                       break;
-                                       
-                               case PV_SWITCHES:
-                                       for (p3 = p2->u1.list; p3 ;p3=p3->next) {
-                                               char *c = strchr(p3->u1.str, '/');
-                                               if (c) {
-                                                       *c = '\0';
-                                                       c++;
-                                               } else
-                                                       c = "";
+/* static void substitute_commas(char *str); */
 
-                                               ast_context_add_switch2(context, p3->u1.str, c, 0, registrar);
-                                       }
-                                       break;
-
-                               case PV_ESWITCHES:
-                                       for (p3 = p2->u1.list; p3 ;p3=p3->next) {
-                                               char *c = strchr(p3->u1.str, '/');
-                                               if (c) {
-                                                       *c = '\0';
-                                                       c++;
-                                               } else
-                                                       c = "";
-
-                                               ast_context_add_switch2(context, p3->u1.str, c, 1, registrar);
-                                       }
-                                       break;
-                               default:
-                                       break;
-                               }
-                       }
-                       
-                       break;
-                       
-               default:
-                       /* huh? what? */
-                       break;
-                       
-               }
-       }
-}
+static int aeldebug = 0;
 
 /* interface stuff */
 
+/* if all the below are static, who cares if they are present? */
+
 static int pbx_load_module(void)
 {
-       int errs, sem_err, sem_warn, sem_note;
+       int errs=0, sem_err=0, sem_warn=0, sem_note=0;
        char *rfilename;
        struct ast_context *local_contexts=NULL, *con;
+       struct ast_hashtab *local_table=NULL;
+       
        struct pval *parse_tree;
 
        ast_log(LOG_NOTICE, "Starting AEL load process.\n");
@@ -3434,386 +119,164 @@ static int pbx_load_module(void)
                rfilename = alloca(strlen(config) + strlen(ast_config_AST_CONFIG_DIR) + 2);
                sprintf(rfilename, "%s/%s", ast_config_AST_CONFIG_DIR, config);
        }
-       ast_log(LOG_NOTICE, "AEL load process: calculated config file name '%s'.\n", rfilename);
+       if (access(rfilename,R_OK) != 0) {
+               ast_log(LOG_NOTICE, "File %s not found; AEL declining load\n", rfilename);
+               return AST_MODULE_LOAD_DECLINE;
+       }
        
        parse_tree = ael2_parse(rfilename, &errs);
        ast_log(LOG_NOTICE, "AEL load process: parsed config file name '%s'.\n", rfilename);
        ael2_semantic_check(parse_tree, &sem_err, &sem_warn, &sem_note);
        if (errs == 0 && sem_err == 0) {
                ast_log(LOG_NOTICE, "AEL load process: checked config file name '%s'.\n", rfilename);
-               ast_compile_ael2(&local_contexts, parse_tree);
+               local_table = ast_hashtab_create(11, ast_hashtab_compare_contexts, ast_hashtab_resize_java, ast_hashtab_newsize_java, ast_hashtab_hash_contexts, 0);
+               ast_compile_ael2(&local_contexts, local_table, parse_tree);
                ast_log(LOG_NOTICE, "AEL load process: compiled config file name '%s'.\n", rfilename);
                
-               ast_merge_contexts_and_delete(&local_contexts, registrar);
+               ast_merge_contexts_and_delete(&local_contexts, local_table, registrar);
+               local_table = NULL; /* it's the dialplan global now */
+               local_contexts = NULL;
                ast_log(LOG_NOTICE, "AEL load process: merged config file name '%s'.\n", rfilename);
                for (con = ast_walk_contexts(NULL); con; con = ast_walk_contexts(con))
                        ast_context_verify_includes(con);
                ast_log(LOG_NOTICE, "AEL load process: verified config file name '%s'.\n", rfilename);
        } else {
                ast_log(LOG_ERROR, "Sorry, but %d syntax errors and %d semantic errors were detected. It doesn't make sense to compile.\n", errs, sem_err);
+               destroy_pval(parse_tree); /* free up the memory */
+               return AST_MODULE_LOAD_DECLINE;
        }
        destroy_pval(parse_tree); /* free up the memory */
        
-       return 0;
+       return AST_MODULE_LOAD_SUCCESS;
 }
 
 /* CLI interface */
-static int ael2_debug_read(int fd, int argc, char *argv[])
-{
-       aeldebug |= DEBUG_READ;
-       return 0;
-}
-
-static int ael2_debug_tokens(int fd, int argc, char *argv[])
-{
-       aeldebug |= DEBUG_TOKENS;
-       return 0;
-}
+static char *handle_cli_ael_debug_multiple_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "ael debug [read|tokens|macros|contexts|off]";
+               e->usage =
+                       "Usage: ael debug [read|tokens|macros|contexts|off]\n"
+                       "       Enable AEL read, token, macro, or context debugging,\n"
+                       "       or disable all AEL debugging messages.  Note: this\n"
+                       "       currently does nothing.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return NULL;
+       }
+
+       if (a->argc != 3)
+               return CLI_SHOWUSAGE;
+
+       if (!strcasecmp(a->argv[2], "read"))
+               aeldebug |= DEBUG_READ;
+       else if (!strcasecmp(a->argv[2], "tokens"))
+               aeldebug |= DEBUG_TOKENS;
+       else if (!strcasecmp(a->argv[2], "macros"))
+               aeldebug |= DEBUG_MACROS;
+       else if (!strcasecmp(a->argv[2], "contexts"))
+               aeldebug |= DEBUG_CONTEXTS;
+       else if (!strcasecmp(a->argv[2], "off"))
+               aeldebug = 0;
+       else
+               return CLI_SHOWUSAGE;
+
+       return CLI_SUCCESS;
+}
+
+static char *handle_cli_ael_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "ael set debug {read|tokens|macros|contexts|off}";
+               e->usage =
+                       "Usage: ael debug {read|tokens|macros|contexts|off}\n"
+                       "       Enable AEL read, token, macro, or context debugging,\n"
+                       "       or disable all AEL debugging messages.  Note: this\n"
+                       "       currently does nothing.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return NULL;
+       }
+
+       if (a->argc != e->args)
+               return CLI_SHOWUSAGE;
+
+       if (!strcasecmp(a->argv[3], "read"))
+               aeldebug |= DEBUG_READ;
+       else if (!strcasecmp(a->argv[3], "tokens"))
+               aeldebug |= DEBUG_TOKENS;
+       else if (!strcasecmp(a->argv[3], "macros"))
+               aeldebug |= DEBUG_MACROS;
+       else if (!strcasecmp(a->argv[3], "contexts"))
+               aeldebug |= DEBUG_CONTEXTS;
+       else if (!strcasecmp(a->argv[3], "off"))
+               aeldebug = 0;
+       else
+               return CLI_SHOWUSAGE;
 
-static int ael2_debug_macros(int fd, int argc, char *argv[])
-{
-       aeldebug |= DEBUG_MACROS;
-       return 0;
+       return CLI_SUCCESS;
 }
 
-static int ael2_debug_contexts(int fd, int argc, char *argv[])
+static char *handle_cli_ael_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-       aeldebug |= DEBUG_CONTEXTS;
-       return 0;
-}
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "ael reload";
+               e->usage =
+                       "Usage: ael reload\n"
+                       "       Reloads AEL configuration.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return NULL;
+       }
 
-static int ael2_no_debug(int fd, int argc, char *argv[])
-{
-       aeldebug = 0;
-       return 0;
-}
+       if (a->argc != 2)
+               return CLI_SHOWUSAGE;
 
-static int ael2_reload(int fd, int argc, char *argv[])
-{
-       ast_context_destroy(NULL, registrar);
-       return (pbx_load_module());
+       return (pbx_load_module() ? CLI_FAILURE : CLI_SUCCESS);
 }
 
-static struct ast_cli_entry  ael2_cli[] = {
-       { { "ael2", "reload", NULL }, ael2_reload, "Reload AEL configuration"},
-       { { "ael2", "debug", "read", NULL }, ael2_debug_read, "Enable AEL read debug (does nothing)"},
-       { { "ael2", "debug", "tokens", NULL }, ael2_debug_tokens, "Enable AEL tokens debug (does nothing)"},
-       { { "ael2", "debug", "macros", NULL }, ael2_debug_macros, "Enable AEL macros debug (does nothing)"},
-       { { "ael2", "debug", "contexts", NULL }, ael2_debug_contexts, "Enable AEL contexts debug (does nothing)"},
-       { { "ael2", "no", "debug", NULL }, ael2_no_debug, "Disable AEL debug messages"},
+static struct ast_cli_entry cli_ael_debug_multiple_deprecated = AST_CLI_DEFINE(handle_cli_ael_debug_multiple_deprecated, "Enable AEL debugging flags");
+static struct ast_cli_entry cli_ael[] = {
+       AST_CLI_DEFINE(handle_cli_ael_reload,    "Reload AEL configuration"),
+       AST_CLI_DEFINE(handle_cli_ael_set_debug, "Enable AEL debugging flags", .deprecate_cmd = &cli_ael_debug_multiple_deprecated)
 };
 
-/*
- * Standard module functions ...
- */
-static int unload_module(void *mod)
+static int unload_module(void)
 {
        ast_context_destroy(NULL, registrar);
-       ast_cli_unregister_multiple(ael2_cli, sizeof(ael2_cli)/ sizeof(ael2_cli[0]));
+       ast_cli_unregister_multiple(cli_ael, sizeof(cli_ael) / sizeof(struct ast_cli_entry));
        return 0;
 }
 
-
-static int load_module(void *mod)
+static int load_module(void)
 {
-       ast_cli_register_multiple(ael2_cli, sizeof(ael2_cli)/ sizeof(ael2_cli[0]));
+       ast_cli_register_multiple(cli_ael, sizeof(cli_ael) / sizeof(struct ast_cli_entry));
        return (pbx_load_module());
 }
 
-static int reload(void *mod)
+static int reload(void)
 {
-       ast_context_destroy(NULL, registrar);
        return pbx_load_module();
 }
 
-static const char *description(void)
-{
-       return dtext;
-}
-
-static const char *key(void)
+#ifdef STANDALONE_AEL
+#define AST_MODULE "ael"
+int ael_external_load_module(void);
+int ael_external_load_module(void)
 {
-       return ASTERISK_GPL_KEY;
-}
-
-STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
-
-/* DESTROY the PVAL tree ============================================================================ */
-
-
-
-void destroy_pval_item(pval *item)
-{
-       if (item->filename)
-               free(item->filename);
-       
-       switch (item->type) {
-       case PV_WORD:
-               /* fields: item->u1.str == string associated with this (word). */
-               if (item->u1.str )
-                       free(item->u1.str);
-               if ( item->u2.arglist )
-                       destroy_pval(item->u2.arglist);
-               break;
-               
-       case PV_MACRO:
-               /* fields: item->u1.str     == name of macro
-                          item->u2.arglist == pval list of PV_WORD arguments of macro, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-
-                                  item->u3.macro_statements == pval list of statements in macro body.
-               */
-               destroy_pval(item->u2.arglist);
-               if (item->u1.str )
-                       free(item->u1.str);
-               destroy_pval(item->u3.macro_statements);
-               break;
-                       
-       case PV_CONTEXT:
-               /* fields: item->u1.str     == name of context
-                          item->u2.statements == pval list of statements in context body
-                                  item->u3.abstract == int 1 if an abstract keyword were present
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.statements);
-               break;
-                       
-       case PV_MACRO_CALL:
-               /* fields: item->u1.str     == name of macro to call
-                          item->u2.arglist == pval list of PV_WORD arguments of macro call, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.arglist);
-               break;
-                       
-       case PV_APPLICATION_CALL:
-               /* fields: item->u1.str     == name of application to call
-                          item->u2.arglist == pval list of PV_WORD arguments of macro call, as given by user
-                                  item->u2.arglist->u1.str  == argument
-                                  item->u2.arglist->next   == next arg
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.arglist);
-               break;
-                       
-       case PV_CASE:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.statements);
-               break;
-                       
-       case PV_PATTERN:
-               /* fields: item->u1.str     == value of case
-                          item->u2.statements == pval list of statements under the case
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.statements);
-               break;
-                       
-       case PV_DEFAULT:
-               /* fields: 
-                          item->u2.statements == pval list of statements under the case
-               */
-               destroy_pval(item->u2.statements);
-               break;
-                       
-       case PV_CATCH:
-               /* fields: item->u1.str     == name of extension to catch
-                          item->u2.statements == pval list of statements in context body
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.statements);
-               break;
-                       
-       case PV_SWITCHES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-               */
-               destroy_pval(item->u1.list);
-               break;
-                       
-       case PV_ESWITCHES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-               */
-               destroy_pval(item->u1.list);
-               break;
-                       
-       case PV_INCLUDES:
-               /* fields: item->u1.list     == pval list of PV_WORD elements, one per entry in the list
-                          item->u2.arglist  == pval list of 4 PV_WORD elements for time values
-               */
-               destroy_pval(item->u1.list);
-               break;
-                       
-       case PV_STATEMENTBLOCK:
-               /* fields: item->u1.list     == pval list of statements in block, one per entry in the list
-               */
-               destroy_pval(item->u1.list);
-               break;
-                       
-       case PV_VARDEC:
-               /* fields: item->u1.str     == variable name
-                          item->u2.val     == variable value to assign
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               if (item->u2.val)
-                       free(item->u2.val);
-               break;
-                       
-       case PV_GOTO:
-               /* fields: item->u1.list     == pval list of PV_WORD target names, up to 3, in order as given by user.
-                          item->u1.list->u1.str  == where the data on a PV_WORD will always be.
-               */
-               
-               destroy_pval(item->u1.list);
-               break;
-                       
-       case PV_LABEL:
-               /* fields: item->u1.str     == label name
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               break;
-                       
-       case PV_FOR:
-               /* fields: item->u1.for_init     == a string containing the initalizer
-                          item->u2.for_test     == a string containing the loop test
-                          item->u3.for_inc      == a string containing the loop increment
-
-                                  item->u4.for_statements == a pval list of statements in the for ()
-               */
-               if (item->u1.for_init)
-                       free(item->u1.for_init);
-               if (item->u2.for_test)
-                       free(item->u2.for_test);
-               if (item->u3.for_inc)
-                       free(item->u3.for_inc);
-               destroy_pval(item->u4.for_statements);
-               break;
-                       
-       case PV_WHILE:
-               /* fields: item->u1.str        == the while conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the while ()
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.statements);
-               break;
-                       
-       case PV_BREAK:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_RETURN:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_CONTINUE:
-               /* fields: none
-               */
-               break;
-                       
-       case PV_IFTIME:
-               /* fields: item->u1.list        == the 4 time values, in PV_WORD structs, linked list
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               destroy_pval(item->u1.list);
-               destroy_pval(item->u2.statements);
-               if (item->u3.else_statements) {
-                       destroy_pval(item->u3.else_statements);
-               }
-               break;
-                       
-       case PV_RANDOM:
-               /* fields: item->u1.str        == the random percentage, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the true part ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               fall thru to If */
-       case PV_IF:
-               /* fields: item->u1.str        == the if conditional, as supplied by user
-
-                                  item->u2.statements == a pval list of statements in the if ()
-                                  item->u3.else_statements == a pval list of statements in the else
-                                                                                          (could be zero)
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.statements);
-               if (item->u3.else_statements) {
-                       destroy_pval(item->u3.else_statements);
-               }
-               break;
-                       
-       case PV_SWITCH:
-               /* fields: item->u1.str        == the switch expression
-
-                                  item->u2.statements == a pval list of statements in the switch, 
-                                                                                       (will be case statements, most likely!)
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               destroy_pval(item->u2.statements);
-               break;
-                       
-       case PV_EXTENSION:
-               /* fields: item->u1.str        == the extension name, label, whatever it's called
-
-                                  item->u2.statements == a pval list of statements in the extension
-                                  item->u3.hints      == a char * hint argument
-                                  item->u4.regexten   == an int boolean. non-zero says that regexten was specified
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               if (item->u3.hints)
-                       free(item->u3.hints);
-               destroy_pval(item->u2.statements);
-               break;
-                       
-       case PV_IGNOREPAT:
-               /* fields: item->u1.str        == the ignorepat data
-               */
-               if (item->u1.str)
-                       free(item->u1.str);
-               break;
-                       
-       case PV_GLOBALS:
-               /* fields: item->u1.statements     == pval list of statements, usually vardecs
-               */
-               destroy_pval(item->u1.statements);
-               break;
-       }
-       free(item);
+        pbx_load_module();
+        return 1;
 }
+#endif
 
-void destroy_pval(pval *item) 
-{
-       pval *i,*nxt;
-       
-       for (i=item; i; i=nxt) {
-               nxt = i->next;
-               
-               destroy_pval_item(i);
-       }
-}
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Extension Language Compiler",
+               .load = load_module,
+               .unload = unload_module,
+               .reload = reload,
+              );
 
 #ifdef AAL_ARGCHECK
 static char *ael_funclist[] =