common syntax for context name

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

2 files changed, 292 insertions, 308 deletions

diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index 4add2e951..a48d12a25 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   387
+#define YYLAST   386
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  42
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  54
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  140
+#define YYNRULES  139
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  266
+#define YYNSTATES  265
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -488,11 +488,10 @@ static const unsigned short int yyprhs[] =
      223,   226,   227,   228,   229,   242,   246,   250,   254,   257,
      260,   261,   267,   270,   273,   276,   280,   282,   285,   286,
      288,   292,   296,   302,   308,   314,   320,   322,   326,   332,
-     336,   340,   341,   347,   351,   352,   356,   360,   363,   365,
-     366,   368,   369,   373,   374,   376,   379,   384,   388,   393,
-     397,   400,   404,   405,   407,   410,   412,   418,   421,   424,
-     428,   431,   434,   438,   441,   444,   449,   451,   454,   457,
-     462
+     336,   337,   343,   347,   348,   352,   356,   359,   361,   362,
+     364,   365,   369,   370,   372,   375,   380,   384,   389,   393,
+     396,   400,   401,   403,   406,   408,   414,   417,   420,   424,
+     427,   430,   434,   437,   440,   445,   447,   450,   453,   458
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -531,20 +530,20 @@ static const yysigned_char yyrhs[] =
       68,    -1,    68,    10,    68,    10,    68,    -1,    36,    13,
       68,    13,    68,    -1,    36,    10,    68,    10,    68,    -1,
       68,    -1,    68,    10,    68,    -1,    68,    10,    41,    14,
-      46,    -1,    68,    14,    68,    -1,    68,    14,    36,    -1,
-      -1,    41,     6,    79,    84,     7,    -1,    41,     6,     7,
-      -1,    -1,    41,     6,    81,    -1,    80,    84,     7,    -1,
-      80,     7,    -1,    41,    -1,    -1,    66,    -1,    -1,    84,
-      10,    83,    -1,    -1,    86,    -1,    85,    86,    -1,    34,
-      41,    11,    60,    -1,    36,    11,    60,    -1,    35,    41,
-      11,    60,    -1,    34,    41,    11,    -1,    36,    11,    -1,
-      35,    41,    11,    -1,    -1,    88,    -1,    87,    88,    -1,
-      70,    -1,    37,    41,     4,    60,     5,    -1,    38,    91,
-      -1,    39,    91,    -1,     4,    92,     5,    -1,     4,     5,
-      -1,    41,     8,    -1,    92,    41,     8,    -1,    92,     1,
-      -1,    46,     8,    -1,    46,    13,    62,     8,    -1,    93,
-      -1,    94,    93,    -1,    94,     1,    -1,    40,     4,    94,
-       5,    -1,    40,     4,     5,    -1
+      46,    -1,    68,    14,    46,    -1,    -1,    41,     6,    79,
+      84,     7,    -1,    41,     6,     7,    -1,    -1,    41,     6,
+      81,    -1,    80,    84,     7,    -1,    80,     7,    -1,    41,
+      -1,    -1,    66,    -1,    -1,    84,    10,    83,    -1,    -1,
+      86,    -1,    85,    86,    -1,    34,    41,    11,    60,    -1,
+      36,    11,    60,    -1,    35,    41,    11,    60,    -1,    34,
+      41,    11,    -1,    36,    11,    -1,    35,    41,    11,    -1,
+      -1,    88,    -1,    87,    88,    -1,    70,    -1,    37,    41,
+       4,    60,     5,    -1,    38,    91,    -1,    39,    91,    -1,
+       4,    92,     5,    -1,     4,     5,    -1,    41,     8,    -1,
+      92,    41,     8,    -1,    92,     1,    -1,    46,     8,    -1,
+      46,    13,    62,     8,    -1,    93,    -1,    94,    93,    -1,
+      94,     1,    -1,    40,     4,    94,     5,    -1,    40,     4,
+       5,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -560,11 +559,10 @@ static const unsigned short int yyrline[] =
      385,   388,   389,   390,   388,   396,   400,   403,   405,   407,
      410,   410,   443,   444,   445,   446,   450,   453,   454,   459,
      460,   463,   466,   470,   474,   478,   485,   488,   491,   495,
-     499,   505,   505,   510,   518,   518,   529,   536,   539,   540,
-     543,   544,   547,   550,   551,   552,   555,   559,   563,   567,
-     570,   573,   578,   579,   580,   583,   584,   590,   595,   600,
-     601,   604,   605,   606,   609,   610,   617,   618,   619,   622,
-     625
+     501,   501,   506,   514,   514,   525,   532,   535,   536,   539,
+     540,   543,   546,   547,   548,   551,   555,   559,   563,   566,
+     569,   574,   575,   576,   579,   580,   586,   591,   596,   597,
+     600,   601,   602,   605,   606,   613,   614,   615,   618,   621
 };
 #endif
 
@@ -619,11 +617,10 @@ static const unsigned char yyr1[] =
       70,    71,    72,    73,    70,    70,    70,    70,    70,    70,
       74,    70,    70,    70,    70,    70,    70,    75,    75,    76,
       76,    76,    76,    76,    76,    76,    77,    77,    77,    77,
-      77,    79,    78,    78,    81,    80,    82,    82,    83,    83,
-      84,    84,    84,    85,    85,    85,    86,    86,    86,    86,
-      86,    86,    87,    87,    87,    88,    88,    89,    90,    91,
-      91,    92,    92,    92,    93,    93,    94,    94,    94,    95,
-      95
+      79,    78,    78,    81,    80,    82,    82,    83,    83,    84,
+      84,    84,    85,    85,    85,    86,    86,    86,    86,    86,
+      86,    87,    87,    87,    88,    88,    89,    90,    91,    91,
+      92,    92,    92,    93,    93,    94,    94,    94,    95,    95
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -639,11 +636,10 @@ static const unsigned char yyr2[] =
        2,     0,     0,     0,    12,     3,     3,     3,     2,     2,
        0,     5,     2,     2,     2,     3,     1,     2,     0,     1,
        3,     3,     5,     5,     5,     5,     1,     3,     5,     3,
