This commit closes bug 7605, and half-closes 7638. The AEL code has been redistributed/repartitioned to allow code re-use both inside and outside of Asterisk. This commit introduces the utils/conf2ael program, and an external config-file reader, for both normal config files, and for extensions.conf (context, exten, prio); It provides an API for programs outside of asterisk to use to play with the dialplan and config files.

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79595 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 9 insertions, 2719 deletions

diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index e9dde83ad..39fe8ff20 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -22,6 +22,10 @@
  * 
  */
 
+/*** MODULEINFO
+	<depend>res_ael_share</depend>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -44,12 +48,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/callerid.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 */
 
 #define DEBUG_READ   (1 << 0)
@@ -60,9 +63,8 @@ static char expr_output[2096];
 static char *config = "extensions.ael";
 static char *registrar = "pbx_ael";
 static int pbx_load_module(void);
-
-static int errs, warns;
-static int notes;
+static int warns, errs;
+static struct pval *current_db;
 
 #ifndef AAL_ARGCHECK
 /* for the time being, short circuit all the AAL related structures
@@ -70,12 +72,6 @@ static int notes;
    development, this code can be properly re-instated 
 */
 
-/*! \brief null definitions for structs passed down the infrastructure */
-struct argapp
-{
-	struct argapp *next;
-};
-
 #endif
 
 #ifdef AAL_ARGCHECK
@@ -90,7 +86,6 @@ 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 ast_channel *chan);
 struct pval *find_macro(char *name);
 struct pval *find_context(char *name);
 struct pval *find_context(char *name);
@@ -99,8 +94,6 @@ 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);
-static void linkexten(struct ael_extension *exten, struct ael_extension *add);
-static void gen_prios(struct ael_extension *exten, char *label, pval *statement, struct ael_extension *mother_exten, struct ast_context *context );
 void set_priorities(struct ael_extension *exten);
 void add_extensions(struct ael_extension *exten);
 void ast_compile_ael2(struct ast_context **local_contexts, struct pval *root);
@@ -109,32 +102,16 @@ 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 *match_context;
 static const char *match_exten;
 static const 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, const char *exten, const 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);
-static int check_break(pval *item);
-static int check_continue(pval *item);
-static void check_label(pval *item);
-static void check_macro_returns(pval *macro);
 
 static struct pval *find_label_in_current_context(char *exten, char *label, pval *curr_cont);
 static struct pval *find_first_label_in_current_context(char *label, pval *curr_cont);
