Index: Singular/grammar.cc
===================================================================
--- Singular/grammar.cc	(revision 09bbf540858ad0483955c1f09edd84fad0b43597)
+++ Singular/grammar.cc	(revision 62b87db36aa3d15594d1ef39f82cb84d03a7e344)
@@ -319,9 +319,9 @@
 
 
-#define	YYFINAL		367
+#define	YYFINAL		369
 #define	YYFLAG		-32768
-#define	YYNTBASE	140
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 378 ? yytranslate[x] : 183)
+#define	YYNTBASE	141
+
+#define YYTRANSLATE(x) ((unsigned)(x) <= 378 ? yytranslate[x] : 184)
 
 static const short yytranslate[] = {     0,
@@ -331,9 +331,9 @@
      2,     2,     2,     2,     2,     2,     2,   135,     2,   137,
    138,     2,   127,   133,   128,     2,   129,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,   134,   125,
+     2,     2,     2,     2,     2,     2,     2,   139,   134,   125,
    124,   126,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   130,     2,   131,   132,     2,   139,     2,     2,     2,     2,
+   130,     2,   131,   132,     2,   140,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -376,82 +376,82 @@
    208,   217,   226,   230,   235,   244,   249,   258,   263,   272,
    277,   281,   287,   288,   294,   297,   299,   302,   305,   309,
-   313,   317,   321,   325,   329,   333,   337,   341,   344,   347,
-   350,   353,   355,   359,   361,   363,   366,   369,   372,   375,
-   384,   387,   396,   399,   403,   406,   408,   410,   416,   418,
-   420,   425,   427,   431,   433,   437,   439,   440,   445,   449,
-   452,   456,   459,   462,   466,   471,   476,   481,   486,   491,
-   496,   501,   506,   511,   518,   525,   532,   539,   546,   553,
-   560,   567,   571,   573,   582,   585,   588,   590,   592,   595,
-   598,   600,   606,   609,   615,   617,   619,   623,   629,   633,
-   637,   642,   645,   648,   653
+   313,   317,   321,   325,   329,   333,   337,   341,   345,   348,
+   351,   354,   357,   359,   363,   365,   367,   370,   373,   376,
+   379,   388,   391,   400,   403,   407,   410,   412,   414,   420,
+   422,   424,   429,   431,   435,   437,   441,   443,   444,   449,
+   453,   456,   460,   463,   466,   470,   475,   480,   485,   490,
+   495,   500,   505,   510,   515,   522,   529,   536,   543,   550,
+   557,   564,   571,   575,   577,   586,   589,   592,   594,   596,
+   599,   602,   604,   610,   613,   619,   621,   623,   627,   633,
+   637,   641,   646,   649,   652,   657
 };
 
 static const short yyrhs[] = {    -1,
-   140,   141,     0,   142,     0,   144,   134,     0,   156,   134,
-     0,   182,     0,   119,     0,   134,     0,     1,   134,     0,
-   177,     0,   178,     0,   143,     0,   179,     0,   180,     0,
-   164,     0,   166,     0,   167,     0,    98,   107,     0,   145,
-     0,   168,     0,   169,     0,   170,     0,   181,     0,   172,
-     0,   173,     0,   175,     0,   176,     0,   153,   147,     0,
-   110,     0,   154,     0,   146,    11,   146,     0,   146,   137,
-   138,     0,   146,   137,   147,   138,     0,   130,   147,   131,
-     0,   108,     0,   123,     0,   157,     0,   147,   133,   148,
-     0,   148,     0,   152,     0,   146,     0,   137,   147,   138,
-     0,   148,   130,   148,   133,   148,   131,     0,   148,   130,
-   148,   131,     0,    95,   137,   148,   138,     0,    96,   137,
-   147,   138,     0,    96,   137,   138,     0,    97,   137,   148,
-   138,     0,   155,   137,   147,   138,     0,   155,   137,   138,
-     0,    87,   137,   148,   138,     0,    88,   137,   148,   133,
-   148,   138,     0,    89,   137,   148,   133,   148,   133,   148,
-   138,     0,    92,   137,   148,   133,   148,   138,     0,    92,
-   137,   148,   133,   148,   133,   148,   138,     0,    90,   137,
-   148,   138,     0,    91,   137,   148,   138,     0,    90,   137,
-   148,   133,   148,   138,     0,    93,   137,   148,   138,     0,
-    93,   137,   148,   133,   148,   138,     0,    91,   137,   148,
-   133,   148,   133,   148,   138,     0,    93,   137,   148,   133,
-   148,   133,   148,   138,     0,    94,   137,   138,     0,    94,
-   137,   147,   138,     0,    19,   137,   148,   133,   148,   133,
-   148,   138,     0,    19,   137,   148,   138,     0,    13,   137,
-   148,   133,   148,   133,   148,   138,     0,    13,   137,   148,
-   138,     0,    15,   137,   158,   133,   158,   133,   162,   138,
-     0,    15,   137,   148,   138,     0,   150,   148,   151,     0,
-   150,   148,   124,   148,   151,     0,     0,   115,   137,   149,
-   148,   138,     0,   116,   137,     0,   138,     0,   148,    10,
-     0,   148,     7,     0,   148,   127,   148,     0,   148,   128,
-   148,     0,   148,   129,   148,     0,   148,   132,   148,     0,
-   148,   125,   148,     0,   148,   135,   148,     0,   148,     9,
-   148,     0,   148,     4,   148,     0,   148,     3,   148,     0,
-     8,   148,     0,   128,   148,     0,   156,   163,     0,   147,
-   124,     0,   109,     0,   139,   148,   139,     0,    17,     0,
-    20,     0,    95,   146,     0,    96,   146,     0,    97,   146,
-     0,   155,   146,     0,    19,   146,   130,   148,   131,   130,
-   148,   131,     0,    19,   146,     0,    13,   146,   130,   148,
-   131,   130,   148,   131,     0,    13,   146,     0,   156,   133,
-   146,     0,    14,   146,     0,   106,     0,   148,     0,   137,
-   148,   133,   147,   138,     0,   109,     0,   159,     0,   159,
-   137,   147,   138,     0,   160,     0,   160,   133,   161,     0,
-   160,     0,   137,   161,   138,     0,   124,     0,     0,   125,
-   157,   165,   134,     0,   100,   106,   134,     0,   100,   134,
-     0,    98,   106,   134,     0,    99,   147,     0,   101,   146,
-     0,   169,   133,   146,     0,   103,   137,    95,   138,     0,
-   103,   137,    96,   138,     0,   103,   137,    97,   138,     0,
-   103,   137,   155,   138,     0,   103,   137,    15,   138,     0,
-   103,   137,    19,   138,     0,   103,   137,    13,   138,     0,
-   103,   137,    14,   138,     0,   103,   137,   146,   138,     0,
-   103,   137,   146,   133,    95,   138,     0,   103,   137,   146,
-   133,    96,   138,     0,   103,   137,   146,   133,    97,   138,
-     0,   103,   137,   146,   133,   155,   138,     0,   103,   137,
-   146,   133,    15,   138,     0,   103,   137,   146,   133,    19,
-   138,     0,   103,   137,   146,   133,    13,   138,     0,   103,
-   137,   146,   133,    14,   138,     0,   103,   137,   138,     0,
-    15,     0,   171,   146,   163,   158,   133,   158,   133,   162,
-     0,   171,   146,     0,   123,   157,     0,   104,     0,    38,
-     0,   174,   148,     0,   105,   148,     0,   147,     0,   118,
-   137,   148,   138,   107,     0,   114,   107,     0,   118,   137,
-   148,   138,   112,     0,   112,     0,   113,     0,   120,   106,
-   107,     0,   117,   106,   106,   106,   107,     0,    14,   154,
-   107,     0,   111,   106,   107,     0,   111,   106,   106,   107,
-     0,   122,   156,     0,   122,   148,     0,   121,   137,   147,
-   138,     0,   121,   137,   138,     0
+   141,   142,     0,   143,     0,   145,   134,     0,   157,   134,
+     0,   183,     0,   119,     0,   134,     0,     1,   134,     0,
+   178,     0,   179,     0,   144,     0,   180,     0,   181,     0,
+   165,     0,   167,     0,   168,     0,    98,   107,     0,   146,
+     0,   169,     0,   170,     0,   171,     0,   182,     0,   173,
+     0,   174,     0,   176,     0,   177,     0,   154,   148,     0,
+   110,     0,   155,     0,   147,    11,   147,     0,   147,   137,
+   138,     0,   147,   137,   148,   138,     0,   130,   148,   131,
+     0,   108,     0,   123,     0,   158,     0,   148,   133,   149,
+     0,   149,     0,   153,     0,   147,     0,   137,   148,   138,
+     0,   149,   130,   149,   133,   149,   131,     0,   149,   130,
+   149,   131,     0,    95,   137,   149,   138,     0,    96,   137,
+   148,   138,     0,    96,   137,   138,     0,    97,   137,   149,
+   138,     0,   156,   137,   148,   138,     0,   156,   137,   138,
+     0,    87,   137,   149,   138,     0,    88,   137,   149,   133,
+   149,   138,     0,    89,   137,   149,   133,   149,   133,   149,
+   138,     0,    92,   137,   149,   133,   149,   138,     0,    92,
+   137,   149,   133,   149,   133,   149,   138,     0,    90,   137,
+   149,   138,     0,    91,   137,   149,   138,     0,    90,   137,
+   149,   133,   149,   138,     0,    93,   137,   149,   138,     0,
+    93,   137,   149,   133,   149,   138,     0,    91,   137,   149,
+   133,   149,   133,   149,   138,     0,    93,   137,   149,   133,
+   149,   133,   149,   138,     0,    94,   137,   138,     0,    94,
+   137,   148,   138,     0,    19,   137,   149,   133,   149,   133,
+   149,   138,     0,    19,   137,   149,   138,     0,    13,   137,
+   149,   133,   149,   133,   149,   138,     0,    13,   137,   149,
+   138,     0,    15,   137,   159,   133,   159,   133,   163,   138,
+     0,    15,   137,   149,   138,     0,   151,   149,   152,     0,
+   151,   149,   124,   149,   152,     0,     0,   115,   137,   150,
+   149,   138,     0,   116,   137,     0,   138,     0,   149,    10,
+     0,   149,     7,     0,   149,   127,   149,     0,   149,   128,
+   149,     0,   149,   129,   149,     0,   149,   132,   149,     0,
+   149,   125,   149,     0,   149,   135,   149,     0,   149,     9,
+   149,     0,   149,     4,   149,     0,   149,     3,   149,     0,
+   149,   139,   149,     0,     8,   149,     0,   128,   149,     0,
+   157,   164,     0,   148,   124,     0,   109,     0,   140,   149,
+   140,     0,    17,     0,    20,     0,    95,   147,     0,    96,
+   147,     0,    97,   147,     0,   156,   147,     0,    19,   147,
+   130,   149,   131,   130,   149,   131,     0,    19,   147,     0,
+    13,   147,   130,   149,   131,   130,   149,   131,     0,    13,
+   147,     0,   157,   133,   147,     0,    14,   147,     0,   106,
+     0,   149,     0,   137,   149,   133,   148,   138,     0,   109,
+     0,   160,     0,   160,   137,   148,   138,     0,   161,     0,
+   161,   133,   162,     0,   161,     0,   137,   162,   138,     0,
+   124,     0,     0,   125,   158,   166,   134,     0,   100,   106,
+   134,     0,   100,   134,     0,    98,   106,   134,     0,    99,
+   148,     0,   101,   147,     0,   170,   133,   147,     0,   103,
+   137,    95,   138,     0,   103,   137,    96,   138,     0,   103,
+   137,    97,   138,     0,   103,   137,   156,   138,     0,   103,
+   137,    15,   138,     0,   103,   137,    19,   138,     0,   103,
+   137,    13,   138,     0,   103,   137,    14,   138,     0,   103,
+   137,   147,   138,     0,   103,   137,   147,   133,    95,   138,
+     0,   103,   137,   147,   133,    96,   138,     0,   103,   137,
+   147,   133,    97,   138,     0,   103,   137,   147,   133,   156,
+   138,     0,   103,   137,   147,   133,    15,   138,     0,   103,
+   137,   147,   133,    19,   138,     0,   103,   137,   147,   133,
+    13,   138,     0,   103,   137,   147,   133,    14,   138,     0,
+   103,   137,   138,     0,    15,     0,   172,   147,   164,   159,
+   133,   159,   133,   163,     0,   172,   147,     0,   123,   158,
+     0,   104,     0,    38,     0,   175,   149,     0,   105,   149,
+     0,   148,     0,   118,   137,   149,   138,   107,     0,   114,
+   107,     0,   118,   137,   149,   138,   112,     0,   112,     0,
+   113,     0,   120,   106,   107,     0,   117,   106,   106,   106,
+   107,     0,    14,   155,   107,     0,   111,   106,   107,     0,
+   111,   106,   106,   107,     0,   122,   157,     0,   122,   149,
+     0,   121,   137,   148,   138,     0,   121,   137,   138,     0
 };
 
