[svn-commits] trunk r23614 - in /trunk/pbx/ael: ael.tab.c ael.tab.h ael.y

svn-commits at lists.digium.com svn-commits at lists.digium.com
Sun Apr 30 05:44:55 MST 2006


Author: rizzo
Date: Sun Apr 30 07:44:54 2006
New Revision: 23614

URL: http://svn.digium.com/view/asterisk?rev=23614&view=rev
Log:
more merge of common blocks through intermediate rules.


Modified:
    trunk/pbx/ael/ael.tab.c
    trunk/pbx/ael/ael.tab.h
    trunk/pbx/ael/ael.y

Modified: trunk/pbx/ael/ael.tab.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael.tab.c?rev=23614&r1=23613&r2=23614&view=diff
==============================================================================
--- trunk/pbx/ael/ael.tab.c (original)
+++ trunk/pbx/ael/ael.tab.c Sun Apr 30 07:44:54 2006
@@ -223,11 +223,12 @@
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 #line 53 "ael.y"
 typedef union YYSTYPE {
-	char *str;
-	struct pval *pval;
+	int	intval;		/* integer value, typically flags */
+	char	*str;		/* strings */
+	struct pval *pval;	/* full objects */
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 231 "ael.tab.c"
+#line 232 "ael.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -248,7 +249,7 @@
 
 
 /* Copy the second part of user declarations.  */
-#line 58 "ael.y"
+#line 59 "ael.y"
 
 	/* declaring these AFTER the union makes things a lot simpler! */
 void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s);
@@ -264,7 +265,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 268 "ael.tab.c"
+#line 269 "ael.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -415,18 +416,18 @@
 #endif
 
 /* YYFINAL -- State number of the termination state. */