@@ -144,8 +121,6 @@ static struct pval *find_label_in_current_extension(const char *label, pval *cur
 static struct pval *find_label_in_current_db(const char *context, const char *exten, const char *label);
 static pval *get_goto_target(pval *item);
 static int label_inside_case(pval *label);
-static void attach_exten(struct ael_extension **list, struct ael_extension *newmem);
-static void fix_gotos_in_extensions(struct ael_extension *exten);
 static pval *get_extension_or_contxt(pval *p);
 static pval *get_contxt(pval *p);
 static void remove_spaces_before_equals(char *str);
@@ -456,692 +431,12 @@ static void ael2_print(char *fname, pval *tree)
 #endif
 
 
-/* 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:
-	case PV_LOCALVARDEC:
-		/* 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 void check_macro_returns(pval *macro)
-{
-	pval *i;
-	if (!macro->u3.macro_statements)
-	{
-		pval *z = calloc(1, sizeof(struct pval));
-		ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The macro %s is empty! I will insert a return.\n",
-				macro->filename, macro->startline, macro->endline, macro->u1.str);
-
-		z->type = PV_RETURN;
-		z->startline = macro->startline;
-		z->endline = macro->endline;
-		z->startcol = macro->startcol;
-		z->endcol = macro->endcol;
-		z->filename = strdup(macro->filename);
-
-		macro->u3.macro_statements = z;
-		return;
-	}
-	for (i=macro->u3.macro_statements; i; i=i->next) {
-		/* if the last statement in the list is not return, then insert a return there */
-		if (i->next == NULL) {
-			if (i->type != PV_RETURN) {
-				pval *z = calloc(1, sizeof(struct pval));
-				ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The macro %s does not end with a return; I will insert one.\n",
-						macro->filename, macro->startline, macro->endline, macro->u1.str);
-
-				z->type = PV_RETURN;
-				z->startline = macro->startline;
-				z->endline = macro->endline;
-				z->startcol = macro->startcol;
-				z->endcol = macro->endcol;
-				z->filename = strdup(macro->filename);
-
-				i->next = z;
-				return;
-			}
-		}
-	}
-	return;
-}
-
-
-
-static int extension_matches(pval *here, const char *exten, const 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];
-		const char *p;
-		char *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_includes(pval *includes)
-{
-	struct pval *p4;
-	for (p4=includes->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 && strcmp(incl_context, "parkedcalls") != 0) {
-			ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The included context '%s' cannot be found.\n",
-					includes->filename, includes->startline, includes->endline, incl_context);
-			warns++;
-		}
-	}
-}
-
-
-static void check_timerange(pval *p)
-{
-	char *times;
-	char *e;
-	int s1, s2;
-	int e1, e2;
-
-	times = ast_strdupa(p->u1.str);
-
-	/* 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;
-	char *c;
-	/* The following line is coincidence, really! */
-	int s, e;
-	
-	dow = ast_strdupa(DOW->u1.str);
-
-	/* 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;
-	char *c;
-	/* The following line is coincidence, really! */
-	int s, e;
-
-	day = ast_strdupa(DAY->u1.str);
-
-	/* 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;
-	char *c;
-	/* The following line is coincidence, really! */
-	int s, e;
-
-	mon = ast_strdupa(MON->u1.str);
-
-	/* 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;
-}
-
-static int check_break(pval *item)
-{
-	pval *p = item;
-	
-	while( p && p->type != PV_MACRO && p->type != PV_CONTEXT ) /* early cutout, sort of */ {
-		/* a break is allowed in WHILE, FOR, CASE, DEFAULT, PATTERN; otherwise, it don't make
-		   no sense */
-		if( p->type == PV_CASE || p->type == PV_DEFAULT || p->type == PV_PATTERN 
-			|| p->type == PV_WHILE || p->type == PV_FOR   ) {
-			return 1;
-		}
-		p = p->dad;
-	}
-	ast_log(LOG_ERROR,"Error: file %s, line %d-%d: 'break' not in switch, for, or while statement!\n",
-			item->filename, item->startline, item->endline);
-	errs++;
-	
-	return 0;
-}
-
-static int check_continue(pval *item)
-{
-	pval *p = item;
-	
-	while( p && p->type != PV_MACRO && p->type != PV_CONTEXT ) /* early cutout, sort of */ {
-		/* a break is allowed in WHILE, FOR, CASE, DEFAULT, PATTERN; otherwise, it don't make
-		   no sense */
-		if( p->type == PV_WHILE || p->type == PV_FOR   ) {
-			return 1;
-		}
-		p = p->dad;
-	}
-	ast_log(LOG_ERROR,"Error: file %s, line %d-%d: 'continue' not in 'for' or 'while' statement!\n",
-			item->filename, item->startline, item->endline);
-	errs++;
-	
-	return 0;
-}
-
 static struct pval *in_macro(pval *item)
 {
 	struct pval *curr;
@@ -1169,55 +464,6 @@ static struct pval *in_context(pval *item)
 }
 
 