@@ -468,13 +468,13 @@
    698,   702,   706,   710,   714,   718,   722,   726,   730,   734,
    738,   742,   759,   765,   777,   785,   793,   798,   802,   806,
-   810,   814,   818,   822,   826,   830,   834,   838,   845,   851,
-   853,   865,   867,   878,   879,   883,   893,   902,   906,   910,
-   926,   930,   950,   968,   993,  1004,  1008,  1010,  1023,  1031,
-  1041,  1085,  1087,  1095,  1097,  1103,  1114,  1119,  1122,  1128,
-  1134,  1142,  1156,  1177,  1199,  1204,  1208,  1213,  1217,  1221,
-  1225,  1229,  1233,  1238,  1247,  1256,  1265,  1274,  1283,  1292,
-  1301,  1319,  1325,  1329,  1373,  1383,  1397,  1397,  1399,  1475,
-  1482,  1511,  1524,  1541,  1550,  1555,  1562,  1574,  1593,  1605,
-  1625,  1648,  1655,  1666,  1674
+   810,   814,   818,   822,   826,   830,   834,   838,   842,   849,
+   855,   857,   869,   871,   882,   883,   887,   897,   906,   910,
+   914,   930,   934,   954,   972,   997,  1008,  1012,  1014,  1027,
+  1035,  1045,  1089,  1091,  1099,  1101,  1107,  1118,  1123,  1126,
+  1132,  1138,  1146,  1160,  1181,  1203,  1208,  1212,  1217,  1221,
+  1225,  1229,  1233,  1237,  1242,  1251,  1260,  1269,  1278,  1287,
+  1296,  1305,  1323,  1329,  1333,  1377,  1387,  1401,  1401,  1403,
+  1479,  1486,  1515,  1528,  1545,  1554,  1559,  1566,  1578,  1597,
+  1609,  1629,  1652,  1659,  1670,  1678
 };
 #endif
@@ -502,32 +502,33 @@
 "RINGVAR","PROC_DEF","BREAK_CMD","CONTINUE_CMD","ELSE_CMD","EVAL","QUOTE","FOR_CMD",
 "IF_CMD","SYS_BREAK","WHILE_CMD","RETURN","PARAMETER","SYSVAR","'='","'<'","'>'",
-"'+'","'-'","'/'","'['","']'","'^'","','","';'","'&'","UMINUS","'('","')'","'`'",
-"lines","pprompt","flowctrl","example_dummy","command","assign","elemexpr","exprlist",
-"expr","@1","quote_start","quote_end","expr_arithmetic","left_value","extendedid",
-"currring_lists","declare_ip_variable","stringexpr","rlist","ordername","orderelem",
-"OrderingList","ordering","cmdeq","filecmd","@2","helpcmd","examplecmd","exportcmd",
-"killcmd","listcmd","ringcmd1","ringcmd","scriptcmd","setrings","setringcmd",
-"typecmd","ifcmd","whilecmd","forcmd","proccmd","parametercmd","returncmd", NULL
+"'+'","'-'","'/'","'['","']'","'^'","','","';'","'&'","UMINUS","'('","')'","':'",
+"'`'","lines","pprompt","flowctrl","example_dummy","command","assign","elemexpr",
+"exprlist","expr","@1","quote_start","quote_end","expr_arithmetic","left_value",
+"extendedid","currring_lists","declare_ip_variable","stringexpr","rlist","ordername",
+"orderelem","OrderingList","ordering","cmdeq","filecmd","@2","helpcmd","examplecmd",
+"exportcmd","killcmd","listcmd","ringcmd1","ringcmd","scriptcmd","setrings",
+"setringcmd","typecmd","ifcmd","whilecmd","forcmd","proccmd","parametercmd",
+"returncmd", NULL
 };
 #endif
 
 static const short yyr1[] = {     0,
-   140,   140,   141,   141,   141,   141,   141,   141,   141,   142,
-   142,   142,   142,   142,   142,   142,   142,   143,   144,   144,
-   144,   144,   144,   144,   144,   144,   144,   145,   146,   146,
-   146,   146,   146,   146,   146,   146,   146,   147,   147,   148,
-   148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-   148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-   148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-   148,   148,   149,   148,   150,   151,   152,   152,   152,   152,
-   152,   152,   152,   152,   152,   152,   152,   152,   152,   153,
-   153,   154,   154,   155,   155,   156,   156,   156,   156,   156,
-   156,   156,   156,   156,   156,   157,   158,   158,   159,   160,
-   160,   161,   161,   162,   162,   163,   165,   164,   166,   166,
-   167,   168,   169,   169,   170,   170,   170,   170,   170,   170,
-   170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-   170,   170,   171,   172,   172,   173,   174,   174,   175,   176,
-   176,   177,   177,   177,   177,   177,   178,   179,   180,   180,
-   180,   181,   181,   182,   182
+   141,   141,   142,   142,   142,   142,   142,   142,   142,   143,
+   143,   143,   143,   143,   143,   143,   143,   144,   145,   145,
+   145,   145,   145,   145,   145,   145,   145,   146,   147,   147,
+   147,   147,   147,   147,   147,   147,   147,   148,   148,   149,
+   149,   149,   149,   149,   149,   149,   149,   149,   149,   149,
+   149,   149,   149,   149,   149,   149,   149,   149,   149,   149,
+   149,   149,   149,   149,   149,   149,   149,   149,   149,   149,
+   149,   149,   150,   149,   151,   152,   153,   153,   153,   153,
+   153,   153,   153,   153,   153,   153,   153,   153,   153,   153,
+   154,   154,   155,   155,   156,   156,   157,   157,   157,   157,
+   157,   157,   157,   157,   157,   157,   158,   159,   159,   160,
+   161,   161,   162,   162,   163,   163,   164,   166,   165,   167,
+   167,   168,   169,   170,   170,   171,   171,   171,   171,   171,
+   171,   171,   171,   171,   171,   171,   171,   171,   171,   171,
+   171,   171,   171,   172,   173,   173,   174,   175,   175,   176,
+   177,   177,   178,   178,   178,   178,   178,   179,   180,   181,
+   181,   181,   182,   182,   183,   183
 };
 
@@ -541,59 +542,59 @@
      8,     8,     3,     4,     8,     4,     8,     4,     8,     4,
      3,     5,     0,     5,     2,     1,     2,     2,     3,     3,
