This commit merges the contents of 7721, as it applied to the trunk version. Added the item that would previously trigger a false error to test1.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39571 65c4cc65-6c06-0410-ace0-fbb531ad65f3

pbx/ael/ael-test/ael-test1/extensions.ael

@@ -94,7 +94,7 @@ context testloop {
               y=${y}-1;
          };
     }; 
-    regexten hint(nasty/Thingy) 3 => {
+    regexten hint(nasty/Thingy&nasty/Thingamabob) 3 => {
         for (x=0; ${x} < 3; x=${x} + 1) 
 		{
             	Verbose(x is ${x} !);

pbx/ael/ael.y

@@ -132,7 +132,7 @@ static pval *update_last(pval *, YYLTYPE *);
 
 %type <str>goto_word
 %type <str>word_list
-%type <str>word3_list
+%type <str>word3_list hint_word
 %type <str>test_expr
 %type <str>opt_pri
 
@@ -272,12 +272,12 @@ extension : word EXTENMARK statement {
 		$$->u1.str = $2;
 		$$->u2.statements = $4; set_dads($$,$4);
 		$$->u4.regexten=1;}
-	| KW_HINT LP word3_list RP word EXTENMARK statement {
+	| KW_HINT LP hint_word RP word EXTENMARK statement {
 		$$ = npval2(PV_EXTENSION, &@1, &@7);
 		$$->u1.str = $5;
 		$$->u2.statements = $7; set_dads($$,$7);
 		$$->u3.hints = $3;}
-	| KW_REGEXTEN KW_HINT LP word3_list RP word EXTENMARK statement {
+	| KW_REGEXTEN KW_HINT LP hint_word RP word EXTENMARK statement {
 		$$ = npval2(PV_EXTENSION, &@1, &@8);
 		$$->u1.str = $6;
 		$$->u2.statements = $8; set_dads($$,$8);
@@ -341,6 +341,17 @@ word_list : word { $$ = $1;}
 		prev_word = $$;}
 	;
 
+hint_word : word { $$ = $1; }
+	| hint_word word {
+		asprintf(&($$), "%s %s", $1, $2);
+		free($1);
+		free($2); }
+	| hint_word AMPER word {  /* there are often '&' in hints */
+		asprintf(&($$), "%s&%s", $1, $3);
+		free($1);
+		free($3);}
+
+
 word3_list : word { $$ = $1;}
 	| word word {
 		asprintf(&($$), "%s%s", $1, $2);