remove more shift-reduce conflicts

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

2 files changed, 195 insertions, 207 deletions

diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index aeff148db..d98ab428b 100644
--- a/pbx/ael/ael.tab.c
+++ b/pbx/ael/ael.tab.c
@@ -420,14 +420,14 @@ union yyalloc
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  14
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   302
+#define YYLAST   275
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  42
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  54
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  132
+#define YYNRULES  131
 /* YYNRULES -- Number of states. */
 #define YYNSTATES  262
 
@@ -489,9 +489,9 @@ static const unsigned short int yyprhs[] =
      258,   261,   264,   268,   270,   273,   274,   276,   280,   284,
      290,   296,   302,   308,   310,   314,   320,   324,   325,   331,
      335,   336,   340,   344,   347,   349,   350,   352,   353,   357,
-     358,   361,   366,   370,   375,   376,   378,   381,   383,   389,
-     392,   395,   399,   402,   405,   409,   412,   414,   418,   421,
-     425,   428,   433
+     358,   361,   366,   370,   375,   376,   379,   381,   387,   390,
+     393,   397,   400,   403,   407,   410,   412,   416,   419,   423,
+     426,   431
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -534,13 +534,13 @@ static const yysigned_char yyrhs[] =
       80,    84,     7,    -1,    80,     7,    -1,    41,    -1,    -1,
       66,    -1,    -1,    84,    10,    83,    -1,    -1,    86,    85,
       -1,    34,    41,    11,    60,    -1,    36,    11,    60,    -1,
-      35,    41,    11,    60,    -1,    -1,    88,    -1,    87,    88,
-      -1,    70,    -1,    37,    41,     4,    60,     5,    -1,    38,
-      91,    -1,    39,    91,    -1,     4,    92,     5,    -1,     4,
-       5,    -1,    41,     8,    -1,    92,    41,     8,    -1,    92,
-       1,    -1,    46,    -1,    46,    13,    62,    -1,    93,     8,
-      -1,    94,    93,     8,    -1,    94,     1,    -1,    40,     4,
-      94,     5,    -1,    40,     4,     5,    -1
+      35,    41,    11,    60,    -1,    -1,    88,    87,    -1,    70,
+      -1,    37,    41,     4,    60,     5,    -1,    38,    91,    -1,
+      39,    91,    -1,     4,    92,     5,    -1,     4,     5,    -1,
+      41,     8,    -1,    92,    41,     8,    -1,    92,     1,    -1,
+      46,    -1,    46,    13,    62,    -1,    93,     8,    -1,    94,
+      93,     8,    -1,    94,     1,    -1,    40,     4,    94,     5,
+      -1,    40,     4,     5,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -557,9 +557,9 @@ static const unsigned short int yyrline[] =
      440,   441,   442,   446,   449,   450,   455,   456,   459,   462,
      466,   470,   474,   481,   484,   487,   491,   497,   497,   502,
      510,   510,   521,   528,   531,   532,   535,   536,   539,   542,
-     543,   546,   550,   554,   560,   561,   562,   565,   566,   572,
-     577,   582,   583,   586,   587,   588,   591,   592,   599,   600,
-     601,   604,   607
+     543,   546,   550,   554,   560,   561,   564,   565,   571,   576,
+     581,   582,   585,   586,   587,   590,   591,   598,   599,   600,
+     603,   606
 };
 #endif
 
@@ -615,9 +615,9 @@ static const unsigned char yyr1[] =
       70,    70,    70,    70,    75,    75,    76,    76,    76,    76,
       76,    76,    76,    77,    77,    77,    77,    79,    78,    78,
       81,    80,    82,    82,    83,    83,    84,    84,    84,    85,
-      85,    86,    86,    86,    87,    87,    87,    88,    88,    89,
-      90,    91,    91,    92,    92,    92,    93,    93,    94,    94,
-      94,    95,    95
+      85,    86,    86,    86,    87,    87,    88,    88,    89,    90,
+      91,    91,    92,    92,    92,    93,    93,    94,    94,    94,
+      95,    95
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -634,9 +634,9 @@ static const unsigned char yyr2[] =
        2,     2,     3,     1,     2,     0,     1,     3,     3,     5,
        5,     5,     5,     1,     3,     5,     3,     0,     5,     3,
        0,     3,     3,     2,     1,     0,     1,     0,     3,     0,