-     3,     3,     3,     3,     3,     3,     3,     2,     2,     2,
-     2,     1,     3,     1,     1,     2,     2,     2,     2,     8,
-     2,     8,     2,     3,     2,     1,     1,     5,     1,     1,
-     4,     1,     3,     1,     3,     1,     0,     4,     3,     2,
-     3,     2,     2,     3,     4,     4,     4,     4,     4,     4,
-     4,     4,     4,     6,     6,     6,     6,     6,     6,     6,
-     6,     3,     1,     8,     2,     2,     1,     1,     2,     2,
-     1,     5,     2,     5,     1,     1,     3,     5,     3,     3,
-     4,     2,     2,     4,     3
+     3,     3,     3,     3,     3,     3,     3,     3,     2,     2,
+     2,     2,     1,     3,     1,     1,     2,     2,     2,     2,
+     8,     2,     8,     2,     3,     2,     1,     1,     5,     1,
+     1,     4,     1,     3,     1,     3,     1,     0,     4,     3,
+     2,     3,     2,     2,     3,     4,     4,     4,     4,     4,
+     4,     4,     4,     4,     6,     6,     6,     6,     6,     6,
+     6,     6,     3,     1,     8,     2,     2,     1,     1,     2,
+     2,     1,     5,     2,     5,     1,     1,     3,     5,     3,
+     3,     4,     2,     2,     4,     3
 };
 
 static const short yydefact[] = {     1,
-     0,     0,     0,     0,     0,   143,    94,     0,    95,   148,
+     0,     0,     0,     0,     0,   144,    95,     0,    96,   149,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   147,     0,   106,    35,
-    92,    29,     0,   155,   156,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   148,     0,   107,    35,
+    93,    29,     0,   156,   157,     0,     0,     0,     0,     0,
      7,     0,     0,     0,    36,     0,     0,     0,     8,     0,
-     0,     2,     3,    12,     0,    19,    41,   151,    39,     0,
+     0,     2,     3,    12,     0,    19,    41,   152,    39,     0,
     40,     0,    30,     0,     0,    37,    15,    16,    17,    20,
     21,    22,     0,    24,    25,     0,    26,    27,    10,    11,
     13,    14,    23,     6,     9,     0,     0,     0,     0,     0,
-     0,    36,    88,     0,     0,   103,   105,    30,     0,     0,
-   101,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    96,     0,    97,     0,    98,     0,    18,   122,     0,   120,
-   123,     0,   150,     0,   153,    73,    75,     0,     0,     0,
-     0,     0,   163,   162,   146,   117,    89,     0,     0,     0,
-     4,     0,     0,    91,     0,     0,     0,    78,     0,    77,
-     0,     0,     0,     0,     0,     0,     0,     0,    28,     0,
-    99,   116,     0,     5,    90,     0,   145,   149,     0,     0,
-   159,     0,   107,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,    63,     0,     0,    47,     0,     0,   121,
-   119,     0,     0,     0,     0,     0,     0,     0,   142,     0,
-     0,     0,   160,     0,     0,     0,   157,   165,     0,     0,
-    34,    42,    93,    31,    32,     0,    38,    87,    86,    85,
-    83,    79,    80,    81,     0,    82,    84,     0,    76,    71,
-    50,     0,   104,   124,     0,     0,    68,     0,    39,    70,
-     0,     0,    66,     0,    51,     0,     0,     0,    56,     0,
-    57,     0,     0,    59,    64,    45,    46,    48,   131,   132,
-   129,   130,   125,   126,   127,     0,   133,   128,   161,     0,
-     0,     0,   164,   118,    33,    44,     0,     0,    49,   107,
+     0,    36,    89,     0,     0,   104,   106,    30,     0,     0,
+   102,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    97,     0,    98,     0,    99,     0,    18,   123,     0,   121,
+   124,     0,   151,     0,   154,    73,    75,     0,     0,     0,
+     0,     0,   164,   163,   147,   118,    90,     0,     0,     0,
+     4,     0,     0,    92,     0,     0,     0,    78,     0,    77,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,    28,
+     0,   100,   117,     0,     5,    91,     0,   146,   150,     0,
+     0,   160,     0,   108,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,    63,     0,     0,    47,     0,     0,
+   122,   120,     0,     0,     0,     0,     0,     0,     0,   143,
+     0,     0,     0,   161,     0,     0,     0,   158,   166,     0,
+     0,    34,    42,    94,    31,    32,     0,    38,    87,    86,
+    85,    83,    79,    80,    81,     0,    82,    84,    88,     0,
+    76,    71,    50,     0,   105,   125,     0,     0,    68,     0,
+    39,    70,     0,     0,    66,     0,    51,     0,     0,     0,
+    56,     0,    57,     0,     0,    59,    64,    45,    46,    48,
+   132,   133,   130,   131,   126,   127,   128,     0,   134,   129,
+   162,     0,     0,     0,   165,   119,    33,    44,     0,     0,
+    49,   108,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,    74,   158,   152,   154,     0,    72,     0,     0,     0,
-     0,     0,     0,     0,    52,     0,    58,     0,     0,    54,
-     0,    60,   140,   141,   138,   139,   134,   135,   136,   137,
-    43,     0,     0,     0,   108,   109,     0,   110,   114,     0,
-     0,     0,     0,     0,     0,     0,     0,    67,   102,   112,
-     0,     0,    69,    65,   100,    53,    61,    55,    62,   144,
-     0,   115,     0,   113,   111,     0,     0
+     0,     0,     0,    74,   159,   153,   155,     0,    72,     0,
+     0,     0,     0,     0,     0,     0,    52,     0,    58,     0,
+     0,    54,     0,    60,   141,   142,   139,   140,   135,   136,
+   137,   138,    43,     0,     0,     0,   109,   110,     0,   111,
+   115,     0,     0,     0,     0,     0,     0,     0,     0,    67,
+   103,   113,     0,     0,    69,    65,   101,    53,    61,    55,
+    62,   145,     0,   116,     0,   114,   112,     0,     0
 };
 
 static const short yydefgoto[] = {     1,
-    52,    53,    54,    55,    56,    57,   139,    59,   204,    60,
-   230,    61,    62,    63,    94,    65,    66,   174,   338,   339,
-   351,   340,   165,    67,   210,    68,    69,    70,    71,    72,
+    52,    53,    54,    55,    56,    57,   139,    59,   205,    60,
+   232,    61,    62,    63,    94,    65,    66,   175,   340,   341,
+   353,   342,   166,    67,   211,    68,    69,    70,    71,    72,
     73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
     83,    84
@@ -601,47 +602,47 @@
 
 static const short yypact[] = {-32768,
-   271,  -130,  1484,   933,  1142,  -129,-32768,  1063,-32768,-32768,
-   -81,   -77,   -74,   -64,   -43,   -40,   -34,   -31,  1068,  1073,
-  1123,   -68,  1484,  -100,  1142,   -21,-32768,  1484,-32768,-32768,
--32768,-32768,   -60,-32768,-32768,   -58,   -13,    -9,    25,    26,
--32768,    34,    28,  1148,    87,    87,  1484,  1484,-32768,  1484,
-  1484,-32768,-32768,-32768,    40,-32768,   -10,   -91,  1016,  1484,
--32768,  1484,-32768,  1235,   -80,-32768,-32768,-32768,-32768,-32768,
-   -20,-32768,  1142,-32768,-32768,  1484,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,    72,  -129,    77,    89,    92,
-    97,-32768,    58,   103,  1484,    68,   -10,   125,  1537,  1484,
-   101,  1484,  1484,  1484,  1484,  1484,  1484,  1484,  1201,  1484,
-   -10,  1260,   -10,  1484,   -10,    70,-32768,   111,   112,-32768,
-   -10,  1589,  1016,   -22,-32768,-32768,-32768,   139,  1484,   140,
-  1313,  1142,  1016,   115,-32768,-32768,    58,   -24,  -131,    67,
--32768,  1142,  1372,-32768,  1484,  1484,  1484,-32768,  1484,-32768,
-  1484,  1484,  1484,  1484,  1484,  1484,  1484,    83,   111,  1425,
-   -10,-32768,  1142,-32768,-32768,  1142,    19,  1016,    48,  1484,
--32768,  1484,   479,   116,    95,  1484,   491,   772,   781,   290,
-   304,   790,   334,-32768,  -110,   503,-32768,   -88,   515,-32768,
--32768,   114,   117,   120,   121,   122,   126,   128,-32768,     8,
-   131,   146,-32768,  1484,   148,   527,-32768,-32768,   -69,   141,
--32768,-32768,-32768,-32768,-32768,   -66,  1016,  1025,   325,   325,
-   470,    71,    71,    58,    22,     3,     7,  1484,-32768,-32768,
--32768,   -50,   -10,   -10,  1537,  1484,-32768,   811,   820,-32768,
-  1537,  1484,-32768,   923,-32768,  1484,  1484,  1484,-32768,  1484,
--32768,  1484,  1484,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   222,-32768,-32768,-32768,   539,
-   166,   -12,-32768,-32768,-32768,-32768,  1484,   551,-32768,  1016,
-   143,   953,   144,  1484,   145,   962,   147,   570,   971,   582,
-   980,   346,   437,   142,   149,   151,   157,   158,   160,   163,
-   164,-32768,-32768,-32768,-32768,   989,-32768,  1537,  1484,  1484,
-   -37,   -97,  1484,  1484,-32768,  1484,-32768,  1484,  1484,-32768,
-  1484,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   170,   681,   998,-32768,-32768,   172,   167,-32768,   168,
-   712,  1007,   724,   736,   748,   760,   -97,-32768,-32768,   177,
-   174,  1484,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-   172,-32768,    51,-32768,-32768,   282,-32768
+   276,  -131,  1645,   377,   -50,  -120,-32768,   620,-32768,-32768,
+   -73,   -71,   -67,   -60,   -53,   -40,   -37,   -31,   858,  1045,
+  1100,  -100,  1645,  -102,   -50,   -30,-32768,  1645,-32768,-32768,
+-32768,-32768,     3,-32768,-32768,   -72,   -18,     2,    10,    11,
+-32768,    34,    13,  1295,    37,    37,  1645,  1645,-32768,  1645,
+  1645,-32768,-32768,-32768,    44,-32768,     0,   -83,  1225,  1645,
+-32768,  1645,-32768,  1181,  -105,-32768,-32768,-32768,-32768,-32768,
+    20,-32768,   -50,-32768,-32768,  1645,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,    42,  -120,    43,    47,    53,
+    55,-32768,   139,    61,  1645,    78,     0,    98,  1699,  1645,
+    99,  1645,  1645,  1645,  1645,  1645,  1645,  1645,  1361,  1645,
+     0,  1421,     0,  1645,     0,    84,-32768,    73,    91,-32768,
+     0,  1750,  1225,   -64,-32768,-32768,-32768,   104,  1645,   119,
+  1475,   -50,  1225,    95,-32768,-32768,   139,   -78,  -124,    72,
+-32768,   -50,  1533,-32768,  1645,  1645,  1645,-32768,  1645,-32768,
+  1645,  1645,  1645,  1645,  1645,  1645,  1645,  1645,    92,    73,
+  1587,     0,-32768,   -50,-32768,-32768,   -50,   -10,  1225,   178,
+  1645,-32768,  1645,   502,   106,   315,  1645,   517,   553,   581,
+   339,   405,   650,   420,-32768,  -113,   663,-32768,   -84,   686,
+-32768,-32768,   100,   102,   103,   107,   108,   109,   111,-32768,
+    76,   112,   135,-32768,  1645,   137,   714,-32768,-32768,   -81,
+   117,-32768,-32768,-32768,-32768,-32768,   -70,  1225,  1238,  1334,
+  1334,   105,    64,    64,   139,   448,    38,     6,  1225,  1645,
+-32768,-32768,-32768,   -66,     0,     0,  1699,  1645,-32768,    27,
+   729,-32768,  1699,  1645,-32768,   742,-32768,  1645,  1645,  1645,
+-32768,  1645,-32768,  1645,  1645,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,   337,-32768,-32768,
+-32768,   755,   145,   -21,-32768,-32768,-32768,-32768,  1645,   796,
+-32768,  1225,   120,   819,    14,  1645,   121,   888,   127,   901,
+   929,   952,   967,   472,   487,   122,   125,   126,   136,   141,
+   142,   143,   144,-32768,-32768,-32768,-32768,   980,-32768,  1699,
+  1645,  1645,   -45,  -104,  1645,  1645,-32768,  1645,-32768,  1645,
+  1645,-32768,  1645,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,   132,   993,  1034,-32768,-32768,   149,   146,
+-32768,   148,  1062,  1126,  1139,  1167,  1195,  1210,  -104,-32768,
+-32768,   154,   150,  1645,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,   149,-32768,   -35,-32768,-32768,   259,-32768
 };
 
 static const short yypgoto[] = {-32768,
--32768,-32768,-32768,-32768,-32768,    16,    -1,    15,-32768,-32768,
-    27,-32768,-32768,   310,     4,   272,   171,  -226,-32768,  -334,
-   -41,   -26,   155,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,    19,    -1,    18,-32768,-32768,
+    12,-32768,-32768,   289,     7,   254,    59,  -225,-32768,  -337,
+   -63,   -48,   131,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
 -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
 -32768,-32768
@@ -649,148 +650,170 @@
 
 
-#define	YYLAST		1728
+#define	YYLAST		1890
 
 
 static const short yytable[] = {    58,
-   142,   145,   350,    85,    64,   119,   212,    99,   281,   148,
-   147,   336,   150,   148,   285,   149,   150,    93,   142,    96,
-    97,   118,   145,   101,   146,   147,   350,   255,   148,   142,
-   149,   150,   144,   120,   111,   113,   115,   116,   117,   337,
-   121,   145,   123,   162,   145,   124,   138,    64,   125,   257,
-   146,   147,   163,   164,   148,   102,   149,   150,   133,   103,
-   159,   137,   104,   145,   148,   140,   145,   150,   273,   146,
-   147,   275,   105,   148,   158,   149,   150,   148,   142,   161,
-   150,   332,   145,   202,   203,   146,   147,   279,   167,   148,
-   168,   149,   150,   106,   304,   145,   107,   146,   147,   305,
-   335,   148,   108,   149,   150,   109,   211,   185,   145,   169,
-   188,   142,   166,   173,   175,   122,   177,   178,   179,   180,
-   181,   182,   183,   126,   186,   201,   143,   127,   189,   209,
-   128,   151,   155,   152,   153,   154,   155,   200,   156,   130,
-   266,   216,   162,   206,   143,   267,   151,    97,   152,   153,
-   154,   155,   276,   156,   277,   143,   157,   214,   232,   217,
-   218,   219,   129,   220,   131,   221,   222,   223,   224,   225,
-   226,   227,   151,   141,   152,   153,   154,   155,   233,   156,
-   236,   234,   157,   145,   238,   237,   239,   155,   365,   156,
-   244,   151,    29,   152,   153,   154,   155,   170,   156,   154,
-   155,   157,   156,   190,   143,   213,   228,   151,    95,   152,
-   153,   154,   155,   100,   156,   135,   136,   157,   270,   151,
-   229,   152,   153,   154,   155,   110,   156,   242,   112,   157,
-   176,   171,   243,   114,   294,   295,   296,   143,     7,   160,
-   297,     9,   278,   145,   205,   191,   207,   163,   241,   280,
-   282,   259,   269,   271,   260,   280,   286,   261,   262,   263,
-   288,   289,   290,   264,   291,   265,   292,   293,   268,   301,
-   366,     2,   303,   310,   274,   308,   314,   312,     3,   323,
-   336,   367,   311,     4,     5,     6,   324,     7,   325,     8,
-     9,   306,   146,   147,   326,   327,   148,   328,   149,   150,
-   329,   330,   347,   352,   307,   353,   146,   147,    10,   361,
-   148,   362,   149,   150,    98,   134,   298,   299,   300,   364,
-   360,   235,   280,   333,   334,     0,     0,   341,   342,     0,
-   343,   148,   344,   345,   150,   346,   146,   147,     0,     0,
-   148,     0,   149,   150,     0,     0,     0,     0,   146,   147,
-   363,     0,   148,     0,   149,   150,     0,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-    24,    25,     0,    26,    27,    28,    29,     0,    30,    31,
-    32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-    42,    43,    44,    45,     0,    46,     0,     0,    47,     0,
-    48,     0,     0,     0,    49,     0,     0,    50,     0,    51,
+   142,   352,    85,   119,   338,   116,   117,    64,   145,   147,
+   142,   283,   148,   213,   149,   150,    99,   287,   163,   145,
+    93,   118,    96,    97,   257,   352,   101,   164,   165,   146,
+   147,   120,   339,   148,   125,   149,   150,   111,   113,   115,
+   144,   203,   204,   121,   148,   123,   138,   150,   145,   145,
+    64,   145,   212,   259,   145,    29,   275,    30,    31,    32,
+   160,   133,   145,   102,   137,   103,   145,   277,   140,   104,
+   148,   281,    92,   150,   146,   147,   105,   159,   148,    48,
+   149,   150,   162,   106,   334,   306,   142,   145,   142,    51,
+   307,   168,   337,   169,   146,   147,   107,   145,   148,   108,
+   149,   150,   367,   135,   136,   109,   122,   186,   124,   142,
+   189,   148,   170,   163,   150,   128,   174,   176,   126,   178,
+   179,   180,   181,   182,   183,   184,   143,   187,   202,   210,
+   151,   190,   152,   153,   154,   155,   143,   156,   127,   130,
+   201,   217,    29,   312,   158,   148,   207,   129,   150,   131,
+    97,   151,   167,   152,   153,   154,   155,   285,   156,   234,
+   215,   157,   218,   219,   220,   158,   221,   155,   222,   223,
+   224,   225,   226,   227,   228,   229,   158,   141,    95,   100,
+   146,   147,   235,   110,   148,   236,   149,   150,   240,   112,
+   241,   114,   154,   155,   246,   156,   151,   161,   152,   153,
+   154,   155,   158,   156,   172,   145,   157,   171,   268,   206,
+   158,   214,   143,   269,   143,   230,   151,   191,   152,   153,
+   154,   155,   272,   156,   192,   208,   157,   164,   177,   231,
+   158,   152,   153,   154,   155,   143,   156,   261,   243,   262,
+   263,   271,   273,   158,   264,   265,   266,   280,   267,   270,
+   276,   305,   310,   314,   282,   284,   316,   338,   369,   325,
+   282,   288,   326,   327,   349,   290,   291,   292,   155,   293,
+   156,   294,   295,   328,   303,   368,     2,   158,   329,   330,
+   331,   332,   354,     3,   313,   355,   363,   364,     4,     5,
+     6,   309,     7,    98,     8,     9,   308,   134,   237,   366,
+   362,     0,   151,     0,   152,   153,   154,   155,     0,   156,
+   238,     0,   157,    10,     0,   239,   158,   146,   147,     0,
+     0,   148,     0,   149,   150,     0,     0,   282,   335,   336,
+     0,     0,   343,   344,     0,   345,     0,   346,   347,     0,
+   348,   146,   147,     0,     0,   148,     0,   149,   150,   296,
+   297,   298,   365,     7,     0,   299,     9,     0,     0,     0,
+     0,     0,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    23,    24,    25,     0,    26,    27,
+    28,    29,     0,    30,    31,    32,    33,    34,    35,    36,
+    37,    38,    39,    40,    41,    42,    43,    44,    45,     0,
+    46,     0,     0,    47,     0,    48,     0,   146,   147,    49,
+     0,   148,    50,   149,   150,    51,     0,     0,     0,     0,
+     0,     0,   146,   147,     0,     0,   148,     0,   149,   150,
+     0,   300,   301,   302,     0,     0,     0,     0,     0,   151,
+     0,   152,   153,   154,   155,     0,   156,   244,     0,   157,
+   146,   147,   245,   158,   148,     0,   149,   150,     0,     0,
+     0,     0,     0,   151,     0,   152,   153,   154,   155,     0,
+   156,   250,     0,   157,   146,   147,   251,   158,   148,     0,
+   149,   150,    29,     0,    30,    31,    32,     0,     0,   146,
+   147,     0,     0,   148,     0,   149,   150,     0,     0,    92,
+     0,     0,     0,     0,   146,   147,    48,     0,   148,     0,
+   149,   150,     0,    95,     0,     0,    51,     0,     0,   146,
+   147,     0,     0,   148,     0,   149,   150,     0,     0,   151,
+     0,   152,   153,   154,   155,     0,   156,   252,     0,   157,
+     0,     0,   253,   158,   151,     0,   152,   153,   154,   155,
+     0,   156,   255,     0,   157,   146,   147,   256,   158,   148,
+     0,   149,   150,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   151,     0,   152,   153,   154,   155,   278,   156,
+   279,     0,   157,   146,   147,     0,   158,   148,     0,   149,
+   150,     0,     0,     0,     0,     0,   151,     0,   152,   153,
+   154,   155,     0,   156,   321,     0,   157,     0,     0,   322,
+   158,   151,     0,   152,   153,   154,   155,     0,   156,   323,
+     0,   157,     0,     0,   324,   158,   151,     0,   152,   153,
+   154,   155,     0,   156,     0,     0,   157,     0,     0,   242,
+   158,   151,     0,   152,   153,   154,   155,     0,   156,     0,
+     0,   157,   146,   147,   247,   158,   148,     0,   149,   150,
+     0,     0,     0,     0,     0,   146,   147,     0,     0,   148,
+     0,   149,   150,     0,     0,     0,     0,   151,     0,   152,
+   153,   154,   155,     0,   156,   248,     0,   157,   146,   147,
+     0,   158,   148,     0,   149,   150,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   151,     0,   152,   153,   154,
+   155,     0,   156,   249,     0,   157,   146,   147,     0,   158,
+   148,     0,   149,   150,     0,    29,     0,    30,    31,    32,
+     0,   146,   147,     0,     0,   148,     0,   149,   150,     0,
+     0,     0,    92,     0,   146,   147,     0,     0,   148,    48,
+   149,   150,     0,     0,     0,     0,   100,   146,   147,    51,
+     0,   148,     0,   149,   150,     0,     0,     0,     0,     0,
      0,     0,     0,     0,   151,     0,   152,   153,   154,   155,
-     0,   156,   248,     0,   157,     0,     0,   249,   151,     0,
-   152,   153,   154,   155,     0,   156,   250,     0,   157,   146,
-   147,   251,     0,   148,     0,   149,   150,     0,     0,   151,
-     0,   152,   153,   154,   155,     0,   156,     0,   151,     0,
-   152,   153,   154,   155,     0,   156,   253,     0,   157,     0,
-   151,   254,   152,   153,   154,   155,   148,   156,   319,   150,
-   157,   146,   147,   320,     0,   148,     0,   149,   150,     0,
+     0,   156,   254,     0,   157,     0,     0,   151,   158,   152,
+   153,   154,   155,     0,   156,     0,     0,   157,   146,   147,
+   258,   158,   148,     0,   149,   150,     0,     0,     0,     0,
+   151,     0,   152,   153,   154,   155,     0,   156,     0,     0,
+   157,   146,   147,   260,   158,   148,     0,   149,   150,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,   151,     0,
+   152,   153,   154,   155,     0,   156,     0,     0,   157,     0,
+     0,   274,   158,   151,     0,   152,   153,   154,   155,     0,
+   156,   286,     0,   157,     0,     0,   151,   158,   152,   153,
+   154,   155,   289,   156,     0,     0,   157,     0,     0,   151,
+   158,   152,   153,   154,   155,     0,   156,     0,     0,   157,
+   146,   147,   304,   158,   148,     0,   149,   150,     0,     0,
      0,     0,     0,   146,   147,     0,     0,   148,     0,   149,
-   150,     0,     0,     0,     0,   146,   147,     0,     0,   148,
-     0,   149,   150,     0,     0,     0,     0,   146,   147,     0,
-     0,   148,     0,   149,   150,     0,     0,     0,     0,   146,
+   150,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+   151,     0,   152,   153,   154,   155,     0,   156,     0,     0,
+   157,   146,   147,   231,   158,   148,     0,   149,   150,     0,
+     0,     0,     0,   151,     0,   152,   153,   154,   155,     0,
+   156,   311,     0,   157,   146,   147,     0,   158,   148,     0,
+   149,   150,     0,    29,     0,    30,    31,    32,     0,   146,
    147,     0,     0,   148,     0,   149,   150,     0,     0,     0,
+    92,     0,   146,   147,     0,     0,   148,    48,   149,   150,
+     0,     0,     0,     0,   110,   146,   147,    51,     0,   148,
+     0,   149,   150,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,   151,     0,   152,   153,   154,   155,     0,   156,
+   315,     0,   157,     0,     0,   151,   158,   152,   153,   154,
+   155,     0,   156,     0,     0,   157,   146,   147,   317,   158,
+   148,     0,   149,   150,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   151,     0,   152,   153,   154,   155,     0,
+   156,   318,     0,   157,   146,   147,     0,   158,   148,     0,
+   149,   150,     0,     0,     0,     0,   151,     0,   152,   153,
+   154,   155,     0,   156,     0,     0,   157,     0,     0,   319,
+   158,   151,     0,   152,   153,   154,   155,     0,   156,   320,
+     0,   157,     0,     0,   151,   158,   152,   153,   154,   155,
+   333,   156,     0,     0,   157,     0,     0,   151,   158,   152,
+   153,   154,   155,     0,   156,     0,     0,   157,   146,   147,
+   350,   158,   148,     0,   149,   150,     0,     0,     0,     0,
      0,   146,   147,     0,     0,   148,     0,   149,   150,     0,
-     0,     0,     0,   146,   147,     0,     0,   148,     0,   149,
-   150,   151,     0,   152,   153,   154,   155,     0,   156,   321,
-     0,   157,   146,   147,   322,     0,   148,     0,   149,   150,
-     0,     0,     0,     0,   146,   147,     0,     0,   148,     0,
-   149,   150,     0,     0,     0,     0,   152,   153,   154,   155,
-     0,   156,     0,   151,     0,   152,   153,   154,   155,     0,
-   156,     0,     0,   157,     0,   151,   240,   152,   153,   154,
-   155,     0,   156,     0,     0,   157,     0,   151,   245,   152,
-   153,   154,   155,     0,   156,     0,     0,   157,     0,   151,
-   256,   152,   153,   154,   155,     0,   156,     0,     0,   157,
-     0,   151,   258,   152,   153,   154,   155,     0,   156,     0,
-     0,   157,     0,   151,   272,   152,   153,   154,   155,     0,
-   156,     0,     0,   157,     0,   151,   302,   152,   153,   154,
-   155,     0,   156,   146,   147,   157,     0,   148,   229,   149,
-   150,     0,     0,     0,   151,     0,   152,   153,   154,   155,
-     0,   156,     0,     0,   157,     0,   151,   315,   152,   153,
-   154,   155,     0,   156,   146,   147,   157,     0,   148,   317,
-   149,   150,     0,     0,     0,     0,   146,   147,     0,     0,
-   148,     0,   149,   150,     0,     0,     0,     0,   146,   147,
-     0,     0,   148,     0,   149,   150,     0,     0,     0,     0,
-   146,   147,     0,     0,   148,     0,   149,   150,     0,     0,
+    29,     0,    30,    31,    32,     0,     0,     0,   151,     0,
+   152,   153,   154,   155,   351,   156,     0,    92,   157,   146,
+   147,     0,   158,   148,    48,   149,   150,     0,     0,     0,
+     0,   112,     0,     0,    51,     0,   151,     0,   152,   153,
+   154,   155,     0,   156,     0,     0,   157,   146,   147,   356,
+   158,   148,     0,   149,   150,    29,     0,    30,    31,    32,
      0,     0,   146,   147,     0,     0,   148,     0,   149,   150,
-     0,     0,     0,     0,   146,   147,     0,     0,   148,     0,
-   149,   150,     0,   146,   147,     0,     0,   148,     0,   149,
-   150,     0,   146,   147,     0,     0,   148,     0,   149,   150,
-     0,     0,     0,     0,     0,   151,     0,   152,   153,   154,
-   155,     0,   156,   146,   147,   157,     0,   148,   348,   149,
-   150,     0,   146,   147,     0,     0,   148,     0,   149,   150,
-     0,     0,     0,     0,     0,     0,   151,     0,   152,   153,
-   154,   155,     0,   156,     0,     0,   157,     0,   151,   354,
-   152,   153,   154,   155,     0,   156,     0,     0,   157,     0,
-   151,   356,   152,   153,   154,   155,     0,   156,     0,     0,
-   157,     0,   151,   357,   152,   153,   154,   155,     0,   156,
-     0,     0,   157,     0,   151,   358,   152,   153,   154,   155,
-     0,   156,     0,     0,   157,     0,   151,   359,   152,   153,
-   154,   155,     0,   156,   246,   151,   157,   152,   153,   154,
-   155,     0,   156,   247,   151,   157,   152,   153,   154,   155,
-     0,   156,   252,     0,   157,   146,   147,     0,     0,   148,
-     0,   149,   150,     0,     0,   151,     0,   152,   153,   154,
-   155,   283,   156,     0,   151,   157,   152,   153,   154,   155,
-     0,   156,   284,     0,   157,   146,   147,     0,     0,   148,
-     0,   149,   150,     0,   146,   147,     0,     0,   148,     0,
-   149,   150,     0,   146,   147,     0,     0,   148,     0,   149,
-   150,     0,   146,   147,     0,     0,   148,     0,   149,   150,
-     0,   146,   147,     0,     0,   148,     0,   149,   150,     0,
-   146,   147,     0,     0,   148,     0,   149,   150,     0,   146,
-   147,     0,     0,   148,     0,   149,   150,     0,   146,   147,
-     0,     0,   148,     0,   149,   150,     0,-32768,   147,     0,
-     0,   148,     0,   149,   150,     0,     0,     0,    29,     0,
-    30,    31,    32,     0,     0,     0,     0,   151,     0,   152,
-   153,   154,   155,   287,   156,    92,     0,   157,     0,     0,
-     0,     0,    48,     0,     0,     0,     0,     0,     0,    95,
-     0,    51,     0,     0,     0,     0,     0,   151,     0,   152,
-   153,   154,   155,     0,   156,   309,   151,   157,   152,   153,
-   154,   155,     0,   156,   313,   151,   157,   152,   153,   154,
-   155,     0,   156,   316,   151,   157,   152,   153,   154,   155,
-     0,   156,   318,   151,   157,   152,   153,   154,   155,   331,
-   156,     0,   151,   157,   152,   153,   154,   155,   349,   156,
-     0,   151,   157,   152,   153,   154,   155,   355,   156,     0,
-   151,   157,   152,   153,   154,   155,     0,   156,     0,   151,
-   157,   152,   153,   154,   155,     3,   156,     0,     0,   157,
-     4,   132,    87,     0,     7,     0,     8,     9,    29,     0,
-    30,    31,    32,    29,     0,    30,    31,    32,    29,     0,
-    30,    31,    32,     0,     0,    92,     0,     0,     0,     0,
-    92,     0,    48,     0,     0,    92,     0,    48,     0,   100,
-     0,    51,    48,     0,   110,     0,    51,     0,     3,   112,
-     0,    51,     0,    86,     0,    87,     0,     7,     0,    88,
-     9,     0,     0,     0,     0,     0,     0,     0,    29,     0,
-    30,    31,    32,     0,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    92,     0,    29,     0,    30,
-    31,    32,    48,    29,     0,    30,    31,    32,     0,   114,
-     0,    51,    37,    38,    92,     0,     0,     3,     0,     0,
-    92,    48,    86,     0,    87,    47,     7,    48,    88,     9,
-    51,     0,     0,     0,    50,     0,    51,    11,    12,    13,
+     0,     0,    92,     0,     0,     0,     0,   146,   147,    48,
+     0,   148,     0,   149,   150,     0,   114,     0,     0,    51,
+-32768,   147,     0,     0,   148,     0,   149,   150,     0,     0,
+   151,     0,   152,   153,   154,   155,   357,   156,     0,     0,
+   157,     0,     0,   151,   158,   152,   153,   154,   155,     0,
+   156,     0,     0,   157,     0,     0,   358,   158,     0,     0,
+     0,     0,     0,     0,     0,     0,    29,     0,    30,    31,
+    32,   151,     0,   152,   153,   154,   155,     0,   156,     0,
+     0,   157,     3,    92,   359,   158,     0,     4,   132,    87,
+    48,     7,     0,     8,     9,     0,     0,   161,     0,   151,
+    51,   152,   153,   154,   155,     0,   156,     0,     0,   157,
+     0,     0,   360,   158,   151,     0,   152,   153,   154,   155,
+   148,   156,     0,   150,   157,     0,     0,   361,   158,   151,
+     0,   152,   153,   154,   155,     0,   156,     0,     0,   157,
+     0,     0,   151,   158,   152,   153,   154,   155,     3,   156,
+     0,     0,   157,    86,     0,    87,   158,     7,     0,    88,
+     9,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+    20,    21,     0,     0,     0,     0,     0,     0,     0,     0,
+    29,     0,    30,    31,    32,     0,     0,     0,     0,    37,
+    38,     0,     0,     0,     0,     0,     0,    92,     0,     0,
+     0,     0,    47,     0,    48,     0,     0,     0,     3,     0,
+     0,    50,     0,    86,    51,    87,     0,     7,     0,    88,
+     9,     0,     0,     0,     0,     0,     0,    11,    12,    13,
+    14,    15,    16,    17,    18,    89,    90,    91,   151,     0,
+   152,   153,   154,   155,     0,   156,    29,     0,    30,    31,
+    32,     0,   158,     0,     0,    37,    38,     0,     0,     0,
+     0,     0,     3,    92,     0,     0,     0,    86,    47,    87,
+    48,     7,     0,    88,     9,     0,     0,    50,   185,     0,
+    51,     0,     0,     0,     0,     0,     0,    11,    12,    13,
     14,    15,    16,    17,    18,    89,    90,    91,     0,     0,
      0,     0,     0,     0,     0,     0,    29,     0,    30,    31,
     32,     0,     0,     0,     0,    37,    38,     0,     0,     0,
      3,     0,     0,    92,     0,    86,     0,    87,    47,     7,
-    48,    88,     9,     0,     0,     0,     0,    50,   184,    51,
-    29,     0,    30,    31,    32,     0,    11,    12,    13,    14,
-    15,    16,    17,    18,    89,    90,    91,    92,     0,     0,
-     0,     0,     0,     0,    48,    29,     0,    30,    31,    32,
-     0,   160,     0,    51,    37,    38,     0,     0,     0,     3,
-     0,     0,    92,     0,    86,     0,    87,    47,     7,    48,
-    88,     9,     0,     0,     0,     0,    50,   187,    51,    11,
+    48,    88,     9,     0,     0,     0,     0,    50,   188,     0,
+    51,    11,    12,    13,    14,    15,    16,    17,    18,    89,
+    90,    91,     0,     0,     0,     0,     0,     0,     0,     0,
+    29,     0,    30,    31,    32,     0,     0,     0,     0,    37,
+    38,     0,     0,     0,     3,     0,     0,    92,     0,    86,
+     0,    87,    47,     7,    48,    88,     9,     0,     0,     0,
+     0,    50,   209,     0,    51,     0,     0,     0,     0,    11,
     12,    13,    14,    15,    16,    17,    18,    89,    90,    91,
      0,     0,     0,     0,     0,     0,     0,     0,    29,     0,
@@ -798,175 +821,191 @@
      0,     0,     3,     0,     0,    92,     0,    86,     0,    87,
     47,     7,    48,    88,     9,     0,     0,     0,     0,    50,
-   208,    51,     0,     0,     0,     0,     0,     0,    11,    12,
-    13,    14,    15,    16,    17,    18,    89,    90,    91,     0,
-     0,     0,     0,     0,     0,     0,     0,    29,     0,    30,
-    31,    32,     0,     0,     0,     0,    37,    38,     0,     0,
-     0,     3,     0,     0,    92,     0,    86,     0,    87,    47,
-     7,    48,    88,     9,     0,     0,     0,     0,    50,   215,
-    51,    11,    12,    13,    14,    15,    16,    17,    18,    89,
+   216,     0,    51,    11,    12,    13,    14,    15,    16,    17,
+    18,    89,    90,    91,     0,     0,     0,     0,     0,     0,
+     0,     0,    29,     0,    30,    31,    32,     0,     0,     0,
+     0,    37,    38,     0,     0,     0,     3,     0,     0,    92,
+     0,    86,     0,    87,    47,     7,    48,    88,     9,     0,
+     0,     0,     0,    50,   233,     0,    51,     0,     0,     0,
+     0,    11,    12,    13,    14,    15,    16,    17,    18,    89,
     90,    91,     0,     0,     0,     0,     0,     0,     0,     0,
     29,     0,    30,    31,    32,     0,     0,     0,     0,    37,
-    38,     0,     0,     0,     3,     0,     0,    92,     0,    86,
-     0,    87,    47,     7,    48,    88,     9,     0,     0,     0,
-     0,    50,   231,    51,     0,     0,     0,     0,     0,     0,
-    11,    12,    13,    14,    15,    16,    17,    18,    89,    90,
-    91,     0,     0,     0,     0,     0,     0,     0,     0,    29,
-     0,    30,    31,    32,     0,     0,     0,     0,    37,    38,
-     0,   192,   193,   194,     0,     7,    92,   195,     9,     0,
-     0,    47,     0,    48,     0,     0,     0,     0,     0,     0,
-    50,     0,    51,    11,    12,    13,    14,    15,    16,    17,
-    18,    89,    90,    91,     0,     0,     0,     0,     0,     0,
-     0,     0,    29,     0,    30,    31,    32,     0,     0,     0,
-     0,    37,    38,     0,     0,     0,     0,     0,     0,    92,
-     0,     0,     0,     0,    47,     0,    48,     0,     0,     0,
-     0,     0,     0,   172,     0,    51,     0,     0,     0,     0,
-     0,     0,     0,   196,   197,   198,     0,     0,     0,     0,
+    38,     0,   193,   194,   195,     0,     7,    92,   196,     9,
+     0,     0,    47,     0,    48,     0,     0,     0,     0,     0,
+     0,    50,     0,     0,    51,    11,    12,    13,    14,    15,
+    16,    17,    18,    89,    90,    91,     0,     0,     0,     0,
      0,     0,     0,     0,    29,     0,    30,    31,    32,     0,
+     0,     0,     0,    37,    38,     0,     0,     0,     0,     0,
+     0,    92,     0,     0,     0,     0,    47,     0,    48,     0,
+     0,     0,     0,     0,     0,   173,     0,     0,    51,     0,
+     0,     0,     0,     0,   197,   198,   199,     0,     0,     0,
+     0,     0,     0,     0,     0,    29,     0,    30,    31,    32,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,    92,     0,     0,     0,     0,     0,     0,    48,     0,
-     0,     0,     0,     0,     0,     0,   199,    51
+     0,     0,    92,     0,     0,     0,     0,     0,     0,    48,
+     0,     0,     0,     0,     0,     0,     0,   200,     0,    51
 };
 
 static const short yycheck[] = {     1,
-    11,   133,   337,   134,     1,   106,   138,   137,   235,     7,
-     4,   109,    10,     7,   241,     9,    10,     3,    11,     4,
-     5,    23,   133,     8,     3,     4,   361,   138,     7,    11,
-     9,    10,   124,   134,    19,    20,    21,   106,   107,   137,
-    25,   133,    28,   124,   133,   106,    48,    44,   107,   138,
-     3,     4,   133,   134,     7,   137,     9,    10,    44,   137,
-    62,    47,   137,   133,     7,    51,   133,    10,   138,     3,
-     4,   138,   137,     7,    60,     9,    10,     7,    11,    64,
-    10,   308,   133,   106,   107,     3,     4,   138,    73,     7,
-    76,     9,    10,   137,   107,   133,   137,     3,     4,   112,
-   138,     7,   137,     9,    10,   137,   131,   109,   133,    95,
-   112,    11,   133,    99,   100,   137,   102,   103,   104,   105,
-   106,   107,   108,   137,   110,   122,   137,   137,   114,   131,
-   106,   125,   130,   127,   128,   129,   130,   122,   132,   106,
-   133,   143,   124,   129,   137,   138,   125,   132,   127,   128,
-   129,   130,   131,   132,   133,   137,   135,   142,   160,   145,
-   146,   147,   137,   149,   137,   151,   152,   153,   154,   155,
-   156,   157,   125,   134,   127,   128,   129,   130,   163,   132,
-   133,   166,   135,   133,   170,   138,   172,   130,   138,   132,
-   176,   125,   106,   127,   128,   129,   130,   130,   132,   129,
-   130,   135,   132,   134,   137,   139,   124,   125,   137,   127,
-   128,   129,   130,   137,   132,    45,    46,   135,   204,   125,
-   138,   127,   128,   129,   130,   137,   132,   133,   137,   135,
-   130,   107,   138,   137,    13,    14,    15,   137,    17,   137,
-    19,    20,   228,   133,   106,   134,   107,   133,   133,   235,
-   236,   138,   107,   106,   138,   241,   242,   138,   138,   138,
-   246,   247,   248,   138,   250,   138,   252,   253,   138,   266,
-     0,     1,   107,   130,   134,   133,   130,   133,     8,   138,
-   109,     0,   284,    13,    14,    15,   138,    17,   138,    19,
-    20,   277,     3,     4,   138,   138,     7,   138,     9,    10,
-   138,   138,   133,   137,   278,   138,     3,     4,    38,   133,
-     7,   138,     9,    10,     5,    44,    95,    96,    97,   361,
-   347,   167,   308,   309,   310,    -1,    -1,   313,   314,    -1,
-   316,     7,   318,   319,    10,   321,     3,     4,    -1,    -1,
-     7,    -1,     9,    10,    -1,    -1,    -1,    -1,     3,     4,
-   352,    -1,     7,    -1,     9,    10,    -1,    87,    88,    89,
-    90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-   100,   101,    -1,   103,   104,   105,   106,    -1,   108,   109,
-   110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-   120,   121,   122,   123,    -1,   125,    -1,    -1,   128,    -1,
-   130,    -1,    -1,    -1,   134,    -1,    -1,   137,    -1,   139,
+    11,   339,   134,   106,   109,   106,   107,     1,   133,     4,
+    11,   237,     7,   138,     9,    10,   137,   243,   124,   133,
+     3,    23,     4,     5,   138,   363,     8,   133,   134,     3,
+     4,   134,   137,     7,   107,     9,    10,    19,    20,    21,
+   124,   106,   107,    25,     7,    28,    48,    10,   133,   133,
+    44,   133,   131,   138,   133,   106,   138,   108,   109,   110,
+    62,    44,   133,   137,    47,   137,   133,   138,    51,   137,
+     7,   138,   123,    10,     3,     4,   137,    60,     7,   130,
+     9,    10,    64,   137,   310,   107,    11,   133,    11,   140,
+   112,    73,   138,    76,     3,     4,   137,   133,     7,   137,
+     9,    10,   138,    45,    46,   137,   137,   109,   106,    11,
+   112,     7,    95,   124,    10,   106,    99,   100,   137,   102,
+   103,   104,   105,   106,   107,   108,   137,   110,   122,   131,
+   125,   114,   127,   128,   129,   130,   137,   132,   137,   106,
+   122,   143,   106,   130,   139,     7,   129,   137,    10,   137,
+   132,   125,   133,   127,   128,   129,   130,   131,   132,   161,
+   142,   135,   145,   146,   147,   139,   149,   130,   151,   152,
+   153,   154,   155,   156,   157,   158,   139,   134,   137,   137,
+     3,     4,   164,   137,     7,   167,     9,    10,   171,   137,
+   173,   137,   129,   130,   177,   132,   125,   137,   127,   128,
+   129,   130,   139,   132,   107,   133,   135,   130,   133,   106,
+   139,   140,   137,   138,   137,   124,   125,   134,   127,   128,
+   129,   130,   205,   132,   134,   107,   135,   133,   130,   138,
+   139,   127,   128,   129,   130,   137,   132,   138,   133,   138,
+   138,   107,   106,   139,   138,   138,   138,   230,   138,   138,
+   134,   107,   133,   133,   237,   238,   130,   109,     0,   138,
+   243,   244,   138,   138,   133,   248,   249,   250,   130,   252,
+   132,   254,   255,   138,   268,     0,     1,   139,   138,   138,
+   138,   138,   137,     8,   286,   138,   133,   138,    13,    14,
+    15,   280,    17,     5,    19,    20,   279,    44,   168,   363,
+   349,    -1,   125,    -1,   127,   128,   129,   130,    -1,   132,
+   133,    -1,   135,    38,    -1,   138,   139,     3,     4,    -1,
+    -1,     7,    -1,     9,    10,    -1,    -1,   310,   311,   312,
+    -1,    -1,   315,   316,    -1,   318,    -1,   320,   321,    -1,
+   323,     3,     4,    -1,    -1,     7,    -1,     9,    10,    13,
+    14,    15,   354,    17,    -1,    19,    20,    -1,    -1,    -1,
+    -1,    -1,    87,    88,    89,    90,    91,    92,    93,    94,
+    95,    96,    97,    98,    99,   100,   101,    -1,   103,   104,
+   105,   106,    -1,   108,   109,   110,   111,   112,   113,   114,
+   115,   116,   117,   118,   119,   120,   121,   122,   123,    -1,
+   125,    -1,    -1,   128,    -1,   130,    -1,     3,     4,   134,
+    -1,     7,   137,     9,    10,   140,    -1,    -1,    -1,    -1,
+    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+    -1,    95,    96,    97,    -1,    -1,    -1,    -1,    -1,   125,
+    -1,   127,   128,   129,   130,    -1,   132,   133,    -1,   135,
+     3,     4,   138,   139,     7,    -1,     9,    10,    -1,    -1,
+    -1,    -1,    -1,   125,    -1,   127,   128,   129,   130,    -1,
+   132,   133,    -1,   135,     3,     4,   138,   139,     7,    -1,
+     9,    10,   106,    -1,   108,   109,   110,    -1,    -1,     3,
+     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,   123,
+    -1,    -1,    -1,    -1,     3,     4,   130,    -1,     7,    -1,
+     9,    10,    -1,   137,    -1,    -1,   140,    -1,    -1,     3,
+     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,   125,
+    -1,   127,   128,   129,   130,    -1,   132,   133,    -1,   135,
+    -1,    -1,   138,   139,   125,    -1,   127,   128,   129,   130,
+    -1,   132,   133,    -1,   135,     3,     4,   138,   139,     7,
+    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,   125,    -1,   127,   128,   129,   130,   131,   132,
+   133,    -1,   135,     3,     4,    -1,   139,     7,    -1,     9,
+    10,    -1,    -1,    -1,    -1,    -1,   125,    -1,   127,   128,
+   129,   130,    -1,   132,   133,    -1,   135,    -1,    -1,   138,
+   139,   125,    -1,   127,   128,   129,   130,    -1,   132,   133,
+    -1,   135,    -1,    -1,   138,   139,   125,    -1,   127,   128,
+   129,   130,    -1,   132,    -1,    -1,   135,    -1,    -1,   138,
+   139,   125,    -1,   127,   128,   129,   130,    -1,   132,    -1,
+    -1,   135,     3,     4,   138,   139,     7,    -1,     9,    10,
+    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
+    -1,     9,    10,    -1,    -1,    -1,    -1,   125,    -1,   127,
+   128,   129,   130,    -1,   132,   133,    -1,   135,     3,     4,
+    -1,   139,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,   125,    -1,   127,   128,   129,
+   130,    -1,   132,   133,    -1,   135,     3,     4,    -1,   139,
+     7,    -1,     9,    10,    -1,   106,    -1,   108,   109,   110,
+    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
+    -1,    -1,   123,    -1,     3,     4,    -1,    -1,     7,   130,
+     9,    10,    -1,    -1,    -1,    -1,   137,     3,     4,   140,
+    -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
     -1,    -1,    -1,    -1,   125,    -1,   127,   128,   129,   130,
-    -1,   132,   133,    -1,   135,    -1,    -1,   138,   125,    -1,
-   127,   128,   129,   130,    -1,   132,   133,    -1,   135,     3,
-     4,   138,    -1,     7,    -1,     9,    10,    -1,    -1,   125,
-    -1,   127,   128,   129,   130,    -1,   132,    -1,   125,    -1,
-   127,   128,   129,   130,    -1,   132,   133,    -1,   135,    -1,
-   125,   138,   127,   128,   129,   130,     7,   132,   133,    10,
-   135,     3,     4,   138,    -1,     7,    -1,     9,    10,    -1,
+    -1,   132,   133,    -1,   135,    -1,    -1,   125,   139,   127,
+   128,   129,   130,    -1,   132,    -1,    -1,   135,     3,     4,
+   138,   139,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
+   125,    -1,   127,   128,   129,   130,    -1,   132,    -1,    -1,
+   135,     3,     4,   138,   139,     7,    -1,     9,    10,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   125,    -1,
+   127,   128,   129,   130,    -1,   132,    -1,    -1,   135,    -1,
+    -1,   138,   139,   125,    -1,   127,   128,   129,   130,    -1,
+   132,   133,    -1,   135,    -1,    -1,   125,   139,   127,   128,
+   129,   130,   131,   132,    -1,    -1,   135,    -1,    -1,   125,
+   139,   127,   128,   129,   130,    -1,   132,    -1,    -1,   135,
+     3,     4,   138,   139,     7,    -1,     9,    10,    -1,    -1,
     -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
-    10,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
-    -1,     9,    10,    -1,    -1,    -1,    -1,     3,     4,    -1,
-    -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,     3,
+    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+   125,    -1,   127,   128,   129,   130,    -1,   132,    -1,    -1,
+   135,     3,     4,   138,   139,     7,    -1,     9,    10,    -1,
+    -1,    -1,    -1,   125,    -1,   127,   128,   129,   130,    -1,
+   132,   133,    -1,   135,     3,     4,    -1,   139,     7,    -1,
+     9,    10,    -1,   106,    -1,   108,   109,   110,    -1,     3,
      4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
+   123,    -1,     3,     4,    -1,    -1,     7,   130,     9,    10,
+    -1,    -1,    -1,    -1,   137,     3,     4,   140,    -1,     7,
+    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,   125,    -1,   127,   128,   129,   130,    -1,   132,
+   133,    -1,   135,    -1,    -1,   125,   139,   127,   128,   129,
+   130,    -1,   132,    -1,    -1,   135,     3,     4,   138,   139,
+     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,   125,    -1,   127,   128,   129,   130,    -1,
+   132,   133,    -1,   135,     3,     4,    -1,   139,     7,    -1,
+     9,    10,    -1,    -1,    -1,    -1,   125,    -1,   127,   128,
+   129,   130,    -1,   132,    -1,    -1,   135,    -1,    -1,   138,
+   139,   125,    -1,   127,   128,   129,   130,    -1,   132,   133,
+    -1,   135,    -1,    -1,   125,   139,   127,   128,   129,   130,
+   131,   132,    -1,    -1,   135,    -1,    -1,   125,   139,   127,
+   128,   129,   130,    -1,   132,    -1,    -1,   135,     3,     4,
+   138,   139,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
     -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
-    10,   125,    -1,   127,   128,   129,   130,    -1,   132,   133,
-    -1,   135,     3,     4,   138,    -1,     7,    -1,     9,    10,
-    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
-     9,    10,    -1,    -1,    -1,    -1,   127,   128,   129,   130,
-    -1,   132,    -1,   125,    -1,   127,   128,   129,   130,    -1,
-   132,    -1,    -1,   135,    -1,   125,   138,   127,   128,   129,
-   130,    -1,   132,    -1,    -1,   135,    -1,   125,   138,   127,
-   128,   129,   130,    -1,   132,    -1,    -1,   135,    -1,   125,
-   138,   127,   128,   129,   130,    -1,   132,    -1,    -1,   135,
-    -1,   125,   138,   127,   128,   129,   130,    -1,   132,    -1,
-    -1,   135,    -1,   125,   138,   127,   128,   129,   130,    -1,
-   132,    -1,    -1,   135,    -1,   125,   138,   127,   128,   129,
-   130,    -1,   132,     3,     4,   135,    -1,     7,   138,     9,
-    10,    -1,    -1,    -1,   125,    -1,   127,   128,   129,   130,
-    -1,   132,    -1,    -1,   135,    -1,   125,   138,   127,   128,
-   129,   130,    -1,   132,     3,     4,   135,    -1,     7,   138,
-     9,    10,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
-     7,    -1,     9,    10,    -1,    -1,    -1,    -1,     3,     4,
-    -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
+   106,    -1,   108,   109,   110,    -1,    -1,    -1,   125,    -1,
+   127,   128,   129,   130,   131,   132,    -1,   123,   135,     3,
+     4,    -1,   139,     7,   130,     9,    10,    -1,    -1,    -1,
+    -1,   137,    -1,    -1,   140,    -1,   125,    -1,   127,   128,
+   129,   130,    -1,   132,    -1,    -1,   135,     3,     4,   138,
+   139,     7,    -1,     9,    10,   106,    -1,   108,   109,   110,
+    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+    -1,    -1,   123,    -1,    -1,    -1,    -1,     3,     4,   130,
+    -1,     7,    -1,     9,    10,    -1,   137,    -1,    -1,   140,
      3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,
-    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
-     9,    10,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
-    10,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-    -1,    -1,    -1,    -1,    -1,   125,    -1,   127,   128,   129,
-   130,    -1,   132,     3,     4,   135,    -1,     7,   138,     9,
-    10,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-    -1,    -1,    -1,    -1,    -1,    -1,   125,    -1,   127,   128,
-   129,   130,    -1,   132,    -1,    -1,   135,    -1,   125,   138,
-   127,   128,   129,   130,    -1,   132,    -1,    -1,   135,    -1,
-   125,   138,   127,   128,   129,   130,    -1,   132,    -1,    -1,
-   135,    -1,   125,   138,   127,   128,   129,   130,    -1,   132,
-    -1,    -1,   135,    -1,   125,   138,   127,   128,   129,   130,
-    -1,   132,    -1,    -1,   135,    -1,   125,   138,   127,   128,
-   129,   130,    -1,   132,   133,   125,   135,   127,   128,   129,
-   130,    -1,   132,   133,   125,   135,   127,   128,   129,   130,
-    -1,   132,   133,    -1,   135,     3,     4,    -1,    -1,     7,
-    -1,     9,    10,    -1,    -1,   125,    -1,   127,   128,   129,
-   130,   131,   132,    -1,   125,   135,   127,   128,   129,   130,
-    -1,   132,   133,    -1,   135,     3,     4,    -1,    -1,     7,
-    -1,     9,    10,    -1,     3,     4,    -1,    -1,     7,    -1,
-     9,    10,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
-    10,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,     3,
-     4,    -1,    -1,     7,    -1,     9,    10,    -1,     3,     4,
-    -1,    -1,     7,    -1,     9,    10,    -1,     3,     4,    -1,
-    -1,     7,    -1,     9,    10,    -1,    -1,    -1,   106,    -1,
-   108,   109,   110,    -1,    -1,    -1,    -1,   125,    -1,   127,
-   128,   129,   130,   131,   132,   123,    -1,   135,    -1,    -1,
-    -1,    -1,   130,    -1,    -1,    -1,    -1,    -1,    -1,   137,
-    -1,   139,    -1,    -1,    -1,    -1,    -1,   125,    -1,   127,
-   128,   129,   130,    -1,   132,   133,   125,   135,   127,   128,
-   129,   130,    -1,   132,   133,   125,   135,   127,   128,   129,
-   130,    -1,   132,   133,   125,   135,   127,   128,   129,   130,
-    -1,   132,   133,   125,   135,   127,   128,   129,   130,   131,
-   132,    -1,   125,   135,   127,   128,   129,   130,   131,   132,
-    -1,   125,   135,   127,   128,   129,   130,   131,   132,    -1,
-   125,   135,   127,   128,   129,   130,    -1,   132,    -1,   125,
-   135,   127,   128,   129,   130,     8,   132,    -1,    -1,   135,
-    13,    14,    15,    -1,    17,    -1,    19,    20,   106,    -1,
-   108,   109,   110,   106,    -1,   108,   109,   110,   106,    -1,
-   108,   109,   110,    -1,    -1,   123,    -1,    -1,    -1,    -1,
-   123,    -1,   130,    -1,    -1,   123,    -1,   130,    -1,   137,
-    -1,   139,   130,    -1,   137,    -1,   139,    -1,     8,   137,
-    -1,   139,    -1,    13,    -1,    15,    -1,    17,    -1,    19,
-    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,    -1,
-   108,   109,   110,    -1,    87,    88,    89,    90,    91,    92,
-    93,    94,    95,    96,    97,   123,    -1,   106,    -1,   108,
-   109,   110,   130,   106,    -1,   108,   109,   110,    -1,   137,
-    -1,   139,   115,   116,   123,    -1,    -1,     8,    -1,    -1,
-   123,   130,    13,    -1,    15,   128,    17,   130,    19,    20,
-   139,    -1,    -1,    -1,   137,    -1,   139,    87,    88,    89,
+   125,    -1,   127,   128,   129,   130,   131,   132,    -1,    -1,
+   135,    -1,    -1,   125,   139,   127,   128,   129,   130,    -1,
+   132,    -1,    -1,   135,    -1,    -1,   138,   139,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,   106,    -1,   108,   109,
+   110,   125,    -1,   127,   128,   129,   130,    -1,   132,    -1,
+    -1,   135,     8,   123,   138,   139,    -1,    13,    14,    15,
+   130,    17,    -1,    19,    20,    -1,    -1,   137,    -1,   125,
+   140,   127,   128,   129,   130,    -1,   132,    -1,    -1,   135,
+    -1,    -1,   138,   139,   125,    -1,   127,   128,   129,   130,
+     7,   132,    -1,    10,   135,    -1,    -1,   138,   139,   125,
+    -1,   127,   128,   129,   130,    -1,   132,    -1,    -1,   135,
+    -1,    -1,   125,   139,   127,   128,   129,   130,     8,   132,
+    -1,    -1,   135,    13,    -1,    15,   139,    17,    -1,    19,
+    20,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+    96,    97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+   106,    -1,   108,   109,   110,    -1,    -1,    -1,    -1,   115,
+   116,    -1,    -1,    -1,    -1,    -1,    -1,   123,    -1,    -1,
+    -1,    -1,   128,    -1,   130,    -1,    -1,    -1,     8,    -1,
+    -1,   137,    -1,    13,   140,    15,    -1,    17,    -1,    19,
+    20,    -1,    -1,    -1,    -1,    -1,    -1,    87,    88,    89,
+    90,    91,    92,    93,    94,    95,    96,    97,   125,    -1,
+   127,   128,   129,   130,    -1,   132,   106,    -1,   108,   109,
+   110,    -1,   139,    -1,    -1,   115,   116,    -1,    -1,    -1,
+    -1,    -1,     8,   123,    -1,    -1,    -1,    13,   128,    15,
+   130,    17,    -1,    19,    20,    -1,    -1,   137,   138,    -1,
+   140,    -1,    -1,    -1,    -1,    -1,    -1,    87,    88,    89,
     90,    91,    92,    93,    94,    95,    96,    97,    -1,    -1,
     -1,    -1,    -1,    -1,    -1,    -1,   106,    -1,   108,   109,
    110,    -1,    -1,    -1,    -1,   115,   116,    -1,    -1,    -1,
      8,    -1,    -1,   123,    -1,    13,    -1,    15,   128,    17,
-   130,    19,    20,    -1,    -1,    -1,    -1,   137,   138,   139,
-   106,    -1,   108,   109,   110,    -1,    87,    88,    89,    90,
-    91,    92,    93,    94,    95,    96,    97,   123,    -1,    -1,
-    -1,    -1,    -1,    -1,   130,   106,    -1,   108,   109,   110,
-    -1,   137,    -1,   139,   115,   116,    -1,    -1,    -1,     8,
-    -1,    -1,   123,    -1,    13,    -1,    15,   128,    17,   130,
-    19,    20,    -1,    -1,    -1,    -1,   137,   138,   139,    87,
+   130,    19,    20,    -1,    -1,    -1,    -1,   137,   138,    -1,
+   140,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+    96,    97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+   106,    -1,   108,   109,   110,    -1,    -1,    -1,    -1,   115,
+   116,    -1,    -1,    -1,     8,    -1,    -1,   123,    -1,    13,
+    -1,    15,   128,    17,   130,    19,    20,    -1,    -1,    -1,
+    -1,   137,   138,    -1,   140,    -1,    -1,    -1,    -1,    87,
     88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,    -1,
@@ -974,32 +1013,26 @@
     -1,    -1,     8,    -1,    -1,   123,    -1,    13,    -1,    15,
    128,    17,   130,    19,    20,    -1,    -1,    -1,    -1,   137,
-   138,   139,    -1,    -1,    -1,    -1,    -1,    -1,    87,    88,
-    89,    90,    91,    92,    93,    94,    95,    96,    97,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,    -1,   108,
-   109,   110,    -1,    -1,    -1,    -1,   115,   116,    -1,    -1,
-    -1,     8,    -1,    -1,   123,    -1,    13,    -1,    15,   128,
-    17,   130,    19,    20,    -1,    -1,    -1,    -1,   137,   138,
-   139,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+   138,    -1,   140,    87,    88,    89,    90,    91,    92,    93,
+    94,    95,    96,    97,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,   106,    -1,   108,   109,   110,    -1,    -1,    -1,
+    -1,   115,   116,    -1,    -1,    -1,     8,    -1,    -1,   123,
+    -1,    13,    -1,    15,   128,    17,   130,    19,    20,    -1,
+    -1,    -1,    -1,   137,   138,    -1,   140,    -1,    -1,    -1,
+    -1,    87,    88,    89,    90,    91,    92,    93,    94,    95,
     96,    97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
    106,    -1,   108,   109,   110,    -1,    -1,    -1,    -1,   115,
-   116,    -1,    -1,    -1,     8,    -1,    -1,   123,    -1,    13,
-    -1,    15,   128,    17,   130,    19,    20,    -1,    -1,    -1,
-    -1,   137,   138,   139,    -1,    -1,    -1,    -1,    -1,    -1,
-    87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-    97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,
-    -1,   108,   109,   110,    -1,    -1,    -1,    -1,   115,   116,
-    -1,    13,    14,    15,    -1,    17,   123,    19,    20,    -1,
-    -1,   128,    -1,   130,    -1,    -1,    -1,    -1,    -1,    -1,
-   137,    -1,   139,    87,    88,    89,    90,    91,    92,    93,
-    94,    95,    96,    97,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,   106,    -1,   108,   109,   110,    -1,    -1,    -1,
-    -1,   115,   116,    -1,    -1,    -1,    -1,    -1,    -1,   123,
-    -1,    -1,    -1,    -1,   128,    -1,   130,    -1,    -1,    -1,
-    -1,    -1,    -1,   137,    -1,   139,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    95,    96,    97,    -1,    -1,    -1,    -1,
+   116,    -1,    13,    14,    15,    -1,    17,   123,    19,    20,
+    -1,    -1,   128,    -1,   130,    -1,    -1,    -1,    -1,    -1,
+    -1,   137,    -1,    -1,   140,    87,    88,    89,    90,    91,
+    92,    93,    94,    95,    96,    97,    -1,    -1,    -1,    -1,
     -1,    -1,    -1,    -1,   106,    -1,   108,   109,   110,    -1,
+    -1,    -1,    -1,   115,   116,    -1,    -1,    -1,    -1,    -1,
+    -1,   123,    -1,    -1,    -1,    -1,   128,    -1,   130,    -1,
+    -1,    -1,    -1,    -1,    -1,   137,    -1,    -1,   140,    -1,
+    -1,    -1,    -1,    -1,    95,    96,    97,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,   106,    -1,   108,   109,   110,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,   123,    -1,    -1,    -1,    -1,    -1,    -1,   130,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   138,   139
+    -1,    -1,   123,    -1,    -1,    -1,    -1,    -1,    -1,   130,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,   138,    -1,   140
 };
 #define YYPURE 1
@@ -1659,5 +1692,5 @@
 case 17:
 #line 470 "grammar.y"
-{currentVoice->ifsw=0;;
+{if (currentVoice!=NULL) currentVoice->ifsw=0;;
     break;}
 case 18:
@@ -2126,4 +2159,10 @@
 #line 839 "grammar.y"
 {
+            if(iiExprArith2(&yyval.lv,&yyvsp[-2].lv,':',&yyvsp[0].lv)) YYERROR;
+          ;
+    break;}
+case 89:
+#line 843 "grammar.y"
+{
             memset(&yyval.lv,0,sizeof(yyval.lv));
             int i; TESTSETINT(yyvsp[0].lv,i);
@@ -2132,16 +2171,16 @@
           ;
     break;}
-case 89:
-#line 846 "grammar.y"
+case 90:
+#line 850 "grammar.y"
 {
             if(iiExprArith1(&yyval.lv,&yyvsp[0].lv,'-')) YYERROR;
           ;
     break;}
-case 90:
-#line 852 "grammar.y"
+case 91:
+#line 856 "grammar.y"
 { yyval.lv = yyvsp[-1].lv; ;
     break;}
-case 91:
-#line 854 "grammar.y"
+case 92:
+#line 858 "grammar.y"
 {
             if (yyvsp[-1].lv.rtyp==0)
@@ -2153,6 +2192,6 @@
           ;
     break;}
-case 93:
-#line 868 "grammar.y"
+case 94:
+#line 872 "grammar.y"
 {
             if (yyvsp[-1].lv.Typ()!=STRING_CMD)
@@ -2164,6 +2203,6 @@
           ;
     break;}
-case 96:
-#line 885 "grammar.y"
+case 97:
+#line 889 "grammar.y"
 {
             #ifdef HAVE_NS
@@ -2175,6 +2214,6 @@
           ;
     break;}
-case 97:
-#line 894 "grammar.y"
+case 98:
+#line 898 "grammar.y"
 {
             #ifdef HAVE_NS
@@ -2186,10 +2225,4 @@
           ;
     break;}
-case 98:
-#line 903 "grammar.y"
-{
-            if (iiDeclCommand(&yyval.lv,&yyvsp[0].lv,myynest,yyvsp[-1].i,&(currRing->idroot), TRUE)) YYERROR;
-          ;
-    break;}
 case 99:
 #line 907 "grammar.y"
@@ -2200,4 +2233,10 @@
 case 100:
 #line 911 "grammar.y"
+{
+            if (iiDeclCommand(&yyval.lv,&yyvsp[0].lv,myynest,yyvsp[-1].i,&(currRing->idroot), TRUE)) YYERROR;
+          ;
+    break;}
+case 101:
+#line 915 "grammar.y"
 {
             if (iiDeclCommand(&yyval.lv,&yyvsp[-6].lv,myynest,yyvsp[-7].i,&(currRing->idroot), TRUE)) YYERROR;
@@ -2216,12 +2255,12 @@
           ;
     break;}
-case 101:
-#line 927 "grammar.y"
-{
-            if (iiDeclCommand(&yyval.lv,&yyvsp[0].lv,myynest,yyvsp[-1].i,&(currRing->idroot), TRUE)) YYERROR;
-          ;
-    break;}
 case 102:
 #line 931 "grammar.y"
+{
+            if (iiDeclCommand(&yyval.lv,&yyvsp[0].lv,myynest,yyvsp[-1].i,&(currRing->idroot), TRUE)) YYERROR;
+          ;
+    break;}
+case 103:
+#line 935 "grammar.y"
 {
             int r; TESTSETINT(yyvsp[-4].lv,r);
@@ -2244,6 +2283,6 @@
           ;
     break;}
-case 103:
-#line 951 "grammar.y"
+case 104:
+#line 955 "grammar.y"
 {
             #ifdef HAVE_NS
@@ -2264,6 +2303,6 @@
           ;
     break;}
-case 104:
-#line 969 "grammar.y"
+case 105:
+#line 973 "grammar.y"
 {
             int t=yyvsp[-2].lv.Typ();
@@ -2291,6 +2330,6 @@
           ;
     break;}
-case 105:
-#line 994 "grammar.y"
+case 106:
+#line 998 "grammar.y"
 {
             #ifdef HAVE_NS
@@ -2302,6 +2341,6 @@
           ;
     break;}
-case 108:
-#line 1011 "grammar.y"
+case 109:
+#line 1015 "grammar.y"
 {
             leftv v = &yyvsp[-3].lv;
@@ -2315,6 +2354,6 @@
           ;
     break;}
-case 109:
-#line 1025 "grammar.y"
+case 110:
+#line 1029 "grammar.y"
 {
           // let rInit take care of any errors
@@ -2322,6 +2361,6 @@
         ;
     break;}
-case 110:
-#line 1033 "grammar.y"
+case 111:
+#line 1037 "grammar.y"
 {
             memset(&yyval.lv,0,sizeof(yyval.lv));
@@ -2333,6 +2372,6 @@
           ;
     break;}
-case 111:
-#line 1042 "grammar.y"
+case 112:
+#line 1046 "grammar.y"
 {
             memset(&yyval.lv,0,sizeof(yyval.lv));
@@ -2377,6 +2416,6 @@
           ;
     break;}
-case 113:
-#line 1088 "grammar.y"
+case 114:
+#line 1092 "grammar.y"
 {
             yyval.lv = yyvsp[-2].lv;
@@ -2385,27 +2424,27 @@
           ;
     break;}
-case 115:
-#line 1098 "grammar.y"
+case 116:
+#line 1102 "grammar.y"
 {
             yyval.lv = yyvsp[-1].lv;
           ;
     break;}
-case 116:
-#line 1104 "grammar.y"
+case 117:
+#line 1108 "grammar.y"
 {
             expected_parms = TRUE;
           ;
     break;}
-case 117:
-#line 1116 "grammar.y"
+case 118:
+#line 1120 "grammar.y"
 { if (yyvsp[-1].i != '<') YYERROR;
             if((feFilePending=feFopen(yyvsp[0].name,"r",NULL,TRUE))==NULL) YYERROR; ;
     break;}
-case 118:
-#line 1119 "grammar.y"
+case 119:
+#line 1123 "grammar.y"
 { newFile(yyvsp[-2].name,feFilePending); ;
     break;}
-case 119:
-#line 1124 "grammar.y"
+case 120:
+#line 1128 "grammar.y"
 {
             feHelp(yyvsp[-1].name);
@@ -2413,12 +2452,12 @@
           ;
     break;}
-case 120:
-#line 1129 "grammar.y"
+case 121:
+#line 1133 "grammar.y"
 {
             feHelp(NULL);
           ;
     break;}
-case 121:
-#line 1136 "grammar.y"
+case 122:
+#line 1140 "grammar.y"
 {
             singular_example(yyvsp[-1].name);
@@ -2426,6 +2465,6 @@
           ;
     break;}
-case 122:
-#line 1144 "grammar.y"
+case 123:
+#line 1148 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2439,6 +2478,6 @@
         ;
     break;}
-case 123:
-#line 1158 "grammar.y"
+case 124:
+#line 1162 "grammar.y"
 {
           leftv v=&yyvsp[0].lv;
@@ -2461,6 +2500,6 @@
         ;
     break;}
-case 124:
-#line 1178 "grammar.y"
+case 125:
+#line 1182 "grammar.y"
 {
           leftv v=&yyvsp[0].lv;
@@ -2483,10 +2522,4 @@
         ;
     break;}
-case 125:
-#line 1201 "grammar.y"
-{
-            list_cmd(yyvsp[-1].i,NULL,"// ",TRUE);
-          ;
-    break;}
 case 126:
 #line 1205 "grammar.y"
@@ -2498,18 +2531,18 @@
 #line 1209 "grammar.y"
 {
+            list_cmd(yyvsp[-1].i,NULL,"// ",TRUE);
+          ;
+    break;}
+case 128:
+#line 1213 "grammar.y"
+{
             if (yyvsp[-1].i==QRING_CMD) yyvsp[-1].i=RING_CMD;
             list_cmd(yyvsp[-1].i,NULL,"// ",TRUE);
           ;
     break;}
-case 128:
-#line 1214 "grammar.y"
-{
-            list_cmd(yyvsp[-1].i,NULL,"// ",TRUE);
-          ;
-    break;}
 case 129:
 #line 1218 "grammar.y"
 {
-            list_cmd(RING_CMD,NULL,"// ",TRUE);
+            list_cmd(yyvsp[-1].i,NULL,"// ",TRUE);
           ;
     break;}
@@ -2517,17 +2550,17 @@
 #line 1222 "grammar.y"
 {
+            list_cmd(RING_CMD,NULL,"// ",TRUE);
+          ;
+    break;}
+case 131:
+#line 1226 "grammar.y"
+{
             list_cmd(MATRIX_CMD,NULL,"// ",TRUE);
            ;
     break;}
-case 131:
-#line 1226 "grammar.y"
-{
-            list_cmd(INTMAT_CMD,NULL,"// ",TRUE);
-          ;
-    break;}
 case 132:
 #line 1230 "grammar.y"
 {
-            list_cmd(PROC_CMD,NULL,"// ",TRUE);
+            list_cmd(INTMAT_CMD,NULL,"// ",TRUE);
           ;
     break;}
@@ -2535,10 +2568,16 @@
 #line 1234 "grammar.y"
 {
+            list_cmd(PROC_CMD,NULL,"// ",TRUE);
+          ;
+    break;}
+case 134:
+#line 1238 "grammar.y"
+{
             list_cmd(0,yyvsp[-1].lv.Fullname(),"// ",TRUE);
             yyvsp[-1].lv.CleanUp();
           ;
     break;}
-case 134:
-#line 1239 "grammar.y"
+case 135:
+#line 1243 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2550,6 +2589,6 @@
           ;
     break;}
-case 135:
-#line 1248 "grammar.y"
+case 136:
+#line 1252 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2561,6 +2600,6 @@
           ;
     break;}
