macro statements can be empty

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

2 files changed, 559 insertions, 560 deletions

diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index 7306c3814..8f782498b 100644
--- a/pbx/ael/ael.tab.c
+++ b/pbx/ael/ael.tab.c
@@ -420,7 +420,7 @@ union yyalloc
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  14
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   384
+#define YYLAST   407
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  42
@@ -429,7 +429,7 @@ union yyalloc
 /* YYNRULES -- Number of rules. */
 #define YYNRULES  145
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  283
+#define YYNSTATES  282
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -479,20 +479,20 @@ static const unsigned char yytranslate[] =
 static const unsigned short int yyprhs[] =
 {
        0,     0,     3,     5,     7,    10,    13,    15,    17,    19,
-      21,    23,    25,    30,    32,    33,    42,    50,    55,    59,
-      61,    64,    67,    68,    74,    75,    77,    81,    84,    87,
-      91,    93,    95,    98,   101,   103,   105,   107,   109,   111,
-     112,   118,   121,   123,   128,   132,   137,   145,   154,   156,
-     159,   162,   168,   170,   178,   179,   185,   186,   192,   197,
-     199,   202,   204,   207,   211,   213,   216,   220,   221,   228,
-     232,   233,   239,   243,   247,   250,   251,   252,   253,   266,
-     267,   274,   277,   281,   285,   288,   291,   292,   298,   301,
-     304,   307,   311,   313,   316,   317,   319,   323,   327,   333,
-     339,   345,   351,   353,   357,   363,   367,   373,   377,   378,
-     384,   388,   389,   393,   397,   400,   402,   403,   405,   406,
-     410,   412,   415,   420,   424,   429,   433,   436,   440,   442,
-     445,   447,   453,   456,   459,   463,   466,   469,   473,   476,
-     479,   484,   486,   489,   492,   497
+      21,    23,    25,    30,    32,    33,    42,    47,    51,    53,
+      56,    59,    60,    66,    67,    69,    73,    76,    79,    83,
+      85,    87,    90,    93,    95,    97,    99,   101,   103,   104,
+     110,   113,   115,   120,   124,   129,   137,   146,   148,   151,
+     154,   160,   162,   170,   171,   177,   178,   184,   189,   191,
+     194,   196,   199,   203,   205,   208,   212,   213,   220,   224,
+     225,   231,   235,   239,   242,   243,   244,   245,   258,   259,
+     266,   269,   273,   277,   280,   283,   284,   290,   293,   296,
+     299,   303,   305,   308,   309,   311,   315,   319,   325,   331,
+     337,   343,   345,   349,   355,   359,   365,   369,   370,   376,
+     380,   381,   385,   389,   392,   394,   395,   397,   398,   402,
+     404,   407,   412,   416,   421,   425,   428,   432,   433,   435,
+     438,   440,   446,   449,   452,   456,   459,   462,   466,   469,
+     472,   477,   479,   482,   485,   490
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -502,73 +502,72 @@ static const yysigned_char yyrhs[] =
       44,     1,    -1,    47,    -1,    49,    -1,    50,    -1,     8,
       -1,    41,    -1,    36,    -1,    48,     3,    46,    55,    -1,
       23,    -1,    -1,    15,    41,     6,    54,     7,     4,    91,
-       5,    -1,    15,    41,     6,    54,     7,     4,     5,    -1,
-      16,     4,    51,     5,    -1,    16,     4,     5,    -1,    52,
-      -1,    51,    52,    -1,    51,     1,    -1,    -1,    41,     9,
-      53,    41,     8,    -1,    -1,    41,    -1,    54,    10,    41,
-      -1,    54,     1,    -1,     4,     5,    -1,     4,    56,     5,
-      -1,    57,    -1,     1,    -1,    56,    57,    -1,    56,     1,
-      -1,    60,    -1,    99,    -1,    93,    -1,    94,    -1,    59,
-      -1,    -1,    41,     9,    58,    41,     8,    -1,    41,     1,
-      -1,     8,    -1,    17,    24,    41,     8,    -1,    41,    24,
-      72,    -1,    30,    41,    24,    72,    -1,    31,     6,    68,
-       7,    41,    24,    72,    -1,    30,    31,     6,    68,     7,
-      41,    24,    72,    -1,    72,    -1,    61,    72,    -1,    61,
-       1,    -1,    68,    11,    68,    11,    68,    -1,    41,    -1,
-      62,    13,    68,    13,    68,    13,    68,    -1,    -1,    19,
-       6,    65,    67,     7,    -1,    -1,    22,     6,    66,    67,
-       7,    -1,    20,     6,    63,     7,    -1,    41,    -1,    41,
-      41,    -1,    41,    -1,    41,    41,    -1,    41,    41,    41,
-      -1,    41,    -1,    41,    41,    -1,    41,    11,    41,    -1,
-      -1,    18,     6,    71,    41,     7,     4,    -1,     4,    61,
-       5,    -1,    -1,    41,     9,    73,    41,     8,    -1,    25,
-      80,     8,    -1,    26,    81,     8,    -1,    41,    11,    -1,
-      -1,    -1,    -1,    32,     6,    74,    41,     8,    75,    41,
-       8,    76,    41,     7,    72,    -1,    -1,    33,     6,    77,
-      41,     7,    72,    -1,    70,     5,    -1,    70,    89,     5,
-      -1,    12,    82,     8,    -1,    86,     8,    -1,    41,     8,
-      -1,    -1,    86,     9,    78,    41,     8,    -1,    28,     8,
-      -1,    27,     8,    -1,    29,     8,    -1,    64,    72,    79,
-      -1,     8,    -1,    21,    72,    -1,    -1,    69,    -1,    69,
-      13,    69,    -1,    69,    10,    69,    -1,    69,    13,    69,
-      13,    69,    -1,    69,    10,    69,    10,    69,    -1,    36,
-      13,    69,    13,    69,    -1,    36,    10,    69,    10,    69,
-      -1,    69,    -1,    69,    10,    69,    -1,    69,    10,    41,
-      14,    41,    -1,    69,    14,    69,    -1,    69,    10,    41,
-      14,    36,    -1,    69,    14,    36,    -1,    -1,    41,     6,
-      83,    88,     7,    -1,    41,     6,     7,    -1,    -1,    41,
-       6,    85,    -1,    84,    88,     7,    -1,    84,     7,    -1,
-      41,    -1,    -1,    67,    -1,    -1,    88,    10,    87,    -1,
-      90,    -1,    89,    90,    -1,    34,    41,    11,    61,    -1,
-      36,    11,    61,    -1,    35,    41,    11,    61,    -1,    34,
-      41,    11,    -1,    36,    11,    -1,    35,    41,    11,    -1,
-      92,    -1,    91,    92,    -1,    72,    -1,    37,    41,     4,
-      61,     5,    -1,    38,    95,    -1,    39,    95,    -1,     4,
-      96,     5,    -1,     4,     5,    -1,    41,     8,    -1,    96,
-      41,     8,    -1,    96,     1,    -1,    46,     8,    -1,    46,
-      13,    63,     8,    -1,    97,    -1,    98,    97,    -1,    98,
-       1,    -1,    40,     4,    98,     5,    -1,    40,     4,     5,
-      -1
+       5,    -1,    16,     4,    51,     5,    -1,    16,     4,     5,
+      -1,    52,    -1,    51,    52,    -1,    51,     1,    -1,    -1,
+      41,     9,    53,    41,     8,    -1,    -1,    41,    -1,    54,
+      10,    41,    -1,    54,     1,    -1,     4,     5,    -1,     4,
+      56,     5,    -1,    57,    -1,     1,    -1,    56,    57,    -1,
+      56,     1,    -1,    60,    -1,    99,    -1,    93,    -1,    94,
+      -1,    59,    -1,    -1,    41,     9,    58,    41,     8,    -1,
+      41,     1,    -1,     8,    -1,    17,    24,    41,     8,    -1,
+      41,    24,    72,    -1,    30,    41,    24,    72,    -1,    31,
+       6,    68,     7,    41,    24,    72,    -1,    30,    31,     6,
+      68,     7,    41,    24,    72,    -1,    72,    -1,    61,    72,
+      -1,    61,     1,    -1,    68,    11,    68,    11,    68,    -1,
+      41,    -1,    62,    13,    68,    13,    68,    13,    68,    -1,
+      -1,    19,     6,    65,    67,     7,    -1,    -1,    22,     6,
+      66,    67,     7,    -1,    20,     6,    63,     7,    -1,    41,
+      -1,    41,    41,    -1,    41,    -1,    41,    41,    -1,    41,
+      41,    41,    -1,    41,    -1,    41,    41,    -1,    41,    11,
+      41,    -1,    -1,    18,     6,    71,    41,     7,     4,    -1,
+       4,    61,     5,    -1,    -1,    41,     9,    73,    41,     8,
+      -1,    25,    80,     8,    -1,    26,    81,     8,    -1,    41,
+      11,    -1,    -1,    -1,    -1,    32,     6,    74,    41,     8,
+      75,    41,     8,    76,    41,     7,    72,    -1,    -1,    33,
+       6,    77,    41,     7,    72,    -1,    70,     5,    -1,    70,
+      89,     5,    -1,    12,    82,     8,    -1,    86,     8,    -1,
+      41,     8,    -1,    -1,    86,     9,    78,    41,     8,    -1,
+      28,     8,    -1,    27,     8,    -1,    29,     8,    -1,    64,
+      72,    79,    -1,     8,    -1,    21,    72,    -1,    -1,    69,
+      -1,    69,    13,    69,    -1,    69,    10,    69,    -1,    69,
+      13,    69,    13,    69,    -1,    69,    10,    69,    10,    69,
+      -1,    36,    13,    69,    13,    69,    -1,    36,    10,    69,
+      10,    69,    -1,    69,    -1,    69,    10,    69,    -1,    69,
+      10,    41,    14,    41,    -1,    69,    14,    69,    -1,    69,
+      10,    41,    14,    36,    -1,    69,    14,    36,    -1,    -1,
+      41,     6,    83,    88,     7,    -1,    41,     6,     7,    -1,
+      -1,    41,     6,    85,    -1,    84,    88,     7,    -1,    84,
+       7,    -1,    41,    -1,    -1,    67,    -1,    -1,    88,    10,
+      87,    -1,    90,    -1,    89,    90,    -1,    34,    41,    11,
+      61,    -1,    36,    11,    61,    -1,    35,    41,    11,    61,
+      -1,    34,    41,    11,    -1,    36,    11,    -1,    35,    41,
+      11,    -1,    -1,    92,    -1,    91,    92,    -1,    72,    -1,
+      37,    41,     4,    61,     5,    -1,    38,    95,    -1,    39,
+      95,    -1,     4,    96,     5,    -1,     4,     5,    -1,    41,
+       8,    -1,    96,    41,     8,    -1,    96,     1,    -1,    46,
+       8,    -1,    46,    13,    63,     8,    -1,    97,    -1,    98,
+      97,    -1,    98,     1,    -1,    40,     4,    98,     5,    -1,
+      40,     4,     5,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
        0,   178,   178,   181,   182,   183,   186,   187,   188,   189,
-     192,   193,   196,   204,   205,   208,   211,   216,   219,   223,
-     224,   225,   228,   228,   234,   235,   236,   237,   240,   241,
-     244,   245,   246,   247,   250,   251,   252,   253,   254,   255,
-     255,   259,   260,   263,   268,   272,   277,   282,   291,   292,
-     293,   299,   304,   308,   316,   316,   319,   319,   322,   333,
-     334,   341,   342,   347,   355,   356,   360,   366,   366,   374,
-     377,   377,   381,   384,   387,   390,   391,   392,   390,   398,
-     398,   402,   404,   407,   409,   411,   414,   414,   447,   448,
-     449,   450,   454,   457,   458,   463,   464,   467,   470,   474,
-     478,   482,   489,   492,   495,   499,   503,   507,   513,   513,
-     518,   526,   526,   537,   544,   547,   548,   551,   552,   555,
-     558,   559,   562,   566,   570,   574,   577,   580,   585,   586,
-     589,   590,   596,   601,   606,   607,   610,   611,   612,   615,
-     616,   623,   624,   625,   628,   631
+     192,   193,   196,   204,   205,   208,   213,   216,   220,   221,
+     222,   225,   225,   231,   232,   233,   234,   237,   238,   241,
+     242,   243,   244,   247,   248,   249,   250,   251,   252,   252,
+     256,   257,   260,   265,   269,   274,   279,   288,   289,   290,
+     296,   301,   305,   313,   313,   316,   316,   319,   330,   331,
+     338,   339,   344,   352,   353,   357,   363,   363,   371,   374,
+     374,   378,   381,   384,   387,   388,   389,   387,   395,   395,
+     399,   401,   404,   406,   408,   411,   411,   444,   445,   446,
+     447,   451,   454,   455,   460,   461,   464,   467,   471,   475,
+     479,   486,   489,   492,   496,   500,   504,   510,   510,   515,
+     523,   523,   534,   541,   544,   545,   548,   549,   552,   555,
+     556,   559,   563,   567,   571,   574,   577,   582,   583,   584,
+     587,   588,   594,   599,   604,   605,   608,   609,   610,   613,
+     614,   621,   622,   623,   626,   629
 };
 #endif
 
