[asterisk-commits] branch murf/AEL2 r16520 - in /team/murf/AEL2: doc/ pbx/

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu Mar 30 07:03:34 MST 2006


Author: murf
Date: Thu Mar 30 08:03:29 2006
New Revision: 16520

URL: http://svn.digium.com/view/asterisk?rev=16520&view=rev
Log:
A request was made that the goto statement allow a COMMA as a separator
in addition to the '|' (vertical bar). I have introduced the new syntax,
and added it to the documentation. You can use either commas to separate
the context, extension, label, or vertical bars, but not a mix thereof.
This change should be upward compatible.


Modified:
    team/murf/AEL2/doc/ael2.txt
    team/murf/AEL2/pbx/ael.tab.c
    team/murf/AEL2/pbx/ael.tab.h
    team/murf/AEL2/pbx/ael.y

Modified: team/murf/AEL2/doc/ael2.txt
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/doc/ael2.txt?rev=16520&r1=16519&r2=16520&view=diff
==============================================================================
--- team/murf/AEL2/doc/ael2.txt (original)
+++ team/murf/AEL2/doc/ael2.txt Thu Mar 30 08:03:29 2006
@@ -448,6 +448,9 @@
        | <word> '|' <word>
        | <word> '|' <word> '|' <word>
        | 'default' '|' <word> '|' <word>
+       | <word> ',' <word>
+       | <word> ',' <word> ',' <word>
+       | 'default' ',' <word> ',' <word>
 
 <jumptarget> :== <word>
                | <word> ',' <word>
@@ -917,10 +920,10 @@
          jump s;    // go to first extension in same extension
     }
     3 => {
-            jump s|begin;   // go to label in different extension
+            jump s,begin;   // go to label in different extension
      }
      4 => {
-            jump s|begin at gotoexample;  // overkill go to label in same context
+            jump s,begin at gotoexample;  // overkill go to label in same context
      }
 }
 
@@ -942,6 +945,11 @@
 
 NOTE  AEL2 introduces the special label "1", which is the beginning
       context number for most extensions.
+
+NOTE: A NEW addition to AEL2: you can now use ',' instead of '|' to 
+      separate the items in the target address. You can't have a mix,
+      though, of '|' and ',' in the target. It's either one, or the other.
+
 
 
 

Modified: team/murf/AEL2/pbx/ael.tab.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/ael.tab.c?rev=16520&r1=16519&r2=16520&view=diff
==============================================================================
--- team/murf/AEL2/pbx/ael.tab.c (original)
+++ team/murf/AEL2/pbx/ael.tab.c Thu Mar 30 08:03:29 2006
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 1.875c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -36,9 +36,6 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
-/* Bison version.  */
-#define YYBISON_VERSION "2.1"
-
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -48,7 +45,8 @@
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
-/* Substitute the variable and function names.  */
+/* If NAME_PREFIX is specified substitute the variables and functions
+   names.  */
 #define yyparse ael_yyparse
 #define yylex   ael_yylex
 #define yyerror ael_yyerror
@@ -105,7 +103,6 @@
      word = 296
    };
 #endif
-/* Tokens.  */
 #define KW_CONTEXT 258
 #define LC 259
 #define RC 260
@@ -234,19 +231,14 @@
 # define YYERROR_VERBOSE 1
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 #line 72 "ael.y"
 typedef union YYSTYPE {
 	char *str;
 	struct pval *pval;
 } YYSTYPE;
-/* Line 196 of yacc.c.  */
-#line 250 "ael.tab.c"
+/* Line 191 of yacc.c.  */
+#line 242 "ael.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -269,49 +261,30 @@
 /* Copy the second part of user declarations.  */
 
 
-/* Line 219 of yacc.c.  */
-#line 274 "ael.tab.c"
-
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
-#ifndef YY_
-# if YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
-#  endif
+/* Line 214 of yacc.c.  */
+#line 266 "ael.tab.c"
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+# ifndef YYFREE
+#  define YYFREE free
 # endif
-# ifndef YY_
-#  define YY_(msgid) msgid
+# ifndef YYMALLOC
+#  define YYMALLOC malloc
 # endif
-#endif
-
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_USE_ALLOCA
 #  if YYSTACK_USE_ALLOCA
+#   define YYSTACK_ALLOC alloca
+#  endif
+# else
+#  if defined (alloca) || defined (_ALLOCA_H)
+#   define YYSTACK_ALLOC alloca
+#  else
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if defined (__STDC__) || defined (__cplusplus)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     define YYINCLUDED_STDLIB_H
-#    endif
 #   endif
 #  endif
 # endif