-case 136:
-#line 1257 "grammar.y"
+case 137:
+#line 1261 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2572,6 +2611,6 @@
           ;
     break;}
-case 137:
-#line 1266 "grammar.y"
+case 138:
+#line 1270 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2583,6 +2622,6 @@
           ;
     break;}
-case 138:
-#line 1275 "grammar.y"
+case 139:
+#line 1279 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2594,6 +2633,6 @@
           ;
     break;}
-case 139:
-#line 1284 "grammar.y"
+case 140:
+#line 1288 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2605,6 +2644,6 @@
           ;
     break;}
-case 140:
-#line 1293 "grammar.y"
+case 141:
+#line 1297 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2616,6 +2655,6 @@
           ;
     break;}
-case 141:
-#line 1302 "grammar.y"
+case 142:
+#line 1306 "grammar.y"
 {
 #ifdef HAVE_NS
@@ -2627,16 +2666,16 @@
           ;
     break;}
-case 142:
-#line 1320 "grammar.y"
+case 143:
+#line 1324 "grammar.y"
 {
             list_cmd(-1,NULL,"// ",TRUE);
           ;
     break;}
-case 143:
-#line 1326 "grammar.y"
+case 144:
+#line 1330 "grammar.y"
 { yyInRingConstruction = TRUE; ;
     break;}