@@ -615,18 +614,18 @@ static const unsigned short int yytoknum[] =
 static const unsigned char yyr1[] =
 {
        0,    42,    43,    44,    44,    44,    45,    45,    45,    45,
-      46,    46,    47,    48,    48,    49,    49,    50,    50,    51,
-      51,    51,    53,    52,    54,    54,    54,    54,    55,    55,
-      56,    56,    56,    56,    57,    57,    57,    57,    57,    58,
-      57,    57,    57,    59,    60,    60,    60,    60,    61,    61,
-      61,    62,    62,    63,    65,    64,    66,    64,    64,    67,
-      67,    68,    68,    68,    69,    69,    69,    71,    70,    72,
-      73,    72,    72,    72,    72,    74,    75,    76,    72,    77,
-      72,    72,    72,    72,    72,    72,    78,    72,    72,    72,
-      72,    72,    72,    79,    79,    80,    80,    80,    80,    80,
-      80,    80,    81,    81,    81,    81,    81,    81,    83,    82,
-      82,    85,    84,    86,    86,    87,    87,    88,    88,    88,
-      89,    89,    90,    90,    90,    90,    90,    90,    91,    91,
+      46,    46,    47,    48,    48,    49,    50,    50,    51,    51,
+      51,    53,    52,    54,    54,    54,    54,    55,    55,    56,
+      56,    56,    56,    57,    57,    57,    57,    57,    58,    57,
+      57,    57,    59,    60,    60,    60,    60,    61,    61,    61,
+      62,    62,    63,    65,    64,    66,    64,    64,    67,    67,
+      68,    68,    68,    69,    69,    69,    71,    70,    72,    73,
+      72,    72,    72,    72,    74,    75,    76,    72,    77,    72,
+      72,    72,    72,    72,    72,    78,    72,    72,    72,    72,
+      72,    72,    79,    79,    80,    80,    80,    80,    80,    80,
+      80,    81,    81,    81,    81,    81,    81,    83,    82,    82,
+      85,    84,    86,    86,    87,    87,    88,    88,    88,    89,
+      89,    90,    90,    90,    90,    90,    90,    91,    91,    91,
       92,    92,    93,    94,    95,    95,    96,    96,    96,    97,
       97,    98,    98,    98,    99,    99
 };
@@ -635,18 +634,18 @@ static const unsigned char yyr1[] =
 static const unsigned char yyr2[] =
 {
        0,     2,     1,     1,     2,     2,     1,     1,     1,     1,
-       1,     1,     4,     1,     0,     8,     7,     4,     3,     1,
-       2,     2,     0,     5,     0,     1,     3,     2,     2,     3,
-       1,     1,     2,     2,     1,     1,     1,     1,     1,     0,
-       5,     2,     1,     4,     3,     4,     7,     8,     1,     2,
-       2,     5,     1,     7,     0,     5,     0,     5,     4,     1,
-       2,     1,     2,     3,     1,     2,     3,     0,     6,     3,
-       0,     5,     3,     3,     2,     0,     0,     0,    12,     0,
-       6,     2,     3,     3,     2,     2,     0,     5,     2,     2,
-       2,     3,     1,     2,     0,     1,     3,     3,     5,     5,
-       5,     5,     1,     3,     5,     3,     5,     3,     0,     5,
-       3,     0,     3,     3,     2,     1,     0,     1,     0,     3,
-       1,     2,     4,     3,     4,     3,     2,     3,     1,     2,
+       1,     1,     4,     1,     0,     8,     4,     3,     1,     2,
+       2,     0,     5,     0,     1,     3,     2,     2,     3,     1,
+       1,     2,     2,     1,     1,     1,     1,     1,     0,     5,
+       2,     1,     4,     3,     4,     7,     8,     1,     2,     2,
+       5,     1,     7,     0,     5,     0,     5,     4,     1,     2,
+       1,     2,     3,     1,     2,     3,     0,     6,     3,     0,
+       5,     3,     3,     2,     0,     0,     0,    12,     0,     6,
+       2,     3,     3,     2,     2,     0,     5,     2,     2,     2,
+       3,     1,     2,     0,     1,     3,     3,     5,     5,     5,
+       5,     1,     3,     5,     3,     5,     3,     0,     5,     3,
+       0,     3,     3,     2,     1,     0,     1,     0,     3,     1,
+       2,     4,     3,     4,     3,     2,     3,     0,     1,     2,
        1,     5,     2,     2,     3,     2,     2,     3,     2,     2,
        4,     1,     2,     2,     4,     3
 };
