more simplifications

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

2 files changed, 211 insertions, 219 deletions

diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index d98ab428b..cee884135 100644
--- a/pbx/ael/ael.tab.c
+++ b/pbx/ael/ael.tab.c
@@ -420,16 +420,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  14
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   275
+#define YYLAST   287
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  42
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  54
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  131
+#define YYNRULES  130
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  262
+#define YYNSTATES  260
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -490,8 +490,8 @@ static const unsigned short int yyprhs[] =
      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,   379,   381,   387,   390,
-     393,   397,   400,   403,   407,   410,   412,   416,   419,   423,
-     426,   431
+     393,   397,   398,   402,   405,   407,   411,   414,   418,   421,
+     426
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -536,11 +536,10 @@ static const yysigned_char yyrhs[] =
       -1,    34,    41,    11,    60,    -1,    36,    11,    60,    -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
+      39,    91,    -1,     4,    92,     5,    -1,    -1,    41,     8,
+      92,    -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.  */
@@ -558,8 +557,8 @@ static const unsigned short int yyrline[] =
      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,   564,   565,   571,   576,
-     581,   582,   585,   586,   587,   590,   591,   598,   599,   600,
-     603,   606
+     581,   584,   585,   586,   589,   590,   597,   598,   599,   602,
+     605
 };
 #endif
 
@@ -616,8 +615,8 @@ static const unsigned char yyr1[] =
       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,    88,    88,    89,    90,
-      91,    91,    92,    92,    92,    93,    93,    94,    94,    94,
-      95,    95
+      91,    92,    92,    92,    93,    93,    94,    94,    94,    95,
+      95
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -635,8 +634,8 @@ static const unsigned char yyr2[] =
        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,     2,     1,     5,     2,     2,