-#define YYFINAL  18
+#define YYFINAL  14
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   488
+#define YYLAST   489
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  42
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  56
+#define YYNNTS  58
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  149
+#define YYNRULES  151
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  344
+#define YYNSTATES  343
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -476,104 +477,106 @@
 static const unsigned short int yyprhs[] =
 {
        0,     0,     3,     5,     7,    10,    13,    15,    17,    19,
-      21,    23,    25,    29,    34,    43,    51,    59,    66,    71,
-      75,    77,    80,    83,    84,    90,    92,    96,    99,   102,
-     106,   108,   110,   113,   116,   118,   120,   122,   124,   126,
-     127,   133,   136,   138,   143,   147,   152,   160,   169,   171,
-     174,   177,   178,   184,   185,   191,   206,   217,   219,   222,
-     224,   227,   231,   233,   236,   240,   241,   248,   252,   253,
-     259,   263,   267,   270,   271,   272,   273,   286,   287,   294,
-     297,   301,   305,   308,   311,   312,   318,   321,   324,   327,
-     331,   335,   339,   341,   344,   345,   347,   351,   355,   361,
-     367,   373,   379,   381,   385,   391,   395,   401,   405,   406,
-     412,   416,   417,   421,   425,   428,   430,   431,   433,   434,
-     438,   440,   443,   448,   452,   457,   461,   464,   468,   470,
-     473,   475,   481,   486,   490,   495,   499,   502,   506,   509,
-     512,   527,   538,   542,   558,   570,   573,   575,   577,   582
+      21,    23,    25,    30,    32,    33,    42,    50,    58,    65,
+      70,    74,    76,    79,    82,    83,    89,    91,    95,    98,
+     101,   105,   107,   109,   112,   115,   117,   119,   121,   123,
+     125,   126,   132,   135,   137,   142,   146,   151,   159,   168,
+     170,   173,   176,   177,   183,   184,   190,   205,   216,   218,
+     221,   223,   226,   230,   232,   235,   239,   240,   247,   251,
+     252,   258,   262,   266,   269,   270,   271,   272,   285,   286,
+     293,   296,   300,   304,   307,   310,   311,   317,   320,   323,
+     326,   330,   334,   338,   340,   343,   344,   346,   350,   354,
+     360,   366,   372,   378,   380,   384,   390,   394,   400,   404,
+     405,   411,   415,   416,   420,   424,   427,   429,   430,   432,
+     433,   437,   439,   442,   447,   451,   456,   460,   463,   467,
+     469,   472,   474,   480,   485,   489,   492,   496,   499,   502,
+     506,   509,   512,   527,   538,   542,   558,   570,   573,   575,
+     577,   582
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const yysigned_char yyrhs[] =
 {
       43,     0,    -1,    44,    -1,    45,    -1,    44,    45,    -1,
-      44,     1,    -1,    47,    -1,    48,    -1,    49,    -1,     8,
-      -1,    41,    -1,    36,    -1,     3,    46,    54,    -1,    23,
-       3,    46,    54,    -1,    15,    41,     6,    53,     7,     4,
-      90,     5,    -1,    15,    41,     6,    53,     7,     4,     5,
-      -1,    15,    41,     6,     7,     4,    90,     5,    -1,    15,
-      41,     6,     7,     4,     5,    -1,    16,     4,    50,     5,
-      -1,    16,     4,     5,    -1,    51,    -1,    50,    51,    -1,
-      50,     1,    -1,    -1,    41,     9,    52,    41,     8,    -1,
-      41,    -1,    53,    10,    41,    -1,    53,     1,    -1,     4,
-       5,    -1,     4,    55,     5,    -1,    56,    -1,     1,    -1,
-      55,    56,    -1,    55,     1,    -1,    59,    -1,    97,    -1,
-      92,    -1,    93,    -1,    58,    -1,    -1,    41,     9,    57,
-      41,     8,    -1,    41,     1,    -1,     8,    -1,    17,    24,
-      41,     8,    -1,    41,    24,    71,    -1,    30,    41,    24,
-      71,    -1,    31,     6,    67,     7,    41,    24,    71,    -1,
-      30,    31,     6,    67,     7,    41,    24,    71,    -1,    71,
-      -1,    60,    71,    -1,    60,     1,    -1,    -1,    19,     6,
-      62,    66,     7,    -1,    -1,    22,     6,    64,    66,     7,
-      -1,    20,     6,    67,    11,    67,    11,    67,    13,    67,
-      13,    67,    13,    67,     7,    -1,    20,     6,    41,    13,
-      67,    13,    67,    13,    67,     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,    70,    41,     7,     4,    -1,     4,    60,
-       5,    -1,    -1,    41,     9,    72,    41,     8,    -1,    25,
-      79,     8,    -1,    26,    80,     8,    -1,    41,    11,    -1,
-      -1,    -1,    -1,    32,     6,    73,    41,     8,    74,    41,
-       8,    75,    41,     7,    71,    -1,    -1,    33,     6,    76,
-      41,     7,    71,    -1,    69,     5,    -1,    69,    88,     5,
-      -1,    12,    81,     8,    -1,    85,     8,    -1,    41,     8,
-      -1,    -1,    85,     9,    77,    41,     8,    -1,    28,     8,
-      -1,    27,     8,    -1,    29,     8,    -1,    63,    71,    78,
-      -1,    61,    71,    78,    -1,    65,    71,    78,    -1,     8,
-      -1,    21,    71,    -1,    -1,    68,    -1,    68,    13,    68,
-      -1,    68,    10,    68,    -1,    68,    13,    68,    13,    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,    41,
-      -1,    68,    14,    68,    -1,    68,    10,    41,    14,    36,
-      -1,    68,    14,    36,    -1,    -1,    41,     6,    82,    87,
-       7,    -1,    41,     6,     7,    -1,    -1,    41,    84,     6,
-      -1,    83,    87,     7,    -1,    83,     7,    -1,    41,    -1,
-      -1,    66,    -1,    -1,    87,    10,    86,    -1,    89,    -1,
-      88,    89,    -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,    91,    -1,
-      90,    91,    -1,    71,    -1,    37,    41,     4,    60,     5,
-      -1,    38,     4,    94,     5,    -1,    38,     4,     5,    -1,
-      39,     4,    94,     5,    -1,    39,     4,     5,    -1,    41,
-       8,    -1,    94,    41,     8,    -1,    94,     1,    -1,    96,
-       8,    -1,    96,    13,    67,    11,    67,    11,    67,    13,
-      67,    13,    67,    13,    67,     8,    -1,    96,    13,    41,
-      13,    67,    13,    67,    13,    67,     8,    -1,    95,    96,
-       8,    -1,    95,    96,    13,    67,    11,    67,    11,    67,
-      13,    67,    13,    67,    13,    67,     8,    -1,    95,    96,
-      13,    41,    13,    67,    13,    67,    13,    67,     8,    -1,
-      95,     1,    -1,    41,    -1,    36,    -1,    40,     4,    95,
+      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,
+      15,    41,     6,     7,     4,    91,     5,    -1,    15,    41,
+       6,     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,    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,    -1,    19,     6,    63,
+      67,     7,    -1,    -1,    22,     6,    65,    67,     7,    -1,
+      20,     6,    68,    11,    68,    11,    68,    13,    68,    13,
+      68,    13,    68,     7,    -1,    20,     6,    41,    13,    68,
+      13,    68,    13,    68,     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,
+      62,    72,    79,    -1,    66,    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,    85,     6,    -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,     4,    96,     5,    -1,    38,     4,     5,    -1,    39,
+      95,    -1,     4,    96,     5,    -1,     4,     5,    -1,    41,
+       8,    -1,    96,    41,     8,    -1,    96,     1,    -1,    98,
+       8,    -1,    98,    13,    68,    11,    68,    11,    68,    13,
+      68,    13,    68,    13,    68,     8,    -1,    98,    13,    41,
+      13,    68,    13,    68,    13,    68,     8,    -1,    97,    98,
+       8,    -1,    97,    98,    13,    68,    11,    68,    11,    68,
+      13,    68,    13,    68,    13,    68,     8,    -1,    97,    98,
+      13,    41,    13,    68,    13,    68,    13,    68,     8,    -1,
+      97,     1,    -1,    41,    -1,    36,    -1,    40,     4,    97,
        5,    -1,    40,     4,     5,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   170,   170,   173,   174,   185,   188,   189,   190,   191,
-     194,   195,   198,   202,   209,   212,   215,   219,   224,   227,
-     231,   232,   233,   236,   236,   242,   245,   249,   252,   253,
-     256,   257,   258,   261,   264,   265,   266,   267,   268,   269,
-     269,   273,   274,   277,   282,   286,   291,   296,   305,   306,
-     309,   312,   312,   317,   317,   322,   338,   358,   359,   366,
-     367,   372,   380,   381,   385,   391,   391,   399,   402,   402,
-     406,   409,   412,   415,   416,   417,   415,   423,   423,   427,
-     429,   432,   434,   436,   439,   439,   472,   473,   474,   475,
-     479,   483,   487,   490,   491,   496,   498,   503,   508,   515,
-     522,   529,   538,   543,   548,   555,   562,   569,   578,   578,
-     583,   588,   588,   598,   605,   608,   609,   612,   615,   618,
-     625,   626,   631,   635,   639,   643,   646,   649,   654,   655,
-     660,   661,   667,   670,   674,   677,   681,   684,   689,   692,
-     695,   712,   725,   730,   748,   763,   766,   767,   770,   773
+       0,   174,   174,   177,   178,   189,   192,   193,   194,   195,
+     198,   199,   202,   210,   211,   214,   217,   220,   224,   229,
+     232,   236,   237,   238,   241,   241,   247,   250,   254,   257,
+     258,   261,   262,   263,   266,   269,   270,   271,   272,   273,
+     274,   274,   278,   279,   282,   287,   291,   296,   301,   310,
+     311,   314,   317,   317,   322,   322,   327,   343,   363,   364,
+     371,   372,   377,   385,   386,   390,   396,   396,   404,   407,
+     407,   411,   414,   417,   420,   421,   422,   420,   428,   428,
+     432,   434,   437,   439,   441,   444,   444,   477,   478,   479,
+     480,   484,   488,   492,   495,   496,   501,   503,   508,   513,
+     520,   527,   534,   543,   548,   553,   560,   567,   574,   583,
+     583,   588,   593,   593,   603,   610,   613,   614,   617,   620,
+     623,   630,   631,   636,   640,   644,   648,   651,   654,   659,
+     660,   665,   666,   672,   675,   679,   684,   685,   688,   691,
+     696,   699,   702,   719,   732,   737,   755,   770,   773,   774,
+     777,   780
 };
 #endif
 
@@ -589,16 +592,17 @@
   "KW_RETURN", "KW_BREAK", "KW_CONTINUE", "KW_REGEXTEN", "KW_HINT",
   "KW_FOR", "KW_WHILE", "KW_CASE", "KW_PATTERN", "KW_DEFAULT", "KW_CATCH",
   "KW_SWITCHES", "KW_ESWITCHES", "KW_INCLUDES", "word", "$accept", "file",
-  "objects", "object", "word_or_default", "context", "macro", "globals",
-  "global_statements", "global_statement", "@1", "arglist",
-  "elements_block", "elements", "element", "@2", "ignorepat", "extension",
-  "statements", "if_head", "@3", "random_head", "@4", "iftime_head",
-  "word_list", "word3_list", "goto_word", "switch_head", "@5", "statement",
-  "@6", "@7", "@8", "@9", "@10", "@11", "opt_else", "target", "jumptarget",
-  "macro_call", "@12", "application_call_head", "@13", "application_call",
-  "opt_word", "eval_arglist", "case_statements", "case_statement",
-  "macro_statements", "macro_statement", "switches", "eswitches",
-  "switchlist", "includeslist", "includedname", "includes", 0
+  "objects", "object", "word_or_default", "context", "opt_abstract",
+  "macro", "globals", "global_statements", "global_statement", "@1",
+  "arglist", "elements_block", "elements", "element", "@2", "ignorepat",
+  "extension", "statements", "if_head", "@3", "random_head", "@4",
+  "iftime_head", "word_list", "word3_list", "goto_word", "switch_head",
+  "@5", "statement", "@6", "@7", "@8", "@9", "@10", "@11", "opt_else",
+  "target", "jumptarget", "macro_call", "@12", "application_call_head",
+  "@13", "application_call", "opt_word", "eval_arglist", "case_statements",
+  "case_statement", "macro_statements", "macro_statement", "switches",
+  "eswitches", "switchlist_block", "switchlist", "includeslist",
+  "includedname", "includes", 0
 };
 #endif
 