@@ -657,183 +656,187 @@ static const unsigned char yyr2[] =
 static const unsigned char yydefact[] =
 {
       14,     9,     0,     0,    13,     0,     0,     3,     6,     0,
-       7,     8,     0,     0,     1,     5,     4,     0,    24,    18,
-       0,     0,    19,    11,    10,     0,    25,     0,    22,    21,
-      17,    20,     0,    12,    27,     0,     0,     0,    31,    28,
-      42,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-      38,    34,    36,    37,    35,     0,    26,     0,     0,     0,
-       0,     0,     0,   132,   133,     0,    41,    39,     0,    33,
-      29,    32,     0,    16,    92,     0,     0,     0,     0,     0,
+       7,     8,     0,     0,     1,     5,     4,     0,    23,    17,
+       0,     0,    18,    11,    10,     0,    24,     0,    21,    20,
+      16,    19,     0,    12,    26,     0,     0,     0,    30,    27,
+      41,     0,     0,     0,     0,     0,     0,     0,     0,    29,
+      37,    33,    35,    36,    34,   127,    25,     0,     0,     0,
+       0,     0,     0,   132,   133,     0,    40,    38,     0,    32,
+      28,    31,     0,    91,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   130,   118,     0,     0,   128,    23,     0,     0,     0,
-      61,     0,   135,     0,     0,   145,     0,   141,     0,     0,
-      44,     0,    48,     0,     0,    67,    54,     0,    56,     0,
-      64,    95,     0,   102,     0,    89,    88,    90,    75,    79,
-       0,   111,    85,    70,    74,    94,    81,     0,     0,     0,
-       0,   120,   114,    59,   117,     0,    84,    86,    15,   129,
-      43,     0,    45,    62,     0,   136,   138,   134,     0,   139,
-       0,   143,   144,   142,     0,    50,    69,    49,   108,    83,
-       0,     0,    52,     0,     0,     0,     0,     0,     0,     0,
-      65,     0,     0,    72,     0,     0,    73,     0,     0,     0,
-     112,     0,     0,    91,     0,     0,   126,    82,   121,    60,
-     113,   116,     0,     0,    63,     0,   137,     0,    40,   110,
-     118,     0,     0,     0,    58,     0,     0,     0,     0,    66,
-      97,    96,    64,   103,   107,   105,     0,     0,     0,     0,
-      93,   125,   127,     0,   115,   119,     0,     0,     0,   140,
-       0,     0,    55,     0,     0,    57,     0,     0,     0,     0,
-       0,    76,     0,   131,    71,     0,     0,    87,     0,    46,
-     109,    68,     0,     0,   101,   100,    99,    98,   106,   104,
-       0,    80,    47,     0,    51,     0,     0,    77,    53,     0,
-       0,     0,    78
+     130,   117,     0,     0,   128,    22,     0,     0,     0,    60,
+       0,   135,     0,     0,   145,     0,   141,     0,     0,    43,
+       0,    47,     0,     0,    66,    53,     0,    55,     0,    63,
+      94,     0,   101,     0,    88,    87,    89,    74,    78,     0,
+     110,    84,    69,    73,    93,    80,     0,     0,     0,     0,
+     119,   113,    58,   116,     0,    83,    85,    15,   129,    42,
+       0,    44,    61,     0,   136,   138,   134,     0,   139,     0,
+     143,   144,   142,     0,    49,    68,    48,   107,    82,     0,
+       0,    51,     0,     0,     0,     0,     0,     0,     0,    64,
+       0,     0,    71,     0,     0,    72,     0,     0,     0,   111,
+       0,     0,    90,     0,     0,   125,    81,   120,    59,   112,
+     115,     0,     0,    62,     0,   137,     0,    39,   109,   117,
+       0,     0,     0,    57,     0,     0,     0,     0,    65,    96,
+      95,    63,   102,   106,   104,     0,     0,     0,     0,    92,
+     124,   126,     0,   114,   118,     0,     0,     0,   140,     0,
+       0,    54,     0,     0,    56,     0,     0,     0,     0,     0,
+      75,     0,   131,    70,     0,     0,    86,     0,    45,   108,
+      67,     0,     0,   100,    99,    98,    97,   105,   103,     0,
+      79,    46,     0,    50,     0,     0,    76,    52,     0,     0,
+       0,    77
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,     5,     6,     7,   106,     8,     9,    10,    11,    21,
-      22,    37,    27,    33,    48,    49,   109,    50,    51,   111,
-     173,   174,    89,   171,   176,   144,   175,   121,    90,   170,
-     112,   191,   187,   270,   279,   188,   202,   193,   122,   124,
-     114,   210,    92,   190,    93,   235,   145,   140,   141,    94,
-      95,    52,    53,    63,   104,   107,   108,    54
+      -1,     5,     6,     7,   105,     8,     9,    10,    11,    21,
+      22,    37,    27,    33,    48,    49,   108,    50,    51,   110,
+     172,   173,    88,   170,   175,   143,   174,   120,    89,   169,
+     111,   190,   186,   269,   278,   187,   201,   192,   121,   123,
+     113,   209,    91,   189,    92,   234,   144,   139,   140,    93,
+      94,    52,    53,    63,   103,   106,   107,    54
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -186
+#define YYPACT_NINF -187
 static const short int yypact[] =
 {
-     103,  -186,    -6,    56,  -186,    41,   355,  -186,  -186,    68,
-    -186,  -186,    71,    20,  -186,  -186,  -186,   -26,    23,  -186,
-     126,     1,  -186,  -186,  -186,   108,  -186,   143,  -186,  -186,
-    -186,  -186,   141,  -186,  -186,   137,   102,   111,  -186,  -186,
-    -186,   166,    37,   159,   170,   170,   191,    61,   146,  -186,
-    -186,  -186,  -186,  -186,  -186,   269,  -186,   162,   155,   192,
-     175,   161,    22,  -186,  -186,     2,  -186,  -186,   321,  -186,
-    -186,  -186,   321,  -186,  -186,   167,   201,   206,   208,   209,
-      50,   178,   203,   212,   213,   210,   216,   187,   119,   321,
-      98,  -186,    12,   185,   295,  -186,  -186,   221,   161,   321,
-     194,   229,  -186,   234,    16,  -186,    82,  -186,    13,   202,
-    -186,     4,  -186,   239,   241,  -186,  -186,   211,  -186,    74,
-       9,   149,   242,   150,   245,  -186,  -186,  -186,  -186,  -186,
-     250,  -186,  -186,  -186,  -186,   235,  -186,   217,   218,   246,
-     104,  -186,  -186,   219,  -186,   181,  -186,  -186,  -186,  -186,
-    -186,   257,  -186,   225,   226,  -186,  -186,  -186,   270,  -186,
-     211,  -186,  -186,  -186,   271,  -186,  -186,  -186,   273,  -186,
-     244,   249,    17,   279,   275,   272,   249,   178,   178,   252,
-    -186,   178,   178,  -186,   263,    58,  -186,   264,   267,   321,
-    -186,   268,   321,  -186,   300,   301,   321,  -186,  -186,  -186,
-    -186,   277,   278,   285,  -186,   262,  -186,   308,  -186,  -186,
-     249,   323,   324,   161,  -186,   161,   327,   325,   329,  -186,
-     328,   331,   134,  -186,  -186,  -186,   337,   330,   243,   343,
-    -186,   321,   321,    47,  -186,  -186,   344,   333,   321,  -186,
-     182,   356,  -186,   346,   350,  -186,   178,   178,   178,   178,
-      95,  -186,   321,  -186,  -186,    88,   205,  -186,   321,  -186,
-    -186,  -186,   161,   161,  -186,  -186,  -186,  -186,  -186,  -186,
-     326,  -186,  -186,   351,  -186,   357,   161,  -186,  -186,   332,
-     359,   321,  -186
+     103,  -187,    -4,    48,  -187,    75,   384,  -187,  -187,    81,
+    -187,  -187,    89,     0,  -187,  -187,  -187,   -20,    96,  -187,
+     121,     7,  -187,  -187,  -187,   138,  -187,    16,  -187,  -187,
+    -187,  -187,   140,  -187,  -187,   139,   106,   108,  -187,  -187,
+    -187,   120,   -21,   146,   147,   147,   151,    67,   145,  -187,
+    -187,  -187,  -187,  -187,  -187,   324,  -187,   150,   119,   153,
+     137,   122,    10,  -187,  -187,    -1,  -187,  -187,   350,  -187,
+    -187,  -187,   350,  -187,   123,   159,   167,   168,   181,   -17,
+     148,   180,   182,   183,   186,   187,   154,    19,   350,    24,
+    -187,    15,   131,   298,  -187,  -187,   189,   122,   350,   157,
+     194,  -187,   198,    13,  -187,    74,  -187,     6,   166,  -187,
+     242,  -187,   188,   202,  -187,  -187,   170,  -187,    56,    -5,
+      99,   205,   117,   206,  -187,  -187,  -187,  -187,  -187,   211,
+    -187,  -187,  -187,  -187,   197,  -187,   178,   179,   210,    98,
+    -187,  -187,   193,  -187,   118,  -187,  -187,  -187,  -187,  -187,
+     220,  -187,   200,   201,  -187,  -187,  -187,   227,  -187,   170,
+    -187,  -187,  -187,   236,  -187,  -187,  -187,   221,  -187,   207,
+     208,    21,   238,   245,   244,   208,   148,   148,   212,  -187,
+     148,   148,  -187,   215,    47,  -187,   216,   217,   350,  -187,
+     218,   350,  -187,   252,   254,   350,  -187,  -187,  -187,  -187,
+     225,   231,   237,  -187,   255,  -187,   273,  -187,  -187,   208,
+     275,   278,   122,  -187,   122,   279,   277,   276,  -187,   283,
+     282,    20,  -187,  -187,  -187,   280,   289,   272,   299,  -187,
+     350,   350,    45,  -187,  -187,   300,   285,   350,  -187,   128,
+     307,  -187,   301,   304,  -187,   148,   148,   148,   148,    49,
+    -187,   350,  -187,  -187,    88,   204,  -187,   350,  -187,  -187,
+    -187,   122,   122,  -187,  -187,  -187,  -187,  -187,  -187,   271,
+    -187,  -187,   306,  -187,   313,   122,  -187,  -187,   281,   322,
+     350,  -187
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -186,  -186,  -186,   362,   352,  -186,  -186,  -186,  -186,  -186,
-     353,  -186,  -186,  -186,  -186,   334,  -186,  -186,  -186,  -185,
-    -186,   215,  -186,  -186,  -186,   -15,   -58,   -80,  -186,  -186,
-     -55,  -186,  -186,  -186,  -186,  -186,  -186,  -186,  -186,  -186,
-    -186,  -186,  -186,  -186,  -186,  -186,   169,  -186,   232,  -186,
-     282,  -186,  -186,   335,  -186,   276,  -186,  -186
+    -187,  -187,  -187,   327,   317,  -187,  -187,  -187,  -187,  -187,
+     316,  -187,  -187,  -187,  -187,   290,  -187,  -187,  -187,  -186,
+    -187,   196,  -187,  -187,  -187,   -76,   -58,   -79,  -187,  -187,
+     -55,  -187,  -187,  -187,  -187,  -187,  -187,  -187,  -187,  -187,
+    -187,  -187,  -187,  -187,  -187,  -187,   132,  -187,   209,  -187,
+     247,  -187,  -187,   302,  -187,   253,  -187,  -187
 };
 
 /* 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 -125
+#define YYTABLE_NINF -124
 static const short int yytable[] =
 {
-      91,   123,    29,   101,   228,   165,    30,   105,    72,   166,
-      23,   233,    74,   110,   161,    24,    75,   156,   162,   142,
-     179,   157,    76,    77,    78,    19,    79,   102,   -61,    80,
-      81,    82,    83,    84,   135,    12,    85,    86,    23,    91,
-     151,    14,    20,    24,   152,    88,   255,   256,   165,    23,
-     180,    72,  -123,   143,    24,    74,   167,   158,   153,    75,
-      13,    20,    66,   103,    26,    76,    77,    78,    59,    79,
-      67,    17,    80,    81,    82,    83,    84,    18,    60,    85,
-      86,  -123,  -123,  -123,   177,    68,   119,   178,    88,   165,
-     159,   120,    72,  -122,   224,   160,    74,   217,   218,   120,
-      75,   220,   221,   136,   223,   225,    76,    77,    78,   197,
-      79,     1,    32,    80,    81,    82,    83,    84,     2,     3,
-      85,    86,  -122,  -122,  -122,   131,     4,   132,   133,    88,
-     134,   268,   137,   138,   139,    28,   269,   230,   137,   138,
-     139,    55,    38,    56,    34,   179,    39,    69,   250,    40,
-      35,    70,    57,    36,    40,   243,   212,   244,    41,   181,
-     184,   216,   182,    41,   185,    61,   264,   265,   266,   267,
-      96,    42,    43,   167,    62,   180,    42,    43,   167,    44,
-      45,    46,    47,   259,    44,    45,    46,    47,   200,   260,
-      58,   201,   201,   146,   147,    65,    97,   271,    98,    99,
-     167,   167,   100,   272,   273,   274,   165,   115,   113,    72,
-    -124,   125,   116,    74,   117,   118,   128,    75,   278,   120,
-     126,   127,   129,    76,    77,    78,   282,    79,   130,   150,
-      80,    81,    82,    83,    84,   153,   154,    85,    86,  -124,
-    -124,  -124,   155,   164,   165,   168,    88,    72,   253,   169,
-     183,    74,   172,   186,   189,    75,   192,   196,   194,   195,
-     199,    76,    77,    78,   203,    79,   204,   205,    80,    81,
-      82,    83,    84,    72,    73,    85,    86,    74,   206,   208,
-     209,    75,   214,   215,    88,   211,   238,    76,    77,    78,
-     143,    79,   213,   219,    80,    81,    82,    83,    84,    72,
-     148,    85,    86,    74,   222,   226,    87,    75,   227,   229,
-      88,   231,   232,    76,    77,    78,   239,    79,   234,   236,
-      80,    81,    82,    83,    84,    72,   237,    85,    86,    74,
-     241,   242,    87,    75,   245,   246,    88,   252,   248,    76,
-      77,    78,   247,    79,   249,   251,    80,    81,    82,    83,
-      84,   254,   257,    85,    86,    -2,    15,   258,   -14,   262,
-     261,   263,    88,     1,   276,   277,   281,   275,    16,    25,
-       2,     3,   198,   280,    31,   207,   149,     0,     4,   240,
-      64,     0,    71,     0,   163
+      90,   122,   227,   100,   104,    19,   178,   160,    29,   232,
+      59,   161,    30,   109,   155,   101,    23,    34,   156,   118,
+      60,    24,   141,    35,   119,   130,    36,   131,   132,   135,
+     133,   178,   -60,   134,   249,    23,   179,    12,    90,   150,
+      24,    20,    23,   151,   254,   255,   164,    24,    20,    72,
+    -122,   102,    13,    73,   157,   166,   142,    74,   136,   137,
+     138,   179,   152,    75,    76,    77,   176,    78,    66,   177,
+      79,    80,    81,    82,    83,    14,    67,    84,    85,  -122,
+    -122,  -122,   158,   223,    17,   267,    87,   159,   119,   164,
+     268,    68,    72,  -121,   211,    18,    73,   216,   217,   215,
+      74,   219,   220,   196,   222,   224,    75,    76,    77,   180,
+      78,     1,   181,    79,    80,    81,    82,    83,     2,     3,
+      84,    85,  -121,  -121,  -121,   199,     4,   183,   200,    87,
+      28,   184,   136,   137,   138,   259,   229,    26,   200,   145,
+     146,    38,    32,    55,    58,    39,    69,    56,    40,    57,
+      70,    62,    61,    40,   242,    65,   243,    41,    95,    97,
+      96,    98,    41,    99,   112,   114,   263,   264,   265,   266,
+      42,    43,   166,   115,   116,    42,    43,   166,    44,    45,
+      46,    47,   258,    44,    45,    46,    47,   117,   124,   119,
+     125,   126,   127,   128,   167,   129,   270,   149,   152,   166,
+     166,   153,   271,   272,   273,   164,   154,   163,    72,  -123,
+     168,   171,    73,   182,   185,   188,    74,   277,   191,   193,
+     194,   195,    75,    76,    77,   281,    78,   202,   208,    79,
+      80,    81,    82,    83,   198,   205,    84,    85,  -123,  -123,
+    -123,   203,   204,   164,   207,    87,    72,   165,   210,   142,
+      73,   212,   213,   218,    74,   214,   221,   225,   226,   228,
+      75,    76,    77,   230,    78,   231,   233,    79,    80,    81,
+      82,    83,   235,   164,    84,    85,    72,   252,   236,   237,
+      73,   238,   240,    87,    74,   241,   244,   245,   250,   246,
+      75,    76,    77,   247,    78,   248,   251,    79,    80,    81,
+      82,    83,    72,   147,    84,    85,    73,   253,   256,   257,
+      74,   260,   274,    87,   261,   262,    75,    76,    77,   275,
+      78,   276,   279,    79,    80,    81,    82,    83,    72,   280,
+      84,    85,    73,    16,    25,    86,    74,    31,    71,    87,
+     148,   239,    75,    76,    77,     0,    78,    64,   197,    79,
+      80,    81,    82,    83,    72,   206,    84,    85,    73,     0,
+     162,    86,    74,     0,     0,    87,     0,     0,    75,    76,
+      77,     0,    78,     0,     0,    79,    80,    81,    82,    83,
+       0,     0,    84,    85,    -2,    15,     0,   -14,     0,     0,
+       0,    87,     1,     0,     0,     0,     0,     0,     0,     2,
+       3,     0,     0,     0,     0,     0,     0,     4
 };
 
 static const short int yycheck[] =
 {
-      55,    81,     1,    61,   189,     1,     5,     5,     4,     5,
-      36,   196,     8,    68,     1,    41,    12,     1,     5,     7,
-      11,     5,    18,    19,    20,     5,    22,     5,    11,    25,
-      26,    27,    28,    29,    89,    41,    32,    33,    36,    94,
-      98,     0,    41,    41,    99,    41,   231,   232,     1,    36,
-      41,     4,     5,    41,    41,     8,   111,    41,    41,    12,
-       4,    41,     1,    41,    41,    18,    19,    20,    31,    22,
-       9,     3,    25,    26,    27,    28,    29,     6,    41,    32,
-      33,    34,    35,    36,    10,    24,    36,    13,    41,     1,
-       8,    41,     4,     5,    36,    13,     8,   177,   178,    41,
-      12,   181,   182,     5,   184,   185,    18,    19,    20,     5,
-      22,     8,     4,    25,    26,    27,    28,    29,    15,    16,
-      32,    33,    34,    35,    36,     6,    23,     8,     9,    41,
-      11,    36,    34,    35,    36,     9,    41,   192,    34,    35,
-      36,     4,     1,    41,     1,    11,     5,     1,    14,     8,
-       7,     5,    41,    10,     8,   213,   171,   215,    17,    10,
-      10,   176,    13,    17,    14,     6,   246,   247,   248,   249,
-       8,    30,    31,   228,     4,    41,    30,    31,   233,    38,
-      39,    40,    41,   238,    38,    39,    40,    41,     7,     7,
-      24,    10,    10,     8,     9,     4,    41,   252,     6,    24,
-     255,   256,    41,   258,   262,   263,     1,     6,    41,     4,
-       5,     8,     6,     8,     6,     6,     6,    12,   276,    41,
-       8,     8,     6,    18,    19,    20,   281,    22,    41,     8,
-      25,    26,    27,    28,    29,    41,     7,    32,    33,    34,
-      35,    36,     8,    41,     1,     6,    41,     4,     5,     8,
-       8,     8,    41,     8,     4,    12,    21,    11,    41,    41,
-      41,    18,    19,    20,     7,    22,    41,    41,    25,    26,
-      27,    28,    29,     4,     5,    32,    33,     8,     8,     8,
-       7,    12,     7,    11,    41,    41,    24,    18,    19,    20,
-      41,    22,    13,    41,    25,    26,    27,    28,    29,     4,
-       5,    32,    33,     8,    41,    41,    37,    12,    41,    41,
-      41,    11,    11,    18,    19,    20,     8,    22,    41,    41,
-      25,    26,    27,    28,    29,     4,    41,    32,    33,     8,
-       7,     7,    37,    12,     7,    10,    41,     7,    10,    18,
-      19,    20,    13,    22,    13,     8,    25,    26,    27,    28,
-      29,     8,     8,    32,    33,     0,     1,    24,     3,    13,
-       4,    11,    41,     8,    13,     8,     7,    41,     6,    17,
-      15,    16,   140,    41,    21,   160,    94,    -1,    23,   210,
-      45,    -1,    48,    -1,   108
+      55,    80,   188,    61,     5,     5,    11,     1,     1,   195,
+      31,     5,     5,    68,     1,     5,    36,     1,     5,    36,
+      41,    41,     7,     7,    41,     6,    10,     8,     9,     5,
+      11,    11,    11,    88,    14,    36,    41,    41,    93,    97,
+      41,    41,    36,    98,   230,   231,     1,    41,    41,     4,
+       5,    41,     4,     8,    41,   110,    41,    12,    34,    35,
+      36,    41,    41,    18,    19,    20,    10,    22,     1,    13,
+      25,    26,    27,    28,    29,     0,     9,    32,    33,    34,
+      35,    36,     8,    36,     3,    36,    41,    13,    41,     1,
+      41,    24,     4,     5,   170,     6,     8,   176,   177,   175,
+      12,   180,   181,     5,   183,   184,    18,    19,    20,    10,
+      22,     8,    13,    25,    26,    27,    28,    29,    15,    16,
+      32,    33,    34,    35,    36,     7,    23,    10,    10,    41,
+       9,    14,    34,    35,    36,     7,   191,    41,    10,     8,
+       9,     1,     4,     4,    24,     5,     1,    41,     8,    41,
+       5,     4,     6,     8,   212,     4,   214,    17,     8,     6,
+      41,    24,    17,    41,    41,     6,   245,   246,   247,   248,
+      30,    31,   227,     6,     6,    30,    31,   232,    38,    39,
+      40,    41,   237,    38,    39,    40,    41,     6,     8,    41,
+       8,     8,     6,     6,     6,    41,   251,     8,    41,   254,
+     255,     7,   257,   261,   262,     1,     8,    41,     4,     5,
+       8,    41,     8,     8,     8,     4,    12,   275,    21,    41,
+      41,    11,    18,    19,    20,   280,    22,     7,     7,    25,
+      26,    27,    28,    29,    41,     8,    32,    33,    34,    35,
+      36,    41,    41,     1,     8,    41,     4,     5,    41,    41,
+       8,    13,     7,    41,    12,    11,    41,    41,    41,    41,
+      18,    19,    20,    11,    22,    11,    41,    25,    26,    27,
+      28,    29,    41,     1,    32,    33,     4,     5,    41,    24,
+       8,     8,     7,    41,    12,     7,     7,    10,     8,    13,
+      18,    19,    20,    10,    22,    13,     7,    25,    26,    27,
+      28,    29,     4,     5,    32,    33,     8,     8,     8,    24,
+      12,     4,    41,    41,    13,    11,    18,    19,    20,    13,
+      22,     8,    41,    25,    26,    27,    28,    29,     4,     7,
+      32,    33,     8,     6,    17,    37,    12,    21,    48,    41,
+      93,   209,    18,    19,    20,    -1,    22,    45,   139,    25,
+      26,    27,    28,    29,     4,   159,    32,    33,     8,    -1,
+     107,    37,    12,    -1,    -1,    41,    -1,    -1,    18,    19,
+      20,    -1,    22,    -1,    -1,    25,    26,    27,    28,    29,
+      -1,    -1,    32,    33,     0,     1,    -1,     3,    -1,    -1,
+      -1,    41,     8,    -1,    -1,    -1,    -1,    -1,    -1,    15,
+      16,    -1,    -1,    -1,    -1,    -1,    -1,    23
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -847,28 +850,28 @@ static const unsigned char yystos[] =
        8,    17,    30,    31,    38,    39,    40,    41,    56,    57,
       59,    60,    93,    94,    99,     4,    41,    41,    24,    31,
       41,     6,     4,    95,    95,     4,     1,     9,    24,     1,
-       5,    57,     4,     5,     8,    12,    18,    19,    20,    22,
-      25,    26,    27,    28,    29,    32,    33,    37,    41,    64,
-      70,    72,    84,    86,    91,    92,     8,    41,     6,    24,
-      41,    68,     5,    41,    96,     5,    46,    97,    98,    58,
-      72,    61,    72,    41,    82,     6,     6,     6,     6,    36,
-      41,    69,    80,    69,    81,     8,     8,     8,     6,     6,
-      41,     6,     8,     9,    11,    72,     5,    34,    35,    36,
-      89,    90,     7,    41,    67,    88,     8,     9,     5,    92,
-       8,    68,    72,    41,     7,     8,     1,     5,    41,     8,
-      13,     1,     5,    97,    41,     1,     5,    72,     6,     8,
-      71,    65,    41,    62,    63,    68,    66,    10,    13,    11,
-      41,    10,    13,     8,    10,    14,     8,    74,    77,     4,
-      85,    73,    21,    79,    41,    41,    11,     5,    90,    41,
-       7,    10,    78,     7,    41,    41,     8,    63,     8,     7,
-      83,    41,    67,    13,     7,    11,    67,    69,    69,    41,
-      69,    69,    41,    69,    36,    69,    41,    41,    61,    41,
-      72,    11,    11,    61,    41,    87,    41,    41,    24,     8,
-      88,     7,     7,    68,    68,     7,    10,    13,    10,    13,
-      14,     8,     7,     5,     8,    61,    61,     8,    24,    72,
-       7,     4,    13,    11,    69,    69,    69,    69,    36,    41,
-      75,    72,    72,    68,    68,    41,    13,     8,    68,    76,
-      41,     7,    72
+       5,    57,     4,     8,    12,    18,    19,    20,    22,    25,
+      26,    27,    28,    29,    32,    33,    37,    41,    64,    70,
+      72,    84,    86,    91,    92,     8,    41,     6,    24,    41,
+      68,     5,    41,    96,     5,    46,    97,    98,    58,    72,
+      61,    72,    41,    82,     6,     6,     6,     6,    36,    41,
+      69,    80,    69,    81,     8,     8,     8,     6,     6,    41,
+       6,     8,     9,    11,    72,     5,    34,    35,    36,    89,
+      90,     7,    41,    67,    88,     8,     9,     5,    92,     8,
+      68,    72,    41,     7,     8,     1,     5,    41,     8,    13,
+       1,     5,    97,    41,     1,     5,    72,     6,     8,    71,
+      65,    41,    62,    63,    68,    66,    10,    13,    11,    41,
+      10,    13,     8,    10,    14,     8,    74,    77,     4,    85,
+      73,    21,    79,    41,    41,    11,     5,    90,    41,     7,
+      10,    78,     7,    41,    41,     8,    63,     8,     7,    83,
+      41,    67,    13,     7,    11,    67,    69,    69,    41,    69,
+      69,    41,    69,    36,    69,    41,    41,    61,    41,    72,
+      11,    11,    61,    41,    87,    41,    41,    24,     8,    88,
+       7,     7,    68,    68,     7,    10,    13,    10,    13,    14,
+       8,     7,     5,     8,    61,    61,     8,    24,    72,     7,
+       4,    13,    11,    69,    69,    69,    69,    36,    41,    75,
+      72,    72,    68,    68,    41,    13,     8,    68,    76,    41,
+       7,    72
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1246,7 +1249,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
       case 41: /* "word" */
 #line 172 "ael.y"
         { free((yyvaluep->str));};
-#line 1250 "ael.tab.c"
+#line 1253 "ael.tab.c"
         break;
       case 44: /* "objects" */
 #line 158 "ael.y"
@@ -1254,7 +1257,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1258 "ael.tab.c"
+#line 1261 "ael.tab.c"
         break;
       case 45: /* "object" */
 #line 158 "ael.y"
@@ -1262,12 +1265,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1266 "ael.tab.c"
+#line 1269 "ael.tab.c"
         break;
       case 46: /* "context_name" */
 #line 172 "ael.y"
         { free((yyvaluep->str));};
-#line 1271 "ael.tab.c"
+#line 1274 "ael.tab.c"
         break;
       case 47: /* "context" */
 #line 158 "ael.y"
@@ -1275,7 +1278,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1279 "ael.tab.c"
+#line 1282 "ael.tab.c"
         break;
       case 49: /* "macro" */
 #line 158 "ael.y"
@@ -1283,7 +1286,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1287 "ael.tab.c"
+#line 1290 "ael.tab.c"
         break;
       case 50: /* "globals" */
 #line 158 "ael.y"
@@ -1291,7 +1294,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1295 "ael.tab.c"
+#line 1298 "ael.tab.c"
         break;
       case 51: /* "global_statements" */
 #line 158 "ael.y"
@@ -1299,7 +1302,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1303 "ael.tab.c"
+#line 1306 "ael.tab.c"
         break;
       case 52: /* "global_statement" */
 #line 158 "ael.y"
@@ -1307,7 +1310,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1311 "ael.tab.c"
+#line 1314 "ael.tab.c"
         break;
       case 54: /* "arglist" */
 #line 158 "ael.y"
@@ -1315,7 +1318,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1319 "ael.tab.c"
+#line 1322 "ael.tab.c"
         break;
       case 55: /* "elements_block" */
 #line 158 "ael.y"
@@ -1323,7 +1326,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1327 "ael.tab.c"
+#line 1330 "ael.tab.c"
         break;
       case 56: /* "elements" */
 #line 158 "ael.y"
@@ -1331,7 +1334,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1335 "ael.tab.c"
+#line 1338 "ael.tab.c"
         break;
       case 57: /* "element" */
 #line 158 "ael.y"
@@ -1339,7 +1342,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1343 "ael.tab.c"
+#line 1346 "ael.tab.c"
         break;
       case 59: /* "ignorepat" */
 #line 158 "ael.y"
@@ -1347,7 +1350,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1351 "ael.tab.c"
+#line 1354 "ael.tab.c"
         break;
       case 60: /* "extension" */
 #line 158 "ael.y"
@@ -1355,7 +1358,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1359 "ael.tab.c"
+#line 1362 "ael.tab.c"
         break;
       case 61: /* "statements" */
 #line 158 "ael.y"
@@ -1363,12 +1366,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1367 "ael.tab.c"
+#line 1370 "ael.tab.c"
         break;
       case 62: /* "timerange" */
 #line 172 "ael.y"
         { free((yyvaluep->str));};
-#line 1372 "ael.tab.c"
+#line 1375 "ael.tab.c"
         break;
       case 63: /* "timespec" */
 #line 158 "ael.y"
@@ -1376,7 +1379,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1380 "ael.tab.c"
+#line 1383 "ael.tab.c"
         break;
       case 64: /* "if_like_head" */
 #line 158 "ael.y"
@@ -1384,22 +1387,22 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1388 "ael.tab.c"
+#line 1391 "ael.tab.c"
         break;
       case 67: /* "word_list" */
 #line 172 "ael.y"
         { free((yyvaluep->str));};
-#line 1393 "ael.tab.c"
+#line 1396 "ael.tab.c"
         break;
       case 68: /* "word3_list" */
 #line 172 "ael.y"
         { free((yyvaluep->str));};
-#line 1398 "ael.tab.c"
+#line 1401 "ael.tab.c"
         break;
       case 69: /* "goto_word" */
 #line 172 "ael.y"
         { free((yyvaluep->str));};
-#line 1403 "ael.tab.c"
+#line 1406 "ael.tab.c"
         break;
       case 70: /* "switch_head" */
 #line 158 "ael.y"
@@ -1407,7 +1410,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1411 "ael.tab.c"
+#line 1414 "ael.tab.c"
         break;
       case 72: /* "statement" */
 #line 158 "ael.y"
@@ -1415,7 +1418,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1419 "ael.tab.c"
+#line 1422 "ael.tab.c"
         break;
       case 79: /* "opt_else" */
 #line 158 "ael.y"
@@ -1423,7 +1426,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1427 "ael.tab.c"
+#line 1430 "ael.tab.c"
         break;
       case 80: /* "target" */
 #line 158 "ael.y"
@@ -1431,7 +1434,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1435 "ael.tab.c"
+#line 1438 "ael.tab.c"
         break;
       case 81: /* "jumptarget" */
 #line 158 "ael.y"
@@ -1439,7 +1442,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1443 "ael.tab.c"
+#line 1446 "ael.tab.c"
         break;
       case 82: /* "macro_call" */
 #line 158 "ael.y"
@@ -1447,7 +1450,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1451 "ael.tab.c"
+#line 1454 "ael.tab.c"
         break;
       case 84: /* "application_call_head" */
 #line 158 "ael.y"
@@ -1455,7 +1458,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1459 "ael.tab.c"
+#line 1462 "ael.tab.c"
         break;
       case 86: /* "application_call" */
 #line 158 "ael.y"
@@ -1463,12 +1466,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1467 "ael.tab.c"
+#line 1470 "ael.tab.c"
         break;
       case 87: /* "opt_word" */
 #line 172 "ael.y"
         { free((yyvaluep->str));};
-#line 1472 "ael.tab.c"
+#line 1475 "ael.tab.c"
         break;
       case 88: /* "eval_arglist" */
 #line 158 "ael.y"
@@ -1476,7 +1479,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1480 "ael.tab.c"
+#line 1483 "ael.tab.c"
         break;
       case 89: /* "case_statements" */
 #line 158 "ael.y"
@@ -1484,7 +1487,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1488 "ael.tab.c"
+#line 1491 "ael.tab.c"
         break;
       case 90: /* "case_statement" */
 #line 158 "ael.y"
@@ -1492,7 +1495,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1496 "ael.tab.c"
+#line 1499 "ael.tab.c"
         break;
       case 91: /* "macro_statements" */
 #line 158 "ael.y"
@@ -1500,7 +1503,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1504 "ael.tab.c"
+#line 1507 "ael.tab.c"
         break;
       case 92: /* "macro_statement" */
 #line 158 "ael.y"
@@ -1508,7 +1511,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1512 "ael.tab.c"
+#line 1515 "ael.tab.c"
         break;
       case 93: /* "switches" */
 #line 158 "ael.y"
@@ -1516,7 +1519,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1520 "ael.tab.c"
+#line 1523 "ael.tab.c"
         break;
       case 94: /* "eswitches" */
 #line 158 "ael.y"
@@ -1524,7 +1527,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1528 "ael.tab.c"
+#line 1531 "ael.tab.c"
         break;
       case 95: /* "switchlist_block" */
 #line 158 "ael.y"
@@ -1532,7 +1535,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1536 "ael.tab.c"
+#line 1539 "ael.tab.c"
         break;
       case 96: /* "switchlist" */
 #line 158 "ael.y"
@@ -1540,7 +1543,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1544 "ael.tab.c"
+#line 1547 "ael.tab.c"
         break;
       case 97: /* "included_entry" */
 #line 158 "ael.y"
@@ -1548,7 +1551,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1552 "ael.tab.c"
+#line 1555 "ael.tab.c"
         break;
       case 98: /* "includeslist" */
 #line 158 "ael.y"
@@ -1556,7 +1559,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1560 "ael.tab.c"
+#line 1563 "ael.tab.c"
         break;
       case 99: /* "includes" */
 #line 158 "ael.y"
@@ -1564,7 +1567,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1568 "ael.tab.c"
+#line 1571 "ael.tab.c"
         break;
 
       default:
@@ -1957,168 +1960,161 @@ yyreduce:
     break;
 
   case 16:
-#line 211 "ael.y"
-    {
-		(yyval.pval) = npval2(PV_MACRO, &(yylsp[-6]), &(yylsp[0]));
-		(yyval.pval)->u1.str = (yyvsp[-5].str); (yyval.pval)->u2.arglist = (yyvsp[-3].pval); ;}
-    break;
-
-  case 17:
-#line 216 "ael.y"
+#line 213 "ael.y"
     {
 		(yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-3]), &(yylsp[0]));
 		(yyval.pval)->u1.statements = (yyvsp[-1].pval);;}
     break;
 