-       2,     4,     3,     4,     0,     1,     2,     1,     5,     2,
-       2,     3,     2,     2,     3,     2,     1,     3,     2,     3,
-       2,     4,     3
+       2,     4,     3,     4,     0,     2,     1,     5,     2,     2,
+       3,     2,     2,     3,     2,     1,     3,     2,     3,     2,
+       4,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -650,24 +650,24 @@ static const unsigned char yydefact[] =
        0,    27,    12,    25,     0,     0,     0,    37,     0,     0,
        0,     0,     0,     0,     0,    35,     0,    27,    34,    30,
       32,    33,    31,   114,    24,     0,     0,     0,     0,     0,
-       0,   119,   120,     0,    36,     0,    29,    26,     0,    43,
+       0,   118,   119,     0,    36,     0,    29,    26,     0,    43,
       83,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    64,     0,    73,   117,   107,
-       0,     0,   115,    21,     0,     0,     0,    56,     0,   122,
-       0,     0,   132,   126,     0,     0,    39,     0,    43,     0,
+       0,     0,     0,     0,     0,    64,     0,    73,   116,   107,
+       0,     0,   114,    21,     0,     0,     0,    56,     0,   121,
+       0,     0,   131,   125,     0,     0,    39,     0,    43,     0,
        0,    49,     0,    51,     0,    52,     0,    59,    86,     0,
       93,     0,    80,    79,    81,    68,     0,     0,   100,    76,
-      67,    85,   103,    54,   106,     0,    75,    77,    15,   116,
-      38,     0,    40,    57,     0,   123,   125,   121,     0,     0,
-     128,   130,   131,     0,    45,    63,     0,    97,    74,     0,
+      67,    85,   103,    54,   106,     0,    75,    77,    15,   115,
+      38,     0,    40,    57,     0,   122,   124,   120,     0,     0,
+     127,   129,   130,     0,    45,    63,     0,    97,    74,     0,
      109,    47,     0,     0,     0,     0,     0,     0,    60,     0,
        0,    65,     0,     0,    66,     0,    72,    43,   101,     0,
-      82,    55,   102,   105,     0,     0,    58,     0,   124,   127,
-     129,    99,   107,     0,     0,     0,     0,     0,   109,     0,
+      82,    55,   102,   105,     0,     0,    58,     0,   123,   126,
+     128,    99,   107,     0,     0,     0,     0,     0,   109,     0,
       53,     0,     0,     0,    61,    88,    87,    59,    94,    96,
        0,     0,    84,   104,   108,     0,     0,     0,     0,    50,
        0,     0,    43,    62,   110,     0,     0,     0,     0,     0,
-       0,     0,    69,   118,    78,     0,    41,    98,    43,    43,
+       0,     0,    69,   117,    78,     0,    41,    98,    43,    43,
        0,     0,     0,    92,    91,    90,    89,    95,     0,    42,
        0,     0,     0,    46,     0,     0,    70,    48,     0,     0,
        0,    71