-       3,     0,     5,     3,     0,     3,     3,     2,     1,     0,
-       1,     0,     3,     0,     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
+       0,     5,     3,     0,     3,     3,     2,     1,     0,     1,
+       0,     3,     0,     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
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -656,28 +652,28 @@ static const unsigned char yydefact[] =
        0,     0,    18,    11,    10,     0,    24,     0,    21,    20,
       16,    19,     0,    12,    26,     0,     0,     0,    30,    27,
       40,     0,     0,     0,     0,     0,     0,     0,    38,     0,
-      29,    37,    33,    35,    36,    34,   122,    25,     0,     0,
-       0,     0,     0,     0,   127,   128,     0,    39,     0,    32,
+      29,    37,    33,    35,    36,    34,   121,    25,     0,     0,
+       0,     0,     0,     0,   126,   127,     0,    39,     0,    32,
       28,    31,     0,    86,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
-     113,   125,   111,     0,     0,   123,    22,     0,     0,     0,
-      59,     0,   130,     0,     0,   140,     0,   136,     0,    42,
+     112,   124,   110,     0,     0,   122,    22,     0,     0,     0,
+      59,     0,   129,     0,     0,   139,     0,   135,     0,    42,
        0,    46,     0,     0,    52,     0,    54,     0,    55,     0,
       62,    89,     0,    96,     0,    83,    82,    84,    71,     0,
-       0,   104,    79,    70,    88,     0,     0,     0,     0,   114,
-     107,    57,   110,     0,    78,    80,    15,   124,    41,     0,
-      43,    60,     0,   131,   133,   129,     0,   134,     0,   138,
-     139,   137,    48,    66,    47,   101,    77,     0,    65,    50,
+       0,   103,    79,    70,    88,     0,     0,     0,     0,   113,
+     106,    57,   109,     0,    78,    80,    15,   123,    41,     0,
+      43,    60,     0,   130,   132,   128,     0,   133,     0,   137,
+     138,   136,    48,    66,    47,   100,    77,     0,    65,    50,
        0,     0,     0,     0,     0,     0,    63,     0,     0,    68,
-       0,     0,    69,     0,    75,     0,   105,     0,    85,     0,
-       0,   120,    76,   115,    58,   106,   109,     0,     0,    61,
-       0,   132,     0,   103,   111,     0,     0,    56,     0,     0,
-       0,    64,    91,    90,    62,    97,   100,    99,     0,     0,
-      87,   119,   121,     0,   108,   112,     0,     0,     0,   135,
-       0,    53,     0,     0,     0,     0,     0,     0,     0,    72,
-     126,     0,     0,    81,     0,    44,   102,     0,     0,    95,
-      94,    93,    92,    98,     0,    45,     0,    49,     0,     0,
-      73,    51,     0,     0,     0,    74
+       0,     0,    69,     0,    75,     0,   104,     0,    85,     0,
+       0,   119,    76,   114,    58,   105,   108,     0,     0,    61,
+       0,   131,     0,   102,   110,     0,     0,    56,     0,     0,
+       0,    64,    91,    90,    62,    97,    99,     0,     0,    87,
+     118,   120,     0,   107,   111,     0,     0,     0,   134,     0,
+      53,     0,     0,     0,     0,     0,     0,     0,    72,   125,
+       0,     0,    81,     0,    44,   101,     0,     0,    95,    94,
+      93,    92,    98,     0,    45,     0,    49,     0,     0,    73,
+      51,     0,     0,     0,    74
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
@@ -686,8 +682,8 @@ static const short int yydefgoto[] =
       -1,     5,     6,     7,   106,     8,     9,    10,    11,    21,
       88,    37,    27,    33,    49,    50,    51,    52,   110,   170,
      171,   115,   167,    89,   142,   172,   121,    90,   111,   183,
-     254,   262,   197,   188,   122,   124,   113,   204,    92,   186,
-      93,   225,   143,   138,   139,    94,    95,    53,    54,    64,
+     253,   261,   197,   188,   122,   124,   113,   204,    92,   186,
+      93,   224,   143,   138,   139,    94,    95,    53,    54,    64,
      104,   107,   108,    55
 };
 
