From 71c0689742188ea029c1801af1f2933cac042625 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 24 Nov 2000 10:58:06 +0000
Subject: [PATCH] typo

---
 Parser/Gmsh.l       |   4 +-
 Parser/Gmsh.tab.cpp |   2 +-
 Parser/Gmsh.yy.cpp  | 815 ++++++++++++++++++++++----------------------
 3 files changed, 411 insertions(+), 410 deletions(-)

diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index 896f7ef027..92eb2e4c6c 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -1,4 +1,4 @@
-%{ /* $Id: Gmsh.l,v 1.2 2000-11-23 14:11:38 geuzaine Exp $ */
+%{ /* $Id: Gmsh.l,v 1.3 2000-11-24 10:58:06 geuzaine Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -153,7 +153,7 @@ Sinh                    return tSinh ;
 Save                    return tPhysical;
 Spline                  return tSpline;
 Surface                 return tSurface;
-Symetry                 return tSymetry;
+Symmetry                return tSymmetry;
 
 Transfinite             return tTransfinite;
 Translate               return tTranslate;
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 2d93f05fce..a307869b43 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -146,7 +146,7 @@
 #define	UMINUS	396
 
 #line 1 "Gmsh.y"
- /* $Id: Gmsh.tab.cpp,v 1.6 2000-11-24 10:21:24 geuzaine Exp $ */
+ /* $Id: Gmsh.tab.cpp,v 1.7 2000-11-24 10:58:06 geuzaine Exp $ */
 
 #include <stdarg.h>
 
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 764b6a858f..27d096a8a3 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.6 2000-11-24 10:21:24 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.7 2000-11-24 10:58:06 geuzaine Exp $
  */
 
 #define FLEX_SCANNER
@@ -285,7 +285,7 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 
 #define YY_NUM_RULES 157
 #define YY_END_OF_BUFFER 158
-static yyconst short int yy_accept[941] =
+static yyconst short int yy_accept[942] =
     {   0,
         0,    0,  158,  156,    1,    1,    5,  150,    6,  156,
       156,  151,    2,    9,  155,  155,  155,  155,  155,  155,
@@ -353,43 +353,44 @@ static yyconst short int yy_accept[941] =
       155,  155,   40,    0,  155,  155,   38,  155,  155,  155,
       155,  155,  155,   44,  155,    0,   47,  155,  155,  155,
 
-      155,  155,  155,  155,  155,   75,   76,  155,  155,  155,
+      155,  155,  155,  155,  155,   75,  155,  155,  155,  155,
       155,   81,  155,  155,  146,  155,    0,    0,  155,  155,
       155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
       155,  155,  155,  155,  155,  155,  155,    0,   37,   39,
       155,  155,  155,  155,  155,  155,   45,    0,  155,  155,
-      155,  155,   60,  155,  155,  155,  155,  155,  155,  155,
-      155,  147,  148,    0,    0,  155,  155,  155,  155,  155,
-       20,  155,  155,  155,  155,  155,  155,  155,  155,   29,
-      116,   35,  155,  109,    0,  155,  155,  155,  122,  155,
-      155,    0,  155,  155,  155,  155,  155,   67,  155,  155,
-
-      155,  155,   78,  155,    0,    0,  155,  155,  155,  155,
-      155,  155,  155,  155,  155,  155,  155,  155,  155,   32,
-      155,  108,    0,  112,  155,  155,  155,  155,    0,  155,
-      155,  155,   66,  155,  155,  155,  155,  155,  155,    0,
-        0,  155,  155,  155,  155,  155,   19,  155,  155,  155,
-      155,  155,  155,  155,  155,    0,  155,  155,  121,  155,
-        0,  155,  155,  155,   65,  155,  155,  155,   77,  155,
-      102,    0,  102,  155,  155,  155,  155,  155,  155,  155,
-      127,  155,  155,  155,  155,    0,  155,  155,  155,  124,
-      155,  155,  155,  155,  155,  155,  110,  101,  155,  113,
-
-      101,  155,  155,  155,  155,  155,  155,  155,  155,    0,
-      155,  155,  135,  155,  107,  155,  155,  155,  134,  155,
-      155,  155,  155,  155,  155,  155,  155,   27,    0,  155,
-      155,  155,  155,  155,  155,  155,  155,  155,  155,   98,
-      137,  131,  155,    0,  155,  155,  155,  155,  155,  155,
-      155,  155,  155,  155,  155,  155,  125,  111,  123,  155,
-      155,  155,  132,  155,  155,  155,  155,  155,  155,  155,
-      155,  155,  155,  117,  155,  155,  155,  155,  155,  138,
-      155,  155,  155,  155,  155,  130,  129,  155,  155,  155,
+      155,  155,   60,  155,  155,  155,   76,  155,  155,  155,
+      155,  155,  147,  148,    0,    0,  155,  155,  155,  155,
+      155,   20,  155,  155,  155,  155,  155,  155,  155,  155,
+       29,  116,   35,  155,  109,    0,  155,  155,  155,  122,
+      155,  155,    0,  155,  155,  155,  155,  155,   67,  155,
+
+      155,  155,  155,   78,  155,    0,    0,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+       32,  155,  108,    0,  112,  155,  155,  155,  155,    0,
+      155,  155,  155,   66,  155,  155,  155,  155,  155,  155,
+        0,    0,  155,  155,  155,  155,  155,   19,  155,  155,
+      155,  155,  155,  155,  155,  155,    0,  155,  155,  121,
+      155,    0,  155,  155,  155,   65,  155,  155,  155,   77,
+      155,  102,    0,  102,  155,  155,  155,  155,  155,  155,
+      155,  127,  155,  155,  155,  155,    0,  155,  155,  155,
+      124,  155,  155,  155,  155,  155,  155,  110,  101,  155,
+
+      113,  101,  155,  155,  155,  155,  155,  155,  155,  155,
+        0,  155,  155,  135,  155,  107,  155,  155,  155,  134,
+      155,  155,  155,  155,  155,  155,  155,  155,   27,    0,
+      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
+       98,  137,  131,  155,    0,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  155,  155,  155,  125,  111,  123,
+      155,  155,  155,  132,  155,  155,  155,  155,  155,  155,
+      155,  155,  155,  155,  117,  155,  155,  155,  155,  155,
+      138,  155,  155,  155,  155,  155,  130,  129,  155,  155,
       155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
 
       155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
-      136,  155,  155,  155,  155,  155,  139,  155,  155,  100,
-      155,  155,  155,  155,  155,  155,   99,  155,  155,  155,
-      155,  155,  155,  155,  155,  140,  155,  155,  128,    0
+      155,  136,  155,  155,  155,  155,  155,  139,  155,  155,
+      100,  155,  155,  155,  155,  155,  155,   99,  155,  155,
+      155,  155,  155,  155,  155,  155,  140,  155,  155,  128,
+        0
     } ;
 
 static yyconst int yy_ec[256] =
@@ -435,223 +436,223 @@ static yyconst int yy_meta[67] =
         3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst short int yy_base[946] =
+static yyconst short int yy_base[947] =
     {   0,
-        0,    0, 1168,   46,   47, 1169,   48,   58,   54,   87,
+        0,    0, 1169,   46,   47, 1170,   48,   58,   54,   87,
        69,  117,   56,   57,   98,   85,  147,  124,  131,  129,
        66,  167,  166,   60,   67,  179,  188,   72,  173,  224,
       172,  263,  309,  154,  235,   97,  116,  180,  191,  192,
-      204,  222,  258, 1134, 1134,  237, 1155,  336, 1154, 1153,
-       81, 1152, 1169, 1169,  342,  357,  296,    0,  182, 1122,
-     1128, 1132, 1112,   57,  120, 1124, 1099, 1119, 1092, 1099,
-     1117, 1116, 1117,   51, 1119, 1087, 1095, 1102, 1086,  210,
-     1107, 1108, 1089, 1088, 1083, 1114, 1108, 1115, 1083,   55,
-     1114, 1104, 1088, 1076, 1075, 1097,  123, 1110, 1071, 1094,
-
-     1080, 1069, 1092, 1057, 1067, 1066,  232, 1088, 1059, 1071,
-     1058, 1089, 1066, 1067, 1094, 1079, 1052, 1044,    0, 1065,
-      203, 1052, 1061, 1045, 1052, 1085,    0,    0,    0,    0,
-     1040, 1047, 1048, 1041, 1040, 1044,    0, 1062,    0, 1069,
-        0,    0, 1040,  242, 1042,  125,    0,    0,    0,    0,
-     1045, 1039, 1030, 1043, 1043, 1032, 1023, 1027, 1024, 1031,
-     1024, 1050, 1045, 1169,  319, 1169, 1169, 1169, 1169,  362,
-      379,  348,  384, 1048, 1019, 1059, 1041, 1040,  277, 1020,
-     1018, 1018, 1013, 1018, 1036, 1014, 1011, 1030, 1045, 1029,
-     1030, 1036, 1035, 1007, 1007, 1000, 1012, 1009, 1000,  998,
-
-     1003, 1034, 1029, 1003, 1006,  996, 1025, 1020,  106,  994,
-        0,  986, 1021, 1020,  982,  985,  993, 1008,  990,  983,
-     1014,  979, 1025,  980,  971, 1008,  982,  979,  980, 1014,
-      969,  998,  973,  961,  977,  998,  960,  971,  986,  995,
-      972,  955,  959,  958,  964,  961,  954,  965,  960,  973,
-      958,  954,  952,  942,  953,  953,  967,  968,  947,  942,
-      942,  940,  957,  956,  928,  929,  939,  232,  941,  931,
-      180,  933,  938,  933,  923,  946,  948,  399,  404,  413,
-      418,  423,  944,    0,  948,  945,  964,  921,  924,  931,
-        0,  928,  959,  928,  919,  940,  922,    0,  945,  937,
-
-      943,  932,  943,  931,  900,    0,  917,  907,  900,  899,
-      904,    0,    0,  935,  894,  893,  901,  909,  917,  923,
-      926,  891,  885,  903,  902,    0,  885,    0,  920,  883,
-      893,  917,  878,  925,  875,  876,    0,  876,  873,    0,
-      921,    0,  908,    0,  878,  870,  897,  880,  868,  903,
-      887,  870,  871,  874,  860,  861,  860,  864,  856,  869,
-      892,    0,    0,  859,    0,  869,  851,  884,  879,    0,
-      849,  854,  857,  873,  882,    0,  850,    0,  859,  846,
-      845,  839,    0,    0,  851,  854,  838,  849,  847,  867,
-      870,  428,  433,  865,  870,  867,  846,  828,  832,  831,
-
-      833,    0,  838,  828,  855,  821,  844,  856,  856,  841,
-      857,  853,  821,  827,  824,  823,    0,  822,  832,  820,
-      819,  820,  296,  829,  828,  842,  242,  815,  303,  428,
-        0,  824,  816,  798,  823,    0,  845,  809,    0,  795,
-      803,    0,  820,  796,    0,  814,  789,    0,    0,  828,
-      800,  801,    0,    0,    0,  798,  800,  796,    0,  800,
-      794,  795,  781,  817,  815,  269,  789,    0,  801,  794,
-      786,  787,  776,  778,    0,  780,  776,    0,    0,  763,
-      795,  805,  793,  801,  802,  788,    0,    0,  807,  776,
-      758,  770,  785,    0,  789,    0,  772,  787,  783,  777,
-
-      758,  749,    0,  754,  743,  780,    0,    0,  762,  767,
-      771,  780,  769,    0,  749,  748,  751,  765,  759,  773,
-      776,  773,  758,  739,  732,    0,  775,  741,    0,    0,
-      758,    0,  764,    0,  749,  724,  740,  723,  730,    0,
-      759,    0,  732,  713,  759,  755,  724,  731,  727,    0,
-      730,    0,  724,  714,  718,    0,    0,    0,  731,  741,
-      729,  744,  738,  734,    0,  702,  706,    0,  738,  741,
-      723,  721,  714,  729,  720,  706,  707,    0,  719,  690,
-      715,  716,    0,  739,  687,  700,    0,  707,  707,  707,
-      711,  715,  713,    0,  673,  726,    0,  715,  714,  692,
-
-      675,  680,  672,  676,  707,    0,    0,  699,  685,  672,
+      204,  222,  258, 1135, 1135,  237, 1156,  336, 1155, 1154,
+       81, 1153, 1170, 1170,  342,  357,  296,    0,  182, 1123,
+     1129, 1133, 1113,   57,  120, 1125, 1100, 1120, 1093, 1100,
+     1118, 1117, 1118,   51, 1120, 1088, 1096, 1103, 1087,  210,
+     1108, 1109, 1090, 1089, 1084, 1115, 1109, 1116, 1084,   55,
+     1115, 1105, 1089, 1077, 1076, 1098,  123, 1111, 1072, 1095,
+
+     1081, 1070, 1093, 1058, 1068, 1067,  232, 1089, 1060, 1072,
+     1059, 1090, 1067, 1068, 1095, 1080, 1053, 1045,    0, 1066,
+      203, 1053, 1062, 1046, 1053, 1086,    0,    0,    0,    0,
+     1041, 1048, 1049, 1042, 1041, 1045,    0, 1063,    0, 1070,
+        0,    0, 1041,  242, 1043,  125,    0,    0,    0,    0,
+     1046, 1040, 1031, 1044, 1044, 1033, 1024, 1028, 1025, 1032,
+     1025, 1051, 1046, 1170,  319, 1170, 1170, 1170, 1170,  362,
+      379,  348,  384, 1049, 1020, 1060, 1042, 1041,  277, 1021,
+     1019, 1019, 1014, 1019, 1037, 1015, 1012, 1031, 1046, 1030,
+     1031, 1037, 1036, 1008, 1008, 1001, 1013, 1010, 1001,  999,
+
+     1004, 1035, 1030, 1004, 1007,  997, 1026, 1021,  106,  995,
+        0,  987, 1022, 1021,  983,  986,  994, 1009,  991,  984,
+     1015,  980, 1026,  981,  972, 1009,  983,  980,  981, 1015,
+      970,  999,  974,  962,  978,  999,  961,  972,  987,  996,
+      973,  956,  960,  959,  965,  962,  955,  966,  961,  974,
+      959,  955,  953,  943,  954,  948,  968,  969,  948,  943,
+      943,  941,  958,  957,  929,  930,  940,  232,  942,  932,
+      180,  934,  939,  934,  924,  947,  949,  399,  404,  413,
+      418,  423,  945,    0,  949,  946,  965,  922,  925,  932,
+        0,  929,  960,  929,  920,  941,  923,    0,  946,  938,
+
+      944,  933,  944,  932,  901,    0,  918,  908,  901,  900,
+      905,    0,    0,  936,  895,  894,  902,  910,  918,  924,
+      927,  892,  886,  904,  903,    0,  886,    0,  921,  884,
+      894,  918,  879,  926,  876,  877,    0,  877,  874,    0,
+      922,    0,  909,    0,  879,  871,  898,  881,  869,  904,
+      888,  871,  872,  875,  861,  862,  861,  865,  857,  870,
+      893,    0,    0,  860,    0,  870,  865,  885,  880,    0,
+      850,  855,  858,  874,  883,    0,  851,    0,  860,  847,
+      846,  840,    0,    0,  852,  855,  839,  850,  848,  868,
+      871,  428,  433,  866,  871,  868,  847,  829,  833,  832,
+
+      834,    0,  839,  829,  856,  822,  845,  857,  857,  842,
+      858,  854,  822,  828,  825,  824,    0,  823,  833,  821,
+      820,  821,  296,  830,  829,  843,  242,  816,  303,  428,
+        0,  825,  817,  799,  824,    0,  846,  810,    0,  796,
+      804,    0,  821,  797,    0,  815,  790,    0,    0,  829,
+      801,  802,    0,    0,    0,  799,  801,  797,    0,  801,
+      795,  796,  780,  818,  816,  269,  790,    0,  802,  795,
+      787,  788,  777,  779,    0,  781,  777,    0,    0,  764,
+      796,  806,  794,  802,  803,  789,    0,    0,  808,  777,
+      759,  771,  786,    0,  790,    0,  773,  788,  784,  778,
+
+      759,  750,    0,  755,  744,  781,    0,    0,  763,  768,
+      772,  781,  770,    0,  750,  749,  752,  766,  760,  774,
+      777,  774,  759,  740,  733,    0,  776,  742,    0,    0,
+      759,    0,  765,    0,  750,  725,  741,  724,  731,    0,
+      760,    0,  733,  721,  760,  756,  725,  732,  728,    0,
+      731,    0,  725,  715,  719,    0,    0,    0,  732,  742,
+      730,  745,  739,  735,    0,  703,  707,    0,  739,  742,
+      724,  722,  715,  730,  721,  707,  708,    0,  720,  691,
+      716,  717,    0,  740,  688,  701,    0,  708,  708,  708,
+      712,  716,  714,    0,  674,  727,    0,  716,  715,  693,
+
+      676,  681,  673,  677,  708,    0,  664,  699,  685,  672,
       665,    0,  691,  663,    0,  676,  689,  697,  687,  676,
       694,  698,  664,  656,  671,  681,  686,  688,  674,  688,
       652,  648,  658,  673,  660,  664,  668,  688,    0,    0,
       668,  676,  677,  674,  673,  674,    0,  679,  650,  649,
-      669,  638,    0,  637,  640,  663,  643,  664,  632,  635,
-      649,    0,    0,  643,  653,  641,  317,  651,  656,  620,
-        0,  345,  632,  651,  629,  631,  647,  609,   92,    0,
-        0,    0,  147,    0,  185,  194,  184,  206,    0,  215,
-      214,  265,  254,  272,  293,  273,  268,    0,  311,  304,
-
-      341,  321,    0,  356,  350,  366,  365,  367,  384,  381,
-      383,  352,  370,  371,  389,  394,  430,  417,  423,    0,
-      394,    0,  440,    0,  413,  430,  439,  423,  447,  429,
-      441,  441,    0,  411,  435,  430,  434,  422,  439,    0,
-      450,  472,  452,  463,  463,  455,    0,  452,  453,  458,
-      462,  455,  470,  452,  435,  485,  478,  465,    0,  477,
-      488,  472,  478,  477,    0,  478,  471,  468,    0,  471,
-     1169,    0,    0,  475,  487,  510,  490,  483,  499,  497,
-        0,  490,  507,  493,  478,  516,  499,  496,  497, 1169,
-      508,  513,  505,  501,  515,  517,    0, 1169,  498,    0,
-
-        0,  510,  520,  525,  513,  507,  526,  510,  503,  541,
-      513,  525,    0,  531,    0,  527,  528,  537,    0,  521,
-      521,  516,  539,  524,  539,  540,  529,    0,  551,  534,
-      534,  525,  532,  537,  550,  546,  530,  534,  552,    0,
-      533,    0,  553,  565,  557,  548,  561,  555,  551,  561,
-      566,  571,  560,  545,  553,  571, 1169,    0,    0,  556,
-      559,  550,    0,  560,  573,  559,  557,  575,  578,  577,
-      569,  567,  580,    0,  578,  578,  581,  584,  574,  566,
-      587,  568,  569,  576,  583,    0,    0,  579,  582,  582,
-      589,  593,  597,  595,  587,  600,  592,  582,  594,  608,
-
-      605,  595,  597,  602,  595,  599,  598,  600,  599,  605,
-        0,  615,  616,  617,  605,  609,    0,  611,  608,    0,
-      608,  609,  624,  612,  630,  618,    0,  614,  615,  626,
-      635,  622,  619,  625,  631,    0,  626,  628,    0, 1169,
-      658,  661,  664,  667,  670
+      669,  638,    0,  637,  640,  663,    0,  643,  664,  632,
+      635,  649,    0,    0,  643,  653,  641,  317,  651,  656,
+      620,    0,  345,  632,  650,  627,  629,  645,   90,  118,
+        0,    0,    0,  174,    0,  204,  197,  206,  211,    0,
+      226,  231,  281,  259,  293,  296,  278,  282,    0,  313,
+
+      343,  344,  322,    0,  359,  353,  378,  366,  368,  385,
+      383,  384,  353,  371,  385,  390,  421,  431,  418,  424,
+        0,  395,    0,  441,    0,  414,  431,  440,  425,  448,
+      430,  443,  442,    0,  412,  436,  431,  435,  423,  440,
+        0,  451,  473,  453,  464,  464,  456,    0,  453,  454,
+      459,  463,  456,  471,  453,  436,  486,  479,  466,    0,
+      478,  489,  473,  479,  478,    0,  479,  472,  469,    0,
+      472, 1170,    0,    0,  476,  488,  511,  491,  484,  500,
+      498,    0,  491,  508,  494,  479,  517,  500,  497,  498,
+     1170,  509,  514,  506,  502,  516,  518,    0, 1170,  499,
+
+        0,    0,  511,  521,  526,  514,  508,  527,  511,  504,
+      542,  514,  526,    0,  532,    0,  528,  529,  538,    0,
+      522,  522,  517,  540,  525,  540,  541,  530,    0,  552,
+      535,  535,  526,  533,  538,  551,  547,  531,  535,  553,
+        0,  534,    0,  554,  566,  558,  549,  562,  556,  552,
+      562,  567,  572,  561,  546,  554,  572, 1170,    0,    0,
+      557,  560,  551,    0,  561,  574,  560,  558,  576,  579,
+      578,  570,  568,  581,    0,  579,  579,  582,  585,  575,
+      567,  588,  569,  570,  577,  584,    0,    0,  580,  583,
+      583,  590,  594,  598,  596,  588,  601,  593,  583,  595,
+
+      609,  606,  596,  598,  603,  596,  600,  599,  601,  600,
+      606,    0,  616,  617,  618,  606,  610,    0,  612,  609,
+        0,  609,  610,  625,  613,  631,  619,    0,  615,  616,
+      627,  636,  623,  620,  626,  632,    0,  627,  629,    0,
+     1170,  659,  662,  665,  668,  671
     } ;
 
-static yyconst short int yy_def[946] =
+static yyconst short int yy_def[947] =
     {   0,
-      940,    1,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  940,  940,  940,  940,  940,
-      940,  940,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  940,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  940,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  940,
-      940,  940,  940,  941,  941,  941,  941,  941,  941,  941,
-
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  940,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  940,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      940,  940,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  940,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  940,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  940,  940,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  940,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  940,  941,  941,  941,  941,
-
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  940,  940,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  940,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  940,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  940,  940,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  940,  941,  941,  941,  941,  941,
-      941,  940,  941,  941,  941,  941,  941,  941,  941,  941,
-
-      941,  941,  941,  941,  940,  940,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  940,  941,  941,  941,  941,  941,  940,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  942,
-      940,  943,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  940,  941,  941,  941,  941,
-      940,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      940,  944,  941,  941,  941,  945,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  940,  941,  941,  941,  940,
-      941,  941,  941,  941,  941,  941,  941,  940,  941,  941,
-
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  940,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  940,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  940,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  940,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
-      941,  941,  941,  941,  941,  941,  941,  941,  941,    0,
-      940,  940,  940,  940,  940
+      941,    1,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  941,  941,  941,  941,  941,
+      941,  941,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  941,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  941,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  941,
+      941,  941,  941,  942,  942,  942,  942,  942,  942,  942,
+
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  941,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  941,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      941,  941,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  941,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  941,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  941,  941,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  941,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  941,  942,  942,  942,  942,
+
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  941,  941,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  941,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  941,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  941,  941,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  941,  942,  942,  942,  942,
+      942,  942,  941,  942,  942,  942,  942,  942,  942,  942,
+
+      942,  942,  942,  942,  942,  941,  941,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  941,  942,  942,  942,  942,  942,  941,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      943,  941,  944,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  941,  942,  942,  942,
+      942,  941,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  941,  945,  942,  942,  942,  946,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  941,  942,  942,  942,
+      941,  942,  942,  942,  942,  942,  942,  942,  941,  942,
+
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      941,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  941,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  941,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  941,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+      942,  942,  942,  942,  942,  942,  942,  942,  942,  942,
+        0,  941,  941,  941,  941,  941
     } ;
 
-static yyconst short int yy_nxt[1236] =
+static yyconst short int yy_nxt[1237] =
     {   0,
         4,    5,    6,    7,    8,    9,    4,    4,    4,   10,
        11,   12,   12,   12,   12,   12,   13,   14,   15,   16,
@@ -689,12 +690,12 @@ static yyconst short int yy_nxt[1236] =
        61,  515,  516,  172,  172,  161,  131,  173,  173,  173,
       173,  173,  289,  290,  132,  732,  510,  547,  733,  133,
       134,  548,  518,  734,  135,  511,  278,  278,  136,   66,
-      279,  279,  279,  279,  279,  519,  708,  735,  137,  736,
-      709,  138,  139,  140,  141,  142,   61,   48,   48,   48,
+      279,  279,  279,  279,  279,  519,  709,  735,  137,  736,
+      710,  138,  139,  140,  141,  142,   61,   48,   48,   48,
        48,   48,  143,  170,  170,  170,  170,  170,  165,  173,
-      173,  173,  173,  173,  171,  713,   55,  144,   56,   56,
+      173,  173,  173,  173,  171,  714,   55,  144,   56,   56,
        56,   56,   56,  170,  170,  170,  170,  170,  737,   57,
-      714,  738,  739,  165,  280,  740,  281,  281,  741,  171,
+      715,  738,  739,  165,  280,  740,  281,  281,  741,  171,
       282,  282,  282,  282,  282,  173,  173,  173,  173,  173,
 
       742,  743,  744,  745,   57,  746,  747,  748,  749,  280,
@@ -704,13 +705,13 @@ static yyconst short int yy_nxt[1236] =
       393,  393,  393,  393,  393,  393,  393,  393,  393,  520,
       752,  753,  754,  755,  756,  757,  758,  759,  760,  521,
       761,  762,  763,  522,  764,  765,  766,  767,  768,  769,
-      770,  772,  771,  771,  774,  771,  771,  771,  771,  771,
-      771,  771,  771,  775,  776,  777,  778,  779,  771,  771,
-      780,  781,  782,  783,  784,  785,  786,  787,  788,  789,
+      770,  771,  773,  772,  772,  775,  772,  772,  772,  772,
+      772,  772,  772,  772,  776,  777,  778,  779,  780,  772,
+      772,  781,  782,  783,  784,  785,  786,  787,  788,  789,
 
-      790,  791,  792,  793,  794,  795,  796,  797,  799,  800,
-      798,  798,  802,  798,  798,  798,  798,  798,  798,  798,
-      798,  803,  804,  805,  806,  807,  798,  798,  808,  809,
+      790,  791,  792,  793,  794,  795,  796,  797,  798,  800,
+      801,  799,  799,  803,  799,  799,  799,  799,  799,  799,
+      799,  799,  804,  805,  806,  807,  808,  799,  799,  809,
       810,  811,  812,  813,  814,  815,  816,  817,  818,  819,
       820,  821,  822,  823,  824,  825,  826,  827,  828,  829,
       830,  831,  832,  833,  834,  835,  836,  837,  838,  839,
@@ -725,73 +726,73 @@ static yyconst short int yy_nxt[1236] =
       910,  911,  912,  913,  914,  915,  916,  917,  918,  919,
       920,  921,  922,  923,  924,  925,  926,  927,  928,  929,
       930,  931,  932,  933,  934,  935,  936,  937,  938,  939,
-       58,  771,  720,  771,  773,  719,  773,  798,  718,  798,
-      801,  717,  801,  716,  715,  712,  711,  710,  707,  706,
-      705,  704,  703,  702,  701,  700,  699,  698,  697,  696,
-      695,  694,  693,  692,  691,  690,  689,  688,  687,  686,
-
-      685,  684,  683,  682,  681,  680,  679,  678,  677,  676,
-      675,  674,  673,  672,  671,  670,  669,  668,  667,  666,
-      665,  664,  663,  662,  661,  660,  659,  658,  657,  656,
-      655,  654,  653,  652,  651,  650,  649,  648,  647,  646,
-      645,  644,  643,  642,  641,  640,  639,  638,  637,  636,
-      635,  634,  633,  632,  631,  630,  629,  628,  627,  626,
-      625,  624,  623,  622,  621,  620,  619,  618,  617,  616,
-      615,  614,  613,  612,  611,  610,  609,  608,  607,  606,
-      605,  604,  603,  602,  601,  600,  599,  598,  597,  596,
-      595,  594,  593,  592,  591,  590,  589,  588,  587,  586,
-
-      585,  584,  583,  582,  581,  580,  579,  578,  577,  576,
-      575,  574,  573,  572,  571,  570,  569,  568,  567,  566,
-      565,  564,  563,  562,  561,  560,  559,  558,  557,  556,
-      555,  554,  553,  552,  551,  550,  549,  546,  545,  544,
-      543,  542,  541,  540,  539,  538,  537,  536,  535,  534,
-      533,  532,  531,  530,  529,  528,  527,  526,  525,  524,
-      523,  517,  514,  513,  512,  509,  508,  507,  506,  505,
-      504,  503,  502,  501,  500,  499,  498,  497,  496,  495,
-      494,  493,  492,  491,  490,  489,  488,  487,  486,  485,
-      484,  483,  482,  481,  480,  479,  478,  477,  476,  475,
-
-      474,  473,  472,  471,  470,  469,  468,  467,  466,  465,
-      464,  463,  462,  461,  460,  459,  458,  457,  456,  455,
-      454,  453,  452,  451,  450,  449,  448,  447,  446,  445,
-      444,  443,  442,  441,  440,  439,  438,  437,  436,  435,
-      434,  433,  432,  431,  430,  429,  428,  427,  426,  425,
-      424,  423,  422,  421,  420,  419,  418,  417,  416,  415,
-      414,  413,  412,  411,  410,  409,  408,  407,  406,  405,
-      404,  403,  402,  401,  400,  399,  398,  397,  396,  395,
-      394,  391,  390,  389,  388,  387,  386,  383,  382,  378,
-      377,  376,  375,  374,  373,  372,  371,  370,  369,  368,
-
-      367,  366,  365,  364,  363,  362,  361,  360,  359,  358,
-      357,  356,  355,  354,  353,  352,  351,  350,  349,  348,
-      347,  346,  345,  344,  343,  342,  341,  340,  339,  338,
-      337,  336,  335,  334,  333,  332,  331,  330,  329,  328,
-      327,  326,  325,  324,  323,  322,  319,  318,  317,  316,
-      315,  314,  313,  312,  311,  310,  309,  308,  307,  306,
-      305,  304,  303,  302,  301,  300,  299,  298,  297,  296,
-      295,  294,  293,  292,  291,  287,  286,  285,  284,  283,
-      277,  276,  275,  274,  273,  272,  271,  270,  269,  268,
-      267,  266,  265,  262,  259,  258,  257,  256,  255,  254,
-
-      253,  252,  251,  250,  249,  248,  247,  246,  243,  242,
-      241,  240,  239,  238,  237,  236,  235,  234,  233,  232,
-      229,  228,  227,  226,  225,  224,  223,  222,  221,  218,
-      217,  216,  215,  214,  213,  210,  209,  208,  207,  206,
-      205,  204,  203,  202,  197,  196,  195,  194,  193,  190,
-      189,  188,  187,  186,  185,  184,  174,  179,  178,  177,
-      176,  169,  167,  166,  164,  163,  162,  940,    3,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940
+      940,   58,  772,  720,  772,  774,  719,  774,  799,  718,
+      799,  802,  717,  802,  716,  713,  712,  711,  708,  707,
+      706,  705,  704,  703,  702,  701,  700,  699,  698,  697,
+      696,  695,  694,  693,  692,  691,  690,  689,  688,  687,
+
+      686,  685,  684,  683,  682,  681,  680,  679,  678,  677,
+      676,  675,  674,  673,  672,  671,  670,  669,  668,  667,
+      666,  665,  664,  663,  662,  661,  660,  659,  658,  657,
+      656,  655,  654,  653,  652,  651,  650,  649,  648,  647,
+      646,  645,  644,  643,  642,  641,  640,  639,  638,  637,
+      636,  635,  634,  633,  632,  631,  630,  629,  628,  627,
+      626,  625,  624,  623,  622,  621,  620,  619,  618,  617,
+      616,  615,  614,  613,  612,  611,  610,  609,  608,  607,
+      606,  605,  604,  603,  602,  601,  600,  599,  598,  597,
+      596,  595,  594,  593,  592,  591,  590,  589,  588,  587,
+
+      586,  585,  584,  583,  582,  581,  580,  579,  578,  577,
+      576,  575,  574,  573,  572,  571,  570,  569,  568,  567,
+      566,  565,  564,  563,  562,  561,  560,  559,  558,  557,
+      556,  555,  554,  553,  552,  551,  550,  549,  546,  545,
+      544,  543,  542,  541,  540,  539,  538,  537,  536,  535,
+      534,  533,  532,  531,  530,  529,  528,  527,  526,  525,
+      524,  523,  517,  514,  513,  512,  509,  508,  507,  506,
+      505,  504,  503,  502,  501,  500,  499,  498,  497,  496,
+      495,  494,  493,  492,  491,  490,  489,  488,  487,  486,
+      485,  484,  483,  482,  481,  480,  479,  478,  477,  476,
+
+      475,  474,  473,  472,  471,  470,  469,  468,  467,  466,
+      465,  464,  463,  462,  461,  460,  459,  458,  457,  456,
+      455,  454,  453,  452,  451,  450,  449,  448,  447,  446,
+      445,  444,  443,  442,  441,  440,  439,  438,  437,  436,
+      435,  434,  433,  432,  431,  430,  429,  428,  427,  426,
+      425,  424,  423,  422,  421,  420,  419,  418,  417,  416,
+      415,  414,  413,  412,  411,  410,  409,  408,  407,  406,
+      405,  404,  403,  402,  401,  400,  399,  398,  397,  396,
+      395,  394,  391,  390,  389,  388,  387,  386,  383,  382,
+      378,  377,  376,  375,  374,  373,  372,  371,  370,  369,
+
+      368,  367,  366,  365,  364,  363,  362,  361,  360,  359,
+      358,  357,  356,  355,  354,  353,  352,  351,  350,  349,
+      348,  347,  346,  345,  344,  343,  342,  341,  340,  339,
+      338,  337,  336,  335,  334,  333,  332,  331,  330,  329,
+      328,  327,  326,  325,  324,  323,  322,  319,  318,  317,
+      316,  315,  314,  313,  312,  311,  310,  309,  308,  307,
+      306,  305,  304,  303,  302,  301,  300,  299,  298,  297,
+      296,  295,  294,  293,  292,  291,  287,  286,  285,  284,
+      283,  277,  276,  275,  274,  273,  272,  271,  270,  269,
+      268,  267,  266,  265,  262,  259,  258,  257,  256,  255,
+
+      254,  253,  252,  251,  250,  249,  248,  247,  246,  243,
+      242,  241,  240,  239,  238,  237,  236,  235,  234,  233,
+      232,  229,  228,  227,  226,  225,  224,  223,  222,  221,
+      218,  217,  216,  215,  214,  213,  210,  209,  208,  207,
+      206,  205,  204,  203,  202,  197,  196,  195,  194,  193,
+      190,  189,  188,  187,  186,  185,  184,  174,  179,  178,
+      177,  176,  169,  167,  166,  164,  163,  162,  941,    3,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941
     } ;
 
-static yyconst short int yy_chk[1236] =
+static yyconst short int yy_chk[1237] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -810,16 +811,16 @@ static yyconst short int yy_chk[1236] =
        12,   12,   12,   28,   36,   15,   37,   12,   15,   12,
        16,  209,   18,  679,   18,  146,   16,   20,   36,   20,
        18,   19,   19,   37,   12,   20,   15,   15,   15,  146,
-       19,   18,   19,   65,   12,   17,   20,   17,   19,  683,
+       19,   18,   19,   65,   12,   17,   20,   17,   19,  680,
        37,   18,   20,   17,   34,   18,   17,   97,   97,   17,
        65,   20,   20,   19,   17,   18,   23,   22,   17,   22,
-       17,   34,   31,   29,   17,   19,  685,   17,   17,   26,
+       17,   34,   31,   29,   17,   19,  684,   17,   17,   26,
 
        38,   23,   17,   23,   22,   26,   27,   29,   27,   31,
        29,   39,   40,   34,   59,  686,   26,   38,  687,   31,
        23,   29,   26,   38,   41,   27,   26,   31,   39,   40,
        26,   29,   22,   31,   26,   27,  271,   59,  271,   40,
-      688,   41,   42,   27,   30,  690,   39,   40,   46,   46,
+      688,   41,   42,   27,   30,  689,   39,   40,   46,   46,
        46,   46,   46,   30,  121,   35,  691,   35,   30,   42,
        80,   30,   80,   80,   35,   41,  121,   30,   35,   80,
        35,   35,   35,  692,   30,   30,   30,   42,   43,   30,
@@ -829,12 +830,12 @@ static yyconst short int yy_chk[1236] =
        32,  427,  427,   57,   57,   43,   32,   57,   57,   57,
        57,   57,  179,  179,   32,  695,  423,  466,  696,   32,
        32,  466,  429,  697,   32,  423,  165,  165,   32,   33,
-      165,  165,  165,  165,  165,  429,  667,  699,   33,  700,
-      667,   33,   33,   33,   33,   33,   33,   48,   48,   48,
+      165,  165,  165,  165,  165,  429,  668,  698,   33,  700,
+      668,   33,   33,   33,   33,   33,   33,   48,   48,   48,
        48,   48,   33,   55,   55,   55,   55,   55,   48,  172,
-      172,  172,  172,  172,   55,  672,   56,   33,   56,   56,
+      172,  172,  172,  172,   55,  673,   56,   33,   56,   56,
        56,   56,   56,  170,  170,  170,  170,  170,  701,   56,
-      672,  702,  704,   48,  170,  705,  171,  171,  706,   55,
+      673,  702,  703,   48,  170,  705,  171,  171,  706,   55,
       171,  171,  171,  171,  171,  173,  173,  173,  173,  173,
 
       707,  708,  709,  710,   56,  711,  712,  713,  714,  170,
@@ -842,93 +843,93 @@ static yyconst short int yy_chk[1236] =
       280,  280,  715,  716,  280,  280,  280,  280,  280,  281,
       281,  281,  281,  281,  282,  282,  282,  282,  282,  392,
       392,  392,  392,  392,  393,  393,  393,  393,  393,  430,
-      717,  718,  719,  721,  723,  725,  726,  727,  728,  430,
-      729,  730,  731,  430,  732,  734,  735,  736,  737,  738,
-      739,  741,  742,  742,  743,  742,  742,  742,  742,  742,
-      742,  742,  742,  744,  745,  746,  748,  749,  742,  742,
-      750,  751,  752,  753,  754,  755,  756,  757,  758,  760,
-
-      761,  762,  763,  764,  766,  767,  768,  770,  774,  775,
-      776,  776,  777,  776,  776,  776,  776,  776,  776,  776,
-      776,  778,  779,  780,  782,  783,  776,  776,  784,  785,
-      786,  787,  788,  789,  791,  792,  793,  794,  795,  796,
-      799,  802,  803,  804,  805,  806,  807,  808,  809,  810,
-      811,  812,  814,  816,  817,  818,  820,  821,  822,  823,
-      824,  825,  826,  827,  829,  830,  831,  832,  833,  834,
-      835,  836,  837,  838,  839,  841,  843,  844,  845,  846,
+      717,  718,  719,  720,  722,  724,  726,  727,  728,  430,
+      729,  730,  731,  430,  732,  733,  735,  736,  737,  738,
+      739,  740,  742,  743,  743,  744,  743,  743,  743,  743,
+      743,  743,  743,  743,  745,  746,  747,  749,  750,  743,
+      743,  751,  752,  753,  754,  755,  756,  757,  758,  759,
+
+      761,  762,  763,  764,  765,  767,  768,  769,  771,  775,
+      776,  777,  777,  778,  777,  777,  777,  777,  777,  777,
+      777,  777,  779,  780,  781,  783,  784,  777,  777,  785,
+      786,  787,  788,  789,  790,  792,  793,  794,  795,  796,
+      797,  800,  803,  804,  805,  806,  807,  808,  809,  810,
+      811,  812,  813,  815,  817,  818,  819,  821,  822,  823,
+      824,  825,  826,  827,  828,  830,  831,  832,  833,  834,
+      835,  836,  837,  838,  839,  840,  842,  844,  845,  846,
       847,  848,  849,  850,  851,  852,  853,  854,  855,  856,
-      860,  861,  862,  864,  865,  866,  867,  868,  869,  870,
+      857,  861,  862,  863,  865,  866,  867,  868,  869,  870,
 
-      871,  872,  873,  875,  876,  877,  878,  879,  880,  881,
-      882,  883,  884,  885,  888,  889,  890,  891,  892,  893,
+      871,  872,  873,  874,  876,  877,  878,  879,  880,  881,
+      882,  883,  884,  885,  886,  889,  890,  891,  892,  893,
       894,  895,  896,  897,  898,  899,  900,  901,  902,  903,
-      904,  905,  906,  907,  908,  909,  910,  912,  913,  914,
-      915,  916,  918,  919,  921,  922,  923,  924,  925,  926,
-      928,  929,  930,  931,  932,  933,  934,  935,  937,  938,
-      941,  942,  678,  942,  943,  677,  943,  944,  676,  944,
-      945,  675,  945,  674,  673,  670,  669,  668,  666,  665,
-      664,  661,  660,  659,  658,  657,  656,  655,  654,  652,
+      904,  905,  906,  907,  908,  909,  910,  911,  913,  914,
+      915,  916,  917,  919,  920,  922,  923,  924,  925,  926,
+      927,  929,  930,  931,  932,  933,  934,  935,  936,  938,
+      939,  942,  943,  678,  943,  944,  677,  944,  945,  676,
+      945,  946,  675,  946,  674,  671,  670,  669,  667,  666,
+      665,  662,  661,  660,  659,  658,  656,  655,  654,  652,
       651,  650,  649,  648,  646,  645,  644,  643,  642,  641,
 
       638,  637,  636,  635,  634,  633,  632,  631,  630,  629,
       628,  627,  626,  625,  624,  623,  622,  621,  620,  619,
-      618,  617,  616,  614,  613,  611,  610,  609,  608,  605,
-      604,  603,  602,  601,  600,  599,  598,  596,  595,  593,
-      592,  591,  590,  589,  588,  586,  585,  584,  582,  581,
-      580,  579,  577,  576,  575,  574,  573,  572,  571,  570,
-      569,  567,  566,  564,  563,  562,  561,  560,  559,  555,
-      554,  553,  551,  549,  548,  547,  546,  545,  544,  543,
-      541,  539,  538,  537,  536,  535,  533,  531,  528,  527,
-      525,  524,  523,  522,  521,  520,  519,  518,  517,  516,
-
-      515,  513,  512,  511,  510,  509,  506,  505,  504,  502,
-      501,  500,  499,  498,  497,  495,  493,  492,  491,  490,
-      489,  486,  485,  484,  483,  482,  481,  480,  477,  476,
-      474,  473,  472,  471,  470,  469,  467,  465,  464,  463,
-      462,  461,  460,  458,  457,  456,  452,  451,  450,  447,
-      446,  444,  443,  441,  440,  438,  437,  435,  434,  433,
-      432,  428,  426,  425,  424,  422,  421,  420,  419,  418,
-      416,  415,  414,  413,  412,  411,  410,  409,  408,  407,
-      406,  405,  404,  403,  401,  400,  399,  398,  397,  396,
-      395,  394,  391,  390,  389,  388,  387,  386,  385,  382,
-
-      381,  380,  379,  377,  375,  374,  373,  372,  371,  369,
-      368,  367,  366,  364,  361,  360,  359,  358,  357,  356,
-      355,  354,  353,  352,  351,  350,  349,  348,  347,  346,
-      345,  343,  341,  339,  338,  336,  335,  334,  333,  332,
-      331,  330,  329,  327,  325,  324,  323,  322,  321,  320,
-      319,  318,  317,  316,  315,  314,  311,  310,  309,  308,
-      307,  305,  304,  303,  302,  301,  300,  299,  297,  296,
-      295,  294,  293,  292,  290,  289,  288,  287,  286,  285,
-      283,  277,  276,  275,  274,  273,  272,  270,  269,  267,
-      266,  265,  264,  263,  262,  261,  260,  259,  258,  257,
-
-      256,  255,  254,  253,  252,  251,  250,  249,  248,  247,
-      246,  245,  244,  243,  242,  241,  240,  239,  238,  237,
-      236,  235,  234,  233,  232,  231,  230,  229,  228,  227,
-      226,  225,  224,  223,  222,  221,  220,  219,  218,  217,
-      216,  215,  214,  213,  212,  210,  208,  207,  206,  205,
-      204,  203,  202,  201,  200,  199,  198,  197,  196,  195,
-      194,  193,  192,  191,  190,  189,  188,  187,  186,  185,
-      184,  183,  182,  181,  180,  178,  177,  176,  175,  174,
-      163,  162,  161,  160,  159,  158,  157,  156,  155,  154,
-      153,  152,  151,  145,  143,  140,  138,  136,  135,  134,
-
-      133,  132,  131,  126,  125,  124,  123,  122,  120,  118,
-      117,  116,  115,  114,  113,  112,  111,  110,  109,  108,
-      106,  105,  104,  103,  102,  101,  100,   99,   98,   96,
-       95,   94,   93,   92,   91,   89,   88,   87,   86,   85,
-       84,   83,   82,   81,   79,   78,   77,   76,   75,   73,
-       72,   71,   70,   69,   68,   67,   66,   63,   62,   61,
-       60,   52,   50,   49,   47,   45,   44,    3,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940,  940,  940,  940,  940,  940,
-      940,  940,  940,  940,  940
+      618,  617,  616,  614,  613,  611,  610,  609,  608,  607,
+      605,  604,  603,  602,  601,  600,  599,  598,  596,  595,
+      593,  592,  591,  590,  589,  588,  586,  585,  584,  582,
+      581,  580,  579,  577,  576,  575,  574,  573,  572,  571,
+      570,  569,  567,  566,  564,  563,  562,  561,  560,  559,
+      555,  554,  553,  551,  549,  548,  547,  546,  545,  544,
+      543,  541,  539,  538,  537,  536,  535,  533,  531,  528,
+      527,  525,  524,  523,  522,  521,  520,  519,  518,  517,
+
+      516,  515,  513,  512,  511,  510,  509,  506,  505,  504,
+      502,  501,  500,  499,  498,  497,  495,  493,  492,  491,
+      490,  489,  486,  485,  484,  483,  482,  481,  480,  477,
+      476,  474,  473,  472,  471,  470,  469,  467,  465,  464,
+      463,  462,  461,  460,  458,  457,  456,  452,  451,  450,
+      447,  446,  444,  443,  441,  440,  438,  437,  435,  434,
+      433,  432,  428,  426,  425,  424,  422,  421,  420,  419,
+      418,  416,  415,  414,  413,  412,  411,  410,  409,  408,
+      407,  406,  405,  404,  403,  401,  400,  399,  398,  397,
+      396,  395,  394,  391,  390,  389,  388,  387,  386,  385,
+
+      382,  381,  380,  379,  377,  375,  374,  373,  372,  371,
+      369,  368,  367,  366,  364,  361,  360,  359,  358,  357,
+      356,  355,  354,  353,  352,  351,  350,  349,  348,  347,
+      346,  345,  343,  341,  339,  338,  336,  335,  334,  333,
+      332,  331,  330,  329,  327,  325,  324,  323,  322,  321,
+      320,  319,  318,  317,  316,  315,  314,  311,  310,  309,
+      308,  307,  305,  304,  303,  302,  301,  300,  299,  297,
+      296,  295,  294,  293,  292,  290,  289,  288,  287,  286,
+      285,  283,  277,  276,  275,  274,  273,  272,  270,  269,
+      267,  266,  265,  264,  263,  262,  261,  260,  259,  258,
+
+      257,  256,  255,  254,  253,  252,  251,  250,  249,  248,
+      247,  246,  245,  244,  243,  242,  241,  240,  239,  238,
+      237,  236,  235,  234,  233,  232,  231,  230,  229,  228,
+      227,  226,  225,  224,  223,  222,  221,  220,  219,  218,
+      217,  216,  215,  214,  213,  212,  210,  208,  207,  206,
+      205,  204,  203,  202,  201,  200,  199,  198,  197,  196,
+      195,  194,  193,  192,  191,  190,  189,  188,  187,  186,
+      185,  184,  183,  182,  181,  180,  178,  177,  176,  175,
+      174,  163,  162,  161,  160,  159,  158,  157,  156,  155,
+      154,  153,  152,  151,  145,  143,  140,  138,  136,  135,
+
+      134,  133,  132,  131,  126,  125,  124,  123,  122,  120,
+      118,  117,  116,  115,  114,  113,  112,  111,  110,  109,
+      108,  106,  105,  104,  103,  102,  101,  100,   99,   98,
+       96,   95,   94,   93,   92,   91,   89,   88,   87,   86,
+       85,   84,   83,   82,   81,   79,   78,   77,   76,   75,
+       73,   72,   71,   70,   69,   68,   67,   66,   63,   62,
+       61,   60,   52,   50,   49,   47,   45,   44,    3,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941,  941,  941,  941,  941,
+      941,  941,  941,  941,  941,  941
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -986,7 +987,7 @@ void   skipline(void);
 	     && ferror( yyin ) )					\
      YY_FATAL_ERROR( "input in flex scanner failed" );
 
-#line 990 "Gmsh.yy.cpp"
+#line 991 "Gmsh.yy.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1140,7 +1141,7 @@ YY_DECL
 #line 60 "Gmsh.l"
 
 
-#line 1144 "Gmsh.yy.cpp"
+#line 1145 "Gmsh.yy.cpp"
 
 	if ( yy_init )
 		{
@@ -1191,13 +1192,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 941 )
+				if ( yy_current_state >= 942 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 1169 );
+		while ( yy_base[yy_current_state] != 1170 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1601,7 +1602,7 @@ return tSurface;
 case 76:
 YY_RULE_SETUP
 #line 156 "Gmsh.l"
-return tSymetry;
+return tSymmetry;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
@@ -1999,7 +2000,7 @@ YY_RULE_SETUP
 #line 251 "Gmsh.l"
 ECHO;
 	YY_BREAK
-#line 2003 "Gmsh.yy.cpp"
+#line 2004 "Gmsh.yy.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2291,7 +2292,7 @@ static yy_state_type yy_get_previous_state()
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 941 )
+			if ( yy_current_state >= 942 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2326,11 +2327,11 @@ yy_state_type yy_current_state;
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 941 )
+		if ( yy_current_state >= 942 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 940);
+	yy_is_jam = (yy_current_state == 941);
 
 	return yy_is_jam ? 0 : yy_current_state;
 	}
-- 
GitLab