-/* general purpose goto finder */
-
-static void check_label(pval *item)
-{
-	struct pval *curr;
-	struct pval *x;
-	int alright = 0;
-	
-	/* A label outside an extension just plain does not make sense! */
-	
-	curr = item;
-	
-	while( curr ) {
-		if( curr->type == PV_MACRO || curr->type == PV_EXTENSION   ) {
-			alright = 1;
-			break;
-		}
-		curr = curr->dad;
-	}
-	if( !alright )
-	{
-		ast_log(LOG_ERROR,"Error: file %s, line %d-%d: Label %s is not within an extension or macro!\n",
-				item->filename, item->startline, item->endline, item->u1.str);
-		errs++;	
-	}
-	
-	
-	/* basically, ensure that a label is not repeated in a context. Period.
-	   The method:  well, for each label, find the first label in the context
-	   with the same name. If it's not the current label, then throw an error. */
-
-	
-	/* printf("==== check_label:   ====\n"); */
-	if( !current_extension )
-		curr = current_context;
-	else
-		curr = current_extension;
-	
-	x = find_first_label_in_current_context((char *)item->u1.str, curr);
-	/* printf("Hey, check_label found with item = %x, and x is %x, and currcont is %x, label name is %s\n", item,x, current_context, (char *)item->u1.str); */
-	if( x && x != item )
-	{
-		ast_log(LOG_ERROR,"Error: file %s, line %d-%d: Duplicate label %s! Previously defined at file %s, line %d.\n",
-				item->filename, item->startline, item->endline, item->u1.str, x->filename, x->startline);
-		errs++;
-	}
-	/* printf("<<<<< check_label:   ====\n"); */
-}
-
 static pval *get_goto_target(pval *item)
 {
 	/* just one item-- the label should be in the current extension */
@@ -1586,302 +832,6 @@ static void find_pval_gotos(pval *item,int 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.
-		*/
-		/* printf("    matching in MACRO %s, match_context=%s; retoncontmtch=%d; \n", item->u1.str, match_context, return_on_context_match); */
-		if (!strcmp(match_context,"*") || !strcmp(item->u1.str, match_context)) {
-			
-			/* printf("MACRO: match context is: %s\n", match_context); */
-			
-			if (return_on_context_match && !strcmp(item->u1.str, match_context)) /* if we're just searching for a context, don't bother descending into them */ {
-				/* printf("Returning on matching macro %s\n", match_context); */
-				return item;
-			}
-			
-			
-			if (!return_on_context_match) {
-				/* printf("Descending into matching macro %s/%s\n", match_context, item->u1.str); */
-				if ((x=match_pval(item->u3.macro_statements)))  {
-					/* printf("Responded with pval match %x\n", x); */
-					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
-		*/
-		/* printf("    matching in CONTEXT\n"); */
-		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); */
-				/* printf("non-CONTEXT: Responded with pval match %x\n", x); */
-				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 */ {
-					/* printf("CONTEXT: Responded with pval match %x\n", x); */
-					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
-		*/
-		/* printf("    matching in CASE\n"); */
-		if ((x=match_pval(item->u2.statements))) {
-			/* printf("CASE: Responded with pval match %x\n", x); */
-			return x;
-		}
-		break;
-			
-	case PV_PATTERN:
-		/* fields: item->u1.str     == value of case
-		           item->u2.statements == pval list of statements under the case
-		*/
-		/* printf("    matching in PATTERN\n"); */
-		if ((x=match_pval(item->u2.statements))) {
-			/* printf("PATTERN: Responded with pval match %x\n", x); */
-			return x;
-		}
-		break;
-			
-	case PV_DEFAULT:
-		/* fields: 
-		           item->u2.statements == pval list of statements under the case
-		*/
-		/* printf("    matching in DEFAULT\n"); */
-		if ((x=match_pval(item->u2.statements))) {
-			/* printf("DEFAULT: Responded with pval match %x\n", x); */
-			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
-		*/
-		/* printf("    matching in CATCH\n"); */
-		if (!strcmp(match_exten,"*") || extension_matches(item, match_exten, item->u1.str) ) {
-			/* printf("Descending into matching catch %s => %s\n", match_exten, item->u1.str); */
-			if (strcmp(match_label,"1") == 0) {
-				if (item->u2.statements) {
-					struct pval *p5 = item->u2.statements;
-					while (p5 && p5->type == PV_LABEL)  /* find the first non-label statement in this context. If it exists, there's a "1" */
-						p5 = p5->next;
-					if (p5)
-						return p5;
-					else
-						return 0;
-				}
-				else
-					return 0;
-			}
-
-			if ((x=match_pval(item->u2.statements))) {
-				/* printf("CATCH: Responded with pval match %x\n", (unsigned int)x); */
-				return x;
-			}
-		} else {
-			/* printf("Skipping catch %s\n", item->u1.str); */
-		}
-		break;
-			
-	case PV_STATEMENTBLOCK:
-		/* fields: item->u1.list     == pval list of statements in block, one per entry in the list
-		*/
-		/* printf("    matching in STATEMENTBLOCK\n"); */
-		if ((x=match_pval(item->u1.list))) {
-			/* printf("STATEMENTBLOCK: Responded with pval match %x\n", x); */
-			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?current_extension->u1.str:"<macro>"));*/
-		
-		if (count_labels) {
-			if (!strcmp(match_label, item->u1.str)) {
-				label_count++;
-				last_matched_label = item;
-			}
-			
-		} else {
-			if (!strcmp(match_label, item->u1.str)) {
-				/* printf("LABEL: Responded with pval match %x\n", x); */
-				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 ()
-		*/
-		/* printf("    matching in FOR\n"); */
-		if ((x=match_pval(item->u4.for_statements))) {
-			/* printf("FOR: Responded with pval match %x\n", x);*/
-			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 ()
-		*/
-		/* printf("    matching in WHILE\n"); */
-		if ((x=match_pval(item->u2.statements))) {
-			/* printf("WHILE: Responded with pval match %x\n", x); */
-			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)
-		*/
-		/* printf("    matching in IF/IFTIME/RANDOM\n"); */
-		if ((x=match_pval(item->u2.statements))) {
-			return x;
-		}
-		if (item->u3.else_statements) {
-			if ((x=match_pval(item->u3.else_statements))) {
-				/* printf("IF/IFTIME/RANDOM: Responded with pval match %x\n", x); */
-				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!)
-		*/
-		/* printf("    matching in SWITCH\n"); */
-		if ((x=match_pval(item->u2.statements))) {
-			/* printf("SWITCH: Responded with pval match %x\n", x); */
-			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
-		*/
-		/* printf("    matching in EXTENSION\n"); */
-		if (!strcmp(match_exten,"*") || extension_matches(item, match_exten, item->u1.str) ) {
-			/* printf("Descending into matching exten %s => %s\n", match_exten, item->u1.str); */
-			if (strcmp(match_label,"1") == 0) {
-				if (item->u2.statements) {
-					struct pval *p5 = item->u2.statements;
-					while (p5 && p5->type == PV_LABEL)  /* find the first non-label statement in this context. If it exists, there's a "1" */
-						p5 = p5->next;
-					if (p5)
-						return p5;
-					else
-						return 0;
-				}
-				else
-					return 0;
-			}
-
-			if ((x=match_pval(item->u2.statements))) {
-				/* printf("EXTENSION: Responded with pval match %x\n", x); */
-				return x;
-			}
-		} else {
-			/* printf("Skipping exten %s\n", item->u1.str); */
-		}
-		break;
-	default:
-		/* printf("    matching in default = %d\n", item->type); */
-		break;
-	}
-	return 0;
-}
-
-struct pval *match_pval(pval *item)
-{
-	pval *i;
-
-	for (i=item; i; i=i->next) {
-		pval *x;
-		/* printf("   -- match pval: item %d\n", i->type); */
-		
-		if ((x = match_pval_item(i))) {
-			/* printf("match_pval: returning x=%x\n", (int)x); */
-			return x; /* cut the search short */
-		}
-	}
-	return 0;
-}
-
-#if 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;
-}
-#endif
-
 struct pval *find_first_label_in_current_context(char *label, pval *curr_cont)
 {
 	/* printf("  --- Got args %s, %s\n", exten, label); */
@@ -1993,914 +943,6 @@ static struct pval *find_label_in_current_db(const char *context, const char *ex
 }
 
 
-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,*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! */
-			
-		opcop = ast_strdupa(is->u1.str);
-
-		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;
-	
-	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:
-		opcop = ast_strdupa(is->u1.str);
-		
-		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, *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++;
-	
-	buff1 = ast_strdupa(p);
-
-	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++;
-		}
-	}
-#else
-	pval *t,*tl=0,*p2;
-	int def= 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;
-		}
-		tl = t;
-	}
-	if (def) /* nothing to check. All cases accounted for! */
-		return;
-	/* if no default, warn and insert a default case at the end */
-	p2 = tl->next = calloc(1, sizeof(struct pval));
-	
-	p2->type = PV_DEFAULT;
-	p2->startline = tl->startline;
-	p2->endline = tl->endline;
-	p2->startcol = tl->startcol;
-	p2->endcol = tl->endcol;
-	p2->filename = strdup(tl->filename);
-	ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: A default case was automatically added to the switch.\n",
-			p2->filename, p2->startline, p2->endline);
-	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_ERROR,"Error: 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);
-						errs++;
-					}
-				}
-			}
-		}
-	}
-}
-
-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, int in_globals)
-{
-	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;
-
-		check_macro_returns(item);
-		
-		for (lp=item->u2.arglist; lp; lp=lp->next) {
-		
-		}
-		check_pval(item->u3.macro_statements, apps,in_globals);
-		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,in_globals);
-		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) {
-			/* here is a good place to check to see if the definition is in extensions.conf! */
-			ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: macro call to non-existent %s ! Hopefully it is present in extensions.conf! \n",
-					item->filename, item->startline, item->endline, item->u1.str);
-			warns++;
-		} else if (macro_def->type != PV_MACRO) {
-			ast_log(LOG_ERROR,"Error: file %s, line %d-%d: macro call to %s references a context, not a macro!\n",
-					item->filename, item->startline, item->endline, item->u1.str);
-			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,"gosub") == 0
-			|| strcasecmp(item->u1.str,"return") == 0
-			|| strcasecmp(item->u1.str,"gosubif") == 0
-			|| strcasecmp(item->u1.str,"continuewhile") == 0
-			|| strcasecmp(item->u1.str,"endwhile") == 0
-			|| strcasecmp(item->u1.str,"execif") == 0
-			|| strcasecmp(item->u1.str,"execiftime") == 0
-			|| strcasecmp(item->u1.str,"exitwhile") == 0
-			|| strcasecmp(item->u1.str,"goto") == 0
-			|| strcasecmp(item->u1.str,"macro") == 0
-			|| strcasecmp(item->u1.str,"macroexclusive") == 0
-			|| strcasecmp(item->u1.str,"macroif") == 0
-			|| strcasecmp(item->u1.str,"stackpop") == 0
-			|| strcasecmp(item->u1.str,"execIf") == 0 ) {
-			ast_log(LOG_WARNING,"Warning: file %s, line %d-%d: application call to %s affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!\n",
-					item->filename, item->startline, item->endline, item->u1.str);
-			warns++;
-		}
-		if (strcasecmp(item->u1.str,"macroexit") == 0) {
-				ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: I am converting the MacroExit call here to a return statement.\n",
-						item->filename, item->startline, item->endline);
-				item->type = PV_RETURN;
-				free(item->u1.str);
-				item->u1.str = 0;
-		}
-		
-#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,in_globals);
-		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,in_globals);
-		break;
-			
-	case PV_DEFAULT:
-		/* fields: 
-		           item->u2.statements == pval list of statements under the case
-		*/
-
-		check_pval(item->u2.statements, apps,in_globals);
-		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,in_globals);
-		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,in_globals);
-		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,in_globals);
-		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,in_globals);
-		check_includes(item);
-		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,in_globals);
-		break;
-			
-	case PV_VARDEC:
-	case PV_LOCALVARDEC:
-		/* 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? */
-		if( !in_globals ) { /* don't check stuff inside the globals context; no wrapping in $[ ] there... */
-			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),NULL);
-			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++;
-		}
-
-		check_label(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 ()
-		*/
-		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),NULL);
-		}
-		ast_expr(item->u2.for_test, expr_output, sizeof(expr_output),NULL);
-		strp = strchr(item->u3.for_inc, '=');
-		if (strp) {
-			ast_expr(strp+1, expr_output, sizeof(expr_output),NULL);
-		}
-		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,in_globals);
-		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),NULL);
-		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,in_globals);
-		break;
-			
-	case PV_BREAK:
-		/* fields: none
-		*/
-		check_break(item);
-		break;
-			
-	case PV_RETURN:
-		/* fields: none
-		*/
-		break;
-			
-	case PV_CONTINUE:
-		/* fields: none
-		*/
-		check_continue(item);
-		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),NULL);
-		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,in_globals);
-		if (item->u3.else_statements) {
-			check_pval(item->u3.else_statements, apps,in_globals);
-		}
-		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,in_globals);
-		if (item->u3.else_statements) {
-			check_pval(item->u3.else_statements, apps,in_globals);
-		}
-		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),NULL);
-		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,in_globals);
-		if (item->u3.else_statements) {
-			check_pval(item->u3.else_statements, apps,in_globals);
-		}
-		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,in_globals);
-		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,in_globals);
-		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, 1);
-		break;
-	default:
-		break;
-	}
-}
-
-void check_pval(pval *item, struct argapp *apps, int in_globals)
-{
-	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,in_globals);
-	}
-}
-
-static 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, 0);
-
-#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 */
@@ -2908,71 +950,6 @@ static void ael2_semantic_check(pval *item, int *arg_errs, int *arg_warns, int *
 
 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;
-	}
-	if( !prio->exten )
-		prio->exten = exten; /* don't override the switch value */
-}
-
-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);
-		
-		/* cidmatch fields are allocated with name, and freed when
-		   the name field is freed. Don't do a free for this field,
-		   unless you LIKE to see a crash! */
-
-		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);
-	}
-}
-
 static int label_inside_case(pval *label)
 {
 	pval *p = label;
@@ -3667,155 +1644,6 @@ static void gen_prios(struct ael_extension *exten, char *label, pval *statement,
 	}
 }
 