@@ -696,135 +692,135 @@ static const short int yydefgoto[] =
 #define YYPACT_NINF -139
 static const short int yypact[] =
 {
-     120,  -139,   -30,    15,  -139,    68,   180,  -139,  -139,    72,
-    -139,  -139,    76,    24,  -139,  -139,  -139,   -21,    40,  -139,
-     114,     5,  -139,  -139,  -139,   125,  -139,    23,  -139,  -139,
-    -139,  -139,    20,  -139,  -139,   130,   109,   113,  -139,  -139,
-    -139,   137,   -15,   164,   167,   167,   174,     8,  -139,   136,
-    -139,  -139,  -139,  -139,  -139,  -139,   320,  -139,   171,   141,
-     178,   161,   156,    26,  -139,  -139,    52,  -139,   346,  -139,
-    -139,  -139,   346,  -139,   157,   193,   193,   194,   193,   -14,
-     165,   199,   202,   203,   207,   193,   173,   154,  -139,   346,
-     158,  -139,     1,    27,   294,  -139,  -139,   208,   156,   346,
-     176,   216,  -139,   222,    13,  -139,    84,  -139,     2,  -139,
-     238,  -139,   209,   223,  -139,   220,  -139,   196,  -139,    97,
-      90,   135,   230,   132,   232,  -139,  -139,  -139,  -139,   346,
-     240,  -139,  -139,  -139,   224,   206,   210,   237,   104,  -139,
-    -139,   211,  -139,   145,  -139,  -139,  -139,  -139,  -139,   242,
-    -139,   212,   213,  -139,  -139,  -139,   247,  -139,   196,  -139,
-    -139,  -139,  -139,  -139,  -139,   252,  -139,   221,  -139,   106,
-     248,   261,   263,   165,   165,   234,  -139,   165,   165,  -139,
-     236,    89,  -139,   241,  -139,   346,  -139,   346,  -139,   267,
-     270,   346,  -139,  -139,  -139,  -139,   243,   244,   250,  -139,
-     259,  -139,   281,  -139,   221,   285,   156,  -139,   156,   293,
-     291,  -139,   295,   297,    75,  -139,  -139,  -139,   299,   268,
-    -139,   346,   346,    44,  -139,  -139,   300,   287,   346,  -139,
-     162,  -139,   302,   306,   165,   165,   165,   165,   -21,  -139,
-    -139,    86,   200,  -139,   346,  -139,  -139,   156,   156,  -139,
-    -139,  -139,  -139,  -139,   277,  -139,   312,  -139,   321,   156,
-    -139,  -139,   289,   326,   346,  -139
+      93,  -139,   -30,    18,  -139,    35,   176,  -139,  -139,   112,
+    -139,  -139,    82,    24,  -139,  -139,  -139,   -21,    99,  -139,
+     125,     5,  -139,  -139,  -139,   148,  -139,    74,  -139,  -139,
+    -139,  -139,    20,  -139,  -139,   150,   118,   121,  -139,  -139,
+    -139,   154,   -15,   174,   177,   177,   178,     8,  -139,   130,
+    -139,  -139,  -139,  -139,  -139,  -139,   319,  -139,   175,   146,
+     187,   170,   155,    26,  -139,  -139,    86,  -139,   345,  -139,
+    -139,  -139,   345,  -139,   156,   189,   189,   192,   189,    51,
+     161,   197,   198,   201,   204,   189,   171,   133,  -139,   345,
+     139,  -139,     1,   157,   293,  -139,  -139,   205,   155,   345,
+     173,   208,  -139,   214,    13,  -139,    11,  -139,     2,  -139,
+     237,  -139,   210,   215,  -139,   225,  -139,   195,  -139,    23,
+      57,   135,   222,   119,   229,  -139,  -139,  -139,  -139,   345,
+     235,  -139,  -139,  -139,   223,   202,   206,   239,    89,  -139,
+    -139,   207,  -139,   136,  -139,  -139,  -139,  -139,  -139,   244,
+    -139,   211,   212,  -139,  -139,  -139,   238,  -139,   195,  -139,
+    -139,  -139,  -139,  -139,  -139,   247,  -139,   217,  -139,    95,
+     248,   253,   256,   161,   161,   232,  -139,   161,   161,  -139,
+     233,   -21,  -139,   236,  -139,   345,  -139,   345,  -139,   265,
+     269,   345,  -139,  -139,  -139,  -139,   240,   241,   242,  -139,
+     260,  -139,   280,  -139,   217,   283,   155,  -139,   155,   281,
+     289,  -139,   294,   290,    16,  -139,  -139,   298,   267,  -139,
+     345,   345,    44,  -139,  -139,   299,   285,   345,  -139,   143,
+    -139,   297,   303,   161,   161,   161,   161,   -21,  -139,  -139,
+      85,   199,  -139,   345,  -139,  -139,   155,   155,  -139,  -139,
+    -139,  -139,  -139,   275,  -139,   304,  -139,   316,   155,  -139,
+    -139,   287,   322,   345,  -139
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -139,  -139,  -139,   328,   -17,  -139,  -139,  -139,  -139,  -139,
-      -9,  -139,  -139,  -139,  -139,   288,  -139,  -139,  -138,  -139,
-     183,    48,  -139,  -139,   169,   -57,   -78,  -139,   -55,  -139,
+    -139,  -139,  -139,   326,   -17,  -139,  -139,  -139,  -139,  -139,
+      -9,  -139,  -139,  -139,  -139,   284,  -139,  -139,  -138,  -139,
+     182,    52,  -139,  -139,   168,   -57,   -78,  -139,   -55,  -139,
     -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,
-    -139,  -139,   139,  -139,   217,  -139,   257,  -139,  -139,   311,
-    -139,   251,  -139,  -139
+    -139,  -139,   132,  -139,   216,  -139,   249,  -139,  -139,   305,
+    -139,   234,  -139,  -139
 };
 
 /* 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 -119
+#define YYTABLE_NINF -118
 static const short int yytable[] =
 {
       25,    91,   123,   159,    22,   101,    29,   160,   140,    67,
-      30,    12,    31,   109,   154,    23,    60,    28,   155,    13,
-      24,    38,   119,    48,    34,    39,    61,   120,    40,    19,
-      35,   102,    68,    36,   134,   144,   145,    41,    23,    91,
-      48,   149,   141,    24,   150,   162,    20,   219,    72,  -117,
-      42,    43,    73,   223,   156,   164,    74,   105,    44,    45,
-      46,    47,    75,    76,    77,    20,    78,   103,    14,    79,
-      80,    81,    82,    83,   184,    17,    84,    85,  -117,  -117,
-    -117,    26,    18,   241,   242,    87,   175,   162,    23,   238,
-      72,  -116,   157,    24,    73,   209,   210,   158,    74,   212,
-     213,   175,   215,   217,    75,    76,    77,   173,    78,   192,
-     174,    79,    80,    81,    82,    83,   176,   -59,    84,    85,
-    -116,  -116,  -116,    28,   116,   216,   118,    87,     1,    32,
-     120,   176,   220,   129,    56,     2,     3,    69,   135,   136,
-     137,    70,   180,     4,    40,   177,   181,   151,   178,   232,
-      57,   233,   195,    41,    58,   196,   249,   250,   251,   252,
-     131,    59,   132,    28,   164,   133,    42,    43,   164,   246,
-      62,    63,   196,   245,    44,    45,    46,    47,    66,    96,
-      -2,    15,    97,   -14,    98,    99,   164,   164,     1,   255,
-     256,   257,   135,   136,   137,     2,     3,   100,   112,   114,
-     117,   162,   261,     4,    72,  -118,   120,   125,    73,   265,
-     126,   127,    74,   128,   130,   165,   148,   151,    75,    76,
-      77,   253,    78,   152,   168,    79,    80,    81,    82,    83,
-     153,   166,    84,    85,  -118,  -118,  -118,   169,   179,   162,
-     182,    87,    72,   163,   185,   187,    73,   189,   191,   198,
-      74,   190,   194,   199,   200,   201,    75,    76,    77,   203,
-      78,   206,   141,    79,    80,    81,    82,    83,   207,   162,
-      84,    85,    72,   240,   208,   211,    73,   214,   221,    87,
-      74,   222,   218,   228,   224,   226,    75,    76,    77,   229,
-      78,   227,   231,    79,    80,    81,    82,    83,    72,   146,
-      84,    85,    73,   234,   235,   236,    74,   239,   243,    87,
-     237,   244,    75,    76,    77,   247,    78,   248,   258,    79,
-      80,    81,    82,    83,    72,   259,    84,    85,    73,   260,
-     263,    86,    74,   264,    16,    87,   205,    71,    75,    76,
-      77,   202,    78,   230,     0,    79,    80,    81,    82,    83,
-      72,   147,    84,    85,    73,   193,    65,    86,    74,   161,
-       0,    87,     0,     0,    75,    76,    77,     0,    78,     0,
-       0,    79,    80,    81,    82,    83,     0,     0,    84,    85,
-       0,     0,     0,     0,     0,     0,     0,    87
+      30,    12,    31,   109,   154,    23,    60,    28,   155,   157,
+      24,    38,    13,    48,   158,    39,    61,   175,    40,    19,
+     237,   102,    68,   173,   134,    14,   174,    41,    23,    91,
+      48,   149,   141,    24,   150,   162,    20,   218,    72,  -116,
+      42,    43,    73,   222,   156,   164,    74,   176,    44,    45,
+      46,    47,    75,    76,    77,    20,    78,   103,   175,    79,
+      80,    81,    82,    83,   184,    34,    84,    85,  -116,  -116,
+    -116,    35,   240,   241,    36,    87,   162,   119,    18,    72,
+    -115,   105,   120,    73,   192,   209,   210,    74,   176,   212,
+     213,     1,   215,    75,    76,    77,   -59,    78,     2,     3,
+      79,    80,    81,    82,    83,    17,     4,    84,    85,  -115,
+    -115,  -115,    23,   135,   136,   137,    87,    24,   116,   180,
+     118,    69,   219,   181,    28,    70,   151,   129,    40,   131,
+      26,   132,    28,   195,   133,   177,   196,    41,   178,   231,
+     245,   232,    32,   196,    56,   248,   249,   250,   251,    57,
+      42,    43,    58,   164,   216,   144,   145,   164,    44,    45,
+      46,    47,   244,   135,   136,   137,    -2,    15,    59,   -14,
+      62,    63,    66,    96,     1,   164,   164,    97,   254,   255,
+     256,     2,     3,    98,    99,   114,   100,   112,   117,     4,
+     162,   260,   120,    72,  -117,   125,   126,    73,   264,   127,
+     128,    74,   130,   148,   151,   152,   165,    75,    76,    77,
+     252,    78,   153,   166,    79,    80,    81,    82,    83,   168,
+     179,    84,    85,  -117,  -117,  -117,   169,   182,   162,   185,
+      87,    72,   163,   189,   187,    73,   201,   190,   194,    74,
+     191,   198,   199,   200,   203,    75,    76,    77,   141,    78,
+     207,   206,    79,    80,    81,    82,    83,   208,   162,    84,
+      85,    72,   239,   211,   214,    73,   220,   217,    87,    74,
+     221,   223,   225,   226,   227,    75,    76,    77,   228,    78,
+     230,   233,    79,    80,    81,    82,    83,    72,   146,    84,
+      85,    73,   234,   236,   235,    74,   238,   242,    87,   243,
+     246,    75,    76,    77,   247,    78,   257,   258,    79,    80,
+      81,    82,    83,    72,   259,    84,    85,    73,   262,   263,
+      86,    74,    16,    71,    87,   205,   229,    75,    76,    77,
+     202,    78,   161,   147,    79,    80,    81,    82,    83,    72,
+      65,    84,    85,    73,   193,     0,    86,    74,     0,     0,
+      87,     0,     0,    75,    76,    77,     0,    78,     0,     0,
+      79,    80,    81,    82,    83,     0,     0,    84,    85,     0,
+       0,     0,     0,     0,     0,     0,    87
 };
 
 static const short int yycheck[] =
 {
       17,    56,    80,     1,    13,    62,     1,     5,     7,     1,
-       5,    41,    21,    68,     1,    36,    31,     9,     5,     4,
-      41,     1,    36,    32,     1,     5,    41,    41,     8,     5,
-       7,     5,    24,    10,    89,     8,     9,    17,    36,    94,
+       5,    41,    21,    68,     1,    36,    31,     9,     5,     8,
+      41,     1,     4,    32,    13,     5,    41,    11,     8,     5,
+      14,     5,    24,    10,    89,     0,    13,    17,    36,    94,
       49,    98,    41,    41,    99,     1,    41,   185,     4,     5,
-      30,    31,     8,   191,    41,   110,    12,     5,    38,    39,
-      40,    41,    18,    19,    20,    41,    22,    41,     0,    25,
-      26,    27,    28,    29,   129,     3,    32,    33,    34,    35,
-      36,    41,     6,   221,   222,    41,    11,     1,    36,    14,
-       4,     5,     8,    41,     8,   173,   174,    13,    12,   177,
-     178,    11,   180,   181,    18,    19,    20,    10,    22,     5,
-      13,    25,    26,    27,    28,    29,    41,    11,    32,    33,
-      34,    35,    36,     9,    76,    36,    78,    41,     8,     4,
-      41,    41,   187,    85,     4,    15,    16,     1,    34,    35,
-      36,     5,    10,    23,     8,    10,    14,    41,    13,   206,
-      41,   208,     7,    17,    41,    10,   234,   235,   236,   237,
-       6,    24,     8,     9,   219,    11,    30,    31,   223,     7,
-       6,     4,    10,   228,    38,    39,    40,    41,     4,     8,
-       0,     1,    41,     3,     6,    24,   241,   242,     8,   244,
-     247,   248,    34,    35,    36,    15,    16,    41,    41,     6,
-       6,     1,   259,    23,     4,     5,    41,     8,     8,   264,
-       8,     8,    12,     6,    41,     6,     8,    41,    18,    19,
-      20,   238,    22,     7,     4,    25,    26,    27,    28,    29,
-       8,     8,    32,    33,    34,    35,    36,    41,     8,     1,
-       8,    41,     4,     5,     4,    21,     8,    41,    11,     7,
-      12,    41,    41,    41,    41,     8,    18,    19,    20,     7,
-      22,    13,    41,    25,    26,    27,    28,    29,     7,     1,
-      32,    33,     4,     5,    11,    41,     8,    41,    11,    41,
-      12,    11,    41,    24,    41,    41,    18,    19,    20,     8,
-      22,    41,     7,    25,    26,    27,    28,    29,     4,     5,
-      32,    33,     8,    10,    13,    10,    12,     8,     8,    41,
-      13,    24,    18,    19,    20,    13,    22,    11,    41,    25,
-      26,    27,    28,    29,     4,    13,    32,    33,     8,     8,
-      41,    37,    12,     7,     6,    41,   167,    49,    18,    19,
-      20,   158,    22,   204,    -1,    25,    26,    27,    28,    29,
-       4,    94,    32,    33,     8,   138,    45,    37,    12,   108,
-      -1,    41,    -1,    -1,    18,    19,    20,    -1,    22,    -1,
-      -1,    25,    26,    27,    28,    29,    -1,    -1,    32,    33,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    41
+      30,    31,     8,   191,    41,   110,    12,    41,    38,    39,
+      40,    41,    18,    19,    20,    41,    22,    41,    11,    25,
+      26,    27,    28,    29,   129,     1,    32,    33,    34,    35,
+      36,     7,   220,   221,    10,    41,     1,    36,     6,     4,
+       5,     5,    41,     8,     5,   173,   174,    12,    41,   177,
+     178,     8,   180,    18,    19,    20,    11,    22,    15,    16,
+      25,    26,    27,    28,    29,     3,    23,    32,    33,    34,
+      35,    36,    36,    34,    35,    36,    41,    41,    76,    10,
+      78,     1,   187,    14,     9,     5,    41,    85,     8,     6,
+      41,     8,     9,     7,    11,    10,    10,    17,    13,   206,
+       7,   208,     4,    10,     4,   233,   234,   235,   236,    41,
+      30,    31,    41,   218,   181,     8,     9,   222,    38,    39,
+      40,    41,   227,    34,    35,    36,     0,     1,    24,     3,
+       6,     4,     4,     8,     8,   240,   241,    41,   243,   246,
+     247,    15,    16,     6,    24,     6,    41,    41,     6,    23,
+       1,   258,    41,     4,     5,     8,     8,     8,   263,     8,
+       6,    12,    41,     8,    41,     7,     6,    18,    19,    20,
+     237,    22,     8,     8,    25,    26,    27,    28,    29,     4,
+       8,    32,    33,    34,    35,    36,    41,     8,     1,     4,
+      41,     4,     5,    41,    21,     8,     8,    41,    41,    12,
+      11,     7,    41,    41,     7,    18,    19,    20,    41,    22,
+       7,    13,    25,    26,    27,    28,    29,    11,     1,    32,
+      33,     4,     5,    41,    41,     8,    11,    41,    41,    12,
+      11,    41,    41,    41,    24,    18,    19,    20,     8,    22,
+       7,    10,    25,    26,    27,    28,    29,     4,     5,    32,
+      33,     8,    13,    13,    10,    12,     8,     8,    41,    24,
+      13,    18,    19,    20,    11,    22,    41,    13,    25,    26,
+      27,    28,    29,     4,     8,    32,    33,     8,    41,     7,
+      37,    12,     6,    49,    41,   167,   204,    18,    19,    20,
+     158,    22,   108,    94,    25,    26,    27,    28,    29,     4,
+      45,    32,    33,     8,   138,    -1,    37,    12,    -1,    -1,
+      41,    -1,    -1,    18,    19,    20,    -1,    22,    -1,    -1,
+      25,    26,    27,    28,    29,    -1,    -1,    32,    33,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    41
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -852,12 +848,12 @@ static const unsigned char yystos[] =
       10,    14,     8,    71,    70,     4,    81,    21,    75,    41,
       41,    11,     5,    86,    41,     7,    10,    74,     7,    41,
       41,     8,    62,     7,    79,    66,    13,     7,    11,    68,
-      68,    41,    68,    68,    41,    68,    36,    68,    41,    60,
-      70,    11,    11,    60,    41,    83,    41,    41,    24,     8,
-      84,     7,    67,    67,    10,    13,    10,    13,    14,     8,
-       5,    60,    60,     8,    24,    70,     7,    13,    11,    68,
-      68,    68,    68,    46,    72,    70,    67,    67,    41,    13,
-       8,    67,    73,    41,     7,    70
+      68,    41,    68,    68,    41,    68,    46,    41,    60,    70,
+      11,    11,    60,    41,    83,    41,    41,    24,     8,    84,
+       7,    67,    67,    10,    13,    10,    13,    14,     8,     5,
+      60,    60,     8,    24,    70,     7,    13,    11,    68,    68,
+      68,    68,    46,    72,    70,    67,    67,    41,    13,     8,
+      67,    73,    41,     7,    70
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1235,7 +1231,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
       case 41: /* "word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1239 "ael.tab.c"
+#line 1235 "ael.tab.c"
         break;
       case 44: /* "objects" */
 #line 159 "ael.y"