@@ -619,40 +623,42 @@
 static const unsigned char yyr1[] =
 {
        0,    42,    43,    44,    44,    44,    45,    45,    45,    45,
-      46,    46,    47,    47,    48,    48,    48,    48,    49,    49,
-      50,    50,    50,    52,    51,    53,    53,    53,    54,    54,
-      55,    55,    55,    55,    56,    56,    56,    56,    56,    57,
-      56,    56,    56,    58,    59,    59,    59,    59,    60,    60,
-      60,    62,    61,    64,    63,    65,    65,    66,    66,    67,
-      67,    67,    68,    68,    68,    70,    69,    71,    72,    71,
-      71,    71,    71,    73,    74,    75,    71,    76,    71,    71,
-      71,    71,    71,    71,    77,    71,    71,    71,    71,    71,
-      71,    71,    71,    78,    78,    79,    79,    79,    79,    79,
-      79,    79,    80,    80,    80,    80,    80,    80,    82,    81,
-      81,    84,    83,    85,    85,    86,    86,    87,    87,    87,
-      88,    88,    89,    89,    89,    89,    89,    89,    90,    90,
-      91,    91,    92,    92,    93,    93,    94,    94,    94,    95,
-      95,    95,    95,    95,    95,    95,    96,    96,    97,    97
+      46,    46,    47,    48,    48,    49,    49,    49,    49,    50,
+      50,    51,    51,    51,    53,    52,    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,    63,    62,    65,    64,    66,    66,    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,    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,    92,    92,    93,    93,    94,    95,    95,    96,    96,
+      96,    97,    97,    97,    97,    97,    97,    97,    98,    98,
+      99,    99
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const unsigned char yyr2[] =
 {
        0,     2,     1,     1,     2,     2,     1,     1,     1,     1,
-       1,     1,     3,     4,     8,     7,     7,     6,     4,     3,
-       1,     2,     2,     0,     5,     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,     0,     5,     0,     5,    14,    10,     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,
-       3,     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,     5,     4,     3,     4,     3,     2,     3,     2,     2,
-      14,    10,     3,    15,    11,     2,     1,     1,     4,     3
+       1,     1,     4,     1,     0,     8,     7,     7,     6,     4,
+       3,     1,     2,     2,     0,     5,     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,     0,     5,     0,     5,    14,    10,     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,     3,     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,     5,     4,     3,     2,     3,     2,     2,     3,
+       2,     2,    14,    10,     3,    15,    11,     2,     1,     1,
+       4,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -660,257 +666,257 @@
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
-       0,     0,     9,     0,     0,     0,     0,     0,     3,     6,
-       7,     8,    11,    10,     0,     0,     0,     0,     1,     5,
-       4,     0,    12,     0,    19,     0,     0,    20,     0,    31,
-      28,    42,     0,     0,     0,     0,     0,     0,     0,     0,
-      30,    38,    34,    36,    37,    35,     0,    25,     0,    23,
-      22,    18,    21,    13,     0,     0,     0,     0,     0,     0,
-       0,    41,    39,     0,    33,    29,    32,     0,    27,     0,
-       0,     0,     0,     0,     0,    59,     0,   133,     0,     0,
-     135,     0,   149,   147,   146,     0,     0,     0,     0,    92,
+      14,     9,     0,     0,    13,     0,     0,     3,     6,     0,
+       7,     8,     0,     0,     1,     5,     4,     0,     0,    20,
+       0,     0,    21,    11,    10,     0,     0,    26,     0,    24,
+      23,    19,    22,     0,    12,     0,    28,     0,     0,     0,
+      32,    29,    43,     0,     0,     0,     0,     0,     0,     0,
+       0,    31,    39,    35,    37,    38,    36,     0,    18,    93,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   111,     0,     0,     0,     0,    44,   118,     0,
-      17,     0,   130,     0,   128,     0,    26,     0,    43,     0,
-      45,    60,     0,   136,   138,   132,     0,   134,   145,   148,
-       0,   139,     0,     0,     0,    48,     0,     0,    65,    51,
-       0,    53,     0,    62,    95,     0,   102,     0,    87,    86,
-      88,    73,    77,    83,    68,    72,     0,    94,    94,    94,
-      79,     0,     0,     0,     0,   120,   114,    57,   117,     0,
-      82,    84,     0,    16,   129,    15,     0,    24,     0,    61,
-       0,   137,   142,     0,    59,     0,    40,    50,    67,    49,
-     108,    81,     0,     0,    59,     0,     0,     0,     0,     0,
-      63,     0,     0,    70,     0,     0,    71,     0,     0,     0,
-     112,     0,    90,    89,    91,     0,     0,   126,    80,   121,
-      58,   113,   116,     0,     0,    14,     0,     0,    59,     0,
-       0,     0,   110,   118,     0,     0,     0,     0,     0,     0,
-       0,    64,    97,    96,    62,   103,   107,   105,     0,     0,
-       0,    93,   125,   127,     0,   115,   119,     0,     0,     0,
-      46,     0,     0,     0,     0,     0,     0,    52,     0,     0,
-      54,     0,     0,     0,     0,     0,    74,     0,    69,     0,
-       0,    85,   131,    47,     0,     0,     0,     0,   109,    66,
-       0,     0,   101,   100,    99,    98,   106,   104,     0,    78,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    75,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   141,     0,    56,     0,     0,   144,     0,
-       0,     0,     0,     0,     0,     0,    76,     0,     0,     0,
-       0,   140,    55,   143
+       0,     0,     0,   112,     0,     0,     0,     0,   131,   119,
+       0,     0,   129,     0,    27,     0,     0,     0,     0,     0,
+       0,     0,   135,     0,    42,    40,     0,    34,    30,    33,
+       0,    49,     0,     0,    66,    52,     0,    54,     0,    63,
+      96,     0,   103,     0,    88,    87,    89,    74,    78,     0,
+      84,    69,    73,     0,    95,    95,    95,    80,     0,     0,
+       0,     0,   121,   115,    58,   118,     0,    83,    85,    17,
+     130,    16,     0,    25,     0,     0,     0,    60,     0,   134,
+       0,     0,   137,     0,   151,   149,   148,     0,     0,     0,
+      45,    51,    68,    50,   109,    82,     0,     0,    60,     0,
+       0,     0,     0,     0,    64,     0,     0,    71,     0,     0,
+      72,     0,     0,     0,     0,   113,     0,    91,    90,    92,
+       0,     0,   127,    81,   122,    59,   114,   117,     0,    15,
+      44,     0,    46,    61,     0,   138,   140,   133,     0,   136,
+     147,   150,     0,   141,     0,     0,   111,   119,     0,     0,
+       0,     0,     0,     0,     0,    65,    98,    97,    63,   104,
+     108,   106,     0,     0,     0,     0,    94,   126,   128,     0,
+     116,   120,     0,     0,    62,     0,   139,   144,     0,    60,
+       0,    41,     0,     0,    53,     0,     0,    55,     0,     0,
+       0,     0,     0,    75,     0,   132,    70,     0,     0,    86,
+       0,     0,    60,     0,     0,     0,   110,    67,     0,     0,
+     102,   101,   100,    99,   107,   105,     0,    79,     0,    47,
+       0,     0,     0,     0,     0,     0,     0,    48,     0,     0,
+       0,     0,     0,     0,    76,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    57,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   143,     0,     0,
+      77,   146,     0,     0,     0,     0,     0,    56,     0,     0,
+       0,   142,   145
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,     6,     7,     8,    14,     9,    10,    11,    26,    27,
-      71,    48,    22,    39,    40,    87,    41,    42,   134,   103,
-     193,   104,   196,   105,   168,    76,   144,   106,   192,   135,
-     209,   207,   298,   320,   208,   223,   212,   145,   147,   137,
-     233,   108,   156,   109,   256,   169,   164,   165,   113,   114,
-      43,    44,    79,    85,    86,    45
+      -1,     5,     6,     7,    25,     8,     9,    10,    11,    21,
+      22,    39,    28,    34,    50,    51,   159,    52,    53,   100,
+      74,   167,    75,   170,    76,   135,   148,   110,    77,   166,
+     101,   184,   181,   286,   311,   182,   198,   187,   111,   113,
+     103,   217,    79,   123,    80,   241,   136,   131,   132,    81,
+      82,    54,    55,    92,   151,   157,   158,    56
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -192
+#define YYPACT_NINF -182
 static const short int yypact[] =
 {
-     178,    76,  -192,   -36,    21,    13,    18,   465,  -192,  -192,
-    -192,  -192,  -192,  -192,    43,    66,    52,    76,  -192,  -192,
-    -192,   144,  -192,     5,  -192,    61,    14,  -192,    43,  -192,
-    -192,  -192,    62,   113,    89,   143,   166,   176,   134,   201,
-    -192,  -192,  -192,  -192,  -192,  -192,   184,  -192,   152,  -192,
-    -192,  -192,  -192,  -192,   148,   213,   196,   149,    64,    93,
-       3,  -192,  -192,   431,  -192,  -192,  -192,   327,  -192,   225,
-     189,   192,   226,   149,   431,   194,   231,  -192,   235,    44,
-    -192,    53,  -192,  -192,  -192,    12,   138,   203,   431,  -192,
-     208,   246,   247,   248,   249,   124,   215,   250,   251,   253,
-     257,   258,   160,   431,   431,   431,   106,  -192,    25,    70,
-    -192,   216,  -192,   353,  -192,   379,  -192,   259,  -192,   261,
-    -192,   233,   236,  -192,  -192,  -192,   270,  -192,  -192,  -192,
-     179,  -192,   239,   273,   271,  -192,   260,   274,  -192,  -192,
-     243,  -192,   198,   109,   200,   277,   193,   278,  -192,  -192,
-    -192,  -192,  -192,  -192,  -192,  -192,   281,   267,   267,   267,
-    -192,   254,   266,   283,   121,  -192,  -192,   269,  -192,   205,
-    -192,  -192,   288,  -192,  -192,  -192,   405,  -192,   275,  -192,
-     284,  -192,  -192,   276,    10,   290,  -192,  -192,  -192,  -192,
-     304,  -192,   295,   296,    51,   303,   296,   215,   215,   297,
-    -192,   215,   215,  -192,   299,   163,  -192,   300,   302,   307,
-    -192,   431,  -192,  -192,  -192,   311,   313,   431,  -192,  -192,
-    -192,  -192,   309,   310,   431,  -192,   291,   431,    86,   314,
-     149,   149,  -192,   296,   337,   355,   149,   149,   356,   308,
-     354,  -192,   359,   357,   122,  -192,  -192,  -192,   358,   367,
-     368,  -192,   431,   431,     2,  -192,  -192,   369,   301,   431,
-    -192,   149,   149,   375,   378,   214,   388,  -192,   380,   384,
-    -192,   215,   215,   215,   215,   164,  -192,   431,  -192,    55,
-      96,  -192,  -192,  -192,   383,   389,   149,   149,  -192,  -192,
-     149,   149,  -192,  -192,  -192,  -192,  -192,  -192,   361,  -192,
-     149,   149,   390,   401,   402,   406,   410,   408,   409,   149,
-     149,   149,   149,  -192,   149,   149,   418,   415,   422,   423,
-     399,   433,   432,  -192,   149,  -192,   149,   437,  -192,   149,
-     434,   435,   431,   439,   149,   149,  -192,   149,   446,   448,
-     453,  -192,  -192,  -192
+     145,  -182,   -23,    22,  -182,    58,   187,  -182,  -182,    70,
+    -182,  -182,    92,    12,  -182,  -182,  -182,    82,     1,  -182,
+     105,    14,  -182,  -182,  -182,   117,   126,  -182,   112,  -182,
+    -182,  -182,  -182,   301,  -182,   344,  -182,   133,    74,   109,
+    -182,  -182,  -182,   122,    68,   152,   163,   171,   172,   107,
+     306,  -182,  -182,  -182,  -182,  -182,  -182,   448,  -182,  -182,
+     148,   194,   199,   207,   208,    98,   189,   185,   229,   231,
+     234,   235,   204,   183,   448,   448,   448,    40,  -182,    18,
+      -4,   370,  -182,   396,  -182,   240,   210,   243,   228,   214,
+      27,    28,  -182,    11,  -182,  -182,   448,  -182,  -182,  -182,
+     242,  -182,   250,   249,  -182,  -182,   218,  -182,   173,    71,
+     188,   255,   130,   257,  -182,  -182,  -182,  -182,  -182,   254,
+    -182,  -182,  -182,   260,   251,   251,   251,  -182,   237,   238,
+     270,    67,  -182,  -182,   241,  -182,   212,  -182,  -182,  -182,
+    -182,  -182,   422,  -182,   277,   214,   448,   245,   280,  -182,
+     285,    49,  -182,    65,  -182,  -182,  -182,     8,   135,   247,
+    -182,  -182,  -182,  -182,   288,  -182,   262,   267,    76,   299,
+     267,   189,   189,   271,  -182,   189,   189,  -182,   274,   111,
+    -182,   275,   276,   448,   278,  -182,   448,  -182,  -182,  -182,
+     309,   310,   448,  -182,  -182,  -182,  -182,   281,   283,  -182,
+    -182,   289,  -182,   284,   286,  -182,  -182,  -182,   318,  -182,
+    -182,  -182,   166,  -182,   287,   321,  -182,   267,   323,   326,
+     214,   214,   327,   325,   330,  -182,   328,   337,    69,  -182,
+    -182,  -182,   343,   346,   272,   347,  -182,   448,   448,     2,
+    -182,  -182,   349,   313,  -182,   334,  -182,  -182,   319,    83,
+     348,  -182,   217,   357,  -182,   352,   356,  -182,   189,   189,
+     189,   189,   141,  -182,   448,  -182,  -182,    59,   137,  -182,
+     355,   448,    84,   369,   214,   214,  -182,  -182,   214,   214,
+    -182,  -182,  -182,  -182,  -182,  -182,   342,  -182,   448,  -182,
+     214,   214,   371,   375,   374,   378,   360,  -182,   380,   383,
+     214,   214,   214,   214,  -182,   214,   214,   392,   393,   402,
+     397,   372,   399,   404,   214,   214,  -182,   214,   412,   214,
+     214,   423,   407,   419,   448,   427,   425,  -182,   214,   214,
+    -182,  -182,   214,   426,   429,   430,   214,  -182,   214,   437,
+     438,  -182,  -182
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -192,  -192,  -192,   455,   450,  -192,  -192,  -192,  -192,   443,
-    -192,  -192,   442,  -192,   436,  -192,  -192,  -192,  -191,  -192,
-    -192,  -192,  -192,  -192,    32,   -64,   -95,  -192,  -192,   -63,
-    -192,  -192,  -192,  -192,  -192,  -192,   -20,  -192,  -192,  -192,
-    -192,  -192,  -192,  -192,  -192,   238,  -192,   312,   362,  -111,
-    -192,  -192,   419,  -192,   394,  -192
+    -182,  -182,  -182,   447,  -182,  -182,  -182,  -182,  -182,  -182,
+     436,  -182,  -182,  -182,  -182,   408,  -182,  -182,  -182,  -181,
+    -182,  -182,  -182,  -182,  -182,    61,   -94,   -43,  -182,  -182,
+     -35,  -182,  -182,  -182,  -182,  -182,  -182,   -21,  -182,  -182,
+    -182,  -182,  -182,  -182,  -182,  -182,   244,  -182,   331,   381,
+     -80,  -182,  -182,  -182,   387,  -182,   308,  -182
 };
 
 /* 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 -126
 static const short int yytable[] =
 {
-     107,   146,   174,   187,   112,    15,    88,  -123,    82,   119,
-      89,   120,    46,   128,    90,    50,    17,   129,    18,    51,
-      91,    92,    93,   230,    94,    16,   254,    95,    96,    97,
-      98,    99,   166,   258,   100,   101,  -123,  -123,  -123,    83,
-     157,   158,   159,   102,    84,   124,    47,    21,    83,   125,
-     112,   121,   112,    84,   124,    25,   187,    24,   127,    88,
-    -122,   279,   280,    89,   236,   174,   167,    90,   185,    77,
-      49,   189,    23,    91,    92,    93,   195,    94,   170,   171,
-      95,    96,    97,    98,    99,   126,    54,   100,   101,  -122,
-    -122,  -122,   121,    25,   126,    57,   102,   187,    80,   261,
-      88,  -124,   239,   240,    89,    78,   242,   243,    90,   245,
-     247,   160,    12,   112,    91,    92,    93,    13,    94,   229,
-     199,    95,    96,    97,    98,    99,   218,   121,   100,   101,
-    -124,  -124,  -124,   199,    78,    61,   275,   102,   213,   214,
-     161,   162,   163,    62,    55,    29,   131,    58,   251,    30,
-     200,   132,    31,    68,    56,   161,   162,   163,    63,    69,
-     142,    32,    70,   200,   260,   143,   263,   264,   153,   154,
-      59,   155,   268,   269,    33,    34,   292,   293,   294,   295,
-      60,     1,    35,    36,    37,    38,     2,   182,    67,    72,
-      75,   189,   183,     3,     4,   189,   283,   284,   285,   246,
-     296,     5,    64,   204,   143,   297,    65,   205,   197,    31,
-     201,   198,   221,   202,   299,   222,   189,   189,    32,    73,
-      74,   288,   302,   303,   222,   235,   304,   305,   238,   115,
-     116,    33,    34,   117,   118,   121,   307,   308,   122,    35,
-      36,    37,    38,   123,   133,   316,   317,   318,   319,   136,
-     321,   322,   138,   139,   140,   141,   143,   172,   148,   149,
-     330,   150,   331,   151,   152,   333,   190,   177,   178,   336,
-     338,   339,   187,   340,   179,    88,   188,   180,   181,    89,
-     184,   186,   191,    90,   194,   203,   206,   210,   211,    91,
-      92,    93,   224,    94,   217,   215,    95,    96,    97,    98,
-      99,   231,   187,   100,   101,    88,   282,   216,   227,    89,
-     220,   232,   102,    90,   237,   259,   226,   228,   271,    91,
-      92,    93,   252,    94,   253,   262,    95,    96,    97,    98,
-      99,    88,   110,   100,   101,    89,   234,   167,   241,    90,
-     244,   248,   102,   249,   266,    91,    92,    93,   250,    94,
-     255,   257,    95,    96,    97,    98,    99,    88,   173,   100,
-     101,    89,   267,   270,   111,    90,   276,   272,   102,   273,
-     274,    91,    92,    93,   277,    94,   278,   281,    95,    96,
-      97,    98,    99,    88,   175,   100,   101,    89,   286,   287,
-     111,    90,   289,   290,   102,   291,   300,    91,    92,    93,
-     301,    94,   306,   309,    95,    96,    97,    98,    99,    88,
-     225,   100,   101,    89,   310,   311,   111,    90,   313,   312,
-     102,   314,   315,    91,    92,    93,   323,    94,   324,   325,
-      95,    96,    97,    98,    99,    88,   326,   100,   101,    89,
-     327,   328,   111,    90,   332,   329,   102,   334,   335,    91,
-      92,    93,   337,    94,   341,   342,    95,    96,    97,    98,
-      99,   343,    20,   100,   101,    -2,    19,    28,     1,    52,
-      53,   265,   102,     2,     0,    66,   219,   176,    81,   130,
-       3,     4,     0,     0,     0,     0,     0,     0,     5
+      78,   140,   234,   161,   137,   138,    57,  -124,    26,   210,
+      59,   239,   169,   211,    60,    30,   154,    19,    12,    31,
+      61,    62,    63,   112,    64,   133,    13,    65,    66,    67,
+      68,    69,   149,   152,    70,    71,  -124,  -124,  -124,   124,
+     125,   126,    27,    73,   155,   127,    78,   155,    78,   156,
+     206,   201,   156,    20,   207,    20,   267,   268,    14,   134,
+     161,   160,   140,    57,  -123,   163,   206,    59,   150,   150,
+     209,    60,   193,    17,   128,   129,   130,    61,    62,    63,
+     173,    64,   173,   262,    65,    66,    67,    68,    69,   220,
+     208,    70,    71,  -123,  -123,  -123,   274,   290,    18,    87,
+      73,   128,   129,   130,   188,   189,   208,    78,    94,    88,
+     174,   202,   174,    36,    29,    84,    95,   203,    23,    37,
+     250,    33,    38,    24,   203,   203,   255,   256,   223,   224,
+      35,    96,   226,   227,   108,   229,   231,    83,   161,   109,
+     178,    57,  -125,   213,   179,    59,    86,   230,   214,    60,
+      85,   236,   109,     1,   273,    61,    62,    63,    89,    64,
+       2,     3,    65,    66,    67,    68,    69,    90,     4,    70,
+      71,  -125,  -125,  -125,   247,    91,    93,   284,    73,   248,
+     292,   293,   285,   171,   294,   295,   172,    -2,    15,   102,
+     -14,   120,   121,   114,   122,     1,   298,   299,   175,   163,
+     104,   176,     2,     3,   163,   105,   307,   308,   309,   310,
+       4,   312,   313,   106,   107,   280,   281,   282,   283,   196,
+     321,   322,   197,   323,   276,   325,   326,   197,   219,   287,
+     109,   222,   163,   163,   333,   334,   289,   115,   335,   116,
+     117,   118,   339,   161,   340,   119,    57,   162,   143,   145,
+      59,   144,   146,   297,    60,   147,   164,   165,   183,   168,
+      61,    62,    63,   177,    64,   180,   185,    65,    66,    67,
+      68,    69,   186,   161,    70,    71,    57,   265,   190,   191,

[... 2112 lines stripped ...]


More information about the svn-commits mailing list