-case 144:
-#line 1335 "grammar.y"
+case 145:
+#line 1339 "grammar.y"
 {
             BOOLEAN do_pop = FALSE;
@@ -2678,6 +2717,6 @@
           ;
     break;}
-case 145:
-#line 1374 "grammar.y"
+case 146:
+#line 1378 "grammar.y"
 {
             BOOLEAN do_pop = FALSE;
@@ -2688,6 +2727,6 @@
           ;
     break;}
-case 146:
-#line 1385 "grammar.y"
+case 147:
+#line 1389 "grammar.y"
 {
             if ((yyvsp[-1].i!=LIB_CMD)||(iiLibCmd(yyvsp[0].name,TRUE,TRUE,TRUE)))
@@ -2701,6 +2740,6 @@
           ;
     break;}
-case 149:
-#line 1401 "grammar.y"
+case 150:
+#line 1405 "grammar.y"
 {
             if ((yyvsp[-1].i==KEEPRING_CMD) && (myynest==0))
@@ -2776,6 +2815,6 @@
           ;
     break;}
-case 150:
-#line 1477 "grammar.y"
+case 151:
+#line 1481 "grammar.y"
 {
             if (yyvsp[0].lv.rtyp!=IDHDL) MYYERROR("identifier expected");
@@ -2784,6 +2823,6 @@
           ;
     break;}