@@ -1243,7 +1239,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1247 "ael.tab.c"
+#line 1243 "ael.tab.c"
         break;
       case 45: /* "object" */
 #line 159 "ael.y"
@@ -1251,12 +1247,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1255 "ael.tab.c"
+#line 1251 "ael.tab.c"
         break;
       case 46: /* "context_name" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1260 "ael.tab.c"
+#line 1256 "ael.tab.c"
         break;
       case 47: /* "context" */
 #line 159 "ael.y"
@@ -1264,7 +1260,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1268 "ael.tab.c"
+#line 1264 "ael.tab.c"
         break;
       case 49: /* "macro" */
 #line 159 "ael.y"
@@ -1272,7 +1268,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1276 "ael.tab.c"
+#line 1272 "ael.tab.c"
         break;
       case 50: /* "globals" */
 #line 159 "ael.y"
@@ -1280,7 +1276,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1284 "ael.tab.c"
+#line 1280 "ael.tab.c"
         break;
       case 51: /* "global_statements" */
 #line 159 "ael.y"
@@ -1288,7 +1284,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1292 "ael.tab.c"
+#line 1288 "ael.tab.c"
         break;
       case 52: /* "assignment" */
 #line 159 "ael.y"
@@ -1296,7 +1292,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1300 "ael.tab.c"
+#line 1296 "ael.tab.c"
         break;
       case 54: /* "arglist" */
 #line 159 "ael.y"