@@ -689,44 +689,44 @@ static const short int yydefgoto[] =
 #define YYPACT_NINF -106
 static const short int yypact[] =
 {
-     122,  -106,   -25,    13,  -106,    36,   166,  -106,  -106,    40,
-    -106,  -106,    69,    50,  -106,  -106,  -106,    21,    60,   102,
-      93,    50,  -106,  -106,   128,  -106,    96,  -106,  -106,  -106,
-     103,   123,  -106,  -106,   137,   107,   108,  -106,   151,    17,
-     185,   188,   188,   200,   104,  -106,   124,   123,  -106,  -106,
-    -106,  -106,  -106,     0,  -106,   197,   169,   201,   187,   171,
-       9,  -106,  -106,     6,  -106,   168,  -106,  -106,   134,   168,
-    -106,   172,   209,   209,   210,   209,    46,   176,   211,   212,
-     213,   216,   209,   177,   101,  -106,   168,  -106,  -106,     8,
-      59,    51,  -106,  -106,   215,   171,   168,   183,   218,  -106,
-     219,     5,  -106,   217,   220,     4,  -106,   142,   168,   223,
-     224,  -106,   222,  -106,   190,  -106,   158,    12,   160,   225,
-     136,   226,  -106,  -106,  -106,  -106,   168,   231,  -106,  -106,
-    -106,   221,  -106,   195,  -106,   192,  -106,  -106,  -106,  -106,
-    -106,   230,  -106,   198,   199,  -106,  -106,  -106,   233,   190,
-    -106,  -106,  -106,   235,  -106,  -106,    30,   237,  -106,   204,
-     143,    19,   234,   239,   227,   176,   176,   207,  -106,   176,
-     176,  -106,   208,    21,  -106,   214,  -106,   168,  -106,   168,
-    -106,  -106,  -106,   228,   229,   232,  -106,   236,  -106,  -106,
-    -106,  -106,   204,   243,   238,   240,   241,   246,   143,   171,
-    -106,   171,   244,   245,  -106,   247,   248,    10,  -106,  -106,
-     251,   150,  -106,  -106,  -106,   254,   242,   168,   196,  -106,
-     252,   253,   168,  -106,  -106,   255,   256,   176,   176,   176,
-     176,    21,  -106,  -106,  -106,   168,  -106,  -106,   168,   168,
-      80,   171,   171,  -106,  -106,  -106,  -106,  -106,   249,  -106,
-      85,    88,   258,  -106,   257,   171,  -106,  -106,   250,   265,
+      10,  -106,   -20,    24,  -106,    43,    14,  -106,  -106,    65,
+    -106,  -106,    50,    40,  -106,  -106,  -106,    87,    49,    92,
+       3,    40,  -106,  -106,    71,  -106,   119,  -106,  -106,  -106,
+      34,    74,  -106,  -106,   104,    69,    81,  -106,   100,    66,
+     125,   144,   144,   158,    97,  -106,   131,    74,  -106,  -106,
+    -106,  -106,  -106,    51,  -106,   147,   127,   163,   149,   130,
+       7,  -106,  -106,     6,  -106,   168,  -106,  -106,   138,   168,
+    -106,   133,   169,   169,   175,   169,    89,   141,   181,   183,
+     184,   193,   169,   161,   129,  -106,   168,  -106,  -106,    17,
+     145,   198,    51,  -106,   196,   130,   168,   164,   199,  -106,
+     202,     4,  -106,   194,   203,     5,  -106,   140,   168,   206,
+     205,  -106,   211,  -106,   176,  -106,   139,    46,   151,   208,
+     136,   210,  -106,  -106,  -106,  -106,   168,   215,  -106,  -106,
+    -106,   200,  -106,   179,  -106,   156,  -106,  -106,  -106,  -106,
+    -106,   216,  -106,   185,   186,  -106,  -106,  -106,   214,   176,
+    -106,  -106,  -106,   217,  -106,  -106,    15,   221,  -106,   188,
+     143,    53,   218,   223,   213,   141,   141,   191,  -106,   141,
+     141,  -106,   192,    87,  -106,   195,  -106,   168,  -106,   168,
+    -106,  -106,  -106,   197,   201,   204,  -106,   219,  -106,  -106,
+    -106,  -106,   188,   227,   207,   209,   224,   232,   143,   130,
+    -106,   130,   229,   228,  -106,   230,   231,    75,  -106,  -106,
+     238,   146,  -106,  -106,  -106,   239,   225,   168,   160,  -106,
+     240,   241,   168,  -106,  -106,   242,   243,   141,   141,   141,
+     141,    87,  -106,  -106,  -106,   168,  -106,  -106,   168,   168,
+      18,   130,   130,  -106,  -106,  -106,  -106,  -106,   212,  -106,
+      26,    31,   244,  -106,   248,   130,  -106,  -106,   220,   251,
      168,  -106
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -106,  -106,  -106,   268,   -17,  -106,  -106,  -106,  -106,   259,
-     105,  -106,  -106,  -106,   206,  -106,  -106,  -106,  -105,  -106,
-     126,   -21,  -106,  -106,    97,   -57,   -70,  -106,   -52,  -106,
+    -106,  -106,  -106,   253,   -17,  -106,  -106,  -106,  -106,   245,
+      72,  -106,  -106,  -106,   222,  -106,  -106,  -106,  -105,  -106,
+     111,    36,  -106,  -106,   103,   -57,   -70,  -106,   -52,  -106,
     -106,  -106,  -106,  -106,  -106,  -106,  -106,  -106,  -106,  -106,
-    -106,  -106,    84,    79,  -106,  -106,   191,  -106,  -106,   260,
-    -106,   173,  -106,  -106
+    -106,  -106,    73,    70,  -106,   171,  -106,  -106,  -106,   233,
+    -106,   159,  -106,  -106
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -736,72 +736,66 @@ static const short int yypgoto[] =
 #define YYTABLE_NINF -114
 static const short int yytable[] =
 {
-      24,    88,    98,   156,    69,   151,   146,   120,    70,   152,
-     147,   102,    71,   106,    99,   132,    12,    13,    72,    73,
-      74,   167,    75,   167,   231,    76,    77,    78,    79,    80,
-     -56,   154,    81,    82,   131,   -44,    14,    83,   141,    88,
-      22,    84,    22,    17,   142,    23,   148,    23,    57,   133,
-     100,   168,   113,   168,   115,    69,   138,    22,    58,    70,
-     143,   126,    23,    71,   -44,   -44,   -44,   136,   137,    72,
-      73,    74,   211,    75,   176,    18,    76,    77,    78,    79,
-      80,   154,   116,    81,    82,  -112,   154,   117,    83,   154,
-    -111,    19,    84,  -113,    28,   202,   203,    33,    29,   205,
-     206,    25,   208,    34,    28,    64,    35,   128,   -18,   129,
-      27,    27,   130,    27,  -112,  -112,  -112,   240,    21,  -111,
-    -111,  -111,  -113,  -113,  -113,    66,    21,   212,    65,    67,
-       1,    37,    31,   250,   251,    66,    45,     2,     3,   -28,
-      38,    53,   225,   154,   226,     4,   172,   155,    54,    55,
-     173,   154,    45,    39,    40,   233,   209,   243,   244,   245,
-     246,    41,    42,    43,    44,   236,    -2,    15,   165,   -14,
-     169,   166,    69,   170,     1,    56,    70,   194,   195,   196,
-      71,     2,     3,   249,   252,   253,    72,    73,    74,     4,
-      75,    59,    60,    76,    77,    78,    79,    80,   257,   182,
-      81,    82,   183,   237,    63,    93,   183,    95,   261,    84,
-      94,    96,    97,   109,   247,   111,   114,   117,   127,   122,
-     123,   124,   125,   140,   143,   144,   160,   145,   150,   157,
-     149,   161,   158,   171,   174,   177,   181,   185,   201,   186,
-     187,   188,   179,   190,   191,   133,   200,   199,   204,   207,
-     219,   223,   222,    68,   227,   210,   193,   229,   228,   232,
-     217,   230,   234,   238,   239,   256,   235,   242,   241,   213,
-     215,   255,   260,   216,    16,   189,   218,   224,   153,   220,
-      30,   221,   139,     0,     0,     0,     0,     0,     0,     0,
-     254,   259,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    62
+      24,    88,    98,   156,    28,   146,   151,   120,    29,   147,
+     152,   102,    99,   106,    -2,    15,   154,   -14,     1,   154,
+     -44,    12,     1,  -112,   132,     2,     3,   154,    13,     2,
+       3,  -111,   154,     4,   131,    28,  -113,     4,   141,   -18,
+      88,    22,    22,    14,   142,   148,    23,    23,   100,   -44,
+     -44,   -44,  -112,  -112,  -112,    69,    18,   167,   133,    70,
+    -111,  -111,  -111,    71,   -56,  -113,  -113,  -113,    17,    72,
+      73,    74,   211,    75,   176,    31,    76,    77,    78,    79,
+      80,    19,    37,    81,    82,    21,   167,   168,    83,   231,
+      25,    38,    84,    21,   143,   202,   203,    57,    64,   205,
+     206,    27,   208,    45,    39,    40,    27,    58,    53,   113,
+      54,   115,    41,    42,    43,    44,   168,   240,   126,    45,
+      33,    65,    55,    22,    56,   116,    34,   212,    23,    35,
+     117,    59,    66,   250,   251,   128,    67,   129,    27,    66,
+     130,   154,   225,   -28,   226,   155,   172,   154,    60,   165,
+     173,   233,   166,   136,   137,    93,   209,   243,   244,   245,
+     246,   169,    63,   182,   170,   236,   183,   237,    94,    95,
+     183,    97,    69,    96,   109,   111,    70,   194,   195,   196,
+      71,   114,   117,   249,   252,   253,    72,    73,    74,   122,
+      75,   123,   124,    76,    77,    78,    79,    80,   257,   125,
+      81,    82,   127,   138,   140,   143,   144,   149,   261,    84,
+     145,   150,   157,   158,   247,   160,   171,   161,   174,   177,
+     181,   179,   188,   185,   201,   190,   186,   187,   191,   133,
+     200,   199,   204,   207,   219,   222,   210,   223,   213,   227,
+     229,   228,   215,   217,   230,   216,   232,   234,   220,   235,
+     221,   238,   239,   254,   242,   241,   256,   255,   260,    16,
+     189,   259,   193,   139,   153,   218,    30,     0,   224,    68,
+       0,     0,     0,     0,     0,    62
 };
 
 static const short int yycheck[] =
 {
-      17,    53,    59,   108,     4,     1,     1,    77,     8,     5,
-       5,     5,    12,    65,     5,     7,    41,     4,    18,    19,
-      20,    11,    22,    11,    14,    25,    26,    27,    28,    29,
-      11,     1,    32,    33,    86,     5,     0,    37,    95,    91,
-      36,    41,    36,     3,    96,    41,    41,    41,    31,    41,
-      41,    41,    73,    41,    75,     4,     5,    36,    41,     8,
-      41,    82,    41,    12,    34,    35,    36,     8,     9,    18,
-      19,    20,   177,    22,   126,     6,    25,    26,    27,    28,
-      29,     1,    36,    32,    33,     5,     1,    41,    37,     1,
-       5,    41,    41,     5,     1,   165,   166,     1,     5,   169,
-     170,    41,   172,     7,     1,     1,    10,     6,     5,     8,
-       9,     9,    11,     9,    34,    35,    36,   222,    13,    34,
-      35,    36,    34,    35,    36,     1,    21,   179,    24,     5,
-       8,     8,     4,   238,   239,     1,    31,    15,    16,     5,
-      17,     4,   199,     1,   201,    23,    10,     5,    41,    41,
-      14,     1,    47,    30,    31,     5,   173,   227,   228,   229,
-     230,    38,    39,    40,    41,   217,     0,     1,    10,     3,
-      10,    13,     4,    13,     8,    24,     8,    34,    35,    36,
-      12,    15,    16,   235,   241,   242,    18,    19,    20,    23,
-      22,     6,     4,    25,    26,    27,    28,    29,   255,     7,
-      32,    33,    10,     7,     4,     8,    10,     6,   260,    41,
-      41,    24,    41,    41,   231,     6,     6,    41,    41,     8,
-       8,     8,     6,     8,    41,     7,     4,     8,     8,     6,
-      13,    41,     8,     8,     8,     4,    41,     7,    11,    41,
-      41,     8,    21,     8,     7,    41,     7,    13,    41,    41,
-       7,     5,    11,    47,    10,    41,   159,    10,    13,     8,
-      24,    13,     8,    11,    11,     8,    24,    11,    13,    41,
-      41,    13,     7,    41,     6,   149,   192,   198,   105,    41,
-      21,    41,    91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      41,    41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    42
+      17,    53,    59,   108,     1,     1,     1,    77,     5,     5,
+       5,     5,     5,    65,     0,     1,     1,     3,     8,     1,
+       5,    41,     8,     5,     7,    15,    16,     1,     4,    15,
+      16,     5,     1,    23,    86,     1,     5,    23,    95,     5,
+      92,    36,    36,     0,    96,    41,    41,    41,    41,    34,
+      35,    36,    34,    35,    36,     4,     6,    11,    41,     8,
+      34,    35,    36,    12,    11,    34,    35,    36,     3,    18,
+      19,    20,   177,    22,   126,     4,    25,    26,    27,    28,
+      29,    41,     8,    32,    33,    13,    11,    41,    37,    14,
+      41,    17,    41,    21,    41,   165,   166,    31,     1,   169,
+     170,     9,   172,    31,    30,    31,     9,    41,     4,    73,
+      41,    75,    38,    39,    40,    41,    41,   222,    82,    47,
+       1,    24,    41,    36,    24,    36,     7,   179,    41,    10,
+      41,     6,     1,   238,   239,     6,     5,     8,     9,     1,
+      11,     1,   199,     5,   201,     5,    10,     1,     4,    10,
+      14,     5,    13,     8,     9,     8,   173,   227,   228,   229,
+     230,    10,     4,     7,    13,   217,    10,     7,    41,     6,
+      10,    41,     4,    24,    41,     6,     8,    34,    35,    36,
+      12,     6,    41,   235,   241,   242,    18,    19,    20,     8,
+      22,     8,     8,    25,    26,    27,    28,    29,   255,     6,
+      32,    33,    41,     5,     8,    41,     7,    13,   260,    41,
+       8,     8,     6,     8,   231,     4,     8,    41,     8,     4,
+      41,    21,     8,     7,    11,     8,    41,    41,     7,    41,
+       7,    13,    41,    41,     7,    11,    41,     5,    41,    10,
+      10,    13,    41,    24,    13,    41,     8,     8,    41,    24,
+      41,    11,    11,    41,    11,    13,     8,    13,     7,     6,
+     149,    41,   159,    92,   105,   192,    21,    -1,   198,    47,
+      -1,    -1,    -1,    -1,    -1,    42
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -821,7 +815,7 @@ static const unsigned char yystos[] =
       41,    92,     5,    46,    93,    94,    70,    60,    70,    41,
       78,     6,    63,    63,     6,    63,    36,    41,    68,    76,
       68,    77,     8,     8,     8,     6,    63,    41,     6,     8,
-      11,    70,     7,    41,    66,    84,     8,     9,     5,    88,
+      11,    70,     7,    41,    66,    84,     8,     9,     5,    87,
        8,    67,    70,    41,     7,     8,     1,     5,    41,    13,
        8,     1,     5,    93,     1,     5,    60,     6,     8,    64,
        4,    41,    61,    62,    67,    10,    13,    11,    41,    10,
@@ -1212,7 +1206,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
       case 41: /* "word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1216 "ael.tab.c"
+#line 1210 "ael.tab.c"
         break;
       case 44: /* "objects" */
 #line 159 "ael.y"
@@ -1220,7 +1214,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1224 "ael.tab.c"
+#line 1218 "ael.tab.c"
         break;
       case 45: /* "object" */
 #line 159 "ael.y"
@@ -1228,12 +1222,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1232 "ael.tab.c"
+#line 1226 "ael.tab.c"
         break;
       case 46: /* "context_name" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1237 "ael.tab.c"
+#line 1231 "ael.tab.c"
         break;
       case 47: /* "context" */
 #line 159 "ael.y"
@@ -1241,7 +1235,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1245 "ael.tab.c"
+#line 1239 "ael.tab.c"
         break;
       case 49: /* "macro" */
 #line 159 "ael.y"
@@ -1249,7 +1243,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1253 "ael.tab.c"
+#line 1247 "ael.tab.c"
         break;
       case 50: /* "globals" */
 #line 159 "ael.y"
@@ -1257,7 +1251,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1261 "ael.tab.c"
+#line 1255 "ael.tab.c"
         break;
       case 51: /* "global_statements" */
 #line 159 "ael.y"
@@ -1265,7 +1259,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1269 "ael.tab.c"
+#line 1263 "ael.tab.c"
         break;
       case 52: /* "assignment" */
 #line 159 "ael.y"
@@ -1273,7 +1267,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1277 "ael.tab.c"
+#line 1271 "ael.tab.c"
         break;
       case 54: /* "arglist" */
 #line 159 "ael.y"
@@ -1281,7 +1275,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1285 "ael.tab.c"
+#line 1279 "ael.tab.c"
         break;
       case 55: /* "elements_block" */
 #line 159 "ael.y"
@@ -1289,7 +1283,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1293 "ael.tab.c"
+#line 1287 "ael.tab.c"
         break;
       case 56: /* "elements" */
 #line 159 "ael.y"
@@ -1297,7 +1291,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1301 "ael.tab.c"
+#line 1295 "ael.tab.c"
         break;
       case 57: /* "element" */
 #line 159 "ael.y"
@@ -1305,7 +1299,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1309 "ael.tab.c"
+#line 1303 "ael.tab.c"
         break;
       case 58: /* "ignorepat" */
 #line 159 "ael.y"
@@ -1313,7 +1307,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1317 "ael.tab.c"
+#line 1311 "ael.tab.c"
         break;
       case 59: /* "extension" */
 #line 159 "ael.y"
@@ -1321,7 +1315,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1325 "ael.tab.c"
+#line 1319 "ael.tab.c"
         break;
       case 60: /* "statements" */
 #line 159 "ael.y"
@@ -1329,12 +1323,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1333 "ael.tab.c"
+#line 1327 "ael.tab.c"
         break;
       case 61: /* "timerange" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1338 "ael.tab.c"
+#line 1332 "ael.tab.c"
         break;
       case 62: /* "timespec" */
 #line 159 "ael.y"
@@ -1342,12 +1336,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1346 "ael.tab.c"
+#line 1340 "ael.tab.c"
         break;
       case 63: /* "test_expr" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1351 "ael.tab.c"
+#line 1345 "ael.tab.c"
         break;
       case 65: /* "if_like_head" */
 #line 159 "ael.y"
@@ -1355,22 +1349,22 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1359 "ael.tab.c"
+#line 1353 "ael.tab.c"
         break;
       case 66: /* "word_list" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1364 "ael.tab.c"
+#line 1358 "ael.tab.c"
         break;
       case 67: /* "word3_list" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1369 "ael.tab.c"
+#line 1363 "ael.tab.c"
         break;
       case 68: /* "goto_word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1374 "ael.tab.c"
+#line 1368 "ael.tab.c"
         break;
       case 69: /* "switch_statement" */
 #line 159 "ael.y"
@@ -1378,7 +1372,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1382 "ael.tab.c"
+#line 1376 "ael.tab.c"
         break;
       case 70: /* "statement" */
 #line 159 "ael.y"
@@ -1386,7 +1380,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1390 "ael.tab.c"
+#line 1384 "ael.tab.c"
         break;
       case 75: /* "opt_else" */
 #line 159 "ael.y"
@@ -1394,7 +1388,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1398 "ael.tab.c"
+#line 1392 "ael.tab.c"
         break;
       case 76: /* "target" */
 #line 159 "ael.y"
@@ -1402,7 +1396,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1406 "ael.tab.c"
+#line 1400 "ael.tab.c"
         break;
       case 77: /* "jumptarget" */
 #line 159 "ael.y"
@@ -1410,7 +1404,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1414 "ael.tab.c"
+#line 1408 "ael.tab.c"
         break;
       case 78: /* "macro_call" */
 #line 159 "ael.y"
@@ -1418,7 +1412,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1422 "ael.tab.c"
+#line 1416 "ael.tab.c"
         break;
       case 80: /* "application_call_head" */
 #line 159 "ael.y"
@@ -1426,7 +1420,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1430 "ael.tab.c"
+#line 1424 "ael.tab.c"
         break;
       case 82: /* "application_call" */
 #line 159 "ael.y"
@@ -1434,12 +1428,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1438 "ael.tab.c"
+#line 1432 "ael.tab.c"
         break;
       case 83: /* "opt_word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1443 "ael.tab.c"
+#line 1437 "ael.tab.c"
         break;
       case 84: /* "eval_arglist" */
 #line 159 "ael.y"
@@ -1447,7 +1441,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1451 "ael.tab.c"
+#line 1445 "ael.tab.c"
         break;
       case 85: /* "case_statements" */
 #line 159 "ael.y"
@@ -1455,7 +1449,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1459 "ael.tab.c"
+#line 1453 "ael.tab.c"
         break;
       case 86: /* "case_statement" */
 #line 159 "ael.y"
@@ -1463,7 +1457,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1467 "ael.tab.c"
+#line 1461 "ael.tab.c"
         break;
       case 87: /* "macro_statements" */
 #line 159 "ael.y"
@@ -1471,7 +1465,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1475 "ael.tab.c"
+#line 1469 "ael.tab.c"
         break;
       case 88: /* "macro_statement" */
 #line 159 "ael.y"
@@ -1479,7 +1473,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1483 "ael.tab.c"
+#line 1477 "ael.tab.c"
         break;
       case 89: /* "switches" */
 #line 159 "ael.y"
@@ -1487,7 +1481,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1491 "ael.tab.c"
+#line 1485 "ael.tab.c"
         break;
       case 90: /* "eswitches" */
 #line 159 "ael.y"
@@ -1495,7 +1489,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1499 "ael.tab.c"
+#line 1493 "ael.tab.c"
         break;
       case 91: /* "switchlist_block" */
 #line 159 "ael.y"
@@ -1503,7 +1497,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1507 "ael.tab.c"
+#line 1501 "ael.tab.c"
         break;
       case 92: /* "switchlist" */
 #line 159 "ael.y"
@@ -1511,7 +1505,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1515 "ael.tab.c"
+#line 1509 "ael.tab.c"
         break;
       case 93: /* "included_entry" */
 #line 159 "ael.y"
@@ -1519,7 +1513,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1523 "ael.tab.c"
+#line 1517 "ael.tab.c"
         break;
       case 94: /* "includeslist" */
 #line 159 "ael.y"
@@ -1527,7 +1521,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1531 "ael.tab.c"
+#line 1525 "ael.tab.c"
         break;
       case 95: /* "includes" */
 #line 159 "ael.y"
@@ -1535,7 +1529,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1539 "ael.tab.c"
+#line 1533 "ael.tab.c"
         break;
 
       default:
@@ -2597,103 +2591,98 @@ yyreduce:
 
   case 115:
 #line 561 "ael.y"
-    {(yyval.pval) = (yyvsp[0].pval);;}
+    { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
   case 116:
-#line 562 "ael.y"
-    { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
+#line 564 "ael.y"
+    {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 117:
 #line 565 "ael.y"
-    {(yyval.pval)=(yyvsp[0].pval);;}
-    break;
-
-  case 118:
-#line 566 "ael.y"
     {
 		(yyval.pval) = npval2(PV_CATCH, &(yylsp[-4]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-3].str);
 		(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
     break;
 
-  case 119:
-#line 572 "ael.y"
+  case 118:
+#line 571 "ael.y"
     {
 		(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
     break;
 
-  case 120:
-#line 577 "ael.y"
+  case 119:
+#line 576 "ael.y"
     {
 		(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
     break;
 
+  case 120:
+#line 581 "ael.y"
+    { (yyval.pval) = (yyvsp[-1].pval); ;}
+    break;
+
   case 121:
 #line 582 "ael.y"
-    { (yyval.pval) = (yyvsp[-1].pval); ;}
+    { (yyval.pval) = NULL; ;}
     break;
 
   case 122:
-#line 583 "ael.y"
-    { (yyval.pval) = NULL; ;}
+#line 585 "ael.y"
+    { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
     break;
 
   case 123:
 #line 586 "ael.y"
-    { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
+    { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
     break;
 
   case 124:
 #line 587 "ael.y"
-    { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
+    {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
   case 125:
-#line 588 "ael.y"
-    {(yyval.pval)=(yyvsp[-1].pval);;}
+#line 590 "ael.y"
+    { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
   case 126:
 #line 591 "ael.y"
-    { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
-    break;
-
-  case 127:
-#line 592 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->u2.arglist = (yyvsp[0].pval);
 		prev_word=0; /* XXX sure ? */ ;}
     break;
 
-  case 128:
-#line 599 "ael.y"
+  case 127:
+#line 598 "ael.y"
     { (yyval.pval) = (yyvsp[-1].pval); ;}
     break;
 
-  case 129:
-#line 600 "ael.y"
+  case 128:
+#line 599 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-2].pval), (yyvsp[-1].pval)); ;}
     break;
 
-  case 130:
-#line 601 "ael.y"
+  case 129:
+#line 600 "ael.y"
     {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
-  case 131:
-#line 604 "ael.y"
+  case 130:
+#line 603 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
     break;
 
-  case 132:
-#line 607 "ael.y"
+  case 131:
+#line 606 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
     break;
@@ -2703,7 +2692,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 2707 "ael.tab.c"
+#line 2696 "ael.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2978,7 +2967,7 @@ yyreturn:
 }
 
 
-#line 612 "ael.y"
+#line 611 "ael.y"
 
 
 static char *token_equivs1[] =
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index f9b543594..bf3e56061 100644
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -558,8 +558,7 @@ case_statement: KW_CASE word COLON statements {
 	;
 
 macro_statements: /* empty */ { $$ = NULL; }
-	| macro_statement {$$ = $1;}
-	| macro_statements macro_statement { $$ = linku1($1, $2); }
+	| macro_statement macro_statements { $$ = linku1($1, $2); }
 	;
 
 macro_statement : statement {$$=$1;}