@@ -319,39 +292,13 @@
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
 #  endif
-# else
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
-#  endif
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifdef __cplusplus
-}
-#  endif
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
@@ -364,7 +311,7 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  short yyss;
   YYSTYPE yyvs;
     YYLTYPE yyls;
 };
@@ -375,7 +322,7 @@
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
+     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
       + 2 * YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
@@ -388,7 +335,7 @@
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  YYSIZE_T yyi;				\
+	  register YYSIZE_T yyi;		\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
@@ -417,28 +364,28 @@
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short int yysigned_char;
+   typedef short yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  17
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   565
+#define YYLAST   563
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  42
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  51
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  143
+#define YYNRULES  146
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  339
+#define YYNSTATES  347
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   296
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX) 						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
@@ -479,7 +426,7 @@
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short int yyprhs[] =
+static const unsigned short yyprhs[] =
 {
        0,     0,     3,     5,     7,    10,    13,    15,    17,    19,
       21,    27,    32,    38,    43,    50,    56,    63,    69,    78,
@@ -490,12 +437,12 @@
      247,   250,   254,   255,   262,   266,   267,   273,   277,   281,
      284,   285,   286,   287,   300,   301,   308,   311,   315,   319,
      322,   325,   326,   332,   335,   338,   341,   344,   349,   352,
-     357,   360,   365,   367,   369,   373,   379,   385,   387,   391,
-     397,   401,   407,   411,   412,   418,   422,   423,   427,   431,
-     434,   436,   437,   441,   444,   446,   449,   454,   458,   463,
-     467,   470,   474,   476,   479,   481,   487,   492,   496,   501,
-     505,   508,   512,   515,   518,   533,   544,   548,   564,   576,
-     579,   581,   583,   588
+     357,   360,   365,   367,   369,   373,   377,   383,   389,   395,
+     401,   403,   407,   413,   417,   423,   427,   428,   434,   438,
+     439,   443,   447,   450,   452,   453,   457,   460,   462,   465,
+     470,   474,   479,   483,   486,   490,   492,   495,   497,   503,
+     508,   512,   517,   521,   524,   528,   531,   534,   549,   560,
+     564,   580,   592,   595,   597,   599,   604
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -538,33 +485,34 @@
       -1,    61,    68,    -1,    61,    68,    21,    68,    -1,    59,
       68,    -1,    59,    68,    21,    68,    -1,    63,    68,    -1,
       63,    68,    21,    68,    -1,     8,    -1,    41,    -1,    41,
-      13,    41,    -1,    41,    13,    41,    13,    41,    -1,    36,
-      13,    41,    13,    41,    -1,    41,    -1,    41,    10,    41,
-      -1,    41,    10,    41,    14,    41,    -1,    41,    14,    41,
-      -1,    41,    10,    41,    14,    36,    -1,    41,    14,    36,
-      -1,    -1,    41,     6,    78,    82,     7,    -1,    41,     6,
-       7,    -1,    -1,    41,    80,     6,    -1,    79,    82,     7,
-      -1,    79,     7,    -1,    64,    -1,    -1,    82,    10,    41,
-      -1,    82,    10,    -1,    84,    -1,    83,    84,    -1,    34,
-      41,    11,    58,    -1,    36,    11,    58,    -1,    35,    41,
-      11,    58,    -1,    34,    41,    11,    -1,    36,    11,    -1,
-      35,    41,    11,    -1,    86,    -1,    85,    86,    -1,    68,
-      -1,    37,    41,     4,    58,     5,    -1,    38,     4,    89,
-       5,    -1,    38,     4,     5,    -1,    39,     4,    89,     5,
-      -1,    39,     4,     5,    -1,    41,     8,    -1,    89,    41,
-       8,    -1,    89,     1,    -1,    91,     8,    -1,    91,    13,
-      65,    11,    65,    11,    65,    13,    65,    13,    65,    13,
-      65,     8,    -1,    91,    13,    41,    13,    65,    13,    65,
-      13,    65,     8,    -1,    90,    91,     8,    -1,    90,    91,
-      13,    65,    11,    65,    11,    65,    13,    65,    13,    65,
-      13,    65,     8,    -1,    90,    91,    13,    41,    13,    65,
-      13,    65,    13,    65,     8,    -1,    90,     1,    -1,    41,
-      -1,    36,    -1,    40,     4,    90,     5,    -1,    40,     4,
-       5,    -1
+      13,    41,    -1,    41,    10,    41,    -1,    41,    13,    41,
+      13,    41,    -1,    41,    10,    41,    10,    41,    -1,    36,
+      13,    41,    13,    41,    -1,    36,    10,    41,    10,    41,
+      -1,    41,    -1,    41,    10,    41,    -1,    41,    10,    41,
+      14,    41,    -1,    41,    14,    41,    -1,    41,    10,    41,
+      14,    36,    -1,    41,    14,    36,    -1,    -1,    41,     6,
+      78,    82,     7,    -1,    41,     6,     7,    -1,    -1,    41,
+      80,     6,    -1,    79,    82,     7,    -1,    79,     7,    -1,
+      64,    -1,    -1,    82,    10,    41,    -1,    82,    10,    -1,
+      84,    -1,    83,    84,    -1,    34,    41,    11,    58,    -1,
+      36,    11,    58,    -1,    35,    41,    11,    58,    -1,    34,
+      41,    11,    -1,    36,    11,    -1,    35,    41,    11,    -1,
+      86,    -1,    85,    86,    -1,    68,    -1,    37,    41,     4,
+      58,     5,    -1,    38,     4,    89,     5,    -1,    38,     4,
+       5,    -1,    39,     4,    89,     5,    -1,    39,     4,     5,
+      -1,    41,     8,    -1,    89,    41,     8,    -1,    89,     1,
+      -1,    91,     8,    -1,    91,    13,    65,    11,    65,    11,
+      65,    13,    65,    13,    65,    13,    65,     8,    -1,    91,
+      13,    41,    13,    65,    13,    65,    13,    65,     8,    -1,
+      90,    91,     8,    -1,    90,    91,    13,    65,    11,    65,
+      11,    65,    13,    65,    13,    65,    13,    65,     8,    -1,
+      90,    91,    13,    41,    13,    65,    13,    65,    13,    65,
+       8,    -1,    90,     1,    -1,    41,    -1,    36,    -1,    40,
+       4,    90,     5,    -1,    40,     4,     5,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,   139,   139,   142,   143,   146,   149,   150,   151,   152,
      155,   156,   157,   158,   159,   160,   161,   162,   165,   167,
@@ -575,17 +523,17 @@
      270,   271,   274,   274,   279,   280,   280,   283,   284,   285,
      286,   287,   288,   286,   291,   291,   294,   295,   296,   297,
      298,   300,   300,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   344,   345,   348,   353,   360,   363,   366,
-     371,   376,   381,   388,   388,   391,   394,   394,   402,   408,
-     411,   412,   413,   414,   417,   418,   423,   424,   425,   426,
-     427,   428,   431,   432,   437,   438,   441,   442,   445,   446,
-     449,   450,   451,   454,   455,   476,   489,   490,   510,   523,
-     526,   527,   530,   531
+     339,   340,   341,   344,   345,   348,   351,   356,   361,   366,
+     373,   376,   379,   384,   389,   394,   401,   401,   404,   407,
+     407,   415,   421,   424,   425,   426,   427,   430,   431,   436,
+     437,   438,   439,   440,   441,   444,   445,   450,   451,   454,
+     455,   458,   459,   462,   463,   464,   467,   468,   489,   502,
+     503,   523,   536,   539,   540,   543,   544
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
@@ -611,7 +559,7 @@
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -633,12 +581,12 @@
       65,    65,    67,    66,    68,    69,    68,    68,    68,    68,
       70,    71,    72,    68,    73,    68,    68,    68,    68,    68,
       68,    74,    68,    68,    68,    68,    68,    68,    68,    68,
-      68,    68,    68,    75,    75,    75,    75,    76,    76,    76,
-      76,    76,    76,    78,    77,    77,    80,    79,    81,    81,
-      82,    82,    82,    82,    83,    83,    84,    84,    84,    84,
-      84,    84,    85,    85,    86,    86,    87,    87,    88,    88,
-      89,    89,    89,    90,    90,    90,    90,    90,    90,    90,
-      91,    91,    92,    92
+      68,    68,    68,    75,    75,    75,    75,    75,    75,    75,
+      76,    76,    76,    76,    76,    76,    78,    77,    77,    80,
+      79,    81,    81,    82,    82,    82,    82,    83,    83,    84,
+      84,    84,    84,    84,    84,    85,    85,    86,    86,    87,
+      87,    88,    88,    89,    89,    89,    90,    90,    90,    90,
+      90,    90,    90,    91,    91,    92,    92
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -653,12 +601,12 @@
        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,     2,     4,     2,     4,
-       2,     4,     1,     1,     3,     5,     5,     1,     3,     5,
-       3,     5,     3,     0,     5,     3,     0,     3,     3,     2,
-       1,     0,     3,     2,     1,     2,     4,     3,     4,     3,
-       2,     3,     1,     2,     1,     5,     4,     3,     4,     3,
-       2,     3,     2,     2,    14,    10,     3,    15,    11,     2,
-       1,     1,     4,     3
+       2,     4,     1,     1,     3,     3,     5,     5,     5,     5,
+       1,     3,     5,     3,     5,     3,     0,     5,     3,     0,
+       3,     3,     2,     1,     0,     3,     2,     1,     2,     4,
+       3,     4,     3,     2,     3,     1,     2,     1,     5,     4,
+       3,     4,     3,     2,     3,     2,     2,    14,    10,     3,
+      15,    11,     2,     1,     1,     4,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -674,222 +622,224 @@
       27,    26,    22,    25,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    40,     0,    34,    12,    33,    10,     0,
       31,     0,     0,     0,    17,     0,    15,     0,     0,     0,
-       0,    59,     0,   127,     0,     0,   129,     0,   143,   141,
-     140,     0,     0,     0,     0,    92,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   106,     0,
-       0,     0,     0,    44,   111,     0,    21,     0,   124,     0,
-     122,     0,    30,     0,    16,    14,    43,     0,    45,    60,
-       0,   130,   132,   126,     0,   128,   139,   142,     0,   133,
+       0,    59,     0,   130,     0,     0,   132,     0,   146,   144,
+     143,     0,     0,     0,     0,    92,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   109,     0,
+       0,     0,     0,    44,   114,     0,    21,     0,   127,     0,
+     125,     0,    30,     0,    16,    14,    43,     0,    45,    60,
+       0,   133,   135,   129,     0,   131,   142,   145,     0,   136,
        0,     0,     0,    48,     0,     0,    62,    51,     0,    53,
-       0,    93,     0,    97,     0,    84,    83,    85,    70,    74,
+       0,    93,     0,   100,     0,    84,    83,    85,    70,    74,
       80,    65,    69,     0,    88,    86,    90,    76,     0,     0,
-       0,     0,   114,   109,    57,   110,     0,    79,    81,     0,
-      20,   123,    19,     0,    28,     0,    61,     0,   131,   136,
-       0,    59,     0,    41,    50,    64,    49,   103,    78,     0,
-       0,    59,     0,     0,     0,     0,    67,     0,     0,    68,
-       0,     0,     0,   107,     0,     0,     0,     0,     0,   120,
-      77,   115,    58,   108,   113,     0,     0,    18,     0,     0,
-      59,     0,     0,     0,   105,   111,     0,     0,     0,     0,
-       0,     0,    94,    98,   102,   100,     0,     0,     0,    89,
-      87,    91,   119,   121,     0,   112,     0,     0,     0,    46,
-       0,     0,     0,     0,     0,     0,    52,     0,     0,    54,
-       0,     0,     0,    71,     0,    66,     0,     0,    82,   125,
-      47,     0,     0,     0,     0,   104,    63,     0,     0,    96,
-      95,   101,    99,     0,    75,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    72,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   135,     0,
-      56,     0,     0,   138,     0,     0,     0,     0,     0,     0,
-       0,    73,     0,     0,     0,     0,   134,    55,   137
+       0,     0,   117,   112,    57,   113,     0,    79,    81,     0,
+      20,   126,    19,     0,    28,     0,    61,     0,   134,   139,
+       0,    59,     0,    41,    50,    64,    49,   106,    78,     0,
+       0,    59,     0,     0,     0,     0,     0,     0,    67,     0,
+       0,    68,     0,     0,     0,   110,     0,     0,     0,     0,
+       0,   123,    77,   118,    58,   111,   116,     0,     0,    18,
+       0,     0,    59,     0,     0,     0,   108,   114,     0,     0,
+       0,     0,     0,     0,     0,    95,    94,   101,   105,   103,
+       0,     0,     0,    89,    87,    91,   122,   124,     0,   115,
+       0,     0,     0,    46,     0,     0,     0,     0,     0,     0,
+      52,     0,     0,    54,     0,     0,     0,     0,     0,    71,
+       0,    66,     0,     0,    82,   128,    47,     0,     0,     0,
+       0,   107,    63,     0,     0,    99,    98,    97,    96,   104,
+     102,     0,    75,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    72,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   138,     0,    56,     0,
+       0,   141,     0,     0,     0,     0,     0,     0,     0,    73,
+       0,     0,     0,     0,   137,    55,   140
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+static const short yydefgoto[] =
 {
       -1,     6,     7,     8,     9,    10,    11,    25,    26,    73,
       49,    38,    39,    93,    40,    41,   142,   109,   200,   110,
-     203,   111,   175,    82,   112,   199,   143,   212,   210,   293,
-     315,   211,   225,   152,   154,   145,   235,   114,   163,   115,
+     203,   111,   175,    82,   112,   199,   143,   214,   212,   301,
+     323,   213,   227,   152,   154,   145,   237,   114,   163,   115,
      176,   171,   172,   119,   120,    42,    43,    85,    91,    92,
       44
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -119
-static const short int yypact[] =
-{
-     245,    23,  -119,   -38,     6,     9,    41,   235,  -119,  -119,
-    -119,  -119,    46,    69,    79,    21,    36,  -119,  -119,  -119,
-     478,   482,     2,  -119,    84,     1,  -119,    96,   103,  -119,
-    -119,    91,    73,   115,   123,   137,   144,    10,   141,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,   161,   159,  -119,   146,
-    -119,  -119,  -119,  -119,   497,   524,   129,   171,   152,   156,
-      28,    35,    13,  -119,   452,  -119,  -119,  -119,  -119,   348,
-    -119,   184,   167,   174,  -119,   271,  -119,   324,   208,   156,
-     452,   180,   218,  -119,   220,    19,  -119,    51,  -119,  -119,
-    -119,    12,    98,   185,   452,  -119,   188,   226,   227,   228,
-     231,    77,   205,   239,   241,   244,   249,   251,   178,   452,
-     452,   452,   149,  -119,    20,   126,  -119,   221,  -119,   374,
-    -119,   400,  -119,   263,  -119,  -119,  -119,   267,  -119,   234,
-     237,  -119,  -119,  -119,   272,  -119,  -119,  -119,   147,  -119,
-     240,   274,   265,  -119,   280,   281,  -119,  -119,   254,  -119,
-     291,   292,   300,   197,   308,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,   312,   298,   305,   309,  -119,   290,   293,
-     322,   170,  -119,  -119,   294,  -119,   154,  -119,  -119,   333,
-    -119,  -119,  -119,   426,  -119,   297,  -119,   315,  -119,  -119,
-     299,    38,   331,  -119,  -119,  -119,  -119,   336,  -119,   303,
-     304,    45,   335,   304,   306,   307,  -119,   310,   162,  -119,
-     316,   317,   318,  -119,   452,   452,   452,   338,   339,   452,
-    -119,  -119,  -119,  -119,   320,   328,   452,  -119,   347,   452,
-      58,   361,   156,   156,  -119,   304,   376,   377,   156,   156,
-     380,   375,   378,   381,  -119,  -119,   382,   390,   401,  -119,
-    -119,  -119,   452,   452,     3,  -119,   402,   295,   452,  -119,
-     156,   156,   385,   403,   210,   409,  -119,   404,   405,  -119,
-     383,   394,   173,  -119,   452,  -119,    62,   104,  -119,  -119,
-    -119,   408,   412,   156,   156,  -119,  -119,   156,   156,  -119,
-    -119,  -119,  -119,   395,  -119,   156,   156,   427,   429,   430,
-     434,   431,   436,   437,   156,   156,   156,   156,  -119,   156,
-     156,   449,   448,   455,   453,   424,   460,   456,  -119,   156,
-    -119,   156,   466,  -119,   156,   462,   463,   452,   469,   156,
-     156,  -119,   156,   480,   484,   481,  -119,  -119,  -119
+#define YYPACT_NINF -196
+static const short yypact[] =
+{
+     187,    28,  -196,   -31,    23,   107,    50,   486,  -196,  -196,
+    -196,  -196,   124,   131,    67,    35,    70,  -196,  -196,  -196,
+     476,   480,    44,  -196,   125,     1,  -196,   137,   138,  -196,
+    -196,   119,    73,   145,   159,   169,   179,    10,   203,  -196,
+    -196,  -196,  -196,  -196,  -196,  -196,   279,   201,  -196,     2,
+    -196,  -196,  -196,  -196,   495,   522,   165,   207,   191,   176,
+      36,    38,    13,  -196,   450,  -196,  -196,  -196,  -196,   346,
+    -196,   217,   181,   190,  -196,   307,  -196,   322,   228,   176,
+     450,   196,   233,  -196,   237,    19,  -196,    51,  -196,  -196,
+    -196,    12,   142,   205,   450,  -196,   210,   248,   249,   250,
+     251,   130,   218,   252,   253,   255,   259,   260,   151,   450,
+     450,   450,   113,  -196,    52,   112,  -196,   227,  -196,   372,
+    -196,   398,  -196,   261,  -196,  -196,  -196,   263,  -196,   235,
+     238,  -196,  -196,  -196,   274,  -196,  -196,  -196,   183,  -196,
+     242,   278,   160,  -196,   282,   281,  -196,  -196,   256,  -196,
+     164,   213,   286,   103,   295,  -196,  -196,  -196,  -196,  -196,
+    -196,  -196,  -196,   284,   283,   290,   292,  -196,   266,   275,
+     247,   122,  -196,  -196,   280,  -196,   174,  -196,  -196,   318,
+    -196,  -196,  -196,   424,  -196,   285,  -196,   301,  -196,  -196,
+     287,    45,   320,  -196,  -196,  -196,  -196,   325,  -196,   288,
+     293,    58,   324,   293,   299,   300,   302,   303,  -196,   308,
+     171,  -196,   314,   315,   316,  -196,   450,   450,   450,   331,
+     348,   450,  -196,  -196,  -196,  -196,   326,   328,   450,  -196,
+     309,   450,    59,   359,   176,   176,  -196,   293,   329,   374,
+     176,   176,   375,   376,   380,   378,   382,   371,  -196,  -196,
+     381,   389,   399,  -196,  -196,  -196,   450,   450,     3,  -196,
+     400,   273,   450,  -196,   176,   176,   401,   404,   220,   407,
+    -196,   406,   410,  -196,   392,   393,   396,   397,   173,  -196,
+     450,  -196,    62,   104,  -196,  -196,  -196,   409,   429,   176,
+     176,  -196,  -196,   176,   176,  -196,  -196,  -196,  -196,  -196,
+    -196,   414,  -196,   176,   176,   428,   432,   434,   435,   451,
+     447,   453,   176,   176,   176,   176,  -196,   176,   176,   455,
+     454,   405,   458,   423,   465,   461,  -196,   176,  -196,   176,
+     473,  -196,   176,   477,   479,   450,   482,   176,   176,  -196,
+     176,   488,   491,   496,  -196,  -196,  -196
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
-{
-    -119,  -119,  -119,   485,  -119,  -119,  -119,  -119,   471,  -119,
-    -119,    47,    82,  -119,  -119,  -119,  -109,  -119,  -119,  -119,
-    -119,  -119,    24,   -65,  -119,  -119,   -64,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-     259,  -119,   326,   379,  -118,  -119,  -119,   440,  -119,   407,
-    -119
+static const short yypgoto[] =
+{
+    -196,  -196,  -196,   492,  -196,  -196,  -196,  -196,   483,  -196,
+    -196,    47,    69,  -196,  -196,  -196,  -195,  -196,  -196,  -196,
+    -196,  -196,    32,   -65,  -196,  -196,   -64,  -196,  -196,  -196,
+    -196,  -196,  -196,  -196,  -196,  -196,  -196,  -196,  -196,  -196,
+     268,  -196,   342,   402,  -118,  -196,  -196,   463,  -196,   431,
+    -196
 };
 
 /* 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
-static const short int yytable[] =
-{
-     113,   181,    51,    14,   194,   118,    52,    94,  -117,    47,
-      15,    95,    16,   136,   127,    96,   128,   137,    88,    63,
-     132,    97,    98,    99,   133,   100,    23,   173,   101,   102,
-     103,   104,   105,    83,    64,   106,   107,  -117,  -117,  -117,
-      86,    17,    24,    48,   108,   164,   165,   166,    89,    89,
-      20,   232,   132,    90,    90,   118,   135,   118,   238,    12,
-     134,   174,    24,   194,    13,   181,    94,  -116,    46,    84,
-      95,   260,    27,    21,    96,   192,    84,    28,   196,   129,
-      97,    98,    99,   202,   100,    22,   129,   101,   102,   103,
-     104,   105,   134,    50,   106,   107,  -116,  -116,  -116,   129,
-      54,    75,    77,   108,    57,   194,   139,    55,    94,  -118,
-     254,   140,    95,   150,    58,    56,    96,   257,   151,   118,
-      67,    59,    97,    98,    99,   231,   100,    60,    67,   101,
-     102,   103,   104,   105,   177,   178,   106,   107,  -118,  -118,
-    -118,    61,    65,   276,   277,   108,    66,    70,    62,    30,
-     249,   250,   251,    71,   167,   189,    72,    67,    31,    67,
-     190,   223,    65,    69,   224,   259,    68,   262,   263,    30,
-      78,    32,    33,   267,   268,   220,    80,    79,    31,    34,
-      35,    36,    37,   168,   169,   170,   160,   161,   121,   162,
-     196,    32,    33,   196,   280,   281,   282,    81,   244,    34,
-      35,    36,    37,   245,   168,   169,   170,   207,   122,   291,
-     294,   208,   196,   196,   292,   123,   126,   285,   297,   298,
-     224,   129,   299,   300,   237,   130,   141,   240,   131,   144,
-     302,   303,   146,   147,   148,    -2,    18,   149,     1,   311,
-     312,   313,   314,     2,   316,   317,   153,   155,     1,   156,
-       3,     4,   157,     2,   325,   158,   326,   159,     5,   328,
-       3,     4,   179,   331,   333,   334,   194,   335,     5,    94,
-     195,   184,    65,    95,   185,   186,   124,    96,   187,    30,
-     188,   191,   193,    97,    98,    99,   197,   100,    31,   198,
-     101,   102,   103,   104,   105,   201,   194,   106,   107,    94,
-     279,    32,    33,    95,   204,   205,   108,    96,   206,    34,
-      35,    36,    37,    97,    98,    99,   209,   100,   213,   214,
-     101,   102,   103,   104,   105,    65,   215,   106,   107,   125,
-     216,   217,    30,   219,   218,   222,   108,   226,   228,   229,
-     230,    31,   233,   234,   236,   174,   239,   241,   242,   252,
-     253,   243,    94,   116,    32,    33,    95,   246,   247,   248,
-      96,   255,    34,    35,    36,    37,    97,    98,    99,   256,
-     100,   258,   261,   101,   102,   103,   104,   105,    94,   180,
-     106,   107,    95,   265,   266,   117,    96,   269,   270,   108,
-     273,   271,    97,    98,    99,   272,   100,   274,   283,   101,
-     102,   103,   104,   105,    94,   182,   106,   107,    95,   275,
-     278,   117,    96,   286,   284,   108,   288,   287,    97,    98,
-      99,   295,   100,   296,   289,   101,   102,   103,   104,   105,
-      94,   227,   106,   107,    95,   290,   301,   117,    96,   308,
-     304,   108,   305,   306,    97,    98,    99,   307,   100,   309,
-     310,   101,   102,   103,   104,   105,    94,   318,   106,   107,
-      95,   319,   320,   117,    96,   322,   321,   108,   323,   324,
-      97,    98,    99,   327,   100,   329,   330,   101,   102,   103,
-     104,   105,   332,    29,   106,   107,    30,    45,   336,   338,
-      30,   337,    19,   108,   264,    31,    53,   221,   138,    31,
-     183,    87,    74,     0,     0,    30,     0,     0,    32,    33,
-       0,     0,    32,    33,    31,     0,    34,    35,    36,    37,
-      34,    35,    36,    37,     0,     0,     0,    32,    33,    76,
-       0,     0,    30,     0,     0,    34,    35,    36,    37,     0,
-       0,    31,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    32,    33,     0,     0,     0,     0,
-       0,     0,    34,    35,    36,    37
+#define YYTABLE_NINF -122
+static const short yytable[] =
+{
+     113,   181,    51,    70,   194,   118,    52,    94,  -120,    71,
+      14,    95,    72,   136,   127,    96,   128,   137,    88,    63,
+     132,    97,    98,    99,   133,   100,   258,    15,   101,   102,
+     103,   104,   105,   261,    64,   106,   107,  -120,  -120,  -120,
+      23,    83,    24,    86,   108,   164,   165,   166,    89,    89,
+      17,    47,   132,    90,    90,   118,   135,   118,   234,   173,
+     134,   282,   283,   194,    12,   181,    94,  -119,    46,    13,
+      95,   240,   264,    22,    96,   192,    24,    84,   196,    84,
+      97,    98,    99,   202,   100,    48,   129,   101,   102,   103,
+     104,   105,   134,   174,   106,   107,  -119,  -119,  -119,   129,
+     129,    75,    77,   108,    57,   194,    27,    67,    94,  -121,
+      16,    28,    95,   209,    58,    67,    96,   210,   167,   118,
+     177,   178,    97,    98,    99,   233,   100,   222,    20,   101,
+     102,   103,   104,   105,    50,    21,   106,   107,  -121,  -121,
+    -121,    54,    55,    56,    67,   108,    67,   168,   169,   170,
+     139,    59,   253,   254,   255,   140,   168,   169,   170,   160,
+     161,   194,   162,    60,    94,   195,   150,   263,    95,   266,
+     267,   151,    96,    61,   204,   271,   272,   205,    97,    98,
+      99,   225,   100,    62,   226,   101,   102,   103,   104,   105,
+       1,   189,   106,   107,   196,     2,   190,   196,   286,   287,
+     288,   108,     3,     4,    65,    69,    78,   248,    66,   299,
+       5,    30,   249,    79,   300,    80,   302,    81,   196,   196,
+      31,   121,   122,   206,   305,   306,   207,   291,   307,   308,
+     226,   123,   239,    32,    33,   242,   126,   129,   310,   311,
+     130,    34,    35,    36,    37,   131,   141,   319,   320,   321,
+     322,   144,   324,   325,   146,   147,   148,   149,   221,   153,
+     155,   156,   333,   157,   334,   158,   159,   336,   179,   184,
+     185,   339,   341,   342,   194,   343,   186,    94,   285,   187,
+      65,    95,   188,   191,    68,    96,   193,    30,   197,   198,
+     215,    97,    98,    99,   208,   100,    31,   201,   101,   102,
+     103,   104,   105,   211,   216,   106,   107,   219,    65,    32,
+      33,   217,   124,   218,   108,    30,   220,    34,    35,    36,
+      37,   224,   228,    65,    31,   231,   230,   125,   232,   238,
+      30,   235,   236,   262,   174,   241,   269,    32,    33,    31,
+     243,   244,   256,   245,   246,    34,    35,    36,    37,   247,
+      94,   116,    32,    33,    95,   250,   251,   252,    96,   257,
+      34,    35,    36,    37,    97,    98,    99,   259,   100,   260,
+     265,   101,   102,   103,   104,   105,    94,   180,   106,   107,
+      95,   270,   273,   117,    96,   278,   274,   108,   276,   279,
+      97,    98,    99,   275,   100,   277,   280,   101,   102,   103,
+     104,   105,    94,   182,   106,   107,    95,   281,   284,   117,
+      96,   292,   328,   108,   289,   290,    97,    98,    99,   293,
+     100,   294,   303,   101,   102,   103,   104,   105,    94,   229,
+     106,   107,    95,   295,   296,   117,    96,   297,   298,   108,
+     304,   312,    97,    98,    99,   313,   100,   314,   315,   101,
+     102,   103,   104,   105,    94,   309,   106,   107,    95,   316,
+     317,   117,    96,   326,   330,   108,   318,   327,    97,    98,
+      99,   329,   100,   331,   332,   101,   102,   103,   104,   105,
+     335,    29,   106,   107,    30,    45,    -2,    18,    30,     1,
+     337,   108,   338,    31,     2,   340,   344,    31,   345,    19,
+      74,     3,     4,    30,   346,   268,    32,    33,    53,     5,
+      32,    33,    31,   223,    34,    35,    36,    37,    34,    35,
+      36,    37,   138,   183,    87,    32,    33,    76,     0,     0,
+      30,     0,     0,    34,    35,    36,    37,     0,     0,    31,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    32,    33,     0,     0,     0,     0,     0,     0,
+      34,    35,    36,    37
 };
 
-static const short int yycheck[] =
-{
-      64,   119,     1,    41,     1,    69,     5,     4,     5,     7,
-       4,     8,     3,     1,    79,    12,    80,     5,     5,     9,
-       1,    18,    19,    20,     5,    22,     5,     7,    25,    26,
-      27,    28,    29,     5,    24,    32,    33,    34,    35,    36,
-       5,     0,    41,    41,    41,   109,   110,   111,    36,    36,
-       4,    13,     1,    41,    41,   119,     5,   121,    13,    36,
-      41,    41,    41,     1,    41,   183,     4,     5,    21,    41,
-       8,    13,    36,     4,    12,   140,    41,    41,   142,    41,
-      18,    19,    20,   148,    22,     6,    41,    25,    26,    27,
-      28,    29,    41,     9,    32,    33,    34,    35,    36,    41,
-       4,    54,    55,    41,    31,     1,     8,     4,     4,     5,
-     219,    13,     8,    36,    41,    24,    12,   226,    41,   183,
-      38,     6,    18,    19,    20,   190,    22,     4,    46,    25,
-      26,    27,    28,    29,     8,     9,    32,    33,    34,    35,
-      36,     4,     1,   252,   253,    41,     5,     1,     4,     8,
-     214,   215,   216,     7,     5,     8,    10,    75,    17,    77,
-      13,     7,     1,     4,    10,   229,     5,   232,   233,     8,
-      41,    30,    31,   238,   239,     5,    24,     6,    17,    38,
-      39,    40,    41,    34,    35,    36,     8,     9,     4,    11,
-     254,    30,    31,   257,   258,   260,   261,    41,    36,    38,
-      39,    40,    41,    41,    34,    35,    36,    10,    41,    36,

[... 2134 lines stripped ...]


More information about the asterisk-commits mailing list