@@ -1304,7 +1300,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1308 "ael.tab.c"
+#line 1304 "ael.tab.c"
         break;
       case 55: /* "elements_block" */
 #line 159 "ael.y"
@@ -1312,7 +1308,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1316 "ael.tab.c"
+#line 1312 "ael.tab.c"
         break;
       case 56: /* "elements" */
 #line 159 "ael.y"
@@ -1320,7 +1316,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1324 "ael.tab.c"
+#line 1320 "ael.tab.c"
         break;
       case 57: /* "element" */
 #line 159 "ael.y"
@@ -1328,7 +1324,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1332 "ael.tab.c"
+#line 1328 "ael.tab.c"
         break;
       case 58: /* "ignorepat" */
 #line 159 "ael.y"
@@ -1336,7 +1332,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1340 "ael.tab.c"
+#line 1336 "ael.tab.c"
         break;
       case 59: /* "extension" */
 #line 159 "ael.y"
@@ -1344,7 +1340,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1348 "ael.tab.c"
+#line 1344 "ael.tab.c"
         break;
       case 60: /* "statements" */
 #line 159 "ael.y"
@@ -1352,12 +1348,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1356 "ael.tab.c"
+#line 1352 "ael.tab.c"
         break;
       case 61: /* "timerange" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1361 "ael.tab.c"
+#line 1357 "ael.tab.c"
         break;
       case 62: /* "timespec" */
 #line 159 "ael.y"