-case 151:
-#line 1483 "grammar.y"
+case 152:
+#line 1487 "grammar.y"
 {
             //Print("typ is %d, rtyp:%d\n",$1.Typ(),$1.rtyp);
@@ -2809,6 +2848,6 @@
           ;
     break;}
-case 152:
-#line 1512 "grammar.y"
+case 153:
+#line 1516 "grammar.y"
 {
             int i; TESTSETINT(yyvsp[-2].lv,i);
@@ -2824,6 +2863,6 @@
           ;
     break;}
-case 153:
-#line 1525 "grammar.y"
+case 154:
+#line 1529 "grammar.y"
 {
             if (currentVoice->ifsw==1)
@@ -2843,6 +2882,6 @@
           ;
     break;}
-case 154:
-#line 1542 "grammar.y"
+case 155:
+#line 1546 "grammar.y"
 {
             int i; TESTSETINT(yyvsp[-2].lv,i);
@@ -2854,6 +2893,6 @@
           ;
     break;}
-case 155:
-#line 1551 "grammar.y"
+case 156:
+#line 1555 "grammar.y"
 {
             if (exitBuffer(BT_break)) YYERROR;
@@ -2861,6 +2900,6 @@
           ;
     break;}
-case 156:
-#line 1556 "grammar.y"
+case 157:
+#line 1560 "grammar.y"
 {
             if (contBuffer(BT_break)) YYERROR;
@@ -2868,6 +2907,6 @@
           ;
     break;}