-       3,     2,     2,     3,     2,     1,     3,     2,     3,     2,
-       4,     3
+       3,     0,     3,     2,     1,     3,     2,     3,     2,     4,
+       3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -650,152 +649,152 @@ 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,   118,   119,     0,    36,     0,    29,    26,     0,    43,
+     121,   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,   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,   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,   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,   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
+       0,     0,   114,    21,     0,     0,     0,    56,     0,     0,
+       0,   130,   124,     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,   115,    38,
+       0,    40,    57,     0,   121,   123,   120,     0,   126,   128,
+     129,     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,     0,   125,   127,    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,   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
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,     5,     6,     7,   103,     8,     9,    10,    11,    20,
-      85,    36,    26,    32,    46,    47,    48,    49,   107,   162,
-     163,   112,   159,    86,   134,   164,   118,    87,   108,   175,
-     248,   258,   184,   180,   119,   121,   110,   192,    89,   178,
-      90,   214,   135,   197,   198,    91,    92,    50,    51,    61,
-     101,   104,   105,    52
+      -1,     5,     6,     7,   102,     8,     9,    10,    11,    20,
+      85,    36,    26,    32,    46,    47,    48,    49,   106,   160,
+     161,   111,   157,    86,   133,   162,   117,    87,   107,   173,
+     246,   256,   182,   178,   118,   120,   109,   190,    89,   176,
+      90,   212,   134,   195,   196,    91,    92,    50,    51,    61,
+     100,   103,   104,    52
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -106
+#define YYPACT_NINF -105
 static const short int yypact[] =
 {
-      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
+     111,  -105,   -36,    15,  -105,    27,   120,  -105,  -105,    85,
+    -105,  -105,    83,    65,  -105,  -105,  -105,    66,    89,   115,
+      16,    65,  -105,  -105,   127,  -105,     8,  -105,  -105,  -105,
+     117,   121,  -105,  -105,   170,    98,   134,  -105,   160,   -27,
+     179,   182,   182,   183,    77,  -105,   136,   121,  -105,  -105,
+    -105,  -105,  -105,    31,  -105,   180,   148,   184,   167,   151,
+     152,  -105,  -105,     6,  -105,     4,  -105,  -105,   163,     4,
+    -105,   153,   189,   189,   191,   189,    76,   158,   190,   192,
+     193,   196,   189,   162,   138,  -105,     4,  -105,  -105,    13,
+      57,   199,    31,  -105,   197,   151,     4,   166,   201,   202,
+     164,  -105,   198,   205,     5,  -105,   165,     4,   203,   206,
+    -105,   211,  -105,   175,  -105,    86,    50,   135,   209,   157,
+     210,  -105,  -105,  -105,  -105,     4,   215,  -105,  -105,  -105,
+     200,  -105,   181,  -105,    80,  -105,  -105,  -105,  -105,  -105,
+     213,  -105,   185,   186,   152,  -105,  -105,   175,  -105,  -105,
+    -105,   216,  -105,  -105,    47,   218,  -105,   187,   144,    51,
+     217,   222,   212,   158,   158,   194,  -105,   158,   158,  -105,
+     195,    66,  -105,   204,  -105,     4,  -105,     4,  -105,  -105,
+    -105,   207,   208,   214,  -105,   219,   171,  -105,  -105,  -105,
+     187,   224,   220,   221,   223,   227,   144,   151,  -105,   151,
+     228,   226,  -105,   230,   229,    14,  -105,  -105,   225,   172,
+    -105,  -105,  -105,   233,   232,     4,   143,  -105,   235,   236,
+       4,  -105,  -105,   231,   239,   158,   158,   158,   158,    66,
+    -105,  -105,  -105,     4,  -105,  -105,     4,     4,    69,   151,
+     151,  -105,  -105,  -105,  -105,  -105,   234,  -105,    74,    79,
+     238,  -105,   244,   151,  -105,  -105,   237,   246,     4,  -105
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -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,    73,    70,  -106,   171,  -106,  -106,  -106,   233,
-    -106,   159,  -106,  -106
+    -105,  -105,  -105,   248,   -17,  -105,  -105,  -105,  -105,   242,
+      64,  -105,  -105,  -105,   240,  -105,  -105,  -105,  -104,  -105,
+      90,    -6,  -105,  -105,   100,   -57,   -70,  -105,   -52,  -105,
+    -105,  -105,  -105,  -105,  -105,  -105,  -105,  -105,  -105,  -105,
+    -105,  -105,    68,    63,  -105,   168,  -105,  -105,  -105,   241,
+     122,   161,  -105,  -105
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -114
+#define YYTABLE_NINF -123
 static const short int yytable[] =
 {
-      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
+      24,    88,    98,   154,    57,    12,   149,   119,    69,    33,
+     150,   101,    70,   105,    58,    34,    71,    28,    35,    13,
+     131,    29,    72,    73,    74,   165,    75,    14,   229,    76,
+      77,    78,    79,    80,   130,    69,    81,    82,   140,    70,
+      88,    22,    22,    71,   141,    84,    23,    23,   152,    72,
+      73,    74,   -44,    75,   132,   166,    76,    77,    78,    79,
+      80,   165,   -56,    81,    82,   135,   136,   112,    83,   114,
+     152,   209,    84,   174,  -112,   152,   125,    21,    64,  -111,
+     152,   -44,   -44,   -44,  -113,    21,    27,   180,    17,    18,
+     181,   166,   142,   200,   201,    45,   163,   203,   204,   164,
+     206,    65,    22,  -112,  -112,  -112,    19,    23,  -111,  -111,
+    -111,    45,   115,  -113,  -113,  -113,   238,   116,    28,     1,
+      -2,    15,   -18,   -14,    27,   210,     2,     3,     1,    37,
+      25,    31,   248,   249,     4,     2,     3,    66,    38,    54,
+     223,    67,   224,     4,   127,   167,   128,    27,   168,   129,
+     235,    39,    40,   181,   207,   241,   242,   243,   244,    41,
+      42,    43,    44,   234,    66,   145,   152,   170,   -28,   146,
+     153,   171,   145,   152,    53,    55,  -122,   231,   192,   193,
+     194,   247,   250,   251,    56,    59,    60,    63,    93,    94,
+      95,    96,    97,    99,   108,   110,   255,   113,   121,   116,
+     122,   123,   124,   126,   137,   139,   259,   142,   143,   155,
+     144,   147,   245,   148,   156,   158,   159,   169,   172,   175,
+     183,   177,   179,   199,   188,   189,   184,   185,   132,   198,
+     197,   217,   221,   230,   220,   202,   205,   187,   225,   226,
+     227,   232,   228,   215,   239,   208,   236,   237,   211,   213,
+     240,   253,   254,   258,    16,   214,   233,   191,   216,   222,
+     138,   218,   219,    30,     0,   151,   186,     0,     0,     0,
+       0,     0,     0,     0,     0,   252,     0,     0,   257,     0,
+       0,     0,     0,    62,     0,     0,     0,    68
 };
 
 static const short int yycheck[] =
 {
-      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
+      17,    53,    59,   107,    31,    41,     1,    77,     4,     1,
+       5,     5,     8,    65,    41,     7,    12,     1,    10,     4,
+       7,     5,    18,    19,    20,    11,    22,     0,    14,    25,
+      26,    27,    28,    29,    86,     4,    32,    33,    95,     8,
+      92,    36,    36,    12,    96,    41,    41,    41,     1,    18,
+      19,    20,     5,    22,    41,    41,    25,    26,    27,    28,
+      29,    11,    11,    32,    33,     8,     9,    73,    37,    75,
+       1,   175,    41,   125,     5,     1,    82,    13,     1,     5,
+       1,    34,    35,    36,     5,    21,     9,     7,     3,     6,
+      10,    41,    41,   163,   164,    31,    10,   167,   168,    13,
+     170,    24,    36,    34,    35,    36,    41,    41,    34,    35,
+      36,    47,    36,    34,    35,    36,   220,    41,     1,     8,
+       0,     1,     5,     3,     9,   177,    15,    16,     8,     8,
+      41,     4,   236,   237,    23,    15,    16,     1,    17,    41,
+     197,     5,   199,    23,     6,    10,     8,     9,    13,    11,
+       7,    30,    31,    10,   171,   225,   226,   227,   228,    38,
+      39,    40,    41,   215,     1,     1,     1,    10,     5,     5,
+       5,    14,     1,     1,     4,    41,     5,     5,    34,    35,
+      36,   233,   239,   240,    24,     6,     4,     4,     8,    41,
+       6,    24,    41,    41,    41,     6,   253,     6,     8,    41,
+       8,     8,     6,    41,     5,     8,   258,    41,     7,     6,
+       8,    13,   229,     8,     8,     4,    41,     8,     8,     4,
+       7,    21,    41,    11,     8,     7,    41,    41,    41,     7,
+      13,     7,     5,     8,    11,    41,    41,   147,    10,    13,
+      10,     8,    13,    24,    13,    41,    11,    11,    41,    41,
+      11,    13,     8,     7,     6,    41,    24,   157,   190,   196,
+      92,    41,    41,    21,    -1,   104,   144,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    41,    -1,    -1,    41,    -1,
+      -1,    -1,    -1,    42,    -1,    -1,    -1,    47
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -811,24 +810,23 @@ static const unsigned char yystos[] =
        4,    91,    91,     4,     1,    24,     1,     5,    56,     4,
        8,    12,    18,    19,    20,    22,    25,    26,    27,    28,
       29,    32,    33,    37,    41,    52,    65,    69,    70,    80,
-      82,    87,    88,     8,    41,     6,    24,    41,    67,     5,
-      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,    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,
-      13,     8,    10,    14,     8,    71,    70,     4,    81,    21,
-      75,    41,     7,    10,    74,     7,    41,    41,     8,    62,
-       8,     7,    79,    66,    34,    35,    36,    85,    86,    13,
-       7,    11,    68,    68,    41,    68,    68,    41,    68,    46,
-      41,    60,    70,    41,    83,    41,    41,    24,    84,     7,
-      41,    41,    11,     5,    85,    67,    67,    10,    13,    10,
-      13,    14,     8,     5,     8,    24,    70,     7,    11,    11,
-      60,    13,    11,    68,    68,    68,    68,    46,    72,    70,
-      60,    60,    67,    67,    41,    13,     8,    67,    73,    41,
-       7,    70
+      82,    87,    88,     8,    41,     6,    24,    41,    67,    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,    87,     8,
+      67,    70,    41,     7,     8,     1,     5,    13,     8,     1,
+       5,    93,     1,     5,    60,     6,     8,    64,     4,    41,
+      61,    62,    67,    10,    13,    11,    41,    10,    13,     8,
+      10,    14,     8,    71,    70,     4,    81,    21,    75,    41,
+       7,    10,    74,     7,    41,    41,    92,    62,     8,     7,
+      79,    66,    34,    35,    36,    85,    86,    13,     7,    11,
+      68,    68,    41,    68,    68,    41,    68,    46,    41,    60,
+      70,    41,    83,    41,    41,    24,    84,     7,    41,    41,
+      11,     5,    85,    67,    67,    10,    13,    10,    13,    14,
+       8,     5,     8,    24,    70,     7,    11,    11,    60,    13,
+      11,    68,    68,    68,    68,    46,    72,    70,    60,    60,
+      67,    67,    41,    13,     8,    67,    73,    41,     7,    70
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1206,7 +1204,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
       case 41: /* "word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1210 "ael.tab.c"
+#line 1208 "ael.tab.c"
         break;
       case 44: /* "objects" */
 #line 159 "ael.y"
@@ -1214,7 +1212,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1218 "ael.tab.c"
+#line 1216 "ael.tab.c"
         break;
       case 45: /* "object" */
 #line 159 "ael.y"
@@ -1222,12 +1220,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1226 "ael.tab.c"
+#line 1224 "ael.tab.c"
         break;
       case 46: /* "context_name" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1231 "ael.tab.c"
+#line 1229 "ael.tab.c"
         break;
       case 47: /* "context" */
 #line 159 "ael.y"
@@ -1235,7 +1233,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1239 "ael.tab.c"
+#line 1237 "ael.tab.c"
         break;
       case 49: /* "macro" */
 #line 159 "ael.y"
@@ -1243,7 +1241,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1247 "ael.tab.c"
+#line 1245 "ael.tab.c"
         break;
       case 50: /* "globals" */
 #line 159 "ael.y"
@@ -1251,7 +1249,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1255 "ael.tab.c"
+#line 1253 "ael.tab.c"
         break;
       case 51: /* "global_statements" */
 #line 159 "ael.y"
@@ -1259,7 +1257,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1263 "ael.tab.c"
+#line 1261 "ael.tab.c"
         break;
       case 52: /* "assignment" */
 #line 159 "ael.y"
@@ -1267,7 +1265,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1271 "ael.tab.c"
+#line 1269 "ael.tab.c"
         break;
       case 54: /* "arglist" */
 #line 159 "ael.y"
@@ -1275,7 +1273,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1279 "ael.tab.c"
+#line 1277 "ael.tab.c"
         break;
       case 55: /* "elements_block" */
 #line 159 "ael.y"
@@ -1283,7 +1281,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1287 "ael.tab.c"
+#line 1285 "ael.tab.c"
         break;
       case 56: /* "elements" */
 #line 159 "ael.y"
@@ -1291,7 +1289,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1295 "ael.tab.c"
+#line 1293 "ael.tab.c"
         break;
       case 57: /* "element" */
 #line 159 "ael.y"
@@ -1299,7 +1297,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1303 "ael.tab.c"
+#line 1301 "ael.tab.c"
         break;
       case 58: /* "ignorepat" */
 #line 159 "ael.y"
@@ -1307,7 +1305,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1311 "ael.tab.c"
+#line 1309 "ael.tab.c"
         break;
       case 59: /* "extension" */
 #line 159 "ael.y"
@@ -1315,7 +1313,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1319 "ael.tab.c"
+#line 1317 "ael.tab.c"
         break;
       case 60: /* "statements" */
 #line 159 "ael.y"
@@ -1323,12 +1321,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1327 "ael.tab.c"
+#line 1325 "ael.tab.c"
         break;
       case 61: /* "timerange" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1332 "ael.tab.c"
+#line 1330 "ael.tab.c"
         break;
       case 62: /* "timespec" */
 #line 159 "ael.y"
@@ -1336,12 +1334,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1340 "ael.tab.c"
+#line 1338 "ael.tab.c"
         break;
       case 63: /* "test_expr" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1345 "ael.tab.c"
+#line 1343 "ael.tab.c"
         break;
       case 65: /* "if_like_head" */
 #line 159 "ael.y"
@@ -1349,22 +1347,22 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1353 "ael.tab.c"
+#line 1351 "ael.tab.c"
         break;
       case 66: /* "word_list" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1358 "ael.tab.c"
+#line 1356 "ael.tab.c"
         break;
       case 67: /* "word3_list" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1363 "ael.tab.c"
+#line 1361 "ael.tab.c"
         break;
       case 68: /* "goto_word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1368 "ael.tab.c"
+#line 1366 "ael.tab.c"
         break;
       case 69: /* "switch_statement" */
 #line 159 "ael.y"
@@ -1372,7 +1370,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1376 "ael.tab.c"
+#line 1374 "ael.tab.c"
         break;
       case 70: /* "statement" */
 #line 159 "ael.y"
@@ -1380,7 +1378,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1384 "ael.tab.c"
+#line 1382 "ael.tab.c"
         break;
       case 75: /* "opt_else" */
 #line 159 "ael.y"
@@ -1388,7 +1386,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1392 "ael.tab.c"
+#line 1390 "ael.tab.c"
         break;
       case 76: /* "target" */
 #line 159 "ael.y"
@@ -1396,7 +1394,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1400 "ael.tab.c"
+#line 1398 "ael.tab.c"
         break;
       case 77: /* "jumptarget" */
 #line 159 "ael.y"
@@ -1404,7 +1402,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1408 "ael.tab.c"
+#line 1406 "ael.tab.c"
         break;
       case 78: /* "macro_call" */
 #line 159 "ael.y"
@@ -1412,7 +1410,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1416 "ael.tab.c"
+#line 1414 "ael.tab.c"
         break;
       case 80: /* "application_call_head" */
 #line 159 "ael.y"
@@ -1420,7 +1418,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1424 "ael.tab.c"
+#line 1422 "ael.tab.c"
         break;
       case 82: /* "application_call" */
 #line 159 "ael.y"
@@ -1428,12 +1426,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1432 "ael.tab.c"
+#line 1430 "ael.tab.c"
         break;
       case 83: /* "opt_word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1437 "ael.tab.c"
+#line 1435 "ael.tab.c"
         break;
       case 84: /* "eval_arglist" */
 #line 159 "ael.y"
@@ -1441,7 +1439,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1445 "ael.tab.c"
+#line 1443 "ael.tab.c"
         break;
       case 85: /* "case_statements" */
 #line 159 "ael.y"
@@ -1449,7 +1447,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1453 "ael.tab.c"
+#line 1451 "ael.tab.c"
         break;
       case 86: /* "case_statement" */
 #line 159 "ael.y"
@@ -1457,7 +1455,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1461 "ael.tab.c"
+#line 1459 "ael.tab.c"
         break;
       case 87: /* "macro_statements" */
 #line 159 "ael.y"
@@ -1465,7 +1463,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1469 "ael.tab.c"
+#line 1467 "ael.tab.c"
         break;
       case 88: /* "macro_statement" */
 #line 159 "ael.y"
@@ -1473,7 +1471,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1477 "ael.tab.c"
+#line 1475 "ael.tab.c"
         break;
       case 89: /* "switches" */
 #line 159 "ael.y"
@@ -1481,7 +1479,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1485 "ael.tab.c"
+#line 1483 "ael.tab.c"
         break;
       case 90: /* "eswitches" */
 #line 159 "ael.y"
@@ -1489,7 +1487,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1493 "ael.tab.c"
+#line 1491 "ael.tab.c"
         break;
       case 91: /* "switchlist_block" */
 #line 159 "ael.y"
@@ -1497,7 +1495,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1501 "ael.tab.c"
+#line 1499 "ael.tab.c"
         break;
       case 92: /* "switchlist" */
 #line 159 "ael.y"
@@ -1505,7 +1503,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1509 "ael.tab.c"
+#line 1507 "ael.tab.c"
         break;
       case 93: /* "included_entry" */
 #line 159 "ael.y"
@@ -1513,7 +1511,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1517 "ael.tab.c"
+#line 1515 "ael.tab.c"
         break;
       case 94: /* "includeslist" */
 #line 159 "ael.y"
@@ -1521,7 +1519,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1525 "ael.tab.c"
+#line 1523 "ael.tab.c"
         break;
       case 95: /* "includes" */
 #line 159 "ael.y"
@@ -1529,7 +1527,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1533 "ael.tab.c"
+#line 1531 "ael.tab.c"
         break;
 
       default:
@@ -2627,62 +2625,57 @@ yyreduce:
     break;
 
   case 121:
-#line 582 "ael.y"
+#line 584 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
   case 122:
 #line 585 "ael.y"
-    { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
+    { (yyval.pval) = linku1(nword((yyvsp[-2].str), &(yylsp[-2])), (yyvsp[0].pval)); ;}
     break;
 
   case 123:
 #line 586 "ael.y"
-    { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
+    {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
   case 124:
-#line 587 "ael.y"
-    {(yyval.pval)=(yyvsp[-1].pval);;}
+#line 589 "ael.y"
+    { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
   case 125:
 #line 590 "ael.y"
-    { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
-    break;
-
-  case 126:
-#line 591 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->u2.arglist = (yyvsp[0].pval);
 		prev_word=0; /* XXX sure ? */ ;}
     break;
 
-  case 127:
-#line 598 "ael.y"
+  case 126:
+#line 597 "ael.y"
     { (yyval.pval) = (yyvsp[-1].pval); ;}
     break;
 
-  case 128:
-#line 599 "ael.y"
+  case 127:
+#line 598 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-2].pval), (yyvsp[-1].pval)); ;}
     break;
 
-  case 129:
-#line 600 "ael.y"
+  case 128:
+#line 599 "ael.y"
     {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
-  case 130:
-#line 603 "ael.y"
+  case 129:
+#line 602 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
     break;
 
-  case 131:
-#line 606 "ael.y"
+  case 130:
+#line 605 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
     break;
@@ -2692,7 +2685,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 2696 "ael.tab.c"
+#line 2689 "ael.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2967,7 +2960,7 @@ yyreturn:
 }
 
 
-#line 611 "ael.y"
+#line 610 "ael.y"
 
 
 static char *token_equivs1[] =
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index bf3e56061..a7bd7108a 100644
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -579,11 +579,10 @@ eswitches : KW_ESWITCHES switchlist_block {
 	;
 
 switchlist_block : LC switchlist RC { $$ = $2; }
-	| LC RC { $$ = NULL; }
 	;
 
-switchlist : word SEMI { $$ = nword($1, &@1); }
-	| switchlist word SEMI { $$ = linku1($1, nword($2, &@2)); }
+switchlist : /* empty */ { $$ = NULL; }
+	| word SEMI switchlist { $$ = linku1(nword($1, &@1), $3); }
 	| switchlist error {$$=$1;}
 	;