@@ -1365,12 +1361,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1369 "ael.tab.c"
+#line 1365 "ael.tab.c"
         break;
       case 63: /* "test_expr" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1374 "ael.tab.c"
+#line 1370 "ael.tab.c"
         break;
       case 65: /* "if_like_head" */
 #line 159 "ael.y"
@@ -1378,22 +1374,22 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1382 "ael.tab.c"
+#line 1378 "ael.tab.c"
         break;
       case 66: /* "word_list" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1387 "ael.tab.c"
+#line 1383 "ael.tab.c"
         break;
       case 67: /* "word3_list" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1392 "ael.tab.c"
+#line 1388 "ael.tab.c"
         break;
       case 68: /* "goto_word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1397 "ael.tab.c"
+#line 1393 "ael.tab.c"
         break;
       case 69: /* "switch_head" */
 #line 159 "ael.y"
@@ -1401,7 +1397,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1405 "ael.tab.c"
+#line 1401 "ael.tab.c"
         break;
       case 70: /* "statement" */
 #line 159 "ael.y"
@@ -1409,7 +1405,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1413 "ael.tab.c"
+#line 1409 "ael.tab.c"
         break;
       case 75: /* "opt_else" */
 #line 159 "ael.y"
@@ -1417,7 +1413,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1421 "ael.tab.c"
+#line 1417 "ael.tab.c"
         break;
       case 76: /* "target" */
 #line 159 "ael.y"
@@ -1425,7 +1421,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1429 "ael.tab.c"
+#line 1425 "ael.tab.c"
         break;
       case 77: /* "jumptarget" */
 #line 159 "ael.y"