-void set_priorities(struct ael_extension *exten)
-{
-	int i;
-	struct ael_priority *pr;
-	do {
-		if (exten->is_switch)
-			i = 10;
-		else 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 ael_priority *pr;
-	char *label=0;
-	char realext[AST_MAX_EXTENSION];
-	if (!exten) {
-		ast_log(LOG_WARNING, "This file is Empty!\n" );
-		return;
-	}
-	do {
-		struct ael_priority *last = 0;
-
-		memset(realext, '\0', sizeof(realext)); /* make sure this is properly initialized */
-		pbx_substitute_variables_helper(NULL, exten->name, realext, sizeof(realext) - 1);
-		if (exten->hints) {
-			if (ast_add_extension2(exten->context, 0 /*no replace*/, realext, PRIORITY_HINT, NULL, exten->cidmatch, 
-								  exten->hints, NULL, ast_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,"Return");
-				appargs[0] = 0;
-				break;
-				
-			default:
-				break;
-			}
-			if (last && last->type == AEL_LABEL ) {
-				label = last->origin->u1.str;
-			}
-			else
-				label = 0;
-			
-			if (ast_add_extension2(exten->context, 0 /*no replace*/, realext, pr->priority_num, (label?label:NULL), exten->cidmatch, 
-								  app, strdup(appargs), ast_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 );
-}
-
-static void attach_exten(struct ael_extension **list, struct ael_extension *newmem)
-{
-	/* travel to the end of the list... */
-	struct ael_extension *lptr;
-	if( !*list ) {
-		*list = newmem;
-		return;
-	}
-	lptr = *list;
-	
-	while( lptr->next_exten ) {
-		lptr = lptr->next_exten;
-	}
-	/* lptr should now pointing to the last element in the list; it has a null next_exten pointer */
-	lptr->next_exten = newmem;
-}
-
 static pval *get_extension_or_contxt(pval *p)
 {
 	while( p && p->type != PV_EXTENSION && p->type != PV_CONTEXT && p->type != PV_MACRO ) {
@@ -3836,260 +1664,6 @@ static pval *get_contxt(pval *p)
 	return p;
 }
 
-static void fix_gotos_in_extensions(struct ael_extension *exten)
-{
-	struct ael_extension *e;
-	for(e=exten;e;e=e->next_exten) {
-
-		struct ael_priority *p;
-		for(p=e->plist;p;p=p->next) {
-			
-			if( p->origin && p->origin->type == PV_GOTO && p->origin->u3.goto_target_in_case ) {
-				
-				/* fix the extension of the goto target to the actual extension in the post-compiled dialplan */
-
-				pval *target = p->origin->u2.goto_target;
-				struct ael_extension *z = target->u3.compiled_label;
-				pval *pv2 = p->origin;
-				char buf1[500];
-				char *apparg_save = p->appargs;
-				
-				p->appargs = 0;
-				if (!pv2->u1.list->next) /* just one  -- it won't hurt to repeat the extension */ {
-					snprintf(buf1,sizeof(buf1),"%s,%s", z->name, pv2->u1.list->u1.str);
-					p->appargs = strdup(buf1);
-					
-				} else if (pv2->u1.list->next && !pv2->u1.list->next->next) /* two */ {
-					snprintf(buf1,sizeof(buf1),"%s,%s", z->name, pv2->u1.list->next->u1.str);
-					p->appargs = strdup(buf1);
-				} else if (pv2->u1.list->next && pv2->u1.list->next->next) {
-					snprintf(buf1,sizeof(buf1),"%s,%s,%s", pv2->u1.list->u1.str, 
-							 z->name,
-							 pv2->u1.list->next->next->u1.str);
-					p->appargs = strdup(buf1);
-				}
-				else
-					printf("WHAT? The goto doesn't fall into one of three cases for GOTO????\n");
-				
-				if( apparg_save ) {
-					free(apparg_save);
-				}
-			}
-		}
-	}
-}
-
-
-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;
-	struct ael_extension *exten_list = 0;
-
-	for (p=root; p; p=p->next ) { /* do the globals first, so they'll be there
-									 when we try to eval them */
-		switch (p->type) {
-		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;
-		default:
-			break;
-		}
-	}
-	
-	for (p=root; p; p=p->next ) {
-		pval *lp;
-		int argc;
-		
-		switch (p->type) {
-		case PV_MACRO:
-			
-			context = ast_context_create(local_contexts, p->u1.str, registrar);
-			
-			exten = new_exten();
-			exten->context = context;
-			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),"LOCAL(%s)=${ARG%d}", lp->u1.str, argc++);
-				remove_spaces_before_equals(buf);
-				np2->appargs = strdup(buf);
-				linkprio(exten, np2);
-			}
-			/* add any includes */
-			for (p2=p->u3.macro_statements; p2; p2=p2->next) {
-				pval *p3;
-				
-				switch (p2->type) {
-				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;
-				default:
-					break;
-				}
-			}
-			/* CONTAINS APPCALLS, CATCH, just like extensions... */
-			gen_prios(exten, p->u1.str, p->u3.macro_statements, 0, context );
-			if (exten->return_needed) {  /* most likely, this will go away */
-				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);
-			attach_exten(&exten_list, exten);
-			break;
-			
-		case PV_GLOBALS:
-			/* already done */
-			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;
-				char *s3;
-				
-				switch (p2->type) {
-				case PV_EXTENSION:
-					exten = new_exten();
-					exten->name = strdup(p2->u1.str);
-					exten->context = context;
-					
-					if( (s3=strchr(exten->name, '/') ) != 0 )
-					{
-						*s3 = 0;
-						exten->cidmatch = s3+1;
-					}
-					
-					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, context );
-					if (exten->return_needed) { /* returns don't generate a goto eoe (end of extension) any more, just a Return() app call) */
-						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 )
-					{
-						ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: Empty Extension!\n",
-								p2->filename, p2->startline, p2->endline);
-					}
-					
-					if ( exten->plist_last && 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);
-					attach_exten(&exten_list, 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 = "";
-
-						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;
-			
-		}
-	}
-	/* moved these from being done after a macro or extension were processed,
-	   to after all processing is done, for the sake of fixing gotos to labels inside cases... */
-	/* I guess this would be considered 2nd pass of compiler now... */
-	fix_gotos_in_extensions(exten_list); /* find and fix extension ref in gotos to labels that are in case statements */
-	add_extensions(exten_list);   /* actually makes calls to create priorities in ast_contexts -- feeds dialplan to asterisk */
-	destroy_extensions(exten_list);  /* all that remains is an empty husk, discard of it as is proper */
-	
-}
-
-
 static int aeldebug = 0;
 
 /* interface stuff */
@@ -4225,8 +1799,8 @@ static int reload(void)
 int ael_external_load_module(void);
 int ael_external_load_module(void)
 {
-	pbx_load_module();
-	return 1;
+        pbx_load_module();
+        return 1;
 }
 #endif
 
@@ -4236,290 +1810,6 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Extension Langu
 		.reload = reload,
 	       );
 
-
-/* DESTROY the PVAL tree ============================================================================ */
-
-
-
-void destroy_pval_item(pval *item)
-{
-	if (item == NULL) {
-		ast_log(LOG_WARNING, "null item\n");
-		return;
-	}
-
-	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:
-	case PV_LOCALVARDEC:
-		/* 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);
-}
-
-void destroy_pval(pval *item) 
-{
-	pval *i,*nxt;
-	
-	for (i=item; i; i=nxt) {
-		nxt = i->next;
-		
-		destroy_pval_item(i);
-	}
-}
-
 #ifdef AAL_ARGCHECK
 static char *ael_funclist[] =
 {