-case 157:
-#line 1564 "grammar.y"
+case 158:
+#line 1568 "grammar.y"
 {
             /* -> if(!$2) break; $3; continue;*/
@@ -2879,6 +2918,6 @@
           ;
     break;}
-case 158:
-#line 1576 "grammar.y"
+case 159:
+#line 1580 "grammar.y"
 {
             /* $2 */
@@ -2897,6 +2936,6 @@
           ;
     break;}
-case 159:
-#line 1595 "grammar.y"
+case 160:
+#line 1599 "grammar.y"
 {
             procinfov pi;
@@ -2910,6 +2949,6 @@
           ;
     break;}
-case 160:
-#line 1606 "grammar.y"
+case 161:
+#line 1610 "grammar.y"
 {
             idhdl h = enterid(yyvsp[-2].name,myynest,PROC_CMD,&IDROOT,TRUE);
@@ -2932,6 +2971,6 @@
           ;
     break;}
-case 161:
-#line 1626 "grammar.y"
+case 162:
+#line 1630 "grammar.y"
 {
             omFree((ADDRESS)yyvsp[-1].name);
@@ -2955,6 +2994,6 @@
           ;
     break;}
-case 162:
-#line 1650 "grammar.y"
+case 163:
+#line 1654 "grammar.y"
 {
             //Print("par:%s, %d\n",$2.Name(),$2.Typ());
@@ -2963,6 +3002,6 @@
           ;
     break;}
-case 163:
-#line 1656 "grammar.y"
+case 164:
+#line 1660 "grammar.y"
 {
             //Print("par:%s, %d\n",$2.Name(),$2.Typ());
@@ -2974,6 +3013,6 @@
           ;
     break;}
-case 164:
-#line 1668 "grammar.y"
+case 165:
+#line 1672 "grammar.y"
 {
             if(iiRETURNEXPR==NULL) YYERROR;
@@ -2983,6 +3022,6 @@
           ;
     break;}
-case 165:
-#line 1675 "grammar.y"
+case 166:
+#line 1679 "grammar.y"
 {
             if (yyvsp[-2].i==RETURN)
@@ -3218,3 +3257,3 @@
   return 1;
 }
-#line 1685 "grammar.y"
+#line 1689 "grammar.y"