@@ -1433,7 +1429,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1437 "ael.tab.c"
+#line 1433 "ael.tab.c"
         break;
       case 78: /* "macro_call" */
 #line 159 "ael.y"
@@ -1441,7 +1437,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1445 "ael.tab.c"
+#line 1441 "ael.tab.c"
         break;
       case 80: /* "application_call_head" */
 #line 159 "ael.y"
@@ -1449,7 +1445,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1453 "ael.tab.c"
+#line 1449 "ael.tab.c"
         break;
       case 82: /* "application_call" */
 #line 159 "ael.y"
@@ -1457,12 +1453,12 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1461 "ael.tab.c"
+#line 1457 "ael.tab.c"
         break;
       case 83: /* "opt_word" */
 #line 173 "ael.y"
         { free((yyvaluep->str));};
-#line 1466 "ael.tab.c"
+#line 1462 "ael.tab.c"
         break;
       case 84: /* "eval_arglist" */
 #line 159 "ael.y"
@@ -1470,7 +1466,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1474 "ael.tab.c"
+#line 1470 "ael.tab.c"
         break;
       case 85: /* "case_statements" */
 #line 159 "ael.y"
@@ -1478,7 +1474,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1482 "ael.tab.c"
+#line 1478 "ael.tab.c"
         break;
       case 86: /* "case_statement" */
 #line 159 "ael.y"
@@ -1486,7 +1482,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1490 "ael.tab.c"
+#line 1486 "ael.tab.c"
         break;
       case 87: /* "macro_statements" */
 #line 159 "ael.y"
@@ -1494,7 +1490,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1498 "ael.tab.c"
+#line 1494 "ael.tab.c"
         break;
       case 88: /* "macro_statement" */
 #line 159 "ael.y"
@@ -1502,7 +1498,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1506 "ael.tab.c"
+#line 1502 "ael.tab.c"
         break;
       case 89: /* "switches" */
 #line 159 "ael.y"
@@ -1510,7 +1506,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1514 "ael.tab.c"
+#line 1510 "ael.tab.c"
         break;
       case 90: /* "eswitches" */
 #line 159 "ael.y"
@@ -1518,7 +1514,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1522 "ael.tab.c"
+#line 1518 "ael.tab.c"
         break;
       case 91: /* "switchlist_block" */
 #line 159 "ael.y"
@@ -1526,7 +1522,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1530 "ael.tab.c"
+#line 1526 "ael.tab.c"
         break;
       case 92: /* "switchlist" */
 #line 159 "ael.y"
@@ -1534,7 +1530,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1538 "ael.tab.c"
+#line 1534 "ael.tab.c"
         break;
       case 93: /* "included_entry" */
 #line 159 "ael.y"
@@ -1542,7 +1538,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1546 "ael.tab.c"
+#line 1542 "ael.tab.c"
         break;
       case 94: /* "includeslist" */
 #line 159 "ael.y"
@@ -1550,7 +1546,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1554 "ael.tab.c"
+#line 1550 "ael.tab.c"
         break;
       case 95: /* "includes" */
 #line 159 "ael.y"
@@ -1558,7 +1554,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
 		destroy_pval((yyvaluep->pval));
 		prev_word=0;
 	};
-#line 1562 "ael.tab.c"
+#line 1558 "ael.tab.c"
         break;
 
       default:
@@ -2515,20 +2511,12 @@ yyreduce:
     break;
 
   case 100:
-#line 499 "ael.y"
-    {		/* default, ext, 1 */
-		(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 101:
-#line 505 "ael.y"
+#line 501 "ael.y"
     {reset_argcount(parseio->scanner);;}
     break;
 
-  case 102:
-#line 505 "ael.y"
+  case 101:
+#line 501 "ael.y"
     {
 		/* XXX original code had @2 but i think we need @5 */
 		(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[-4]), &(yylsp[0]));
@@ -2536,20 +2524,20 @@ yyreduce:
 		(yyval.pval)->u2.arglist = (yyvsp[-1].pval);;}
     break;
 
-  case 103:
-#line 510 "ael.y"
+  case 102:
+#line 506 "ael.y"
     {
 		(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-2].str); ;}
     break;
 
-  case 104:
-#line 518 "ael.y"
+  case 103:
+#line 514 "ael.y"
     {reset_argcount(parseio->scanner);;}
     break;
 
-  case 105:
-#line 518 "ael.y"
+  case 104:
+#line 514 "ael.y"
     {
 		if (strcasecmp((yyvsp[-2].str),"goto") == 0) {
 			(yyval.pval) = npval2(PV_GOTO, &(yylsp[-2]), &(yylsp[-1]));
@@ -2561,8 +2549,8 @@ yyreduce:
 		} ;}
     break;
 
-  case 106:
-#line 529 "ael.y"
+  case 105:
+#line 525 "ael.y"
     {
 		(yyval.pval) = update_last((yyvsp[-2].pval), &(yylsp[0]));
  		if( (yyval.pval)->type == PV_GOTO )
@@ -2572,202 +2560,202 @@ yyreduce:
 	;}
     break;
 
-  case 107:
-#line 536 "ael.y"
+  case 106:
+#line 532 "ael.y"
     { (yyval.pval) = update_last((yyvsp[-1].pval), &(yylsp[0])); ;}
     break;
 
-  case 108:
-#line 539 "ael.y"
+  case 107:
+#line 535 "ael.y"
     { (yyval.str) = (yyvsp[0].str) ;}
     break;
 
-  case 109:
-#line 540 "ael.y"
+  case 108:
+#line 536 "ael.y"
     { (yyval.str) = strdup(""); ;}
     break;
 
