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

svn-commits at lists.digium.com svn-commits at lists.digium.com
Sun Apr 30 01:21:46 MST 2006


Author: rizzo
Date: Sun Apr 30 03:21:46 2006
New Revision: 23534

URL: http://svn.digium.com/view/asterisk?rev=23534&view=rev
Log:
more simplifications in the bison sources,
more annotation with XXX of dubious code.
(The code still passes tests)


Modified:
    trunk/pbx/ael/ael.tab.c
    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=23534&r1=23533&r2=23534&view=diff
==============================================================================
--- trunk/pbx/ael/ael.tab.c (original)
+++ trunk/pbx/ael/ael.tab.c Sun Apr 30 03:21:46 2006
@@ -412,18 +412,18 @@
 #endif
 
 /* YYFINAL -- State number of the termination state. */
-#define YYFINAL  17
+#define YYFINAL  18
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   584
+#define YYLAST   505
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  42
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  52
+#define YYNNTS  55
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  151
+#define YYNRULES  149
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  354
+#define YYNSTATES  346
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -473,110 +473,105 @@
 static const unsigned short int yyprhs[] =
 {
        0,     0,     3,     5,     7,    10,    13,    15,    17,    19,
-      21,    27,    32,    38,    43,    50,    56,    63,    69,    78,
-      86,    94,   101,   106,   110,   112,   115,   118,   119,   125,
-     127,   131,   134,   136,   138,   141,   144,   146,   148,   150,
-     152,   154,   155,   161,   164,   166,   171,   175,   180,   188,
-     197,   199,   202,   205,   206,   212,   213,   219,   234,   245,
-     247,   250,   252,   255,   259,   261,   264,   268,   269,   276,
-     280,   281,   287,   291,   295,   298,   299,   300,   301,   314,
-     315,   322,   325,   329,   333,   336,   339,   340,   346,   349,
-     352,   355,   358,   363,   366,   371,   374,   379,   381,   383,
-     387,   391,   397,   403,   409,   415,   417,   421,   427,   431,
-     437,   441,   442,   448,   452,   453,   457,   461,   464,   466,
-     467,   471,   474,   476,   479,   484,   488,   493,   497,   500,
-     504,   506,   509,   511,   517,   522,   526,   531,   535,   538,
-     542,   545,   548,   563,   574,   578,   594,   606,   609,   611,
-     613,   618
+      21,    23,    25,    31,    36,    43,    49,    58,    66,    74,
+      81,    86,    90,    92,    95,    98,    99,   105,   107,   111,
+     114,   116,   118,   121,   124,   126,   128,   130,   132,   134,
+     135,   141,   144,   146,   151,   155,   160,   168,   177,   179,
+     182,   185,   186,   192,   193,   199,   214,   225,   227,   230,
+     232,   235,   239,   241,   244,   248,   249,   256,   260,   261,
+     267,   271,   275,   278,   279,   280,   281,   294,   295,   302,
+     305,   309,   313,   316,   319,   320,   326,   329,   332,   335,
+     339,   343,   347,   349,   352,   353,   355,   359,   363,   369,
+     375,   381,   387,   389,   393,   399,   403,   409,   413,   414,
+     420,   424,   425,   429,   433,   436,   438,   439,   441,   442,
+     446,   448,   451,   456,   460,   465,   469,   472,   476,   478,
+     481,   483,   489,   494,   498,   503,   507,   510,   514,   517,
+     520,   535,   546,   550,   566,   578,   581,   583,   585,   590
 };
 
 /* 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,    46,    -1,    47,    -1,    48,    -1,     8,
-      -1,     3,    41,     4,    53,     5,    -1,     3,    41,     4,
-       5,    -1,     3,    36,     4,    53,     5,    -1,     3,    36,
-       4,     5,    -1,    23,     3,    41,     4,    53,     5,    -1,
-      23,     3,    41,     4,     5,    -1,    23,     3,    36,     4,
-      53,     5,    -1,    23,     3,    36,     4,     5,    -1,    15,
-      41,     6,    52,     7,     4,    86,     5,    -1,    15,    41,
-       6,    52,     7,     4,     5,    -1,    15,    41,     6,     7,
-       4,    86,     5,    -1,    15,    41,     6,     7,     4,     5,
-      -1,    16,     4,    49,     5,    -1,    16,     4,     5,    -1,
-      50,    -1,    49,    50,    -1,    49,     1,    -1,    -1,    41,
-       9,    51,    41,     8,    -1,    41,    -1,    52,    10,    41,
-      -1,    52,     1,    -1,    54,    -1,     1,    -1,    53,    54,
-      -1,    53,     1,    -1,    57,    -1,    93,    -1,    88,    -1,
-      89,    -1,    56,    -1,    -1,    41,     9,    55,    41,     8,
+      44,     1,    -1,    47,    -1,    48,    -1,    49,    -1,     8,
+      -1,    41,    -1,    36,    -1,     3,    46,     4,    54,     5,
+      -1,     3,    46,     4,     5,    -1,    23,     3,    46,     4,
+      54,     5,    -1,    23,     3,    46,     4,     5,    -1,    15,
+      41,     6,    53,     7,     4,    89,     5,    -1,    15,    41,
+       6,    53,     7,     4,     5,    -1,    15,    41,     6,     7,
+       4,    89,     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,    55,    -1,     1,    -1,    54,    55,
+      -1,    54,     1,    -1,    58,    -1,    96,    -1,    91,    -1,
+      92,    -1,    57,    -1,    -1,    41,     9,    56,    41,     8,
       -1,    41,     1,    -1,     8,    -1,    17,    24,    41,     8,
-      -1,    41,    24,    69,    -1,    30,    41,    24,    69,    -1,
-      31,     6,    65,     7,    41,    24,    69,    -1,    30,    31,
-       6,    65,     7,    41,    24,    69,    -1,    69,    -1,    58,
-      69,    -1,    58,     1,    -1,    -1,    19,     6,    60,    64,
-       7,    -1,    -1,    22,     6,    62,    64,     7,    -1,    20,
-       6,    65,    11,    65,    11,    65,    13,    65,    13,    65,
-      13,    65,     7,    -1,    20,     6,    41,    13,    65,    13,
-      65,    13,    65,     7,    -1,    41,    -1,    41,    41,    -1,
+      -1,    41,    24,    70,    -1,    30,    41,    24,    70,    -1,
+      31,     6,    66,     7,    41,    24,    70,    -1,    30,    31,
+       6,    66,     7,    41,    24,    70,    -1,    70,    -1,    59,
+      70,    -1,    59,     1,    -1,    -1,    19,     6,    61,    65,
+       7,    -1,    -1,    22,     6,    63,    65,     7,    -1,    20,
+       6,    66,    11,    66,    11,    66,    13,    66,    13,    66,
+      13,    66,     7,    -1,    20,     6,    41,    13,    66,    13,
+      66,    13,    66,     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,    68,    41,     7,     4,    -1,     4,    58,     5,    -1,
-      -1,    41,     9,    70,    41,     8,    -1,    25,    76,     8,
-      -1,    26,    77,     8,    -1,    41,    11,    -1,    -1,    -1,
-      -1,    32,     6,    71,    41,     8,    72,    41,     8,    73,
-      41,     7,    69,    -1,    -1,    33,     6,    74,    41,     7,
-      69,    -1,    67,     5,    -1,    67,    84,     5,    -1,    12,
-      78,     8,    -1,    82,     8,    -1,    41,     8,    -1,    -1,
-      82,     9,    75,    41,     8,    -1,    28,     8,    -1,    27,
-       8,    -1,    29,     8,    -1,    61,    69,    -1,    61,    69,
-      21,    69,    -1,    59,    69,    -1,    59,    69,    21,    69,
-      -1,    63,    69,    -1,    63,    69,    21,    69,    -1,     8,
-      -1,    66,    -1,    66,    13,    66,    -1,    66,    10,    66,
-      -1,    66,    13,    66,    13,    66,    -1,    66,    10,    66,
-      10,    66,    -1,    36,    13,    66,    13,    66,    -1,    36,
-      10,    66,    10,    66,    -1,    66,    -1,    66,    10,    66,
-      -1,    66,    10,    41,    14,    41,    -1,    66,    14,    66,
-      -1,    66,    10,    41,    14,    36,    -1,    66,    14,    36,
-      -1,    -1,    41,     6,    79,    83,     7,    -1,    41,     6,
-       7,    -1,    -1,    41,    81,     6,    -1,    80,    83,     7,
-      -1,    80,     7,    -1,    64,    -1,    -1,    83,    10,    41,
-      -1,    83,    10,    -1,    85,    -1,    84,    85,    -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,    87,    -1,    86,    87,    -1,    69,
-      -1,    37,    41,     4,    58,     5,    -1,    38,     4,    90,
-       5,    -1,    38,     4,     5,    -1,    39,     4,    90,     5,
-      -1,    39,     4,     5,    -1,    41,     8,    -1,    90,    41,
-       8,    -1,    90,     1,    -1,    92,     8,    -1,    92,    13,
-      65,    11,    65,    11,    65,    13,    65,    13,    65,    13,
-      65,     8,    -1,    92,    13,    41,    13,    65,    13,    65,
-      13,    65,     8,    -1,    91,    92,     8,    -1,    91,    92,
-      13,    65,    11,    65,    11,    65,    13,    65,    13,    65,
-      13,    65,     8,    -1,    91,    92,    13,    41,    13,    65,
-      13,    65,    13,    65,     8,    -1,    91,     1,    -1,    41,
-      -1,    36,    -1,    40,     4,    91,     5,    -1,    40,     4,
-       5,    -1
+       6,    69,    41,     7,     4,    -1,     4,    59,     5,    -1,
+      -1,    41,     9,    71,    41,     8,    -1,    25,    78,     8,
+      -1,    26,    79,     8,    -1,    41,    11,    -1,    -1,    -1,
+      -1,    32,     6,    72,    41,     8,    73,    41,     8,    74,
+      41,     7,    70,    -1,    -1,    33,     6,    75,    41,     7,
+      70,    -1,    68,     5,    -1,    68,    87,     5,    -1,    12,
+      80,     8,    -1,    84,     8,    -1,    41,     8,    -1,    -1,
+      84,     9,    76,    41,     8,    -1,    28,     8,    -1,    27,
+       8,    -1,    29,     8,    -1,    62,    70,    77,    -1,    60,
+      70,    77,    -1,    64,    70,    77,    -1,     8,    -1,    21,
+      70,    -1,    -1,    67,    -1,    67,    13,    67,    -1,    67,
+      10,    67,    -1,    67,    13,    67,    13,    67,    -1,    67,
+      10,    67,    10,    67,    -1,    36,    13,    67,    13,    67,
+      -1,    36,    10,    67,    10,    67,    -1,    67,    -1,    67,
+      10,    67,    -1,    67,    10,    41,    14,    41,    -1,    67,
+      14,    67,    -1,    67,    10,    41,    14,    36,    -1,    67,
+      14,    36,    -1,    -1,    41,     6,    81,    86,     7,    -1,
+      41,     6,     7,    -1,    -1,    41,    83,     6,    -1,    82,
+      86,     7,    -1,    82,     7,    -1,    41,    -1,    -1,    65,
+      -1,    -1,    86,    10,    85,    -1,    88,    -1,    87,    88,
+      -1,    34,    41,    11,    59,    -1,    36,    11,    59,    -1,
+      35,    41,    11,    59,    -1,    34,    41,    11,    -1,    36,
+      11,    -1,    35,    41,    11,    -1,    90,    -1,    89,    90,
+      -1,    70,    -1,    37,    41,     4,    59,     5,    -1,    38,
+       4,    93,     5,    -1,    38,     4,     5,    -1,    39,     4,
+      93,     5,    -1,    39,     4,     5,    -1,    41,     8,    -1,
+      93,    41,     8,    -1,    93,     1,    -1,    95,     8,    -1,
+      95,    13,    66,    11,    66,    11,    66,    13,    66,    13,
+      66,    13,    66,     8,    -1,    95,    13,    41,    13,    66,
+      13,    66,    13,    66,     8,    -1,    94,    95,     8,    -1,
+      94,    95,    13,    66,    11,    66,    11,    66,    13,    66,
+      13,    66,    13,    66,     8,    -1,    94,    95,    13,    41,
+      13,    66,    13,    66,    13,    66,     8,    -1,    94,     1,
+      -1,    41,    -1,    36,    -1,    40,     4,    94,     5,    -1,
+      40,     4,     5,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   157,   157,   160,   161,   172,   175,   176,   177,   178,
-     181,   185,   188,   192,   195,   200,   204,   209,   215,   218,
-     221,   225,   230,   233,   237,   238,   239,   242,   242,   248,
-     251,   256,   259,   260,   261,   264,   267,   268,   269,   270,
-     271,   272,   272,   276,   277,   280,   285,   289,   294,   299,
-     308,   309,   312,   315,   315,   320,   320,   325,   341,   361,
-     362,   369,   370,   375,   383,   384,   388,   394,   394,   402,
-     405,   405,   409,   412,   415,   418,   419,   420,   418,   426,
-     426,   430,   434,   439,   443,   447,   450,   450,   483,   484,
-     485,   486,   491,   497,   502,   508,   513,   519,   522,   524,
-     529,   534,   541,   548,   555,   564,   569,   574,   581,   588,
-     595,   604,   604,   609,   614,   614,   624,   630,   633,   636,
-     639,   644,   651,   652,   657,   661,   665,   669,   672,   675,
-     680,   681,   686,   687,   693,   696,   700,   703,   707,   710,
-     715,   718,   721,   738,   751,   756,   774,   788,   791,   792,
-     795,   798
+       0,   165,   165,   168,   169,   180,   183,   184,   185,   186,
+     189,   190,   193,   197,   200,   205,   229,   232,   235,   239,
+     244,   247,   251,   252,   253,   256,   256,   262,   265,   269,
+     272,   273,   274,   277,   280,   281,   282,   283,   284,   285,
+     285,   289,   290,   293,   298,   302,   307,   312,   321,   322,
+     325,   328,   328,   333,   333,   338,   354,   374,   375,   382,
+     383,   388,   396,   397,   401,   407,   407,   415,   418,   418,
+     422,   425,   428,   431,   432,   433,   431,   439,   439,   443,
+     447,   452,   456,   460,   463,   463,   496,   497,   498,   499,
+     513,   527,   541,   544,   545,   550,   552,   557,   562,   569,
+     576,   583,   592,   597,   602,   609,   616,   623,   632,   632,
+     637,   642,   642,   652,   658,   661,   662,   665,   668,   671,
+     685,   686,   691,   695,   699,   703,   706,   709,   714,   715,
+     720,   721,   727,   730,   734,   737,   741,   744,   749,   752,
+     755,   772,   785,   790,   808,   823,   826,   827,   830,   833
 };
 #endif
 
@@ -592,15 +587,16 @@
   "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", "context", "macro", "globals", "global_statements",
-  "global_statement", "@1", "arglist", "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",
-  "target", "jumptarget", "macro_call", "@12", "application_call_head",
-  "@13", "application_call", "eval_arglist", "case_statements",
-  "case_statement", "macro_statements", "macro_statement", "switches",
-  "eswitches", "switchlist", "includeslist", "includedname", "includes", 0
+  "objects", "object", "word_or_default", "context", "macro", "globals",
+  "global_statements", "global_statement", "@1", "arglist", "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
 };
 #endif
 
@@ -621,42 +617,40 @@
 static const unsigned char yyr1[] =
 {
        0,    42,    43,    44,    44,    44,    45,    45,    45,    45,
-      46,    46,    46,    46,    46,    46,    46,    46,    47,    47,
-      47,    47,    48,    48,    49,    49,    49,    51,    50,    52,
-      52,    52,    53,    53,    53,    53,    54,    54,    54,    54,
-      54,    55,    54,    54,    54,    56,    57,    57,    57,    57,
-      58,    58,    58,    60,    59,    62,    61,    63,    63,    64,
-      64,    65,    65,    65,    66,    66,    66,    68,    67,    69,
-      70,    69,    69,    69,    69,    71,    72,    73,    69,    74,
-      69,    69,    69,    69,    69,    69,    75,    69,    69,    69,
-      69,    69,    69,    69,    69,    69,    69,    69,    76,    76,
-      76,    76,    76,    76,    76,    77,    77,    77,    77,    77,
-      77,    79,    78,    78,    81,    80,    82,    82,    83,    83,
-      83,    83,    84,    84,    85,    85,    85,    85,    85,    85,
-      86,    86,    87,    87,    88,    88,    89,    89,    90,    90,
-      90,    91,    91,    91,    91,    91,    91,    91,    92,    92,
-      93,    93
+      46,    46,    47,    47,    47,    47,    48,    48,    48,    48,
+      49,    49,    50,    50,    50,    52,    51,    53,    53,    53,
+      54,    54,    54,    54,    55,    55,    55,    55,    55,    56,
+      55,    55,    55,    57,    58,    58,    58,    58,    59,    59,
+      59,    61,    60,    63,    62,    64,    64,    65,    65,    66,
+      66,    66,    67,    67,    67,    69,    68,    70,    71,    70,
+      70,    70,    70,    72,    73,    74,    70,    75,    70,    70,
+      70,    70,    70,    70,    76,    70,    70,    70,    70,    70,
+      70,    70,    70,    77,    77,    78,    78,    78,    78,    78,
+      78,    78,    79,    79,    79,    79,    79,    79,    81,    80,
+      80,    83,    82,    84,    84,    85,    85,    86,    86,    86,
+      87,    87,    88,    88,    88,    88,    88,    88,    89,    89,
+      90,    90,    91,    91,    92,    92,    93,    93,    93,    94,
+      94,    94,    94,    94,    94,    94,    95,    95,    96,    96
 };
 
 /* 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,
-       5,     4,     5,     4,     6,     5,     6,     5,     8,     7,
-       7,     6,     4,     3,     1,     2,     2,     0,     5,     1,
-       3,     2,     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,     2,     4,     2,     4,     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
+       1,     1,     5,     4,     6,     5,     8,     7,     7,     6,
+       4,     3,     1,     2,     2,     0,     5,     1,     3,     2,
+       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
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -665,279 +659,260 @@
 static const unsigned char yydefact[] =
 {
        0,     0,     9,     0,     0,     0,     0,     0,     3,     6,
-       7,     8,     0,     0,     0,     0,     0,     1,     5,     4,
-       0,     0,     0,    23,     0,     0,    24,     0,     0,    33,
-      13,    44,     0,     0,     0,     0,     0,     0,     0,     0,
-      32,    40,    36,    38,    39,    37,    11,     0,     0,    29,
-       0,    27,    26,    22,    25,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,    41,     0,    35,    12,    34,
-      10,     0,    31,     0,     0,     0,    17,     0,    15,     0,
-       0,     0,     0,    61,     0,   135,     0,     0,   137,     0,
-     151,   149,   148,     0,     0,     0,     0,    97,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     114,     0,     0,     0,     0,    46,   119,     0,    21,     0,
-     132,     0,   130,     0,    30,     0,    16,    14,    45,     0,
-      47,    62,     0,   138,   140,   134,     0,   136,   147,   150,
-       0,   141,     0,     0,     0,    50,     0,     0,    67,    53,
-       0,    55,     0,    64,    98,     0,   105,     0,    89,    88,
-      90,    75,    79,    85,    70,    74,     0,    93,    91,    95,
-      81,     0,     0,     0,     0,   122,   117,    59,   118,     0,
-      84,    86,     0,    20,   131,    19,     0,    28,     0,    63,
-       0,   139,   144,     0,    61,     0,    42,    52,    69,    51,
-     111,    83,     0,     0,    61,     0,     0,     0,     0,     0,
-      65,     0,     0,    72,     0,     0,    73,     0,     0,     0,
-     115,     0,     0,     0,     0,     0,   128,    82,   123,    60,
-     116,   121,     0,     0,    18,     0,     0,    61,     0,     0,
-       0,   113,   119,     0,     0,     0,     0,     0,     0,     0,
-      66,   100,    99,    64,   106,   110,   108,     0,     0,     0,
-      94,    92,    96,   127,   129,     0,   120,     0,     0,     0,
-      48,     0,     0,     0,     0,     0,     0,    54,     0,     0,
-      56,     0,     0,     0,     0,     0,    76,     0,    71,     0,
-       0,    87,   133,    49,     0,     0,     0,     0,   112,    68,
-       0,     0,   104,   103,   102,   101,   109,   107,     0,    80,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    77,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   143,     0,    58,     0,     0,   146,     0,
-       0,     0,     0,     0,     0,     0,    78,     0,     0,     0,
-       0,   142,    57,   145
+       7,     8,    11,    10,     0,     0,     0,     0,     1,     5,
+       4,     0,     0,    21,     0,     0,    22,     0,    31,    13,
+      42,     0,     0,     0,     0,     0,     0,     0,     0,    30,
+      38,    34,    36,    37,    35,     0,    27,     0,    25,    24,
+      20,    23,     0,     0,     0,     0,     0,     0,     0,     0,
+      41,    39,     0,    33,    12,    32,     0,    29,     0,     0,
+       0,    15,     0,     0,     0,     0,    59,     0,   133,     0,
+       0,   135,     0,   149,   147,   146,     0,     0,     0,     0,
+      92,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   111,     0,     0,     0,     0,    44,   118,
+       0,    19,     0,   130,     0,   128,     0,    28,     0,    14,
+      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,    18,   129,    17,     0,    26,
+       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,    16,     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
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,     6,     7,     8,     9,    10,    11,    25,    26,    75,
-      50,    39,    40,    95,    41,    42,   144,   111,   203,   112,
-     206,   113,   178,    84,   154,   114,   202,   145,   219,   217,
-     308,   330,   218,   232,   155,   157,   147,   242,   116,   166,
-     117,   179,   174,   175,   121,   122,    43,    44,    87,    93,
-      94,    45
+      -1,     6,     7,     8,    14,     9,    10,    11,    25,    26,
+      70,    47,    38,    39,    88,    40,    41,   136,   104,   195,
+     105,   198,   106,   170,    77,   146,   107,   194,   137,   211,
+     209,   300,   322,   210,   225,   214,   147,   149,   139,   235,
+     109,   158,   110,   258,   171,   166,   167,   114,   115,    42,
+      43,    80,    86,    87,    44
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -215
+#define YYPACT_NINF -193
 static const short int yypact[] =
 {
-     212,   127,  -215,   -35,    55,    23,    85,   561,  -215,  -215,
-    -215,  -215,    64,   118,   112,    13,   128,  -215,  -215,  -215,
-     157,   208,     2,  -215,   123,    19,  -215,   130,   137,  -215,
-    -215,  -215,   143,    43,   169,   181,   182,   189,   126,   284,
-    -215,  -215,  -215,  -215,  -215,  -215,  -215,   337,   196,  -215,
-     141,  -215,  -215,  -215,  -215,   342,   357,   135,   188,   177,
-     170,    22,    36,    29,  -215,  -215,   527,  -215,  -215,  -215,
-    -215,   423,  -215,   206,   191,   195,  -215,   384,  -215,   399,
-     210,   170,   527,   200,   215,  -215,   242,    51,  -215,    57,
-    -215,  -215,  -215,    12,   158,   220,   527,  -215,   223,   245,
-     250,   259,   262,   148,   229,   263,   265,   266,   269,   275,
-     251,   527,   527,   527,   156,  -215,    26,   145,  -215,   243,
-    -215,   449,  -215,   475,  -215,   279,  -215,  -215,  -215,   281,
-    -215,   252,   253,  -215,  -215,  -215,   283,  -215,  -215,  -215,
-     204,  -215,   254,   291,   278,  -215,   296,   300,  -215,  -215,
-     276,  -215,    69,    40,    95,   310,   114,   313,  -215,  -215,
-    -215,  -215,  -215,  -215,  -215,  -215,   323,   311,   318,   325,
-    -215,   290,   303,   340,   172,  -215,  -215,   307,  -215,   230,
-    -215,  -215,   348,  -215,  -215,  -215,   501,  -215,   312,  -215,
-     331,  -215,  -215,   315,    58,   346,  -215,  -215,  -215,  -215,
-     353,  -215,   320,   322,    76,   355,   322,   229,   229,   328,
-    -215,   229,   229,  -215,   329,   178,  -215,   330,   338,   343,
-    -215,   527,   527,   527,   375,   379,   527,  -215,  -215,  -215,
-    -215,   350,   352,   527,  -215,   370,   527,   108,   388,   170,
-     170,  -215,   322,   395,   396,   170,   170,   398,   354,   393,
-    -215,   400,   404,    50,  -215,  -215,  -215,   401,   405,   403,
-    -215,  -215,  -215,   527,   527,     3,  -215,   410,   308,   527,
-    -215,   170,   170,   406,   397,   235,   409,  -215,   407,   415,
-    -215,   229,   229,   229,   229,   190,  -215,   527,  -215,    68,
-     111,  -215,  -215,  -215,   408,   421,   170,   170,  -215,  -215,
-     170,   170,  -215,  -215,  -215,  -215,  -215,  -215,   392,  -215,
-     170,   170,   431,   433,   434,   445,   426,   446,   450,   170,
-     170,   170,   170,  -215,   170,   170,   428,   452,   455,   453,
-     429,   464,   460,  -215,   170,  -215,   170,   477,  -215,   170,
-     472,   476,   527,   478,   170,   170,  -215,   170,   480,   485,
-     488,  -215,  -215,  -215
+     121,   117,  -193,   -38,    84,    17,    95,   343,  -193,  -193,
+    -193,  -193,  -193,  -193,    98,   122,     9,   117,  -193,  -193,
+    -193,   151,    53,  -193,   110,    14,  -193,   167,  -193,  -193,
+    -193,   102,    39,   182,   200,   214,   218,   184,   204,  -193,
+    -193,  -193,  -193,  -193,  -193,   219,  -193,   196,  -193,  -193,
+    -193,  -193,   280,   183,   221,   207,   187,    23,    44,    20,
+    -193,  -193,   461,  -193,  -193,  -193,   357,  -193,   228,   192,
+     195,  -193,   333,   229,   187,   461,   197,   234,  -193,   238,
+      16,  -193,    46,  -193,  -193,  -193,     5,   147,   206,   461,
+    -193,   211,   249,   250,   251,   252,   125,   220,   254,   256,
+     258,   253,   261,   104,   461,   461,   461,   129,  -193,    60,
+      50,  -193,   230,  -193,   383,  -193,   409,  -193,   262,  -193,
+    -193,   270,  -193,   239,   242,  -193,  -193,  -193,   276,  -193,
+    -193,  -193,   149,  -193,   246,   281,   274,  -193,   263,   282,
+    -193,  -193,   257,  -193,   173,     7,   201,   283,    63,   287,
+    -193,  -193,  -193,  -193,  -193,  -193,  -193,  -193,   298,   292,
+     292,   292,  -193,   273,   284,   306,   138,  -193,  -193,   286,
+    -193,   120,  -193,  -193,   324,  -193,  -193,  -193,   435,  -193,
+     294,  -193,   236,  -193,  -193,   299,    -6,   328,  -193,  -193,
+    -193,  -193,   335,  -193,   307,   308,    40,   336,   308,   220,
+     220,   311,  -193,   220,   220,  -193,   312,   166,  -193,   313,
+     314,   315,  -193,   461,  -193,  -193,  -193,   346,   349,   461,
+    -193,  -193,  -193,  -193,   326,   327,   461,  -193,   354,   461,
+      65,   359,   187,   187,  -193,   308,   373,   374,   187,   187,
+     385,   386,   380,  -193,   387,   391,   109,  -193,  -193,  -193,
+     392,   399,   410,  -193,   461,   461,     4,  -193,  -193,   411,
+     304,   461,  -193,   187,   187,   394,   388,   177,   418,  -193,
+     412,   415,  -193,   220,   220,   220,   220,   174,  -193,   461,
+    -193,    64,   113,  -193,  -193,  -193,   417,   421,   187,   187,
+    -193,  -193,   187,   187,  -193,  -193,  -193,  -193,  -193,  -193,
+     382,  -193,   187,   187,   420,   431,   432,   436,   440,   438,
+     439,   187,   187,   187,   187,  -193,   187,   187,   448,   445,
+     452,   453,   429,   463,   462,  -193,   187,  -193,   187,   467,
+    -193,   187,   464,   465,   461,   469,   187,   187,  -193,   187,
+     476,   478,   483,  -193,  -193,  -193
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -215,  -215,  -215,   491,  -215,  -215,  -215,  -215,   474,  -215,
-    -215,   104,   -37,  -215,  -215,  -215,  -214,  -215,  -215,  -215,
-    -215,  -215,    60,   -67,  -101,  -215,  -215,   -66,  -215,  -215,
-    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
-    -215,   268,  -215,   341,   391,  -120,  -215,  -215,   456,  -215,
-     418,  -215
+    -193,  -193,  -193,   485,   479,  -193,  -193,  -193,  -193,   470,
+    -193,  -193,   446,    37,  -193,  -193,  -193,  -192,  -193,  -193,
+    -193,  -193,  -193,    18,   -63,   -96,  -193,  -193,   -62,  -193,
+    -193,  -193,  -193,  -193,  -193,    35,  -193,  -193,  -193,  -193,
+    -193,  -193,  -193,  -193,   264,  -193,   331,   384,  -112,  -193,
+    -193,   443,  -193,   419,  -193
 };
 
 /* 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 -127
+#define YYTABLE_NINF -125
 static const short int yytable[] =
 {
-     115,   184,    69,   156,   197,   120,    14,    96,  -125,    48,
-      69,    97,   265,   138,   129,    98,   130,   139,    23,   268,
-      52,    99,   100,   101,    53,   102,    16,    85,   103,   104,
-     105,   106,   107,   176,    90,   108,   109,  -125,  -125,  -125,
-      69,    88,    69,    49,   110,   167,   168,   169,    91,   289,
-     290,   209,   134,    92,    24,   120,   135,   120,   134,    15,
-      24,   209,   137,    86,   285,    91,   184,   177,    20,   197,
-      92,   239,    96,  -124,    58,   195,    97,    86,   199,   207,
-      98,   210,   208,   205,    59,    17,    99,   100,   101,   245,
-     102,   210,   136,   103,   104,   105,   106,   107,   136,   131,
-     108,   109,  -124,  -124,  -124,   211,   248,   249,   212,   110,
-     251,   252,   197,   254,   256,    96,  -126,   131,    22,    97,
-     120,   271,    21,    98,   214,    47,   238,    64,   215,    99,
-     100,   101,    51,   102,    55,    65,   103,   104,   105,   106,
-     107,    56,    72,   108,   109,  -126,  -126,  -126,    73,   131,
-      66,    74,   110,   180,   181,   260,   261,   262,    29,    77,
-      79,   170,    30,    12,    27,    31,   141,    57,    13,    28,
-     270,   142,   273,   274,    32,    60,    80,   227,   278,   279,
-     302,   303,   304,   305,   152,    61,    62,    33,    34,   153,
-     171,   172,   173,    63,    81,    35,    36,    37,    38,   199,
-      71,    82,   199,   293,   294,   295,   171,   172,   173,    29,
-     123,    83,   192,    46,   255,     1,    31,   193,   128,   153,
-       2,   309,   132,   199,   199,    32,   306,     3,     4,   312,
-     313,   307,   124,   314,   315,     5,   125,   230,    33,    34,
-     231,   131,   298,   317,   318,   231,    35,    36,    37,    38,
-     133,   148,   326,   327,   328,   329,   149,   331,   332,   163,
-     164,   143,   165,   244,   146,   150,   247,   340,   151,   341,
-     153,   158,   343,   159,   160,   161,   346,   348,   349,   197,
-     350,   162,    96,   198,   182,    67,    97,   187,   188,    68,
-      98,   191,    31,   189,   190,   194,    99,   100,   101,   196,
-     102,    32,   200,   103,   104,   105,   106,   107,   201,   197,
-     108,   109,    96,   292,    33,    34,    97,   204,   213,   110,
-      98,   216,    35,    36,    37,    38,    99,   100,   101,   220,
-     102,   224,   221,   103,   104,   105,   106,   107,    67,   222,
-     108,   109,    70,    29,   225,    31,   223,    76,   229,   110,
-      31,   226,   233,   235,    32,   236,   237,   240,    29,    32,
-     241,   243,    78,   177,   281,    31,   246,    33,    34,   250,
-     253,   257,    33,    34,    32,    35,    36,    37,    38,   258,
-      35,    36,    37,    38,   259,    67,   263,    33,    34,   126,
-     264,   266,    31,   267,   269,    35,    36,    37,    38,   272,
-      67,    32,   276,   277,   127,   280,   282,    31,   297,   286,
-     283,   288,   287,   299,    33,    34,    32,   284,   291,   296,
-     300,   310,    35,    36,    37,    38,   301,    96,   118,    33,
-      34,    97,   311,   316,   323,    98,   333,    35,    36,    37,
-      38,    99,   100,   101,   319,   102,   320,   321,   103,   104,
-     105,   106,   107,    96,   183,   108,   109,    97,   322,   324,
-     119,    98,   335,   325,   110,   334,   336,    99,   100,   101,
-     337,   102,   338,   339,   103,   104,   105,   106,   107,    96,
-     185,   108,   109,    97,   342,   344,   119,    98,   351,   345,
-     110,   347,   352,    99,   100,   101,   353,   102,    19,    54,
-     103,   104,   105,   106,   107,    96,   234,   108,   109,    97,
-     275,   140,   119,    98,   186,   228,   110,     0,    89,    99,
-     100,   101,     0,   102,     0,     0,   103,   104,   105,   106,
-     107,    96,     0,   108,   109,    97,     0,     0,   119,    98,
-       0,     0,   110,     0,     0,    99,   100,   101,     0,   102,
-       0,     0,   103,   104,   105,   106,   107,     0,     0,   108,
-     109,    -2,    18,     0,     1,     0,     0,     0,   110,     2,
-       0,     0,     0,     0,     0,     0,     3,     4,     0,     0,
-       0,     0,     0,     0,     5
+     108,   148,   176,    15,   113,   189,   130,   232,    89,  -123,
+     131,   121,    90,   122,    23,    49,    91,   126,   201,    50,
+      17,   127,    92,    93,    94,    83,    95,   256,    78,    96,
+      97,    98,    99,   100,   260,   123,   101,   102,  -123,  -123,
+    -123,    84,   159,   160,   161,   103,    85,   126,   202,    81,
+      24,   129,   113,   238,   113,    24,    84,   128,   172,   173,
+      45,    85,   281,   282,    79,   189,   176,   168,    89,  -122,
+      54,   187,    90,   206,   191,    65,    91,   207,   263,   197,
+      55,   123,    92,    93,    94,    79,    95,   128,    16,    96,
+      97,    98,    99,   100,    46,    18,   101,   102,  -122,  -122,
+    -122,   169,    21,   241,   242,   103,   123,   244,   245,    65,
+     247,   249,   155,   156,   189,   157,   113,    89,  -124,    48,
+     201,    90,   231,   277,     1,    91,    53,   223,    22,     2,
+     224,    92,    93,    94,   162,    95,     3,     4,    96,    97,
+      98,    99,   100,   220,     5,   101,   102,  -124,  -124,  -124,
+     202,   253,    28,    12,   103,   133,    29,   184,    13,    30,
+     134,   144,   185,   163,   164,   165,   145,   262,    31,   265,
+     266,    52,   163,   164,   165,   270,   271,   294,   295,   296,
+     297,    32,    33,   199,   290,    60,   200,   224,    56,    34,
+      35,    36,    37,    61,   191,   215,   216,    67,   191,   285,
+     286,   287,   248,    68,    57,    63,    69,   145,    62,    64,
+     298,   203,    30,   237,   204,   299,   240,   301,    58,   191,
+     191,    31,    59,    66,    73,   304,   305,    74,    76,   306,
+     307,    75,   116,   117,    32,    33,   118,   120,   123,   309,
+     310,   124,    34,    35,    36,    37,   125,   135,   318,   319,
+     320,   321,   138,   323,   324,   140,   141,   142,   143,   153,
+     229,   145,   150,   332,   151,   333,   152,   154,   335,   192,
+     179,   174,   338,   340,   341,   189,   342,   180,    89,   190,
+     181,    28,    90,   182,   183,    71,    91,   186,    30,   188,

[... 2331 lines stripped ...]


More information about the svn-commits mailing list