-  case 18:
-#line 219 "ael.y"
+  case 17:
+#line 216 "ael.y"
     { /* empty globals is OK */
 		(yyval.pval) = npval2(PV_GLOBALS, &(yylsp[-2]), &(yylsp[0])); ;}
     break;
 
-  case 19:
-#line 223 "ael.y"
+  case 18:
+#line 220 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
-  case 20:
-#line 224 "ael.y"
+  case 19:
+#line 221 "ael.y"
     {(yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
-  case 21:
-#line 225 "ael.y"
+  case 20:
+#line 222 "ael.y"
     {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
-  case 22:
-#line 228 "ael.y"
+  case 21:
+#line 225 "ael.y"
     { reset_semicount(parseio->scanner); ;}
     break;
 
-  case 23:
-#line 228 "ael.y"
+  case 22:
+#line 225 "ael.y"
     {
 		(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-4].str);
 		(yyval.pval)->u2.val = (yyvsp[-1].str); ;}
     break;
 
-  case 24:
-#line 234 "ael.y"
+  case 23:
+#line 231 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
-  case 25:
-#line 235 "ael.y"
+  case 24:
+#line 232 "ael.y"
     { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 26:
-#line 236 "ael.y"
+  case 25:
+#line 233 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
     break;
 
+  case 26:
+#line 234 "ael.y"
+    {(yyval.pval)=(yyvsp[-1].pval);;}
+    break;
+
   case 27:
 #line 237 "ael.y"
-    {(yyval.pval)=(yyvsp[-1].pval);;}
+    { (yyval.pval) = NULL; ;}
     break;
 
   case 28:
-#line 240 "ael.y"
-    { (yyval.pval) = NULL; ;}
+#line 238 "ael.y"
+    { (yyval.pval) = (yyvsp[-1].pval); ;}
     break;
 
   case 29:
 #line 241 "ael.y"
-    { (yyval.pval) = (yyvsp[-1].pval); ;}
+    { (yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 30:
-#line 244 "ael.y"
-    { (yyval.pval)=(yyvsp[0].pval);;}
+#line 242 "ael.y"
+    {(yyval.pval)=0;;}
     break;
 
   case 31:
-#line 245 "ael.y"
-    {(yyval.pval)=0;;}
+#line 243 "ael.y"
+    { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
   case 32:
-#line 246 "ael.y"
-    { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
+#line 244 "ael.y"
+    { (yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
   case 33:
 #line 247 "ael.y"
-    { (yyval.pval)=(yyvsp[-1].pval);;}
+    {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 34:
-#line 250 "ael.y"
+#line 248 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 35:
-#line 251 "ael.y"
+#line 249 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 36:
-#line 252 "ael.y"
+#line 250 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 37:
-#line 253 "ael.y"
+#line 251 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 38:
-#line 254 "ael.y"
-    {(yyval.pval)=(yyvsp[0].pval);;}
-    break;
-
-  case 39:
-#line 255 "ael.y"
+#line 252 "ael.y"
     { reset_semicount(parseio->scanner); ;}
     break;
 
-  case 40:
-#line 255 "ael.y"
+  case 39:
+#line 252 "ael.y"
     {
 		(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-4].str);
 		(yyval.pval)->u2.val = (yyvsp[-1].str); ;}
     break;
 
-  case 41:
-#line 259 "ael.y"
+  case 40:
+#line 256 "ael.y"
     {free((yyvsp[-1].str)); (yyval.pval)=0;;}
     break;
 
-  case 42:
-#line 260 "ael.y"
+  case 41:
+#line 257 "ael.y"
     {(yyval.pval)=0;/* allow older docs to be read */;}
     break;
 
-  case 43:
-#line 263 "ael.y"
+  case 42:
+#line 260 "ael.y"
     {
 		(yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[-3]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-1].str);;}
     break;
 
-  case 44:
-#line 268 "ael.y"
+  case 43:
+#line 265 "ael.y"
     {
 		(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
 		(yyval.pval)->u2.statements = (yyvsp[0].pval); ;}
     break;
 
-  case 45:
-#line 272 "ael.y"
+  case 44:
+#line 269 "ael.y"
     {
 		(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-3]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2126,8 +2122,8 @@ yyreduce:
 		(yyval.pval)->u4.regexten=1;;}
     break;
 
-  case 46:
-#line 277 "ael.y"
+  case 45:
+#line 274 "ael.y"
     {
 		(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-6]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2135,8 +2131,8 @@ yyreduce:
 		(yyval.pval)->u3.hints = (yyvsp[-4].str);;}
     break;
 
-  case 47:
-#line 282 "ael.y"
+  case 46:
+#line 279 "ael.y"
     {
 		(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[-7]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
@@ -2145,23 +2141,23 @@ yyreduce:
 		(yyval.pval)->u3.hints = (yyvsp[-4].str);;}
     break;
 
-  case 48:
-#line 291 "ael.y"
+  case 47:
+#line 288 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
-  case 49:
-#line 292 "ael.y"
+  case 48:
+#line 289 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
-  case 50:
-#line 293 "ael.y"
+  case 49:
+#line 290 "ael.y"
     {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
-  case 51:
-#line 299 "ael.y"
+  case 50:
+#line 296 "ael.y"
     {
 		asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[-4].str), (yyvsp[-2].str), (yyvsp[0].str));
 		free((yyvsp[-4].str));
@@ -2169,13 +2165,13 @@ yyreduce:
 		free((yyvsp[0].str)); ;}
     break;
 
-  case 52:
-#line 304 "ael.y"
+  case 51:
+#line 301 "ael.y"
     { (yyval.str) = (yyvsp[0].str); ;}
     break;
 
-  case 53:
-#line 308 "ael.y"
+  case 52:
+#line 305 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-6].str), &(yylsp[-6]));
 		(yyval.pval)->u1.list = nword((yyvsp[-4].str), &(yylsp[-4]));
@@ -2183,45 +2179,45 @@ yyreduce:
 		(yyval.pval)->u1.list->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 54:
-#line 316 "ael.y"
+  case 53:
+#line 313 "ael.y"
     { reset_parencount(parseio->scanner); ;}
     break;
 
-  case 55:
-#line 316 "ael.y"
+  case 54:
+#line 313 "ael.y"
     {
 		(yyval.pval)= npval2(PV_IF, &(yylsp[-4]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-1].str); ;}
     break;
 
-  case 56:
-#line 319 "ael.y"
+  case 55:
+#line 316 "ael.y"
     { reset_parencount(parseio->scanner); ;}
     break;
 
-  case 57:
-#line 319 "ael.y"
+  case 56:
+#line 316 "ael.y"
     {
 		(yyval.pval) = npval2(PV_RANDOM, &(yylsp[-4]), &(yylsp[0]));
 		(yyval.pval)->u1.str=(yyvsp[-1].str);;}
     break;
 
-  case 58:
-#line 322 "ael.y"
+  case 57:
+#line 319 "ael.y"
     {
 		(yyval.pval) = npval2(PV_IFTIME, &(yylsp[-3]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[-1].pval);
 		prev_word = 0; ;}
     break;
 
-  case 59:
-#line 333 "ael.y"
+  case 58:
+#line 330 "ael.y"
     { (yyval.str) = (yyvsp[0].str);;}
     break;
 
-  case 60:
-#line 334 "ael.y"
+  case 59:
+#line 331 "ael.y"
     {
 		asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
 		free((yyvsp[-1].str));
@@ -2229,13 +2225,13 @@ yyreduce:
 		prev_word = (yyval.str);;}
     break;
 
-  case 61:
-#line 341 "ael.y"
+  case 60:
+#line 338 "ael.y"
     { (yyval.str) = (yyvsp[0].str);;}
     break;
 
-  case 62:
-#line 342 "ael.y"
+  case 61:
+#line 339 "ael.y"
     {
 		asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
 		free((yyvsp[-1].str));
@@ -2243,8 +2239,8 @@ yyreduce:
 		prev_word = (yyval.str);;}
     break;
 
-  case 63:
-#line 347 "ael.y"
+  case 62:
+#line 344 "ael.y"
     {
 		asprintf(&((yyval.str)), "%s%s%s", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str));
 		free((yyvsp[-2].str));
@@ -2253,97 +2249,97 @@ yyreduce:
 		prev_word=(yyval.str);;}
     break;
 
-  case 64:
-#line 355 "ael.y"
+  case 63:
+#line 352 "ael.y"
     { (yyval.str) = (yyvsp[0].str);;}
     break;
 
-  case 65:
-#line 356 "ael.y"
+  case 64:
+#line 353 "ael.y"
     {
 		asprintf(&((yyval.str)), "%s%s", (yyvsp[-1].str), (yyvsp[0].str));
 		free((yyvsp[-1].str));
 		free((yyvsp[0].str));;}
     break;
 
-  case 66:
-#line 360 "ael.y"
+  case 65:
+#line 357 "ael.y"
     {
 		asprintf(&((yyval.str)), "%s:%s", (yyvsp[-2].str), (yyvsp[0].str));
 		free((yyvsp[-2].str));
 		free((yyvsp[0].str));;}
     break;
 
-  case 67:
-#line 366 "ael.y"
+  case 66:
+#line 363 "ael.y"
     { reset_parencount(parseio->scanner); ;}
     break;
 
-  case 68:
-#line 366 "ael.y"
+  case 67:
+#line 363 "ael.y"
     {
 		(yyval.pval) = npval2(PV_SWITCH, &(yylsp[-5]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
     break;
 
-  case 69:
-#line 374 "ael.y"
+  case 68:
+#line 371 "ael.y"
     {
 		(yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[-1].pval); ;}
     break;
 
-  case 70:
-#line 377 "ael.y"
+  case 69:
+#line 374 "ael.y"
     {reset_semicount(parseio->scanner);;}
     break;
 
-  case 71:
-#line 377 "ael.y"
+  case 70:
+#line 374 "ael.y"
     {
 		(yyval.pval) = npval2(PV_VARDEC, &(yylsp[-4]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-4].str);
 		(yyval.pval)->u2.val = (yyvsp[-1].str); ;}
     break;
 
-  case 72:
-#line 381 "ael.y"
+  case 71:
+#line 378 "ael.y"
     {
 		(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
     break;
 
-  case 73:
-#line 384 "ael.y"
+  case 72:
+#line 381 "ael.y"
     {
 		(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
     break;
 
-  case 74:
-#line 387 "ael.y"
+  case 73:
+#line 384 "ael.y"
     {
 		(yyval.pval) = npval2(PV_LABEL, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-1].str); ;}
     break;
 
-  case 75:
-#line 390 "ael.y"
+  case 74:
+#line 387 "ael.y"
     {reset_semicount(parseio->scanner);;}
     break;
 
-  case 76:
-#line 391 "ael.y"
+  case 75:
+#line 388 "ael.y"
     {reset_semicount(parseio->scanner);;}
     break;
 
-  case 77:
-#line 392 "ael.y"
+  case 76:
+#line 389 "ael.y"
     {reset_parencount(parseio->scanner);;}
     break;
 
-  case 78:
-#line 392 "ael.y"
+  case 77:
+#line 389 "ael.y"
     {
 		(yyval.pval) = npval2(PV_FOR, &(yylsp[-11]), &(yylsp[0]));
 		(yyval.pval)->u1.for_init = (yyvsp[-8].str);
@@ -2352,58 +2348,58 @@ yyreduce:
 		(yyval.pval)->u4.for_statements = (yyvsp[0].pval);;}
     break;
 
-  case 79:
-#line 398 "ael.y"
+  case 78:
+#line 395 "ael.y"
     {reset_parencount(parseio->scanner);;}
     break;
 
-  case 80:
-#line 398 "ael.y"
+  case 79:
+#line 395 "ael.y"
     {
 		(yyval.pval) = npval2(PV_WHILE, &(yylsp[-5]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
 		(yyval.pval)->u2.statements = (yyvsp[0].pval); ;}
     break;
 
-  case 81:
-#line 402 "ael.y"
+  case 80:
+#line 399 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
     break;
 
-  case 82:
-#line 404 "ael.y"
+  case 81:
+#line 401 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
 		(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
     break;
 
-  case 83:
-#line 407 "ael.y"
+  case 82:
+#line 404 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[-1])); ;}
     break;
 
-  case 84:
-#line 409 "ael.y"
+  case 83:
+#line 406 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
     break;
 
-  case 85:
-#line 411 "ael.y"
+  case 84:
+#line 408 "ael.y"
     {
 		(yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-1].str);;}
     break;
 
-  case 86:
-#line 414 "ael.y"
+  case 85:
+#line 411 "ael.y"
     {reset_semicount(parseio->scanner);;}
     break;
 
-  case 87:
-#line 414 "ael.y"
+  case 86:
+#line 411 "ael.y"
     {
 		char *bufx;
 		int tot=0;
@@ -2439,148 +2435,148 @@ yyreduce:
 	;}
     break;
 
-  case 88:
-#line 447 "ael.y"
+  case 87:
+#line 444 "ael.y"
     { (yyval.pval) = npval2(PV_BREAK, &(yylsp[-1]), &(yylsp[0])); ;}
     break;
 
-  case 89:
-#line 448 "ael.y"
+  case 88:
+#line 445 "ael.y"
     { (yyval.pval) = npval2(PV_RETURN, &(yylsp[-1]), &(yylsp[0])); ;}
     break;
 
-  case 90:
-#line 449 "ael.y"
+  case 89:
+#line 446 "ael.y"
     { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[-1]), &(yylsp[0])); ;}
     break;
 
-  case 91:
-#line 450 "ael.y"
+  case 90:
+#line 447 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[-1]));
 		(yyval.pval)->u2.statements = (yyvsp[-1].pval);
 		(yyval.pval)->u3.else_statements = (yyvsp[0].pval);;}
     break;
 
-  case 92:
-#line 454 "ael.y"
+  case 91:
+#line 451 "ael.y"
     { (yyval.pval)=0; ;}
     break;
 
-  case 93:
-#line 457 "ael.y"
+  case 92:
+#line 454 "ael.y"
     { (yyval.pval) = (yyvsp[0].pval); ;}
     break;
 
-  case 94:
-#line 458 "ael.y"
+  case 93:
+#line 455 "ael.y"
     { (yyval.pval) = NULL ; ;}
     break;
 
-  case 95:
-#line 463 "ael.y"
+  case 94:
+#line 460 "ael.y"
     { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 96:
-#line 464 "ael.y"
+  case 95:
+#line 461 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 97:
-#line 467 "ael.y"
+  case 96:
+#line 464 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 98:
-#line 470 "ael.y"
+  case 97:
+#line 467 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-4].str), &(yylsp[-4]));
 		(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 99:
-#line 474 "ael.y"
+  case 98:
+#line 471 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-4].str), &(yylsp[-4]));
 		(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 100:
-#line 478 "ael.y"
+  case 99:
+#line 475 "ael.y"
     {
 		(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
 		(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 101:
-#line 482 "ael.y"
+  case 100:
+#line 479 "ael.y"
     {
 		(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
 		(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 102:
-#line 489 "ael.y"
+  case 101:
+#line 486 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
 		(yyval.pval)->next = nword(strdup("1"), &(yylsp[0])); ;}
     break;
 
-  case 103:
-#line 492 "ael.y"
+  case 102:
+#line 489 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 104:
-#line 495 "ael.y"
+  case 103:
+#line 492 "ael.y"
     {	/* XXX they are stored in a different order */
 		(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
 		(yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
 		(yyval.pval)->next->next = nword((yyvsp[-2].str), &(yylsp[-2])); ;}
     break;
 
-  case 105:
-#line 499 "ael.y"
+  case 104:
+#line 496 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[0].str), &(yylsp[0]));
 		(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[-2]));
 		(yyval.pval)->next->next = nword(strdup("1"), &(yylsp[0])); ;}
     break;
 
-  case 106:
-#line 503 "ael.y"
+  case 105:
+#line 500 "ael.y"
     {
 		(yyval.pval) = nword(strdup("default"), &(yylsp[-4]));
 		(yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
 		(yyval.pval)->next->next = nword((yyvsp[-2].str), &(yylsp[-2])); ;}
     break;
 
-  case 107:
-#line 507 "ael.y"
+  case 106:
+#line 504 "ael.y"
     {
 		(yyval.pval) = nword(strdup("default"), &(yylsp[-2]));
 		(yyval.pval)->next = nword((yyvsp[-2].str), &(yylsp[0]));
 		(yyval.pval)->next->next = nword( strdup("1"), &(yylsp[0])); ;}
     break;
 
-  case 108:
-#line 513 "ael.y"
+  case 107:
+#line 510 "ael.y"
     {reset_argcount(parseio->scanner);;}
     break;
 
-  case 109:
-#line 513 "ael.y"
+  case 108:
+#line 510 "ael.y"
     {
 		/* XXX original code had @2 but i think we need @5 */
 		(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0]));
@@ -2588,20 +2584,20 @@ yyreduce:
 		(yyval.pval)->u2.arglist = (yyvsp[-1].pval);;}
     break;
 
-  case 110:
-#line 518 "ael.y"
+  case 109:
+#line 515 "ael.y"
     {
 		(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
     break;
 
-  case 111:
-#line 526 "ael.y"
+  case 110:
+#line 523 "ael.y"
     {reset_argcount(parseio->scanner);;}
     break;
 
-  case 112:
-#line 526 "ael.y"
+  case 111:
+#line 523 "ael.y"
     {
 		if (strcasecmp((yyvsp[-2].str),"goto") == 0) {
 			(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[-1]));
@@ -2613,8 +2609,8 @@ yyreduce:
 		} ;}
     break;
 
-  case 113:
-#line 537 "ael.y"
+  case 112:
+#line 534 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
  		if( (yyval.pval)->type == PV_GOTO )
@@ -2624,110 +2620,115 @@ yyreduce:
 	;}
     break;
 
+  case 113:
+#line 541 "ael.y"
+    { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
+    break;
+
   case 114:
 #line 544 "ael.y"
-    { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
+    { (yyval.str) = (yyvsp[0].str) ;}
     break;
 
   case 115:
-#line 547 "ael.y"
-    { (yyval.str) = (yyvsp[0].str) ;}
+#line 545 "ael.y"
+    { (yyval.str) = strdup(""); ;}
     break;
 
   case 116:
 #line 548 "ael.y"
-    { (yyval.str) = strdup(""); ;}
+    { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
   case 117:
-#line 551 "ael.y"
-    { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
+#line 549 "ael.y"
+    {
+		(yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
+		(yyval.pval)->u1.str = strdup(""); ;}
     break;
 
   case 118:
 #line 552 "ael.y"
-    {
-		(yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
-		(yyval.pval)->u1.str = strdup(""); ;}
+    { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
     break;
 
   case 119:
 #line 555 "ael.y"
-    { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
+    {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 120:
-#line 558 "ael.y"
-    {(yyval.pval)=(yyvsp[0].pval);;}
+#line 556 "ael.y"
+    { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
   case 121:
 #line 559 "ael.y"
-    { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
-    break;
-
-  case 122:
-#line 562 "ael.y"
     {
 		(yyval.pval) = npval2(PV_CASE, &(yylsp[-3]), &(yylsp[-1])); /* XXX 3 or 4 ? */
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
 		(yyval.pval)->u2.statements = (yyvsp[0].pval);;}
     break;
 
-  case 123:
-#line 566 "ael.y"
+  case 122:
+#line 563 "ael.y"
     {
 		(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.str = NULL;
 		(yyval.pval)->u2.statements = (yyvsp[0].pval);;}
     break;
 
-  case 124:
-#line 570 "ael.y"
+  case 123:
+#line 567 "ael.y"
     {
 		(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-3]), &(yylsp[0])); /* XXX@3 or @4 ? */
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
 		(yyval.pval)->u2.statements = (yyvsp[0].pval);;}
     break;
 
-  case 125:
-#line 574 "ael.y"
+  case 124:
+#line 571 "ael.y"
     {
 		(yyval.pval) = npval2(PV_CASE, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-1].str);;}
     break;
 
-  case 126:
-#line 577 "ael.y"
+  case 125:
+#line 574 "ael.y"
     {
 		(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.str = NULL;;}
     break;
 
-  case 127:
-#line 580 "ael.y"
+  case 126:
+#line 577 "ael.y"
     {
 		(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-1].str);;}
     break;
 
+  case 127:
+#line 582 "ael.y"
+    { (yyval.pval) = NULL; ;}
+    break;
+
   case 128:
-#line 585 "ael.y"
+#line 583 "ael.y"
     {(yyval.pval) = (yyvsp[0].pval);;}
     break;
 
   case 129:
-#line 586 "ael.y"
+#line 584 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
   case 130:
-#line 589 "ael.y"
+#line 587 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
   case 131:
-#line 590 "ael.y"
+#line 588 "ael.y"
     {
 		(yyval.pval) = npval2(PV_CATCH, &(yylsp[-4]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-3].str);
@@ -2735,51 +2736,51 @@ yyreduce:
     break;
 
   case 132:
-#line 596 "ael.y"
+#line 594 "ael.y"
     {
 		(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
     break;
 
   case 133:
-#line 601 "ael.y"
+#line 599 "ael.y"
     {
 		(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
     break;
 
   case 134:
-#line 606 "ael.y"
+#line 604 "ael.y"
     { (yyval.pval) = (yyvsp[-1].pval); ;}
     break;
 
   case 135:
-#line 607 "ael.y"
+#line 605 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
   case 136:
-#line 610 "ael.y"
+#line 608 "ael.y"
     { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
     break;
 
   case 137:
-#line 611 "ael.y"
+#line 609 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
     break;
 
   case 138:
-#line 612 "ael.y"
+#line 610 "ael.y"
     {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
   case 139:
-#line 615 "ael.y"
+#line 613 "ael.y"
     { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
     break;
 
   case 140:
-#line 616 "ael.y"
+#line 614 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-3].str), &(yylsp[-3]));
 		(yyval.pval)->u2.arglist = (yyvsp[-1].pval);
@@ -2787,29 +2788,29 @@ yyreduce:
     break;
 
   case 141:
-#line 623 "ael.y"
+#line 621 "ael.y"
     { (yyval.pval) = (yyvsp[0].pval); ;}
     break;
 
   case 142:
-#line 624 "ael.y"
+#line 622 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
   case 143:
-#line 625 "ael.y"
+#line 623 "ael.y"
     {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
   case 144:
-#line 628 "ael.y"
+#line 626 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
     break;
 
   case 145:
-#line 631 "ael.y"
+#line 629 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
     break;
@@ -2819,7 +2820,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 2823 "ael.tab.c"
+#line 2824 "ael.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3094,7 +3095,7 @@ yyreturn:
 }
 
 
-#line 636 "ael.y"
+#line 634 "ael.y"
 
 
 static char *token_equivs1[] =
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index 65100eaa6..3123fe0dd 100644
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -208,9 +208,6 @@ opt_abstract: KW_ABSTRACT { $$ = 1; }
 macro : KW_MACRO word LP arglist RP LC macro_statements RC {
 		$$ = npval2(PV_MACRO, &@1, &@8);
 		$$->u1.str = $2; $$->u2.arglist = $4; $$->u3.macro_statements = $7; }
-	| KW_MACRO word LP arglist RP LC  RC {
-		$$ = npval2(PV_MACRO, &@1, &@7);
-		$$->u1.str = $2; $$->u2.arglist = $4; }
 	;
 
 globals : KW_GLOBALS LC global_statements RC {
@@ -582,7 +579,8 @@ case_statement: KW_CASE word COLON statements {
 		$$->u1.str = $2;}
 	;
 
-macro_statements: macro_statement {$$ = $1;}
+macro_statements: /* empty */ { $$ = NULL; }
+	| macro_statement {$$ = $1;}
 	| macro_statements macro_statement { $$ = linku1($1, $2); }
 	;