-  case 110:
-#line 543 "ael.y"
+  case 109:
+#line 539 "ael.y"
     { (yyval.pval) = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
-  case 111:
-#line 544 "ael.y"
+  case 110:
+#line 540 "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 112:
-#line 547 "ael.y"
+  case 111:
+#line 543 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[0].str), &(yylsp[0]))); ;}
     break;
 
-  case 113:
-#line 550 "ael.y"
+  case 112:
+#line 546 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
-  case 114:
-#line 551 "ael.y"
+  case 113:
+#line 547 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
-  case 115:
-#line 552 "ael.y"
+  case 114:
+#line 548 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
-  case 116:
-#line 555 "ael.y"
+  case 115:
+#line 551 "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 117:
-#line 559 "ael.y"
+  case 116:
+#line 555 "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 118:
-#line 563 "ael.y"
+  case 117:
+#line 559 "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 119:
-#line 567 "ael.y"
+  case 118:
+#line 563 "ael.y"
     {
 		(yyval.pval) = npval2(PV_CASE, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-1].str);;}
     break;
 
-  case 120:
-#line 570 "ael.y"
+  case 119:
+#line 566 "ael.y"
     {
 		(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.str = NULL;;}
     break;
 
-  case 121:
-#line 573 "ael.y"
+  case 120:
+#line 569 "ael.y"
     {
 		(yyval.pval) = npval2(PV_PATTERN, &(yylsp[-2]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-1].str);;}
     break;
 
-  case 122:
-#line 578 "ael.y"
+  case 121:
+#line 574 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
-  case 123:
-#line 579 "ael.y"
+  case 122:
+#line 575 "ael.y"
     {(yyval.pval) = (yyvsp[0].pval);;}
     break;
 
-  case 124:
-#line 580 "ael.y"
+  case 123:
+#line 576 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
-  case 125:
-#line 583 "ael.y"
+  case 124:
+#line 579 "ael.y"
     {(yyval.pval)=(yyvsp[0].pval);;}
     break;
 
-  case 126:
-#line 584 "ael.y"
+  case 125:
+#line 580 "ael.y"
     {
 		(yyval.pval) = npval2(PV_CATCH, &(yylsp[-4]), &(yylsp[0]));
 		(yyval.pval)->u1.str = (yyvsp[-3].str);
 		(yyval.pval)->u2.statements = (yyvsp[-1].pval);;}
     break;
 
-  case 127:
-#line 590 "ael.y"
+  case 126:
+#line 586 "ael.y"
     {
 		(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
     break;
 
-  case 128:
-#line 595 "ael.y"
+  case 127:
+#line 591 "ael.y"
     {
 		(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[-1]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[0].pval); ;}
     break;
 
-  case 129:
-#line 600 "ael.y"
+  case 128:
+#line 596 "ael.y"
     { (yyval.pval) = (yyvsp[-1].pval); ;}
     break;
 
-  case 130:
-#line 601 "ael.y"
+  case 129:
+#line 597 "ael.y"
     { (yyval.pval) = NULL; ;}
     break;
 
-  case 131:
-#line 604 "ael.y"
+  case 130:
+#line 600 "ael.y"
     { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
     break;
 
-  case 132:
-#line 605 "ael.y"
+  case 131:
+#line 601 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-2].pval), nword((yyvsp[-1].str), &(yylsp[-1]))); ;}
     break;
 
-  case 133:
-#line 606 "ael.y"
+  case 132:
+#line 602 "ael.y"
     {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
-  case 134:
-#line 609 "ael.y"
+  case 133:
+#line 605 "ael.y"
     { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;}
     break;
 
-  case 135:
-#line 610 "ael.y"
+  case 134:
+#line 606 "ael.y"
     {
 		(yyval.pval) = nword((yyvsp[-3].str), &(yylsp[-3]));
 		(yyval.pval)->u2.arglist = (yyvsp[-1].pval);
 		prev_word=0; /* XXX sure ? */ ;}
     break;
 
-  case 136:
-#line 617 "ael.y"
+  case 135:
+#line 613 "ael.y"
     { (yyval.pval) = (yyvsp[0].pval); ;}
     break;
 
-  case 137:
-#line 618 "ael.y"
+  case 136:
+#line 614 "ael.y"
     { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;}
     break;
 
-  case 138:
-#line 619 "ael.y"
+  case 137:
+#line 615 "ael.y"
     {(yyval.pval)=(yyvsp[-1].pval);;}
     break;
 
-  case 139:
-#line 622 "ael.y"
+  case 138:
+#line 618 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0]));
 		(yyval.pval)->u1.list = (yyvsp[-1].pval);;}
     break;
 
-  case 140:
-#line 625 "ael.y"
+  case 139:
+#line 621 "ael.y"
     {
 		(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;}
     break;
@@ -2777,7 +2765,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 2781 "ael.tab.c"
+#line 2769 "ael.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3052,7 +3040,7 @@ yyreturn:
 }
 
 
-#line 630 "ael.y"
+#line 626 "ael.y"
 
 
 static char *token_equivs1[] =
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index f799b5b70..2ef55c37d 100644
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -492,14 +492,10 @@ jumptarget : goto_word {			/* ext, 1 */
 		$$ = nword($5, &@5);
 		$$->next = nword($1, &@1);
 		$$->next->next = nword($3, &@3); }
-	| goto_word AT goto_word {		/* context, ext, 1 */
+	| goto_word AT context_name {		/* context, ext, 1 */
 		$$ = nword($3, &@3);
 		$$->next = nword($1, &@1);
 		$$->next->next = nword(strdup("1"), &@3); }
-	| goto_word AT KW_DEFAULT {		/* default, ext, 1 */
-		$$ = nword(strdup("default"), &@1);
-		$$->next = nword($1, &@3);
-		$$->next->next = nword( strdup("1"), &@3); }
 	;
 
 macro_call : word LP {reset_argcount(parseio->scanner);} eval_arglist RP {