diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index 99e63d1ac6fd5a90ae0f0f291af77d7a836a770f..d39bbc78bf1b840b50b14bb149f500c0bbf0b691 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -188,7 +188,7 @@ static void file_remote_cb(Fl_Widget *w, void *data)
else
c = (onelab::localNetworkClient*)it->second;
GmshServer *server = c->getGmshServer();
-
+
std::string str((const char*)data);
if(str == "start"){
@@ -341,7 +341,7 @@ static int _save_auto(const char *name)
case FORMAT_SVG : return _save_svg(name);
case FORMAT_YUV : return _save_yuv(name);
default :
- CreateOutputFile(name, FORMAT_AUTO);
+ CreateOutputFile(name, FORMAT_AUTO);
return 1;
}
}
@@ -421,7 +421,7 @@ static void file_save_as_cb(Fl_Widget *w, void *data)
std::string name = fileChooserGetName(1);
if(CTX::instance()->confirmOverwrite) {
if(!StatFile(name))
- if(!fl_choice("File '%s' already exists.\n\nDo you want to replace it?",
+ if(!fl_choice("File '%s' already exists.\n\nDo you want to replace it?",
"Cancel", "Replace", 0, name.c_str()))
goto test;
}
@@ -458,7 +458,7 @@ static void file_rename_cb(Fl_Widget *w, void *data)
std::string name = fileChooserGetName(1);
if(CTX::instance()->confirmOverwrite) {
if(!StatFile(name))
- if(!fl_choice("File '%s' already exists.\n\nDo you want to replace it?",
+ if(!fl_choice("File '%s' already exists.\n\nDo you want to replace it?",
"Cancel", "Replace", 0, name.c_str()))
goto test;
}
@@ -485,7 +485,7 @@ void file_watch_cb(Fl_Widget *w, void *data)
(GModel::current()->getFileName(), CTX::instance()->watchFilePattern);
std::string directory = SplitFileName(pattern)[0];
if(directory.empty()) directory = "./";
-
+
dirent **files = 0;
int num = fl_filename_list(directory.c_str(), &files, fl_numericsort);
if(num <= 0) return;
@@ -498,9 +498,9 @@ void file_watch_cb(Fl_Widget *w, void *data)
}
if(files) free((void*)files);
- Msg::Info("%d match%s for pattern '%s'", (int)matches.size(),
+ Msg::Info("%d match%s for pattern '%s'", (int)matches.size(),
(matches.size() > 1) ? "es" : "", pattern.c_str());
-
+
std::set<std::string> allFiles;
for(unsigned int i = 0; i < GModel::list.size(); i++)
allFiles.insert(GetFileNameWithoutPath(GModel::list[i]->getFileName()));
@@ -525,10 +525,10 @@ static void help_short_cb(Fl_Widget *w, void *data)
Msg::Direct(" ");
Msg::Direct("Keyboard shortcuts:");
Msg::Direct(" ");
- Msg::Direct(" Left arrow Go to previous time step");
- Msg::Direct(" Right arrow Go to next time step");
- Msg::Direct(" Up arrow Make previous view visible");
- Msg::Direct(" Down arrow Make next view visible");
+ Msg::Direct(" Left arrow Go to previous time step");
+ Msg::Direct(" Right arrow Go to next time step");
+ Msg::Direct(" Up arrow Make previous view visible");
+ Msg::Direct(" Down arrow Make next view visible");
Msg::Direct(" ");
Msg::Direct(" < Go back to previous context");
Msg::Direct(" > Go forward to next context");
@@ -546,54 +546,54 @@ static void help_short_cb(Fl_Widget *w, void *data)
Msg::Direct(" Shift+a Bring all windows to front");
Msg::Direct(" Shift+g Show geometry options");
Msg::Direct(" Shift+m Show mesh options");
- Msg::Direct(" Shift+o Show general options");
+ Msg::Direct(" Shift+o Show general options");
Msg::Direct(" Shift+p Show post-processing options");
- Msg::Direct(" Shift+s Show solver options");
+ Msg::Direct(" Shift+s Show solver options");
Msg::Direct(" Shift+u Show post-processing view plugins");
Msg::Direct(" Shift+w Show post-processing view options");
Msg::Direct(" Shift+Escape Enable full mouse selection");
Msg::Direct(" ");
- Msg::Direct(" " CC("i") " Show statistics window");
+ Msg::Direct(" " CC("i") " Show statistics window");
Msg::Direct(" " CC("l") " Show message console");
#if defined(__APPLE__)
- Msg::Direct(" " CC("m") " Minimize window");
+ Msg::Direct(" " CC("m") " Minimize window");
#endif
- Msg::Direct(" " CC("n") " Create new project file");
- Msg::Direct(" " CC("o") " Open project file");
+ Msg::Direct(" " CC("n") " Create new project file");
+ Msg::Direct(" " CC("o") " Open project file");
Msg::Direct(" " CC("q") " Quit");
Msg::Direct(" " CC("r") " Rename project file");
Msg::Direct(" " CC("s") " Save file as");
Msg::Direct(" ");
Msg::Direct(" Shift+" CC("c") " Show clipping plane window");
- Msg::Direct(" Shift+" CC("m") " Show manipulator window");
- Msg::Direct(" Shift+" CC("n") " Show option window");
- Msg::Direct(" Shift+" CC("o") " Merge file(s)");
+ Msg::Direct(" Shift+" CC("m") " Show manipulator window");
+ Msg::Direct(" Shift+" CC("n") " Show option window");
+ Msg::Direct(" Shift+" CC("o") " Merge file(s)");
Msg::Direct(" Shift+" CC("s") " Save mesh in default format");
Msg::Direct(" Shift+" CC("u") " Show plugin window");
Msg::Direct(" Shift+" CC("v") " Show visibility window");
Msg::Direct(" ");
- Msg::Direct(" Alt+a Loop through axes modes");
+ Msg::Direct(" Alt+a Loop through axes modes");
Msg::Direct(" Alt+b Hide/show bounding boxes");
Msg::Direct(" Alt+c Loop through predefined color schemes");
Msg::Direct(" Alt+e Hide/Show element outlines for visible post-pro views");
- Msg::Direct(" Alt+f Change redraw mode (fast/full)");
- Msg::Direct(" Alt+h Hide/show all post-processing views");
+ Msg::Direct(" Alt+f Change redraw mode (fast/full)");
+ Msg::Direct(" Alt+h Hide/show all post-processing views");
Msg::Direct(" Alt+i Hide/show all post-processing view scales");
Msg::Direct(" Alt+l Hide/show geometry lines");
Msg::Direct(" Alt+m Toggle visibility of all mesh entities");
Msg::Direct(" Alt+n Hide/show all post-processing view annotations");
Msg::Direct(" Alt+o Change projection mode (orthographic/perspective)");
Msg::Direct(" Alt+p Hide/show geometry points");
- Msg::Direct(" Alt+r Loop through range modes for visible post-pro views");
+ Msg::Direct(" Alt+r Loop through range modes for visible post-pro views");
Msg::Direct(" Alt+s Hide/show geometry surfaces");
- Msg::Direct(" Alt+t Loop through interval modes for visible post-pro views");
+ Msg::Direct(" Alt+t Loop through interval modes for visible post-pro views");
Msg::Direct(" Alt+v Hide/show geometry volumes");
Msg::Direct(" Alt+w Enable/disable all lighting");
- Msg::Direct(" Alt+x Set X view");
- Msg::Direct(" Alt+y Set Y view");
- Msg::Direct(" Alt+z Set Z view");
+ Msg::Direct(" Alt+x Set X view");
+ Msg::Direct(" Alt+y Set Y view");
+ Msg::Direct(" Alt+z Set Z view");
Msg::Direct(" ");
- Msg::Direct(" Alt+Shift+a Hide/show small axes");
+ Msg::Direct(" Alt+Shift+a Hide/show small axes");
Msg::Direct(" Alt+Shift+b Hide/show mesh volume faces");
Msg::Direct(" Alt+Shift+d Hide/show mesh surface faces");
Msg::Direct(" Alt+Shift+l Hide/show mesh lines");
@@ -602,9 +602,9 @@ static void help_short_cb(Fl_Widget *w, void *data)
Msg::Direct(" Alt+Shift+s Hide/show mesh surface edges");
Msg::Direct(" Alt+Shift+v Hide/show mesh volume edges");
Msg::Direct(" Alt+Shift+w Reverse all mesh normals");
- Msg::Direct(" Alt+Shift+x Set -X view");
- Msg::Direct(" Alt+Shift+y Set -Y view");
- Msg::Direct(" Alt+Shift+z Set -Z view");
+ Msg::Direct(" Alt+Shift+x Set -X view");
+ Msg::Direct(" Alt+Shift+y Set -Y view");
+ Msg::Direct(" Alt+Shift+z Set -Z view");
Msg::Direct(" ");
FlGui::instance()->showMessages();
}
@@ -621,17 +621,17 @@ static void help_mouse_cb(Fl_Widget *w, void *data)
Msg::Direct(" - Resize a lasso zoom or a lasso (un)selection");
Msg::Direct(" Left button - Rotate");
Msg::Direct(" - Select an entity");
- Msg::Direct(" - Accept a lasso zoom or a lasso selection");
- Msg::Direct(" Ctrl+Left button Start a lasso zoom or a lasso (un)selection");
+ Msg::Direct(" - Accept a lasso zoom or a lasso selection");
+ Msg::Direct(" Ctrl+Left button Start a lasso zoom or a lasso (un)selection");
Msg::Direct(" Middle button - Zoom");
Msg::Direct(" - Unselect an entity");
Msg::Direct(" - Accept a lasso zoom or a lasso unselection");
- Msg::Direct(" Ctrl+Middle button Orthogonalize display");
+ Msg::Direct(" Ctrl+Middle button Orthogonalize display");
Msg::Direct(" Right button - Pan");
Msg::Direct(" - Cancel a lasso zoom or a lasso (un)selection");
Msg::Direct(" - Pop-up menu on post-processing view button");
- Msg::Direct(" Ctrl+Right button Reset to default viewpoint");
- Msg::Direct(" ");
+ Msg::Direct(" Ctrl+Right button Reset to default viewpoint");
+ Msg::Direct(" ");
Msg::Direct(" For a 2 button mouse, Middle button = Shift+Left button");
Msg::Direct(" For a 1 button mouse, Middle button = Shift+Left button, "
"Right button = Alt+Left button");
@@ -1025,7 +1025,7 @@ static void add_new_surface_volume(int mode)
Msg::StatusBar(3, false, "Select volume boundary\n"
"[Press 'u' to undo last selection or 'q' to abort]");
}
-
+
char ib = FlGui::instance()->selectEntity(type);
if(ib == 'q') {
GModel::current()->setSelection(0);
@@ -1102,11 +1102,11 @@ static void add_new_surface_volume(int mode)
}
}
if(ib == 'l') {
- int size = (type == ENT_LINE) ?
+ int size = (type == ENT_LINE) ?
FlGui::instance()->selectedEdges.size() :
FlGui::instance()->selectedFaces.size();
for(int i=0;i<size;i++){
- int num = (type == ENT_LINE) ?
+ int num = (type == ENT_LINE) ?
FlGui::instance()->selectedEdges[i]->tag() :
FlGui::instance()->selectedFaces[i]->tag();
if(select_contour(type, num, List1)) {
@@ -1127,9 +1127,9 @@ static void add_new_surface_volume(int mode)
List_Unique(List2,fcmp_absint);
if(List_Nbr(List2)) {
switch (mode) {
- case 0: add_surf("Plane Surface", List2,
+ case 0: add_surf("Plane Surface", List2,
GModel::current()->getFileName()); break;
- case 1: add_surf("Ruled Surface", List2,
+ case 1: add_surf("Ruled Surface", List2,
GModel::current()->getFileName()); break;
case 2: add_vol(List2, GModel::current()->getFileName()); break;
}
@@ -1216,7 +1216,7 @@ static void split_selection()
}
for(unsigned int i = 0; i < FlGui::instance()->selectedVertices.size(); i++){
int tag = FlGui::instance()->selectedVertices[i]->tag();
- int index = List_ISearchSeq(List1, &tag, fcmp_int);
+ int index = List_ISearchSeq(List1, &tag, fcmp_int);
if(index < 0) List_Add(List1, &tag);
FlGui::instance()->selectedVertices[i]->setSelection(1);
}
@@ -1262,7 +1262,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
}
drawContext::global()->draw();
-
+
List_T *List1 = List_Create(5, 5, sizeof(int));
while(1) {
if(!List_Nbr(List1))
@@ -1272,7 +1272,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
Msg::StatusBar(3, false, "Select %s\n"
"[Press 'e' to end selection, 'u' to undo last selection "
"or 'q' to abort]", str);
-
+
char ib = FlGui::instance()->selectEntity(type);
if(ib == 'l') {
// we don't use List_Insert in order to keep the original
@@ -1280,7 +1280,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
// expected)
int tag;
switch (type) {
- case ENT_POINT:
+ case ENT_POINT:
for(unsigned int i = 0; i < FlGui::instance()->selectedVertices.size(); i++){
FlGui::instance()->selectedVertices[i]->setSelection(1);
tag = FlGui::instance()->selectedVertices[i]->tag();
@@ -1324,7 +1324,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
case ENT_POINT:
for(unsigned int i = 0; i < FlGui::instance()->selectedVertices.size(); i++){
tag = FlGui::instance()->selectedVertices[i]->tag();
- index = List_ISearchSeq(List1, &tag, fcmp_int);
+ index = List_ISearchSeq(List1, &tag, fcmp_int);
if(index >= 0) List_PSuppress(List1, index);
FlGui::instance()->selectedVertices[i]->setSelection(0);
}
@@ -1332,7 +1332,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
case ENT_LINE:
for(unsigned int i = 0; i < FlGui::instance()->selectedEdges.size(); i++){
tag = FlGui::instance()->selectedEdges[i]->tag();
- index = List_ISearchSeq(List1, &tag, fcmp_int);
+ index = List_ISearchSeq(List1, &tag, fcmp_int);
if(index >= 0) List_PSuppress(List1, index);
FlGui::instance()->selectedEdges[i]->setSelection(0);
}
@@ -1340,7 +1340,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
case ENT_SURFACE:
for(unsigned int i = 0; i < FlGui::instance()->selectedFaces.size(); i++){
tag = FlGui::instance()->selectedFaces[i]->tag();
- index = List_ISearchSeq(List1, &tag, fcmp_int);
+ index = List_ISearchSeq(List1, &tag, fcmp_int);
if(index >= 0) List_PSuppress(List1, index);
FlGui::instance()->selectedFaces[i]->setSelection(0);
}
@@ -1348,7 +1348,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
case ENT_VOLUME:
for(unsigned int i = 0; i < FlGui::instance()->selectedRegions.size(); i++){
tag = FlGui::instance()->selectedRegions[i]->tag();
- index = List_ISearchSeq(List1, &tag, fcmp_int);
+ index = List_ISearchSeq(List1, &tag, fcmp_int);
if(index >= 0) List_PSuppress(List1, index);
FlGui::instance()->selectedRegions[i]->setSelection(0);
}
@@ -1439,7 +1439,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
add_physical(what, List1, GModel::current()->getFileName());
break;
case 8:
- add_charlength(List1, GModel::current()->getFileName(),
+ add_charlength(List1, GModel::current()->getFileName(),
FlGui::instance()->meshContext->input[0]->value());
break;
case 9:
@@ -1469,7 +1469,7 @@ static void action_point_line_surface_volume(int action, int mode, const char *w
Msg::StatusBar(3, false, "");
}
-
+
static void geometry_elementary_add_translate_cb(Fl_Widget *w, void *data)
{
if(!data){
@@ -1703,7 +1703,7 @@ static void mesh_delete_parts_cb(Fl_Widget *w, void *data)
if(CTX::instance()->pickElements){
for(unsigned int i = 0; i < FlGui::instance()->selectedElements.size(); i++){
if(FlGui::instance()->selectedElements[i]->getVisibility() != 2){
- FlGui::instance()->selectedElements[i]->setVisibility(2);
+ FlGui::instance()->selectedElements[i]->setVisibility(2);
ele.push_back(FlGui::instance()->selectedElements[i]);
}
}
@@ -1711,13 +1711,13 @@ static void mesh_delete_parts_cb(Fl_Widget *w, void *data)
else{
for(unsigned int i = 0; i < FlGui::instance()->selectedEdges.size(); i++){
if(FlGui::instance()->selectedEdges[i]->getSelection() != 1){
- FlGui::instance()->selectedEdges[i]->setSelection(1);
+ FlGui::instance()->selectedEdges[i]->setSelection(1);
ent.push_back(FlGui::instance()->selectedEdges[i]);
}
}
for(unsigned int i = 0; i < FlGui::instance()->selectedFaces.size(); i++){
if(FlGui::instance()->selectedFaces[i]->getSelection() != 1){
- FlGui::instance()->selectedFaces[i]->setSelection(1);
+ FlGui::instance()->selectedFaces[i]->setSelection(1);
ent.push_back(FlGui::instance()->selectedFaces[i]);
}
}
@@ -1800,10 +1800,10 @@ static void mesh_inspect_cb(Fl_Widget *w, void *data)
int type = ele->getTypeForMSH();
const char *name;
MElement::getInfoMSH(type, &name);
- Msg::Direct(" Type: %d ('%s')", type, name);
+ Msg::Direct(" Type: %d ('%s')", type, name);
Msg::Direct(" Dimension: %d", ele->getDim());
- Msg::Direct(" Order: %d", ele->getPolynomialOrder());
- Msg::Direct(" Partition: %d", ele->getPartition());
+ Msg::Direct(" Order: %d", ele->getPolynomialOrder());
+ Msg::Direct(" Partition: %d", ele->getPartition());
char tmp1[32], tmp2[512];
sprintf(tmp2, " Vertices:");
for(int i = 0; i < ele->getNumVertices(); i++){
@@ -1844,13 +1844,13 @@ static void mesh_degree_cb(Fl_Widget *w, void *data)
{
int degree = (intptr_t)data;
if(degree == 2)
- SetOrderN(GModel::current(), 2, CTX::instance()->mesh.secondOrderLinear,
+ SetOrderN(GModel::current(), 2, CTX::instance()->mesh.secondOrderLinear,
CTX::instance()->mesh.secondOrderIncomplete);
else if (degree == 1)
SetOrder1(GModel::current());
else // For now, use the same options as for second order meshes
- SetOrderN(GModel::current(), degree,
- CTX::instance()->mesh.secondOrderLinear,
+ SetOrderN(GModel::current(), degree,
+ CTX::instance()->mesh.secondOrderLinear,
CTX::instance()->mesh.secondOrderIncomplete);
CTX::instance()->mesh.changed |= (ENT_LINE | ENT_SURFACE | ENT_VOLUME);
drawContext::global()->draw();
@@ -2034,7 +2034,7 @@ static void add_transfinite_embedded(int dim, bool embed)
case 2:
if(embed && p.size())
add_embedded("Point", p, GModel::current()->getFileName());
- else if(!embed &&
+ else if(!embed &&
(p.size() == 0 + 1 || p.size() == 3 + 1 || p.size() == 4 + 1))
add_trsfsurf(p, GModel::current()->getFileName(),
FlGui::instance()->meshContext->choice[1]->text());
@@ -2194,7 +2194,7 @@ static void view_remove_all_cb(Fl_Widget *w, void *data)
for(int i = PView::list.size() - 1; i >= 0; i--)
if(PView::list[i]->getData()->getName() == name) delete PView::list[i];
}
-
+
FlGui::instance()->updateViews();
drawContext::global()->draw();
}
@@ -2219,7 +2219,7 @@ static void view_save_cb(Fl_Widget *w, void *data)
PView *view = PView::list[(intptr_t)data];
test:
- if(fileChooser(FILE_CHOOSER_CREATE, "Save As", formats,
+ if(fileChooser(FILE_CHOOSER_CREATE, "Save As", formats,
view->getData()->getFileName().c_str())){
std::string name = fileChooserGetName(1);
if(CTX::instance()->confirmOverwrite) {
@@ -2307,11 +2307,11 @@ static void view_all_visible_cb(Fl_Widget *w, void *data)
std::string name;
if(mode >= 0) name = PView::list[mode]->getData()->getName();
for(unsigned int i = 0; i < PView::list.size(); i++)
- opt_view_visible(i, GMSH_SET | GMSH_GUI,
+ opt_view_visible(i, GMSH_SET | GMSH_GUI,
(mode == -1) ? 1 :
(mode == -2) ? 0 :
(mode == -3) ? !opt_view_visible(i, GMSH_GET, 0) :
- (name == PView::list[i]->getData()->getName()) ? 1 :
+ (name == PView::list[i]->getData()->getName()) ? 1 :
0);
drawContext::global()->draw();
}
@@ -2474,10 +2474,10 @@ contextItem menu_geometry[] = {
{"0Geometry"} ,
{"Elementary entities", (Fl_Callback *)geometry_elementary_cb} ,
{"Physical groups", (Fl_Callback *)geometry_physical_cb} ,
- {"Edit", (Fl_Callback *)geometry_edit_cb} ,
- {"Reload", (Fl_Callback *)geometry_reload_cb} ,
+ {"Edit", (Fl_Callback *)geometry_edit_cb} ,
+ {"Reload", (Fl_Callback *)geometry_reload_cb} ,
{""}
-};
+};
contextItem menu_geometry_elementary[] = {
{"0Geometry>Elementary"} ,
{"Add", (Fl_Callback *)geometry_elementary_add_cb} ,
@@ -2489,8 +2489,8 @@ contextItem menu_geometry[] = {
{"Symmetry", (Fl_Callback *)geometry_elementary_symmetry_cb, (void*)0} ,
{"Extrude", (Fl_Callback *)geometry_elementary_extrude_cb, (void*)0} ,
{"Coherence", (Fl_Callback *)geometry_elementary_coherence_cb} ,
- {""}
- };
+ {""}
+ };
contextItem menu_geometry_elementary_add[] = {
{"0Geometry>Elementary>Add"} ,
{"New", (Fl_Callback *)geometry_elementary_add_new_cb, (void*)0} ,
@@ -2498,8 +2498,8 @@ contextItem menu_geometry[] = {
{"Rotate", (Fl_Callback *)geometry_elementary_add_rotate_cb, (void*)0} ,
{"Scale", (Fl_Callback *)geometry_elementary_add_scale_cb, (void*)0} ,
{"Symmetry", (Fl_Callback *)geometry_elementary_add_symmetry_cb, (void*)0} ,
- {""}
- };
+ {""}
+ };
contextItem menu_geometry_elementary_add_new[] = {
{"0Geometry>Elementary>Add>New"} ,
{"Parameter", (Fl_Callback *)geometry_elementary_add_new_cb, (void*)"Parameter"} ,
@@ -2512,48 +2512,48 @@ contextItem menu_geometry[] = {
{"Plane surface", (Fl_Callback *)geometry_elementary_add_new_cb, (void*)"Plane Surface"} ,
{"Ruled surface", (Fl_Callback *)geometry_elementary_add_new_cb, (void*)"Ruled Surface"} ,
{"Volume", (Fl_Callback *)geometry_elementary_add_new_cb, (void*)"Volume"} ,
- {""}
- };
+ {""}
+ };
contextItem menu_geometry_elementary_add_translate[] = {
{"0Geometry>Elementary>Add>Translate"} ,
- {"Point", (Fl_Callback *)geometry_elementary_add_translate_cb, (void*)"Point"} ,
- {"Line", (Fl_Callback *)geometry_elementary_add_translate_cb, (void*)"Line"} ,
+ {"Point", (Fl_Callback *)geometry_elementary_add_translate_cb, (void*)"Point"} ,
+ {"Line", (Fl_Callback *)geometry_elementary_add_translate_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_add_translate_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)geometry_elementary_add_translate_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)geometry_elementary_add_translate_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_geometry_elementary_add_rotate[] = {
{"0Geometry>Elementary>Add>Rotate"} ,
- {"Point", (Fl_Callback *)geometry_elementary_add_rotate_cb, (void*)"Point"} ,
- {"Line", (Fl_Callback *)geometry_elementary_add_rotate_cb, (void*)"Line"} ,
+ {"Point", (Fl_Callback *)geometry_elementary_add_rotate_cb, (void*)"Point"} ,
+ {"Line", (Fl_Callback *)geometry_elementary_add_rotate_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_add_rotate_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)geometry_elementary_add_rotate_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)geometry_elementary_add_rotate_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_geometry_elementary_add_scale[] = {
{"0Geometry>Elementary>Add>Scale"} ,
- {"Point", (Fl_Callback *)geometry_elementary_add_scale_cb, (void*)"Point"} ,
- {"Line", (Fl_Callback *)geometry_elementary_add_scale_cb, (void*)"Line"} ,
+ {"Point", (Fl_Callback *)geometry_elementary_add_scale_cb, (void*)"Point"} ,
+ {"Line", (Fl_Callback *)geometry_elementary_add_scale_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_add_scale_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)geometry_elementary_add_scale_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)geometry_elementary_add_scale_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_geometry_elementary_add_symmetry[] = {
{"0Geometry>Elementary>Add>Symmetry"} ,
- {"Point", (Fl_Callback *)geometry_elementary_add_symmetry_cb, (void*)"Point"} ,
- {"Line", (Fl_Callback *)geometry_elementary_add_symmetry_cb, (void*)"Line"} ,
+ {"Point", (Fl_Callback *)geometry_elementary_add_symmetry_cb, (void*)"Point"} ,
+ {"Line", (Fl_Callback *)geometry_elementary_add_symmetry_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_add_symmetry_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)geometry_elementary_add_symmetry_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)geometry_elementary_add_symmetry_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_geometry_elementary_delete[] = {
{"0Geometry>Elementary>Delete"} ,
{"Point", (Fl_Callback *)geometry_elementary_delete_cb, (void*)"Point"} ,
{"Line", (Fl_Callback *)geometry_elementary_delete_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_delete_cb, (void*)"Surface"} ,
{"Volume", (Fl_Callback *)geometry_elementary_delete_cb, (void*)"Volume"} ,
- {""}
- };
+ {""}
+ };
contextItem menu_geometry_elementary_split[] = {
{"0Geometry>Elementary>Split"},
{"Line",(Fl_Callback *)geometry_elementary_split_cb,(void*)"Line"},
@@ -2561,126 +2561,126 @@ contextItem menu_geometry[] = {
};
contextItem menu_geometry_elementary_translate[] = {
{"0Geometry>Elementary>Translate"} ,
- {"Point", (Fl_Callback *)geometry_elementary_translate_cb, (void*)"Point"} ,
- {"Line", (Fl_Callback *)geometry_elementary_translate_cb, (void*)"Line"} ,
+ {"Point", (Fl_Callback *)geometry_elementary_translate_cb, (void*)"Point"} ,
+ {"Line", (Fl_Callback *)geometry_elementary_translate_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_translate_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)geometry_elementary_translate_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)geometry_elementary_translate_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_geometry_elementary_rotate[] = {
{"0Geometry>Elementary>Rotate"} ,
- {"Point", (Fl_Callback *)geometry_elementary_rotate_cb, (void*)"Point"} ,
- {"Line", (Fl_Callback *)geometry_elementary_rotate_cb, (void*)"Line"} ,
+ {"Point", (Fl_Callback *)geometry_elementary_rotate_cb, (void*)"Point"} ,
+ {"Line", (Fl_Callback *)geometry_elementary_rotate_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_rotate_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)geometry_elementary_rotate_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)geometry_elementary_rotate_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_geometry_elementary_scale[] = {
{"0Geometry>Elementary>Scale"} ,
- {"Point", (Fl_Callback *)geometry_elementary_scale_cb, (void*)"Point"} ,
- {"Line", (Fl_Callback *)geometry_elementary_scale_cb, (void*)"Line"} ,
+ {"Point", (Fl_Callback *)geometry_elementary_scale_cb, (void*)"Point"} ,
+ {"Line", (Fl_Callback *)geometry_elementary_scale_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_scale_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)geometry_elementary_scale_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)geometry_elementary_scale_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_geometry_elementary_symmetry[] = {
{"0Geometry>Elementary>Symmetry"} ,
- {"Point", (Fl_Callback *)geometry_elementary_symmetry_cb, (void*)"Point"} ,
- {"Line", (Fl_Callback *)geometry_elementary_symmetry_cb, (void*)"Line"} ,
+ {"Point", (Fl_Callback *)geometry_elementary_symmetry_cb, (void*)"Point"} ,
+ {"Line", (Fl_Callback *)geometry_elementary_symmetry_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_symmetry_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)geometry_elementary_symmetry_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)geometry_elementary_symmetry_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_geometry_elementary_extrude[] = {
{"0Geometry>Elementary>Extrude"} ,
{"Translate", (Fl_Callback *)geometry_elementary_extrude_translate_cb, (void*)0} ,
{"Rotate", (Fl_Callback *)geometry_elementary_extrude_rotate_cb, (void*)0} ,
- {""}
- };
+ {""}
+ };
contextItem menu_geometry_elementary_extrude_translate[] = {
{"0Geometry>Elementary>Extrude>Translate"} ,
{"Point", (Fl_Callback *)geometry_elementary_extrude_translate_cb, (void*)"Point"} ,
{"Line", (Fl_Callback *)geometry_elementary_extrude_translate_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_extrude_translate_cb, (void*)"Surface"} ,
- {""}
- };
+ {""}
+ };
contextItem menu_geometry_elementary_extrude_rotate[] = {
{"0Geometry>Elementary>Extrude>Rotate"} ,
{"Point", (Fl_Callback *)geometry_elementary_extrude_rotate_cb, (void*)"Point"} ,
{"Line", (Fl_Callback *)geometry_elementary_extrude_rotate_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)geometry_elementary_extrude_rotate_cb, (void*)"Surface"} ,
- {""}
- };
+ {""}
+ };
contextItem menu_geometry_physical[] = {
{"0Geometry>Physical"} ,
{"Add", (Fl_Callback *)geometry_physical_add_cb, (void*)0} ,
- {""}
- };
+ {""}
+ };
contextItem menu_geometry_physical_add[] = {
{"0Geometry>Physical>Add"} ,
{"Point", (Fl_Callback *)geometry_physical_add_cb, (void*)"Point" } ,
{"Line", (Fl_Callback *)geometry_physical_add_cb, (void*)"Line" } ,
{"Surface", (Fl_Callback *)geometry_physical_add_cb, (void*)"Surface" } ,
{"Volume", (Fl_Callback *)geometry_physical_add_cb, (void*)"Volume" } ,
- {""}
- };
+ {""}
+ };
contextItem menu_mesh[] = {
{"1Mesh"} ,
{"Define", (Fl_Callback *)mesh_define_cb} ,
{"1D", (Fl_Callback *)mesh_1d_cb} ,
- {"2D", (Fl_Callback *)mesh_2d_cb} ,
- {"3D", (Fl_Callback *)mesh_3d_cb} ,
- {"Optimize 3D", (Fl_Callback *)mesh_optimize_cb} ,
+ {"2D", (Fl_Callback *)mesh_2d_cb} ,
+ {"3D", (Fl_Callback *)mesh_3d_cb} ,
+ {"Optimize 3D", (Fl_Callback *)mesh_optimize_cb} ,
#if defined(HAVE_NETGEN)
- {"Optimize 3D (Netgen)", (Fl_Callback *)mesh_optimize_netgen_cb} ,
+ {"Optimize 3D (Netgen)", (Fl_Callback *)mesh_optimize_netgen_cb} ,
#endif
- {"Set order", (Fl_Callback *)mesh_change_order_cb} ,
- {"Inspect", (Fl_Callback *)mesh_inspect_cb} ,
+ {"Set order", (Fl_Callback *)mesh_change_order_cb} ,
+ {"Inspect", (Fl_Callback *)mesh_inspect_cb} ,
{"Refine by splitting", (Fl_Callback *)mesh_refine_cb} ,
#if defined(HAVE_METIS) || defined(HAVE_CHACO)
{"Partition", (Fl_Callback *)mesh_partition_cb} ,
#endif
- {"Reclassify 2D", (Fl_Callback *)mesh_classify_cb} ,
+ {"Reclassify 2D", (Fl_Callback *)mesh_classify_cb} ,
#if defined(HAVE_FOURIER_MODEL)
- {"Reparameterize 2D", (Fl_Callback *)mesh_parameterize_cb} ,
+ {"Reparameterize 2D", (Fl_Callback *)mesh_parameterize_cb} ,
#endif
- {"Delete", (Fl_Callback *)mesh_delete_cb} ,
+ {"Delete", (Fl_Callback *)mesh_delete_cb} ,
{"Save", (Fl_Callback *)mesh_save_cb} ,
- {""}
-};
+ {""}
+};
contextItem menu_mesh_define[] = {
{"1Mesh>Define"} ,
{"Size fields", (Fl_Callback *)field_cb},
{"Element size at points", (Fl_Callback *)mesh_define_length_cb } ,
{"Embedded points", (Fl_Callback *)mesh_define_embedded_cb, (void*)"point" } ,
{"Recombine", (Fl_Callback *)mesh_define_recombine_cb } ,
- {"Transfinite", (Fl_Callback *)mesh_define_transfinite_cb } ,
- {"Compound", (Fl_Callback *)mesh_define_compound_cb } ,
- {""}
- };
+ {"Transfinite", (Fl_Callback *)mesh_define_transfinite_cb } ,
+ {"Compound", (Fl_Callback *)mesh_define_compound_cb } ,
+ {""}
+ };
contextItem menu_mesh_define_transfinite[] = {
{"1Mesh>Define>Transfinite"} ,
{"Line", (Fl_Callback *)mesh_define_transfinite_line_cb} ,
{"Surface", (Fl_Callback *)mesh_define_transfinite_surface_cb} ,
- {"Volume", (Fl_Callback *)mesh_define_transfinite_volume_cb} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)mesh_define_transfinite_volume_cb} ,
+ {""}
+ };
contextItem menu_mesh_define_compound[] = {
{"1Mesh>Define>Compound"} ,
{"Line", (Fl_Callback *)mesh_define_compound_entity_cb, (void*)"Line"} ,
{"Surface", (Fl_Callback *)mesh_define_compound_entity_cb, (void*)"Surface"} ,
- {"Volume", (Fl_Callback *)mesh_define_compound_entity_cb, (void*)"Volume"} ,
- {""}
- };
+ {"Volume", (Fl_Callback *)mesh_define_compound_entity_cb, (void*)"Volume"} ,
+ {""}
+ };
contextItem menu_mesh_delete[] = {
{"1Mesh>Edit>Delete"} ,
{"Elements", (Fl_Callback *)mesh_delete_parts_cb, (void*)"elements"} ,
{"Lines", (Fl_Callback *)mesh_delete_parts_cb, (void*)"lines"} ,
{"Surfaces", (Fl_Callback *)mesh_delete_parts_cb, (void*)"surfaces"} ,
{"Volumes", (Fl_Callback *)mesh_delete_parts_cb, (void*)"volumes"} ,
- {""}
- };
+ {""}
+ };
contextItem menu_mesh_degree[] = {
{"1Mesh>Set order"} ,
{"1", (Fl_Callback *)mesh_degree_cb, (void*)1},
@@ -2688,8 +2688,8 @@ contextItem menu_mesh[] = {
{"3", (Fl_Callback *)mesh_degree_cb, (void*)3},
{"4", (Fl_Callback *)mesh_degree_cb, (void*)4},
{"5", (Fl_Callback *)mesh_degree_cb, (void*)5},
- {""}
- };
+ {""}
+ };
contextItem menu_solver[] = {
{"2Solver"} ,
@@ -2698,12 +2698,12 @@ contextItem menu_solver[] = {
{"Solver 2", (Fl_Callback *)solver_cb , (void*)2} ,
{"Solver 3", (Fl_Callback *)solver_cb , (void*)3} ,
{"Solver 4", (Fl_Callback *)solver_cb , (void*)4} ,
- {""}
+ {""}
};
contextItem menu_post[] = {
{"3Post-processing"} ,
- {""}
+ {""}
};
menuWindow::menuWindow()
@@ -2782,14 +2782,14 @@ menuWindow::menuWindow()
// create an empty scroll area that will get populated dynamically
// in set_context()
- scroll = new Fl_Scroll(0, _MH, width, NB_BUTT_SCROLL * BH);
+ scroll = new Fl_Scroll(0, _MH, width, NB_BUTT_SCROLL * BH);
scroll->type(Fl_Scroll::VERTICAL);
scroll->end();
win->size(width, _MH);
- win->position(CTX::instance()->menuPosition[0],
+ win->position(CTX::instance()->menuPosition[0],
CTX::instance()->menuPosition[1]);
-
+
win->end();
}
@@ -2907,7 +2907,7 @@ void menuWindow::setContext(contextItem *menu_asked, int flag)
for(nb = 0; nb < (int)PView::list.size(); nb++) {
PViewData *data = PView::list[nb]->getData();
PViewOptions *opt = PView::list[nb]->getOptions();
-
+
Fl_Light_Button *b1 = new Fl_Light_Button(0, _MH + nb * BH, width - popw, BH);
b1->callback(view_toggle_cb, (void *)nb);
b1->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
@@ -2917,72 +2917,72 @@ void menuWindow::setContext(contextItem *menu_asked, int flag)
strcpy(tmp2, data->getFileName().c_str());
b1->tooltip(tmp2);
label2.push_back(tmp2);
-
+
char *tmp = new char[32];
sprintf(tmp, "[%d]@#-1>", nb);
Fl_Button *b2 = new Fl_Button(width - popw, _MH + nb * BH, popw, BH, tmp);
label.push_back(tmp);
b2->align(FL_ALIGN_RIGHT | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
b2->tooltip("Show view option menu (Shift+w)");
-
+
popupButton *p[2];
p[0] = new popupButton(width - popw, _MH + nb * BH, popw, BH);
p[0]->type(Fl_Menu_Button::POPUP123);
p[1] = new popupButton(0, _MH + nb * BH, width - popw, BH);
p[1]->type(Fl_Menu_Button::POPUP3);
-
+
for(int j = 0; j < 2; j++) {
- p[j]->add("Reload/View", 'r',
+ p[j]->add("Reload/View", 'r',
(Fl_Callback *) view_reload_cb, (void *)nb, 0);
- p[j]->add("Reload/Visible Views", 0,
+ p[j]->add("Reload/Visible Views", 0,
(Fl_Callback *) view_reload_visible_cb, (void *)nb, 0);
- p[j]->add("Reload/All Views", 0,
+ p[j]->add("Reload/All Views", 0,
(Fl_Callback *) view_reload_all_cb, (void *)nb, 0);
- p[j]->add("Remove/View", FL_Delete,
+ p[j]->add("Remove/View", FL_Delete,
(Fl_Callback *) view_remove_cb, (void *)nb, 0);
- p[j]->add("Remove/Other Views", 0,
+ p[j]->add("Remove/Other Views", 0,
(Fl_Callback *) view_remove_other_cb, (void *)nb, 0);
- p[j]->add("Remove/Visible Views", 0,
+ p[j]->add("Remove/Visible Views", 0,
(Fl_Callback *) view_remove_all_cb, (void *)-2, 0);
- p[j]->add("Remove/Invisible Views", 0,
+ p[j]->add("Remove/Invisible Views", 0,
(Fl_Callback *) view_remove_all_cb, (void *)-3, 0);
- p[j]->add("Remove/Empty Views", 0,
+ p[j]->add("Remove/Empty Views", 0,
(Fl_Callback *) view_remove_all_cb, (void *)-4, 0);
- p[j]->add("Remove/All Views", 0,
+ p[j]->add("Remove/All Views", 0,
(Fl_Callback *) view_remove_all_cb, (void *)-1, 0);
- p[j]->add("Remove/By Name", 0,
+ p[j]->add("Remove/By Name", 0,
(Fl_Callback *) view_remove_all_cb, (void *)nb, 0);
- p[j]->add("Alias/View without Options", 0,
+ p[j]->add("Alias/View without Options", 0,
(Fl_Callback *) view_alias_cb, (void *)nb, 0);
- p[j]->add("Alias/View with Options", 0,
+ p[j]->add("Alias/View with Options", 0,
(Fl_Callback *) view_alias_with_options_cb, (void *)nb, 0);
- p[j]->add("Combine Elements/From Visible Views", 0,
+ p[j]->add("Combine Elements/From Visible Views", 0,
(Fl_Callback *) view_combine_space_visible_cb, (void *)nb, 0);
- p[j]->add("Combine Elements/From All Views", 0,
+ p[j]->add("Combine Elements/From All Views", 0,
(Fl_Callback *) view_combine_space_all_cb, (void *)nb, 0);
- p[j]->add("Combine Elements/By View Name", 0,
+ p[j]->add("Combine Elements/By View Name", 0,
(Fl_Callback *) view_combine_space_by_name_cb, (void *)nb, 0);
- p[j]->add("Combine Time Steps/From Visible Views", 0,
+ p[j]->add("Combine Time Steps/From Visible Views", 0,
(Fl_Callback *) view_combine_time_visible_cb, (void *)nb, 0);
- p[j]->add("Combine Time Steps/From All Views", 0,
+ p[j]->add("Combine Time Steps/From All Views", 0,
(Fl_Callback *) view_combine_time_all_cb, (void *)nb, 0);
- p[j]->add("Combine Time Steps/By View Name", 0,
+ p[j]->add("Combine Time Steps/By View Name", 0,
(Fl_Callback *) view_combine_time_by_name_cb, (void *)nb, 0);
- p[j]->add("Set Visibility/All On", 0,
+ p[j]->add("Set Visibility/All On", 0,
(Fl_Callback *) view_all_visible_cb, (void *)-1, 0);
- p[j]->add("Set Visibility/All Off", 0,
+ p[j]->add("Set Visibility/All Off", 0,
(Fl_Callback *) view_all_visible_cb, (void *)-2, 0);
- p[j]->add("Set Visibility/Invert", 0,
+ p[j]->add("Set Visibility/Invert", 0,
(Fl_Callback *) view_all_visible_cb, (void *)-3, 0);
- p[j]->add("Set Visibility/By name", 0,
+ p[j]->add("Set Visibility/By name", 0,
(Fl_Callback *) view_all_visible_cb, (void *)nb, 0);
- p[j]->add("Apply As Background Mesh", 0,
+ p[j]->add("Apply As Background Mesh", 0,
(Fl_Callback *) view_applybgmesh_cb, (void *)nb, 0);
- p[j]->add("Save As...", 0,
+ p[j]->add("Save As...", 0,
(Fl_Callback *) view_save_cb, (void *)nb, FL_MENU_DIVIDER);
- p[j]->add("Options", 'o',
+ p[j]->add("Options", 'o',
(Fl_Callback *) view_options_cb, (void *)nb, 0);
- p[j]->add("Plugins", 'p',
+ p[j]->add("Plugins", 'p',
(Fl_Callback *) plugin_cb, (void *)nb, 0);
}
diff --git a/Geo/CellComplex.cpp b/Geo/CellComplex.cpp
index 9480e36f19edc4bf7b027f0f7ca45f5d309595f3..3b4e06baba8a2ba809208328c1fed919f4ed07fc 100644
--- a/Geo/CellComplex.cpp
+++ b/Geo/CellComplex.cpp
@@ -9,13 +9,13 @@
#include "MElement.h"
CellComplex::CellComplex(GModel* model,
- std::vector<MElement*>& domainElements,
+ std::vector<MElement*>& domainElements,
std::vector<MElement*>& subdomainElements) :
_model(model), _dim(0), _simplicial(true), _saveorig(true)
{
_insertCells(subdomainElements, 1);
- _insertCells(domainElements, 0);
+ _insertCells(domainElements, 0);
int num = 0;
for(int dim = 0; dim < 4; dim++){
@@ -31,31 +31,30 @@ CellComplex::CellComplex(GModel* model,
}
bool CellComplex::_insertCells(std::vector<MElement*>& elements,
- int domain)
+ int domain)
{
for(unsigned int i=0; i < elements.size(); i++){
MElement* element = elements.at(i);
int type = element->getType();
- if(type != TYPE_PNT && type != TYPE_LIN &&
+ if(type != TYPE_PNT && type != TYPE_LIN &&
type != TYPE_TRI && type != TYPE_TET) {
- printf("Mesh element type %d not implemented in homology solver. \n",
- type);
+ Msg::Error("Mesh element type %d not implemented in homology solver", type);
return false;
}
Cell* cell = new Cell(element, domain);
bool insert = _cells[cell->getDim()].insert(cell).second;
if(!insert) delete cell;
}
-
+
for (int dim = 3; dim > 0; dim--){
for(citer cit = firstCell(dim); cit != lastCell(dim); cit++){
Cell* cell = *cit;
int numBdElements = cell->getNumBdElements();
for(int i = 0; i < numBdElements; i++){
Cell* newCell = new Cell(cell, i);
- std::pair<citer, bool> insert =
+ std::pair<citer, bool> insert =
_cells[newCell->getDim()].insert(newCell);
- if(!insert.second) {
+ if(!insert.second) {
delete newCell;
newCell = *(insert.first);
}
@@ -83,10 +82,10 @@ CellComplex::~CellComplex()
void CellComplex::insertCell(Cell* cell)
{
- _newcells.push_back(cell);
+ _newcells.push_back(cell);
std::pair<citer, bool> insertInfo = _cells[cell->getDim()].insert(cell);
if(!insertInfo.second){
- printf("Warning: Cell not inserted! \n");
+ Msg::Warning("Cell not inserted");
Cell* oldCell = (*insertInfo.first);
cell->printCell();
oldCell->printCell();
@@ -94,38 +93,38 @@ void CellComplex::insertCell(Cell* cell)
}
void CellComplex::removeCell(Cell* cell, bool other)
-{
+{
if(!hasCell(cell)) return;
std::map<Cell*, short int, Less_Cell > coboundary;
cell->getCoboundary(coboundary);
- std::map<Cell*, short int, Less_Cell > boundary;
+ std::map<Cell*, short int, Less_Cell > boundary;
cell->getBoundary(boundary);
for( std::map<Cell*, short int, Less_Cell>::iterator it = coboundary.begin(); it != coboundary.end(); it++){
Cell* cbdCell = (*it).first;
cbdCell->removeBoundaryCell(cell, other);
- }
-
+ }
+
for( std::map<Cell*, short int, Less_Cell>::iterator it = boundary.begin(); it != boundary.end(); it++){
Cell* bdCell = (*it).first;
bdCell->removeCoboundaryCell(cell, other);
}
-
+
/* for(Cell::biter it = cell->firstCoboundary(); it != cell->lastCoboundary(); it++){
Cell* cbdCell = (*it).first;
cbdCell->removeBoundaryCell(cell, false);
- }
-
+ }
+
for(Cell::biter it = cell->firstBoundary(); it != cell->lastBoundary(); it++){
Cell* bdCell = (*it).first;
bdCell->removeCoboundaryCell(cell, false);
}*/
-
- _cells[cell->getDim()].erase(cell);
+
+ _cells[cell->getDim()].erase(cell);
if(!_saveorig && !cell->isCombined()) _removedcells.push_back(cell);
}
-void CellComplex::enqueueCells(std::map<Cell*, short int, Less_Cell>& cells,
+void CellComplex::enqueueCells(std::map<Cell*, short int, Less_Cell>& cells,
std::queue<Cell*>& Q,
std::set<Cell*, Less_Cell>& Qset)
{
@@ -140,17 +139,17 @@ void CellComplex::enqueueCells(std::map<Cell*, short int, Less_Cell>& cells,
}
}
-int CellComplex::coreduction(Cell* startCell, bool omit,
+int CellComplex::coreduction(Cell* startCell, bool omit,
std::vector<Cell*>& omittedCells)
-{
+{
int coreductions = 0;
-
+
std::queue<Cell*> Q;
std::set<Cell*, Less_Cell> Qset;
-
+
Q.push(startCell);
Qset.insert(startCell);
-
+
std::map<Cell*, short int, Less_Cell > bd_s;
std::map<Cell*, short int, Less_Cell > cbd_c;
@@ -159,7 +158,7 @@ int CellComplex::coreduction(Cell* startCell, bool omit,
s = Q.front();
Q.pop();
Qset.erase(s);
- if(s->getBoundarySize() == 1
+ if(s->getBoundarySize() == 1
&& inSameDomain(s, s->firstBoundary()->first) ){
s->getBoundary(bd_s);
removeCell(s);
@@ -185,7 +184,7 @@ int CellComplex::reduction(int dim, bool omit,
if(dim < 1 || dim > 3) return 0;
int count = 0;
-
+
bool reduced = true;
while (reduced){
@@ -193,18 +192,18 @@ int CellComplex::reduction(int dim, bool omit,
citer cit = firstCell(dim-1);
while(cit != lastCell(dim-1)){
Cell* cell = *cit;
- if( cell->getCoboundarySize() == 1
+ if( cell->getCoboundarySize() == 1
&& inSameDomain(cell, cell->firstCoboundary()->first)){
cit++;
if(dim == getDim() && omit){
- omittedCells.push_back(cell->firstCoboundary()->first);
+ omittedCells.push_back(cell->firstCoboundary()->first);
}
removeCell(cell->firstCoboundary()->first);
removeCell(cell);
count++;
reduced = true;
}
-
+
if(getSize(dim) == 0 || getSize(dim-1) == 0) break;
cit++;
}
@@ -212,7 +211,7 @@ int CellComplex::reduction(int dim, bool omit,
return count;
}
-int CellComplex::coreduction(int dim, bool omit,
+int CellComplex::coreduction(int dim, bool omit,
std::vector<Cell*>& omittedCells)
{
if(dim < 1 || dim > 3) return 0;
@@ -246,24 +245,25 @@ int CellComplex::coreduction(int dim, bool omit,
}
int CellComplex::reduceComplex(bool docombine, bool omit)
-{
- printf("Cell Complex reduction: \n %d volumes, %d faces, %d edges and %d vertices. \n",
- getSize(3), getSize(2), getSize(1), getSize(0));
+{
+ Msg::Info("Cell Complex reduction:");
+ Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ getSize(3), getSize(2), getSize(1), getSize(0));
int count = 0;
std::vector<Cell*> empty;
for(int i = 3; i > 0; i--) count = count + reduction(i, false, empty);
if(omit){
-
+
removeSubdomain();
std::vector<Cell*> newCells;
while (getSize(getDim()) != 0){
-
+
citer cit = firstCell(getDim());
Cell* cell = *cit;
-
+
removeCell(cell, false);
std::vector<Cell*> omittedCells;
omittedCells.push_back(cell);
@@ -276,19 +276,19 @@ int CellComplex::reduceComplex(bool docombine, bool omit)
insertCell(newCells.at(i));
}
}
-
- printf(" %d volumes, %d faces, %d edges and %d vertices. \n",
- getSize(3), getSize(2), getSize(1), getSize(0));
+
+ Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ getSize(3), getSize(2), getSize(1), getSize(0));
if(docombine) combine(3);
reduction(2, false, empty);
if(docombine) combine(2);
reduction(1, false, empty);
if(docombine) combine(1);
-
- printf(" %d volumes, %d faces, %d edges and %d vertices. \n",
- getSize(3), getSize(2), getSize(1), getSize(0));
-
+
+ Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ getSize(3), getSize(2), getSize(1), getSize(0));
+
return 0;
}
@@ -306,12 +306,13 @@ void CellComplex::removeSubdomain()
int CellComplex::coreduceComplex(bool docombine, bool omit)
{
- printf("Cell Complex coreduction: \n %d volumes, %d faces, %d edges and %d vertices. \n",
- getSize(3), getSize(2), getSize(1), getSize(0));
-
+ Msg::Info("Cell Complex coreduction:");
+ Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ getSize(3), getSize(2), getSize(1), getSize(0));
+
int count = 0;
removeSubdomain();
- std::vector<Cell*> empty;
+ std::vector<Cell*> empty;
for(int dim = 0; dim < 4; dim++){
citer cit = firstCell(dim);
while(cit != lastCell(dim)){
@@ -320,14 +321,14 @@ int CellComplex::coreduceComplex(bool docombine, bool omit)
if(count != 0) break;
cit++;
}
- }
-
+ }
+
if(omit){
std::vector<Cell*> newCells;
while (getSize(0) != 0){
citer cit = firstCell(0);
Cell* cell = *cit;
-
+
removeCell(cell, false);
std::vector<Cell*> omittedCells;
omittedCells.push_back(cell);
@@ -341,9 +342,9 @@ int CellComplex::coreduceComplex(bool docombine, bool omit)
}
}
- printf(" %d volumes, %d faces, %d edges and %d vertices. \n",
- getSize(3), getSize(2), getSize(1), getSize(0));
-
+ Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ getSize(3), getSize(2), getSize(1), getSize(0));
+
if(docombine) cocombine(0);
coreduction(1, false, empty);
if(docombine) cocombine(1);
@@ -352,17 +353,19 @@ int CellComplex::coreduceComplex(bool docombine, bool omit)
coreduction(3, false, empty);
coherent();
- printf(" %d volumes, %d faces, %d edges and %d vertices. \n",
- getSize(3), getSize(2), getSize(1), getSize(0));
+ Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ getSize(3), getSize(2), getSize(1), getSize(0));
return 0;
}
int CellComplex::combine(int dim)
{
- //printf("Cell complex before combining: %d volumes, %d faces, %d edges and %d vertices.\n", getSize(3), getSize(2), getSize(1), getSize(0));
+ //Msg::Info("Cell complex before combining:");
+ //Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ // getSize(3), getSize(2), getSize(1), getSize(0));
if(dim < 1 || dim > 3) return 0;
-
+
std::queue<Cell*> Q;
std::set<Cell*, Less_Cell> Qset;
std::map<Cell*, short int, Less_Cell> bd_c;
@@ -374,7 +377,7 @@ int CellComplex::combine(int dim)
enqueueCells(bd_c, Q, Qset);
while(Q.size() != 0){
Cell* s = Q.front();
- Q.pop();
+ Q.pop();
if(s->getCoboundarySize() == 2){
Cell::biter it = s->firstCoboundary();
@@ -398,7 +401,7 @@ int CellComplex::combine(int dim)
removeCell(c1);
removeCell(c2);
insertCell(newCell);
-
+
cit = firstCell(dim);
count++;
}
@@ -406,23 +409,28 @@ int CellComplex::combine(int dim)
Qset.erase(s);
}
}
- //printf("Cell complex after combining: %d volumes, %d faces, %d edges and %d vertices.\n", getSize(3), getSize(2), getSize(1), getSize(0));
-
+
+ //Msg::Info("Cell complex after combining:");
+ //Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ // getSize(3), getSize(2), getSize(1), getSize(0));
+
return count;
}
int CellComplex::cocombine(int dim)
-{
- //printf("Cell complex before cocombining: %d volumes, %d faces, %d edges and %d vertices.\n", getSize(3), getSize(2), getSize(1), getSize(0));
-
+{
+ //Msg::Info("Cell complex before cocombining:");
+ //Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ // getSize(3), getSize(2), getSize(1), getSize(0));
+
if(dim < 0 || dim > 2) return 0;
-
+
std::queue<Cell*> Q;
std::set<Cell*, Less_Cell> Qset;
std::map<Cell*, short int, Less_Cell> cbd_c;
int count = 0;
-
+
for(citer cit = firstCell(dim); cit != lastCell(dim); cit++){
Cell* cell = *cit;
cell->getCoboundary(cbd_c);
@@ -444,18 +452,18 @@ int CellComplex::cocombine(int dim)
if(!(*c1 == *c2) && abs(or1) == abs(or2)
&& inSameDomain(s, c1) && inSameDomain(s, c2)){
removeCell(s);
-
+
c1->getCoboundary(cbd_c);
enqueueCells(cbd_c, Q, Qset);
c2->getCoboundary(cbd_c);
enqueueCells(cbd_c, Q, Qset);
-
- CombinedCell* newCell = new CombinedCell(c1, c2,
+
+ CombinedCell* newCell = new CombinedCell(c1, c2,
(or1 != or2), true );
removeCell(c1);
removeCell(c2);
insertCell(newCell);
-
+
cit = firstCell(dim);
count++;
}
@@ -463,8 +471,11 @@ int CellComplex::cocombine(int dim)
Qset.erase(s);
}
}
- //printf("Cell complex after cocombining: %d volumes, %d faces, %d edges and %d vertices.\n", getSize(3), getSize(2), getSize(1), getSize(0));
-
+
+ //Msg::Info("Cell complex after cocombining:");
+ //Msg::Info(" %d volumes, %d faces, %d edges and %d vertices",
+ // getSize(3), getSize(2), getSize(1), getSize(0));
+
return count;
}
@@ -481,17 +492,17 @@ bool CellComplex::coherent()
Cell* bdCell = (*it).first;
int ori = (*it).second;
citer cit = _cells[bdCell->getDim()].find(bdCell);
- if(cit == lastCell(bdCell->getDim())){
- printf("Warning! Boundary cell not in cell complex! Boundary removed. \n");
+ if(cit == lastCell(bdCell->getDim())){
+ Msg::Warning("Boundary cell not in cell complex! Boundary removed");
cell->removeBoundaryCell(bdCell, false);
coherent = false;
}
if(!bdCell->hasCoboundary(cell)){
- printf("Warning! Incoherent boundary/coboundary pair! Fixed. \n");
+ Msg::Warning("Incoherent boundary/coboundary pair! Fixed");
bdCell->addCoboundaryCell(ori, cell, false);
coherent = false;
}
-
+
}
std::map<Cell*, short int, Less_Cell> coboundary;
cell->getCoboundary(coboundary);
@@ -500,19 +511,19 @@ bool CellComplex::coherent()
Cell* cbdCell = (*it).first;
int ori = (*it).second;
citer cit = _cells[cbdCell->getDim()].find(cbdCell);
- if(cit == lastCell(cbdCell->getDim())){
- printf("Warning! Coboundary cell not in cell complex! Coboundary removed. \n");
+ if(cit == lastCell(cbdCell->getDim())){
+ Msg::Warning("Coboundary cell not in cell complex! Coboundary removed");
cell->removeCoboundaryCell(cbdCell, false);
coherent = false;
}
if(!cbdCell->hasBoundary(cell)){
- printf("Warning! Incoherent coboundary/boundary pair! Fixed. \n");
+ Msg::Warning("Incoherent coboundary/boundary pair! Fixed");
cbdCell->addBoundaryCell(ori, cell, false);
coherent = false;
}
-
+
}
-
+
}
}
return coherent;
@@ -527,7 +538,7 @@ bool CellComplex::hasCell(Cell* cell, bool orig)
else return true;
}
-void CellComplex::getCells(std::set<Cell*, Less_Cell>& cells,
+void CellComplex::getCells(std::set<Cell*, Less_Cell>& cells,
int dim, int domain){
cells.clear();
for(citer cit = firstCell(dim); cit != lastCell(dim); cit++){
@@ -561,7 +572,8 @@ bool CellComplex::restoreComplex()
void CellComplex::printComplex(int dim)
{
- if(getSize(dim) == 0) printf("Cell complex dimension %d is empty. \n", dim);
+ if(getSize(dim) == 0)
+ Msg::Info("Cell complex dimension %d is empty", dim);
for (citer cit = firstCell(dim); cit != lastCell(dim); cit++){
Cell* cell = *cit;
cell->printCell();
@@ -579,13 +591,13 @@ int CellComplex::saveComplex(std::string filename)
return 0;
}
printf("\nWriting file '%s' ... \n", filename.c_str());
-
+
fprintf(fp, "$Cells\n");
fprintf(fp, "%d\n", getSize(0)+getSize(1)+getSize(2)+getSize(3));
for(int dim = 0; dim < 4; dim++){
for(citer cit = firstCell(dim); cit != lastCell(dim); cit++){
Cell* cell = *cit;
- fprintf(fp, "%d %d %d %d %d", cell->getNum(), cell->getType(),
+ fprintf(fp, "%d %d %d %d %d", cell->getNum(), cell->getType(),
1, cell->getDomain(), cell->getNumVertices());
for(int i = 0; i < cell->getNumVertices(); i++){
fprintf(fp, " %d", cell->getVertex(i));
@@ -606,7 +618,7 @@ int CellComplex::saveComplex(std::string filename)
fclose(fp);
- printf("Wrote %d cells to '%s' \n",
+ printf("Wrote %d cells to '%s' \n",
getSize(0)+getSize(1)+getSize(2)+getSize(3), filename.c_str());
*/
return 1;
@@ -629,10 +641,10 @@ int CellComplex::loadComplex(std::string filename)
if(!fgets(str, sizeof(str), fp) || feof(fp))
break;
}
-
+
if(feof(fp))
break;
-
+
if(!strncmp(&str[1], "Cells", 5)) {
if(!fgets(str, sizeof(str), fp)) return 0;
int numCells;
@@ -646,7 +658,7 @@ int CellComplex::loadComplex(std::string filename)
if(fscanf(fp, "%d", &tag) != 1) return 0;
domain.push_back(tag);
}
-
+
std::vector<int> vertices;
if(fscanf(fp, "%d", &numTags) != 1) return 0;
for(int j = 0; j < numTags; j++){
@@ -663,7 +675,7 @@ int CellComplex::loadComplex(std::string filename)
Cell* cell = new Cell(num, dim, type, domain, vertices);
numToCell[num] = cell;
-
+
int numCell;
if(fscanf(fp, "%d", &numTags) != 1) return 0;
@@ -677,7 +689,7 @@ int CellComplex::loadComplex(std::string filename)
}
}
-
+
}
fclose(fp);
diff --git a/Geo/ChainComplex.cpp b/Geo/ChainComplex.cpp
index e690051411b2cfd8fc831785e43ce984501e6a9e..da18eec876ddb37109e440d2f14bb752a1318a2c 100644
--- a/Geo/ChainComplex.cpp
+++ b/Geo/ChainComplex.cpp
@@ -11,10 +11,10 @@
#include "ChainComplex.h"
ChainComplex::ChainComplex(CellComplex* cellComplex, int domain)
-{
+{
_dim = cellComplex->getDim();
_cellComplex = cellComplex;
-
+
for(int i = 0; i < 5; i++){
_HMatrix[i] = NULL;
_kerH[i] = NULL;
@@ -28,15 +28,15 @@ ChainComplex::ChainComplex(CellComplex* cellComplex, int domain)
for(int dim = 0; dim < 4; dim++){
unsigned int cols = cellComplex->getSize(dim);
unsigned int rows = 0;
-
+
int index = 1;
// ignore cells depending on domain
- for(CellComplex::citer cit = cellComplex->firstCell(dim);
+ for(CellComplex::citer cit = cellComplex->firstCell(dim);
cit != cellComplex->lastCell(dim); cit++){
Cell* cell = *cit;
cell->setIndex(0);
cols--;
- if((domain == 0 && !cell->inSubdomain()) || domain == 1
+ if((domain == 0 && !cell->inSubdomain()) || domain == 1
|| (domain == 2 && cell->inSubdomain()) ){
cols++;
cell->setIndex(index);
@@ -46,7 +46,7 @@ ChainComplex::ChainComplex(CellComplex* cellComplex, int domain)
}
if(dim > 0) rows = lastCols;
lastCols = cols;
-
+
if(cols == 0){ // no dim-cells, no map
//_HMatrix[dim] = create_gmp_matrix_zero(rows, 1);
_HMatrix[dim] = NULL;
@@ -55,53 +55,53 @@ ChainComplex::ChainComplex(CellComplex* cellComplex, int domain)
_HMatrix[dim] = create_gmp_matrix_zero(1, cols);
//_HMatrix[dim] = NULL;
}
-
+
else{
mpz_t elem;
mpz_init(elem);
_HMatrix[dim] = create_gmp_matrix_zero(rows, cols);
- for( std::set<Cell*, Less_Cell>::iterator cit =
+ for( std::set<Cell*, Less_Cell>::iterator cit =
cellComplex->firstCell(dim);
cit != cellComplex->lastCell(dim); cit++){
Cell* cell = *cit;
- if( (domain == 0 && !cell->inSubdomain()) || domain == 1
+ if( (domain == 0 && !cell->inSubdomain()) || domain == 1
|| (domain == 2 && cell->inSubdomain()) ){
for(Cell::biter it = cell->firstBoundary();
it != cell->lastBoundary(); it++){
Cell* bdCell = it->first;
if(it->second.get() == 0) continue;
- if((domain == 0 && !bdCell->inSubdomain()) || domain == 1
+ if((domain == 0 && !bdCell->inSubdomain()) || domain == 1
|| (domain == 2 && cell->inSubdomain()) ){
int old_elem = 0;
- if(bdCell->getIndex() > (int)gmp_matrix_rows( _HMatrix[dim])
- || bdCell->getIndex() < 1
- || cell->getIndex() > (int)gmp_matrix_cols( _HMatrix[dim])
+ if(bdCell->getIndex() > (int)gmp_matrix_rows( _HMatrix[dim])
+ || bdCell->getIndex() < 1
+ || cell->getIndex() > (int)gmp_matrix_cols( _HMatrix[dim])
|| cell->getIndex() < 1){
- printf("Warning: Index out of bound! HMatrix: %d. \n", dim);
+ Msg::Warning("Index out of bound! HMatrix: %d", dim);
}
else{
- gmp_matrix_get_elem(elem, bdCell->getIndex(),
+ gmp_matrix_get_elem(elem, bdCell->getIndex(),
cell->getIndex(), _HMatrix[dim]);
old_elem = mpz_get_si(elem);
mpz_set_si(elem, old_elem + it->second.get());
if( abs((old_elem + it->second.get())) > 1){
//printf("Incidence index: %d, in HMatrix: %d. \n", (old_elem + (*it).second), dim);
}
- gmp_matrix_set_elem(elem, bdCell->getIndex(),
+ gmp_matrix_set_elem(elem, bdCell->getIndex(),
cell->getIndex(), _HMatrix[dim]);
}
}
}
}
- }
- mpz_clear(elem);
+ }
+ mpz_clear(elem);
}
_kerH[dim] = NULL;
_codH[dim] = NULL;
_JMatrix[dim] = NULL;
_QMatrix[dim] = NULL;
- _Hbasis[dim] = NULL;
+ _Hbasis[dim] = NULL;
}
}
@@ -118,111 +118,111 @@ ChainComplex::~ChainComplex()
}
void ChainComplex::KerCod(int dim)
-{
+{
if(dim < 0 || dim > 3 || _HMatrix[dim] == NULL) return;
-
- gmp_matrix* HMatrix
- = copy_gmp_matrix(_HMatrix[dim], 1, 1,
+
+ gmp_matrix* HMatrix
+ = copy_gmp_matrix(_HMatrix[dim], 1, 1,
gmp_matrix_rows(_HMatrix[dim]),
gmp_matrix_cols(_HMatrix[dim]));
-
- gmp_normal_form* normalForm
+
+ gmp_normal_form* normalForm
= create_gmp_Hermite_normal_form(HMatrix, NOT_INVERTED, INVERTED);
//printMatrix(normalForm->left);
//printMatrix(normalForm->canonical);
//printMatrix(normalForm->right);
-
- int minRowCol = std::min(gmp_matrix_rows(normalForm->canonical),
+
+ int minRowCol = std::min(gmp_matrix_rows(normalForm->canonical),
gmp_matrix_cols(normalForm->canonical));
int rank = 0;
mpz_t elem;
mpz_init(elem);
-
+
// find the rank
while(rank < minRowCol){
gmp_matrix_get_elem(elem, rank+1, rank+1, normalForm->canonical);
if(mpz_cmp_si(elem,0) == 0) break;
rank++;
}
-
+
if(rank != (int)gmp_matrix_cols(normalForm->canonical)){
- _kerH[dim]
- = copy_gmp_matrix(normalForm->right, 1, rank+1,
+ _kerH[dim]
+ = copy_gmp_matrix(normalForm->right, 1, rank+1,
gmp_matrix_rows(normalForm->right),
gmp_matrix_cols(normalForm->right));
}
-
+
if(rank > 0){
- _codH[dim] =
+ _codH[dim] =
copy_gmp_matrix(normalForm->canonical, 1, 1,
gmp_matrix_rows(normalForm->canonical), rank);
gmp_matrix_left_mult(normalForm->left, _codH[dim]);
}
-
+
mpz_clear(elem);
destroy_gmp_normal_form(normalForm);
-
+
return;
}
//j:B_k->Z_k
void ChainComplex::Inclusion(int lowDim, int highDim)
{
- if(getKerHMatrix(lowDim) == NULL
- || getCodHMatrix(highDim) == NULL
+ if(getKerHMatrix(lowDim) == NULL
+ || getCodHMatrix(highDim) == NULL
|| abs(lowDim-highDim) != 1) return;
-
- gmp_matrix* Zbasis =
+
+ gmp_matrix* Zbasis =
copy_gmp_matrix(_kerH[lowDim], 1, 1,
- gmp_matrix_rows(_kerH[lowDim]),
+ gmp_matrix_rows(_kerH[lowDim]),
gmp_matrix_cols(_kerH[lowDim]));
- gmp_matrix* Bbasis
+ gmp_matrix* Bbasis
= copy_gmp_matrix(_codH[highDim], 1, 1,
- gmp_matrix_rows(_codH[highDim]),
+ gmp_matrix_rows(_codH[highDim]),
gmp_matrix_cols(_codH[highDim]));
-
-
+
+
int rows = gmp_matrix_rows(Bbasis);
int cols = gmp_matrix_cols(Bbasis);
if(rows < cols) return;
-
+
rows = gmp_matrix_rows(Zbasis);
cols = gmp_matrix_cols(Zbasis);
if(rows < cols) return;
-
+
// inv(U)*A*inv(V) = S
- gmp_normal_form* normalForm
+ gmp_normal_form* normalForm
= create_gmp_Smith_normal_form(Zbasis, INVERTED, INVERTED);
-
+
mpz_t elem;
mpz_init(elem);
-
+
for(int i = 1; i <= cols; i++){
-
+
gmp_matrix_get_elem(elem, i, i, normalForm->canonical);
if(mpz_cmp_si(elem,0) == 0){
destroy_gmp_normal_form(normalForm);
return;
}
}
-
- gmp_matrix_left_mult(normalForm->left, Bbasis);
-
- gmp_matrix* LB = copy_gmp_matrix(Bbasis, 1, 1,
- gmp_matrix_cols(Zbasis),
+
+ gmp_matrix_left_mult(normalForm->left, Bbasis);
+
+ gmp_matrix* LB = copy_gmp_matrix(Bbasis, 1, 1,
+ gmp_matrix_cols(Zbasis),
gmp_matrix_cols(Bbasis));
destroy_gmp_matrix(Bbasis);
-
+
rows = gmp_matrix_rows(LB);
cols = gmp_matrix_cols(LB);
-
+
mpz_t divisor;
mpz_init(divisor);
mpz_t remainder;
mpz_init(remainder);
mpz_t result;
mpz_init(result);
-
+
for(int i = 1; i <= rows; i++){
gmp_matrix_get_elem(divisor, i, i, normalForm->canonical);
for(int j = 1; j <= cols; j++){
@@ -234,11 +234,11 @@ void ChainComplex::Inclusion(int lowDim, int highDim)
else return;
}
}
-
+
gmp_matrix_left_mult(normalForm->right, LB);
-
+
setJMatrix(lowDim, LB);
-
+
mpz_clear(elem);
mpz_clear(divisor);
mpz_clear(result);
@@ -248,24 +248,24 @@ void ChainComplex::Inclusion(int lowDim, int highDim)
void ChainComplex::Quotient(int dim)
{
if(dim < 0 || dim > 4 || _JMatrix[dim] == NULL) return;
-
- gmp_matrix* JMatrix =
+
+ gmp_matrix* JMatrix =
copy_gmp_matrix(_JMatrix[dim], 1, 1,
- gmp_matrix_rows(_JMatrix[dim]),
+ gmp_matrix_rows(_JMatrix[dim]),
gmp_matrix_cols(_JMatrix[dim]));
int rows = gmp_matrix_rows(JMatrix);
int cols = gmp_matrix_cols(JMatrix);
-
- gmp_normal_form* normalForm =
+
+ gmp_normal_form* normalForm =
create_gmp_Smith_normal_form(JMatrix, NOT_INVERTED, NOT_INVERTED);
//printMatrix(normalForm->left);
//printMatrix(normalForm->canonical);
- //printMatrix(normalForm->right);
-
+ //printMatrix(normalForm->right);
+
mpz_t elem;
mpz_init(elem);
-
+
for(int i = 1; i <= cols; i++){
gmp_matrix_get_elem(elem, i, i, normalForm->canonical);
if(mpz_cmp_si(elem,0) == 0){
@@ -274,29 +274,29 @@ void ChainComplex::Quotient(int dim)
}
if(mpz_cmp_si(elem,1) > 0) _torsion[dim].push_back(mpz_get_si(elem));
}
-
+
int rank = cols - _torsion[dim].size();
if(rows - rank > 0){
- gmp_matrix* Hbasis =
+ gmp_matrix* Hbasis =
copy_gmp_matrix(normalForm->left, 1, rank+1, rows, rows);
_QMatrix[dim] = Hbasis;
}
-
+
mpz_clear(elem);
destroy_gmp_normal_form(normalForm);
- return;
+ return;
}
void ChainComplex::computeHomology(bool dual)
-{
+{
int lowDim = 0;
int highDim = 0;
- int setDim = 0;
-
+ int setDim = 0;
+
for(int i=-1; i < 4; i++){
-
+
if(dual){
- lowDim = getDim()+1-i;
+ lowDim = getDim()+1-i;
highDim = getDim()+1-(i+1);
setDim = highDim;
//KerCod(lowDim);
@@ -307,115 +307,115 @@ void ChainComplex::computeHomology(bool dual)
setDim = lowDim;
//KerCod(highDim);
}
-
-
+
+
KerCod(highDim);
-
+
// 1) no edges, but zero cells
- if(lowDim == 0 && !dual
- && gmp_matrix_cols(getHMatrix(lowDim)) > 0
+ if(lowDim == 0 && !dual
+ && gmp_matrix_cols(getHMatrix(lowDim)) > 0
&& getHMatrix(highDim) == NULL) {
- setHbasis( setDim,
+ setHbasis( setDim,
create_gmp_matrix_identity(gmp_matrix_cols(getHMatrix(lowDim))) );
}
- else if(highDim == 0 && dual
- && gmp_matrix_rows(getHMatrix(highDim)) > 0
+ else if(highDim == 0 && dual
+ && gmp_matrix_rows(getHMatrix(highDim)) > 0
&& getHMatrix(lowDim) == NULL) {
- setHbasis( setDim,
+ setHbasis( setDim,
create_gmp_matrix_identity(gmp_matrix_rows(getHMatrix(highDim))) );
}
-
+
// 2) this dimension is empty
else if(getHMatrix(lowDim) == NULL && getHMatrix(highDim) == NULL){
setHbasis(setDim, NULL);
}
// 3) No higher dimension cells -> none of the cycles are boundaries
else if(getHMatrix(highDim) == NULL){
- setHbasis( setDim,
+ setHbasis( setDim,
copy_gmp_matrix(getKerHMatrix(lowDim), 1, 1,
- gmp_matrix_rows(getKerHMatrix(lowDim)),
+ gmp_matrix_rows(getKerHMatrix(lowDim)),
gmp_matrix_cols(getKerHMatrix(lowDim))) );
}
-
-
+
+
// 5) General case:
- // 1) Find the bases of boundaries B and cycles Z
+ // 1) Find the bases of boundaries B and cycles Z
// 2) find j: B -> Z and
- // 3) find quotient Z/j(B)
+ // 3) find quotient Z/j(B)
else {
-
+
// 4) No lower dimension cells -> all chains are cycles
if(getHMatrix(lowDim) == NULL){
- setKerHMatrix(lowDim,
+ setKerHMatrix(lowDim,
create_gmp_matrix_identity(gmp_matrix_rows(getHMatrix(highDim))) );
}
Inclusion(lowDim, highDim);
Quotient(lowDim);
-
+
if(getCodHMatrix(highDim) == NULL){
- setHbasis(setDim,
+ setHbasis(setDim,
copy_gmp_matrix(getKerHMatrix(lowDim), 1, 1,
- gmp_matrix_rows(getKerHMatrix(lowDim)),
+ gmp_matrix_rows(getKerHMatrix(lowDim)),
gmp_matrix_cols(getKerHMatrix(lowDim))) );
- }
+ }
else if(getJMatrix(lowDim) == NULL || getQMatrix(lowDim) == NULL){
setHbasis(setDim, NULL);
- }
+ }
else{
- setHbasis(setDim,
- copy_gmp_matrix(getKerHMatrix(lowDim), 1, 1,
- gmp_matrix_rows(getKerHMatrix(lowDim)),
+ setHbasis(setDim,
+ copy_gmp_matrix(getKerHMatrix(lowDim), 1, 1,
+ gmp_matrix_rows(getKerHMatrix(lowDim)),
gmp_matrix_cols(getKerHMatrix(lowDim))) );
-
+
gmp_matrix_right_mult(getHbasis(setDim), getQMatrix(lowDim));
- }
+ }
}
//destroy_gmp_matrix(getKerHMatrix(lowDim));
//destroy_gmp_matrix(getCodHMatrix(lowDim));
destroy_gmp_matrix(getJMatrix(lowDim));
destroy_gmp_matrix(getQMatrix(lowDim));
-
+
//setKerHMatrix(lowDim, NULL);
//setCodHMatrix(lowDim, NULL);
setJMatrix(lowDim, NULL);
- setQMatrix(lowDim, NULL);
+ setQMatrix(lowDim, NULL);
}
return;
}
void ChainComplex::matrixTest()
-{
+{
const int rows = 3;
const int cols = 6;
-
+
long int elems[rows*cols];
for(int i = 1; i<=rows*cols; i++) elems[i-1] = i;
-
+
gmp_matrix* matrix = create_gmp_matrix_int(rows, cols, elems);
-
+
gmp_matrix* copymatrix = copy_gmp_matrix(matrix, 3, 2, 3, 5);
-
+
printMatrix(matrix);
printMatrix(copymatrix);
}
std::vector<int> ChainComplex::getCoeffVector(int dim, int chainNumber)
-{
+{
std::vector<int> coeffVector;
-
+
if(dim < 0 || dim > 4) return coeffVector;
- if(_Hbasis[dim] == NULL
+ if(_Hbasis[dim] == NULL
|| (int)gmp_matrix_cols(_Hbasis[dim]) < chainNumber) return coeffVector;
-
+
int rows = gmp_matrix_rows(_Hbasis[dim]);
-
+
int elemi;
long int elemli;
mpz_t elem;
mpz_init(elem);
-
+
for(int i = 1; i <= rows; i++){
gmp_matrix_get_elem(elem, i, chainNumber, _Hbasis[dim]);
elemli = mpz_get_si(elem);
@@ -423,9 +423,9 @@ std::vector<int> ChainComplex::getCoeffVector(int dim, int chainNumber)
coeffVector.push_back(elemi);
//printf("coeff: %d \n", coeffVector.at(i-1));
}
-
+
mpz_clear(elem);
- return coeffVector;
+ return coeffVector;
}
gmp_matrix* ChainComplex::getBasis(int dim, int basis)
@@ -438,7 +438,7 @@ gmp_matrix* ChainComplex::getBasis(int dim, int basis)
else return NULL;
}
-void ChainComplex::getBasisChain(std::map<Cell*, int, Less_Cell>& chain,
+void ChainComplex::getBasisChain(std::map<Cell*, int, Less_Cell>& chain,
int num, int dim, int basis, bool deform)
{
gmp_matrix* basisMatrix;
@@ -466,7 +466,7 @@ void ChainComplex::getBasisChain(std::map<Cell*, int, Less_Cell>& chain,
for(citer cit = firstCell(dim); cit != lastCell(dim); cit++){
Cell* cell = cit->first;
int index = cit->second;
- gmp_matrix_get_elem(elem, index, num, basisMatrix);
+ gmp_matrix_get_elem(elem, index, num, basisMatrix);
elemli = mpz_get_si(elem);
elemi = elemli;
if(elemli != 0){
@@ -475,12 +475,12 @@ void ChainComplex::getBasisChain(std::map<Cell*, int, Less_Cell>& chain,
for(Cell::citer it = subCells.begin(); it != subCells.end(); it++){
Cell* subCell = (*it).first;
int coeff = (*it).second;
- chain[subCell] = coeff*elemi*torsion;
+ chain[subCell] = coeff*elemi*torsion;
}
}
}
mpz_clear(elem);
-
+
if(deform && (dim == 1 || dim == 2) ) smoothenChain(chain);
}
@@ -494,29 +494,29 @@ int ChainComplex::getBasisSize(int dim, int basis)
else if(basis == 2) basisMatrix = getBasis(dim, 2);
else if(basis == 3) basisMatrix = getBasis(dim, 3);
else return 0;
-
+
if(basisMatrix != NULL) return gmp_matrix_cols(basisMatrix);
- else return 0;
+ else return 0;
}
int ChainComplex::getTorsion(int dim, int num)
{
if(dim < 0 || dim > 4) return 0;
- if(_Hbasis[dim] == NULL
+ if(_Hbasis[dim] == NULL
|| (int)gmp_matrix_cols(_Hbasis[dim]) < num) return 0;
- if(_torsion[dim].empty()
+ if(_torsion[dim].empty()
|| (int)_torsion[dim].size() < num) return 1;
else return _torsion[dim].at(num-1);
}
bool ChainComplex::deform(std::map<Cell*, int, Less_Cell>& cells,
- std::map<Cell*, int, Less_Cell>& cellsInChain,
+ std::map<Cell*, int, Less_Cell>& cellsInChain,
std::map<Cell*, int, Less_Cell>& cellsNotInChain)
{
std::vector<int> cc;
std::vector<int> bc;
-
+
for(citer cit = cellsInChain.begin(); cit != cellsInChain.end(); cit++){
Cell* c = (*cit).first;
c->setImmune(false);
@@ -528,19 +528,19 @@ bool ChainComplex::deform(std::map<Cell*, int, Less_Cell>& cells,
bc.push_back((*cit).second);
}
}
-
+
if(cc.empty() || (getDim() == 2 && cc.size() < 2) ) return false;
int inout = cc[0]*bc[0];
for(unsigned int i = 0; i < cc.size(); i++){
- if(cc[i]*bc[i] != inout) return false;
+ if(cc[i]*bc[i] != inout) return false;
}
-
+
for(citer cit = cellsInChain.begin(); cit != cellsInChain.end(); cit++){
Cell* cell = cit->first;
citer it = cells.find(cell);
if(it != cells.end()) cells[cell] = 0;
}
-
+
int n = 1;
for(citer cit = cellsNotInChain.begin(); cit != cellsNotInChain.end();
cit++){
@@ -551,10 +551,10 @@ bool ChainComplex::deform(std::map<Cell*, int, Less_Cell>& cells,
std::pair<citer,bool> insert = cells.insert( std::make_pair( cell, coeff));
if(!insert.second && (*insert.first).second == 0){
- (*insert.first).second = coeff;
+ (*insert.first).second = coeff;
}
else if (!insert.second && (*insert.first).second != 0){
- printf("Error: invalid chain smoothening add! \n");
+ Msg::Error("Invalid chain smoothening add!");
}
n++;
}
@@ -563,12 +563,12 @@ bool ChainComplex::deform(std::map<Cell*, int, Less_Cell>& cells,
bool ChainComplex::deformChain(std::map<Cell*, int, Less_Cell>& cells,
std::pair<Cell*, int> cell, bool bend)
-{
+{
Cell* c1 = cell.first;
int dim = c1->getDim();
for(Cell::biter cit = c1->firstCoboundary(true); cit != c1->lastCoboundary();
cit++){
-
+
std::map<Cell*, int, Less_Cell> cellsInChain;
std::map<Cell*, int, Less_Cell> cellsNotInChain;
Cell* c1CbdCell = cit->first;
@@ -578,15 +578,15 @@ bool ChainComplex::deformChain(std::map<Cell*, int, Less_Cell>& cells,
Cell* c1CbdBdCell = cit2->first;
int coeff = cit2->second.geto();
if(coeff == 0) continue;
- if( (cells.find(c1CbdBdCell) != cells.end() && cells[c1CbdBdCell] != 0)
+ if( (cells.find(c1CbdBdCell) != cells.end() && cells[c1CbdBdCell] != 0)
|| c1CbdBdCell->inSubdomain()){
cellsInChain.insert(std::make_pair(c1CbdBdCell, coeff));
}
else cellsNotInChain.insert(std::make_pair(c1CbdBdCell, coeff));
}
-
+
bool next = false;
-
+
for(citer cit2 = cellsInChain.begin(); cit2 != cellsInChain.end(); cit2++){
Cell* c = (*cit2).first;
int coeff = 0;
@@ -594,39 +594,39 @@ bool ChainComplex::deformChain(std::map<Cell*, int, Less_Cell>& cells,
if(it != cells.end()) coeff = it->second;
if(c->getImmune()) next = true;
if(c->inSubdomain()) bend = false;
- if(coeff > 1 || coeff < -1) next = true;
+ if(coeff > 1 || coeff < -1) next = true;
}
-
+
for(citer cit2 = cellsNotInChain.begin(); cit2 != cellsNotInChain.end();
cit2++){
Cell* c = (*cit2).first;
if(c->inSubdomain()) next = true;
- }
+ }
if(next) continue;
-
- if( (dim == 1 && cellsInChain.size() == 2
- && cellsNotInChain.size() == 1) ||
- (dim == 2 && cellsInChain.size() == 3
+
+ if( (dim == 1 && cellsInChain.size() == 2
+ && cellsNotInChain.size() == 1) ||
+ (dim == 2 && cellsInChain.size() == 3
&& cellsNotInChain.size() == 1)){
//printf("straighten \n");
return deform(cells, cellsInChain, cellsNotInChain);
}
- else if ( (dim == 1 && cellsInChain.size() == 1
+ else if ( (dim == 1 && cellsInChain.size() == 1
&& cellsNotInChain.size() == 2 && bend) ||
- (dim == 2 && cellsInChain.size() == 2
+ (dim == 2 && cellsInChain.size() == 2
&& cellsNotInChain.size() == 2 && bend)){
//printf("bend \n");
return deform(cells, cellsInChain, cellsNotInChain);
}
- else if ((dim == 1 && cellsInChain.size() == 3
+ else if ((dim == 1 && cellsInChain.size() == 3
&& cellsNotInChain.size() == 0) ||
- (dim == 2 && cellsInChain.size() == 4
+ (dim == 2 && cellsInChain.size() == 4
&& cellsNotInChain.size() == 0)){
//printf("remove boundary \n");
return deform(cells, cellsInChain, cellsNotInChain);
}
}
-
+
return false;
}
@@ -634,7 +634,7 @@ void ChainComplex::smoothenChain(std::map<Cell*, int, Less_Cell>& cells)
{
if(!_cellComplex->simplicial() || cells.empty()) return;
int dim = cells.begin()->first->getDim();
- int start = cells.size();
+ int start = cells.size();
int useless = 0;
for(int i = 0; i < 20; i++){
@@ -642,7 +642,7 @@ void ChainComplex::smoothenChain(std::map<Cell*, int, Less_Cell>& cells)
for(citer cit = cells.begin(); cit != cells.end(); cit++){
//if(!deformChain(*cit, false) && getDim() == 2) deformChain(*cit, true);
if(dim == 2) deformChain(cells, *cit, true);
- deformChain(cells, *cit, false);
+ deformChain(cells, *cit, false);
}
@@ -660,8 +660,8 @@ void ChainComplex::smoothenChain(std::map<Cell*, int, Less_Cell>& cells)
}
eraseNullCells(cells);
int size = cells.size();
- printf("Smoothened a %d-chain from %d cells to %d cells.\n",
- dim, start, size);
+ Msg::Info("Smoothened a %d-chain from %d cells to %d cells",
+ dim, start, size);
}
void ChainComplex::eraseNullCells(std::map<Cell*, int, Less_Cell>& cells)
@@ -681,8 +681,8 @@ void ChainComplex::deImmuneCells(std::map<Cell*, int, Less_Cell>& cells)
}
}
-HomologySequence::HomologySequence(ChainComplex* subcomplex,
- ChainComplex* complex,
+HomologySequence::HomologySequence(ChainComplex* subcomplex,
+ ChainComplex* complex,
ChainComplex* relcomplex)
{
_subcomplex = subcomplex;
@@ -690,11 +690,11 @@ HomologySequence::HomologySequence(ChainComplex* subcomplex,
_relcomplex = relcomplex;
mpz_t elem;
- mpz_init_set_si(elem, -1);
+ mpz_init_set_si(elem, -1);
for(int i = 0; i < 4; i++){
_Ic_sub[i] = NULL;
_Ic_rel[i] = NULL;
-
+
_Dh[i] = NULL;
_invDh[i] = NULL;
@@ -702,22 +702,22 @@ HomologySequence::HomologySequence(ChainComplex* subcomplex,
_Ih[i] = NULL;
_invJh[i] = NULL;
_invIh[i] = NULL;
-
+
}
-
+
findIcMaps();
/*findDhMap(1);
findInvIhMap(0);
blockHBasis(_Dh[1], _invIh[0], _subcomplex, 0);*/
-
+
/*findJhMap(1);
findInvDhMap(1);
blockHBasis(_Jh[1], _invDh[1], _relcomplex, 1);*/
-
+
}
-HomologySequence::~HomologySequence()
+HomologySequence::~HomologySequence()
{
for(int i = 0; i < 4; i++){
destroy_gmp_matrix(_Ic_sub[i]);
@@ -736,9 +736,9 @@ void HomologySequence::findIcMaps()
for(int i = 0; i < 4; i++){
mpz_t one;
mpz_init_set_si(one, 1);
- if(_complex->getBasisSize(i, 0) > 0
+ if(_complex->getBasisSize(i, 0) > 0
&& _subcomplex->getBasisSize(i, 0) > 0){
- _Ic_sub[i] = create_gmp_matrix_zero(_complex->getBasisSize(i, 0),
+ _Ic_sub[i] = create_gmp_matrix_zero(_complex->getBasisSize(i, 0),
_subcomplex->getBasisSize(i, 0));
//printf("rows %d, cols %d. \n", _complex->getBasisSize(i, 0),
// _subcomplex->getBasisSize(i, 0));
@@ -752,11 +752,11 @@ void HomologySequence::findIcMaps()
}
}
- if(_complex->getBasisSize(i, 0) > 0
+ if(_complex->getBasisSize(i, 0) > 0
&& _relcomplex->getBasisSize(i, 0) > 0){
- _Ic_rel[i] = create_gmp_matrix_zero(_complex->getBasisSize(i, 0),
+ _Ic_rel[i] = create_gmp_matrix_zero(_complex->getBasisSize(i, 0),
_relcomplex->getBasisSize(i, 0));
- //printf("rows %d, cols %d. \n", _complex->getBasisSize(i, 0),
+ //printf("rows %d, cols %d. \n", _complex->getBasisSize(i, 0),
for(ChainComplex::citer cit = _complex->firstCell(i);
cit != _complex->lastCell(i); cit++){
Cell* cell = cit->first;
@@ -772,65 +772,65 @@ void HomologySequence::findIcMaps()
void HomologySequence::findIhMap(int i)
{
- if(_Ic_sub[i] != NULL
- && _complex->getBasisSize(i, 3) > 0
+ if(_Ic_sub[i] != NULL
+ && _complex->getBasisSize(i, 3) > 0
&& _subcomplex->getBasisSize(i, 3) > 0){
- gmp_matrix* IH = copy_gmp_matrix(_Ic_sub[i], 1, 1,
- gmp_matrix_rows(_Ic_sub[i]),
+ gmp_matrix* IH = copy_gmp_matrix(_Ic_sub[i], 1, 1,
+ gmp_matrix_rows(_Ic_sub[i]),
gmp_matrix_cols(_Ic_sub[i]));
gmp_matrix_right_mult(IH, _subcomplex->getBasis(i, 3));
- _Ih[i] = createIncMap(IH, _complex->getBasis(i, 3));
+ _Ih[i] = createIncMap(IH, _complex->getBasis(i, 3));
}
}
void HomologySequence::findInvIhMap(int i)
{
- if(_Ic_sub[i] != NULL
- && _complex->getBasisSize(i, 3) > 0
+ if(_Ic_sub[i] != NULL
+ && _complex->getBasisSize(i, 3) > 0
&& _subcomplex->getBasisSize(i, 3) > 0){
- gmp_matrix* IH = copy_gmp_matrix(_Ic_sub[i], 1, 1,
- gmp_matrix_rows(_Ic_sub[i]),
+ gmp_matrix* IH = copy_gmp_matrix(_Ic_sub[i], 1, 1,
+ gmp_matrix_rows(_Ic_sub[i]),
gmp_matrix_cols(_Ic_sub[i]));
gmp_matrix_transp(IH);
gmp_matrix_right_mult(IH, _complex->getBasis(i, 3));
- _invIh[i] = createIncMap(IH, _subcomplex->getBasis(i, 3));
+ _invIh[i] = createIncMap(IH, _subcomplex->getBasis(i, 3));
}
}
void HomologySequence::findJhMap(int i)
{
- if(_Ic_rel[i] != NULL
- && _complex->getBasisSize(i, 3) > 0
+ if(_Ic_rel[i] != NULL
+ && _complex->getBasisSize(i, 3) > 0
&& _relcomplex->getBasisSize(i, 3) > 0){
- gmp_matrix* JH = copy_gmp_matrix(_Ic_rel[i], 1, 1,
- gmp_matrix_rows(_Ic_rel[i]),
+ gmp_matrix* JH = copy_gmp_matrix(_Ic_rel[i], 1, 1,
+ gmp_matrix_rows(_Ic_rel[i]),
gmp_matrix_cols(_Ic_rel[i]));
gmp_matrix_transp(JH);
gmp_matrix_right_mult(JH, _complex->getBasis(i, 3));
- _Jh[i] = createIncMap(JH, _relcomplex->getBasis(i, 3));
+ _Jh[i] = createIncMap(JH, _relcomplex->getBasis(i, 3));
}
}
void HomologySequence::findInvJhMap(int i)
{
- if(_Ic_rel[i] != NULL
- && _complex->getBasisSize(i, 3) > 0
+ if(_Ic_rel[i] != NULL
+ && _complex->getBasisSize(i, 3) > 0
&& _relcomplex->getBasisSize(i, 3) > 0){
- gmp_matrix* JH = copy_gmp_matrix(_Ic_rel[i], 1, 1,
- gmp_matrix_rows(_Ic_rel[i]),
+ gmp_matrix* JH = copy_gmp_matrix(_Ic_rel[i], 1, 1,
+ gmp_matrix_rows(_Ic_rel[i]),
gmp_matrix_cols(_Ic_rel[i]));
gmp_matrix_right_mult(JH, _relcomplex->getBasis(i, 3));
- _invJh[i] = createIncMap(JH, _complex->getBasis(i, 3));
+ _invJh[i] = createIncMap(JH, _complex->getBasis(i, 3));
}
}
void HomologySequence::findDhMap(int i)
{
- if(i > 0 && _relcomplex->getBasisSize(i, 3) > 0
+ if(i > 0 && _relcomplex->getBasisSize(i, 3) > 0
&& _subcomplex->getBasisSize(i-1, 3) > 0
&& _complex->getBoundaryOp(i) != NULL){
- gmp_matrix* JDIH = copy_gmp_matrix(_Ic_sub[i-1], 1, 1,
- gmp_matrix_rows(_Ic_sub[i-1]),
+ gmp_matrix* JDIH = copy_gmp_matrix(_Ic_sub[i-1], 1, 1,
+ gmp_matrix_rows(_Ic_sub[i-1]),
gmp_matrix_cols(_Ic_sub[i-1]));
gmp_matrix_transp(JDIH);
gmp_matrix_right_mult(JDIH, _complex->getBoundaryOp(i));
@@ -842,11 +842,11 @@ void HomologySequence::findDhMap(int i)
void HomologySequence::findInvDhMap(int i)
{
- if(i > 0 && _relcomplex->getBasisSize(i, 3) > 0
+ if(i > 0 && _relcomplex->getBasisSize(i, 3) > 0
&& _subcomplex->getBasisSize(i-1, 3) > 0
&& _complex->getBoundaryOp(i) != NULL){
- gmp_matrix* JDIH = copy_gmp_matrix(_Ic_rel[i], 1, 1,
- gmp_matrix_rows(_Ic_rel[i]),
+ gmp_matrix* JDIH = copy_gmp_matrix(_Ic_rel[i], 1, 1,
+ gmp_matrix_rows(_Ic_rel[i]),
gmp_matrix_cols(_Ic_rel[i]));
gmp_matrix_transp(JDIH);
gmp_matrix* bd = _complex->getBoundaryOp(i);
@@ -860,30 +860,30 @@ void HomologySequence::findInvDhMap(int i)
}
//i: a->b : aBasis = bBasis*incMap
-gmp_matrix* HomologySequence::createIncMap(gmp_matrix* domBasis,
- gmp_matrix* codBasis)
+gmp_matrix* HomologySequence::createIncMap(gmp_matrix* domBasis,
+ gmp_matrix* codBasis)
{
if(domBasis == NULL || codBasis == NULL){
printf("ERROR: null matrix given. \n");
return NULL;
}
-
+
int rows = gmp_matrix_rows(domBasis);
int cols = gmp_matrix_cols(domBasis);
if(rows < cols || rows == 0 || cols == 0) return NULL;
-
+
rows = gmp_matrix_rows(codBasis);
cols = gmp_matrix_cols(codBasis);
if(rows < cols || rows == 0 || cols == 0) return NULL;
- gmp_matrix* temp = codBasis;
+ gmp_matrix* temp = codBasis;
codBasis = copy_gmp_matrix(temp, 1, 1,
gmp_matrix_rows(temp),
gmp_matrix_cols(temp));
// inv(U)*A*inv(V) = S
- gmp_normal_form* normalForm
+ gmp_normal_form* normalForm
= create_gmp_Smith_normal_form(codBasis, INVERTED, INVERTED);
-
+
mpz_t elem;
mpz_init(elem);
@@ -894,10 +894,10 @@ gmp_matrix* HomologySequence::createIncMap(gmp_matrix* domBasis,
return NULL;
}
}
-
- gmp_matrix_left_mult(normalForm->left, domBasis);
- gmp_matrix* LB = copy_gmp_matrix(domBasis, 1, 1,
- gmp_matrix_cols(codBasis),
+
+ gmp_matrix_left_mult(normalForm->left, domBasis);
+ gmp_matrix* LB = copy_gmp_matrix(domBasis, 1, 1,
+ gmp_matrix_cols(codBasis),
gmp_matrix_cols(domBasis));
destroy_gmp_matrix(domBasis);
@@ -972,19 +972,18 @@ gmp_matrix* HomologySequence::removeZeroCols(gmp_matrix* matrix)
mpz_clear(elem);
return newMatrix;
}
-
-void HomologySequence::blockHBasis(gmp_matrix* block1T,
- gmp_matrix* block2T,
+
+void HomologySequence::blockHBasis(gmp_matrix* block1T,
+ gmp_matrix* block2T,
ChainComplex* complex, int dim)
{
-
printMatrix(block1T);
printMatrix(block2T);
if(block1T == NULL && block2T == NULL) return;
gmp_matrix* Hbasis = complex->getBasis(dim, 3);
-
+
if(block1T == NULL && block2T != NULL){
gmp_matrix_right_mult(Hbasis, block2T);
printMatrix(Hbasis);
@@ -998,24 +997,24 @@ void HomologySequence::blockHBasis(gmp_matrix* block1T,
int rows = gmp_matrix_rows(Hbasis);
int cols = gmp_matrix_cols(Hbasis);
- gmp_matrix* temp1 = copy_gmp_matrix(Hbasis, 1, 1, rows, cols);
+ gmp_matrix* temp1 = copy_gmp_matrix(Hbasis, 1, 1, rows, cols);
gmp_matrix* temp2 = copy_gmp_matrix(Hbasis, 1, 1, rows, cols);
printMatrix(temp1);
printMatrix(temp2);
- gmp_matrix_right_mult(temp1, block1T);
+ gmp_matrix_right_mult(temp1, block1T);
gmp_matrix_right_mult(temp2, block2T);
-
+
printMatrix(temp1);
- printMatrix(temp2);
+ printMatrix(temp2);
temp1 = removeZeroCols(temp1);
temp2 = removeZeroCols(temp2);
printMatrix(temp1);
printMatrix(temp2);
int bcol = gmp_matrix_cols(temp1);
-
+
mpz_t elem;
mpz_init(elem);
for(int i = 1; i <= rows; i++){
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index c43f9b67353799b02b6e310c2754d6a4b4d14357..ef5c59065294c1eee82553f2b677f3f2dcad262e 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -49,6 +49,10 @@
#include "meshGFaceBamg.h"
#endif
+#if defined(HAVE_KBIPACK)
+#include "Homology.h"
+#endif
+
std::vector<GModel*> GModel::list;
int GModel::_current = -1;
@@ -263,12 +267,12 @@ GVertex *GModel::getVertexByTag(int n) const
return 0;
}
-std::vector<int> GModel::getEdgesByStringTag(const std::string tag)
-{
+std::vector<int> GModel::getEdgesByStringTag(const std::string tag)
+{
std::vector<int> nums;
- std::map<int, std::vector<GEntity*> > physicalGroups[4];
- getPhysicalGroups(physicalGroups);
- std::vector<GEntity*> allEdges = physicalGroups[1][this->getPhysicalNumber(1,tag)];
+ std::map<int, std::vector<GEntity*> > physicalGroups[4];
+ getPhysicalGroups(physicalGroups);
+ std::vector<GEntity*> allEdges = physicalGroups[1][this->getPhysicalNumber(1,tag)];
for ( std::vector<GEntity*>::iterator it = allEdges.begin(); it != allEdges.end(); it++){
GEntity *ge = *it;
nums.push_back(ge->tag());
@@ -518,7 +522,7 @@ int GModel::mesh(int dimension)
#endif
}
-int GModel::adaptMesh(int technique, simpleFunction<double> *f,
+int GModel::adaptMesh(int technique, simpleFunction<double> *f,
std::vector<double> parameters, bool meshAll)
{
#if defined(HAVE_MESH)
@@ -540,7 +544,7 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f,
fields->reset();
int id = fields->newId();
(*fields)[id] = new meshMetric(this, technique, f, parameters);;
- fields->background_field = id;
+ fields->background_field = id;
opt_mesh_lc_integration_precision(0, GMSH_SET, 1.e-4);
opt_mesh_algo2d(0, GMSH_SET, 7.0); //bamg
@@ -557,11 +561,11 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f,
char name[256];
sprintf(name, "meshAdapt-%d.msh", ITER);
writeMSH(name);
-
+
if (ITER++ >= niter) break;
if (ITER > 3 && fabs((double)(nbElems - nbElemsOld)) < 0.01 * nbElemsOld) break;
-
- nbElemsOld = nbElems;
+
+ nbElemsOld = nbElems;
}
}
else{
@@ -588,7 +592,7 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f,
}
if (elements.size() == 0)return -1;
-
+
fields->reset();
int id = fields->newId();
(*fields)[id] = new meshMetric(this, technique, f, parameters);
@@ -611,7 +615,7 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f,
_octree = 0;
}
}
-
+
nbElems = getNumMeshElements();
if (++ITER >= niter) break;
if (fabs((double)(nbElems - nbElemsOld)) < 0.01 * nbElemsOld) break;
@@ -836,7 +840,7 @@ int GModel::getMeshElementIndex(MElement *e)
void GModel::setMeshElementIndex(MElement *e, int index)
{
- _elementIndexCache[e->getNum()] = index;
+ _elementIndexCache[e->getNum()] = index;
}
template <class T>
@@ -919,7 +923,7 @@ int GModel::indexMeshVertices(bool all, int singlePartition)
}
else if(entities[i]->mesh_vertices[j]->getIndex() == -2)
index++;
-
+
return numVertices;
}
@@ -982,7 +986,7 @@ void GModel::_storeElementsInEntities(std::map<int, std::vector<MElement*> > &ma
if(!v->points.empty()) { // CAD points already have one by default
v->points.clear();
v->mesh_vertices.clear();
- }
+ }
_addElements(v->points, it->second);
}
break;
@@ -1112,7 +1116,7 @@ void GModel::checkMeshCoherence(double tolerance)
Msg::Info("Checking for duplicate vertices...");
std::vector<MVertex*> vertices;
for(unsigned int i = 0; i < entities.size(); i++)
- vertices.insert(vertices.end(), entities[i]->mesh_vertices.begin(),
+ vertices.insert(vertices.end(), entities[i]->mesh_vertices.begin(),
entities[i]->mesh_vertices.end());
MVertexPositionSet pos(vertices);
for(unsigned int i = 0; i < vertices.size(); i++)
@@ -1142,7 +1146,7 @@ void GModel::checkMeshCoherence(double tolerance)
int num = 0;
for(unsigned int i = 0; i < vertices.size(); i++){
if(!vertices[i]->getIndex()){
- Msg::Info("Duplicate element with barycenter (%.16g,%.16g,%.16g)",
+ Msg::Info("Duplicate element with barycenter (%.16g,%.16g,%.16g)",
vertices[i]->x(), vertices[i]->y(), vertices[i]->z());
num++;
}
@@ -1317,7 +1321,7 @@ static void recurConnectMEdgesByMVertex(MVertex *v,
{
if (touched.find(v) != touched.end()) return;
touched.insert(v);
- for (std::multimap <MVertex*, MEdge>::iterator it = v2e.lower_bound(v);
+ for (std::multimap <MVertex*, MEdge>::iterator it = v2e.lower_bound(v);
it != v2e.upper_bound(v) ; ++it){
group.insert(it->second);
for (int i = 0; i < it->second.getNumVertices(); ++i){
@@ -1326,7 +1330,7 @@ static void recurConnectMEdgesByMVertex(MVertex *v,
}
}
-static int connectedSurfaceBoundaries(std::set<MEdge, Less_Edge> &edges,
+static int connectedSurfaceBoundaries(std::set<MEdge, Less_Edge> &edges,
std::vector<std::vector<MEdge> > &boundaries)
{
std::multimap<MVertex*,MEdge> v2e;
@@ -1361,13 +1365,13 @@ void GModel::makeDiscreteRegionsSimplyConnected()
std::set<MVertex*> touched;
- for(std::vector<discreteRegion*>::iterator itR = discRegions.begin();
+ for(std::vector<discreteRegion*>::iterator itR = discRegions.begin();
itR != discRegions.end(); itR++){
std::vector<MElement*> allElements((*itR)->getNumMeshElements());
for(unsigned int i = 0; i < (*itR)->getNumMeshElements(); i++)
allElements[i] = (*itR)->getMeshElement(i);
-
+
std::vector<std::vector<MElement*> > conRegions;
int nbRegions = connectedVolumes(allElements, conRegions);
if (nbRegions > 1) remove(*itR);
@@ -1420,13 +1424,13 @@ void GModel::makeDiscreteFacesSimplyConnected()
std::set<MVertex*> touched;
- for(std::vector<discreteFace*>::iterator itF = discFaces.begin();
+ for(std::vector<discreteFace*>::iterator itF = discFaces.begin();
itF != discFaces.end(); itF++){
std::vector<MElement*> allElements((*itF)->getNumMeshElements());
for(unsigned int i = 0; i < (*itF)->getNumMeshElements(); i++)
allElements[i] = (*itF)->getMeshElement(i);
-
+
std::vector<std::vector<MElement*> > conFaces;
int nbFaces = connectedSurfaces(allElements, conFaces);
if (nbFaces > 1) remove(*itF);
@@ -1453,7 +1457,7 @@ void GModel::makeDiscreteFacesSimplyConnected()
MElementFactory factory;
MElement *e2 = factory.create(e->getTypeForMSH(), verts, e->getNum(),
e->getPartition());
- if(e2->getType() == TYPE_TRI)
+ if(e2->getType() == TYPE_TRI)
f->triangles.push_back((MTriangle*)e2);
else
f->quadrangles.push_back((MQuadrangle*)e2);
@@ -1481,17 +1485,17 @@ void GModel::createTopologyFromMesh(int ignoreHoles)
if((*it)->geomType() == GEntity::DiscreteVolume)
discRegions.push_back((discreteRegion*) *it);
createTopologyFromRegions(discRegions);
-
+
// create topology for all discrete faces
std::vector<discreteFace*> discFaces;
for(fiter it = firstFace(); it != lastFace(); it++)
if((*it)->geomType() == GEntity::DiscreteSurface)
discFaces.push_back((discreteFace*) *it);
createTopologyFromFaces(discFaces, ignoreHoles);
-
+
//create old format (necessary e.g. for old-style extruded boundary layers)
exportDiscreteGEOInternals();
-
+
double t2 = Cpu();
Msg::StatusBar(2, true, "Done creating topology from mesh (%g s)", t2 - t1);
}
@@ -1504,7 +1508,7 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
// map_faces, which associates each MFace with the tags of the
// adjacent regions
std::map<MFace, std::vector<int>, Less_Face > map_faces;
- for (std::vector<discreteRegion*>::iterator it = discRegions.begin();
+ for (std::vector<discreteRegion*>::iterator it = discRegions.begin();
it != discRegions.end(); it++)
(*it)->findFaces(map_faces);
@@ -1522,7 +1526,7 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
while (!map_faces.empty()){
Msg::Debug("... %d mesh faces left to process", map_faces.size());
-
+
// get mesh faces with identical region connections (i.e., a part
// of region boundaries that can be later defined as a discrete
// face)
@@ -1540,13 +1544,13 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
else
itmap++;
}
-
+
// if the mesh already contains discrete faces, check if the
// candidate discrete face does contain any of those; if not,
// create a new discreteFace. Then create populate the
// region2Faces map that associates for each region the (old or
// new) boundary discrete faces
- for (std::vector<discreteFace*>::iterator itF = discFaces.begin();
+ for (std::vector<discreteFace*>::iterator itF = discFaces.begin();
itF != discFaces.end(); itF++){
bool candidate = true;
@@ -1567,7 +1571,7 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
std::set<MFace, Less_Face>::iterator itset = myFaces.find(mf);
myFaces.erase(itset);
}
- for(std::vector<int>::iterator itReg = tagRegions.begin();
+ for(std::vector<int>::iterator itReg = tagRegions.begin();
itReg != tagRegions.end(); itReg++) {
std::map<int, std::set<int> >::iterator it = region2Faces.find(*itReg);
if (it == region2Faces.end())
@@ -1588,7 +1592,7 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
add(f);
discFaces.push_back(f);
std::set<MVertex*> myVertices;
- for(std::set<MFace, Less_Face>::iterator it = myFaces.begin();
+ for(std::set<MFace, Less_Face>::iterator it = myFaces.begin();
it != myFaces.end(); it++){
std::vector<MVertex*> verts(it->getNumVertices());
for(int i = 0; i < it->getNumVertices(); i++){
@@ -1606,15 +1610,15 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
else
f->triangles.push_back(new MTriangle(verts));
}
- f->mesh_vertices.insert(f->mesh_vertices.begin(),
+ f->mesh_vertices.insert(f->mesh_vertices.begin(),
myVertices.begin(), myVertices.end());
- for (std::vector<int>::iterator itReg = tagRegions.begin();
+ for (std::vector<int>::iterator itReg = tagRegions.begin();
itReg != tagRegions.end(); itReg++) {
// delete mesh vertices of new edge from adjacent regions
GRegion *dReg = getRegionByTag(*itReg);
- for (std::set<MVertex*>::iterator itv = myVertices.begin();
+ for (std::set<MVertex*>::iterator itv = myVertices.begin();
itv != myVertices.end(); itv++) {
std::vector<MVertex*>::iterator itve =
std::find(dReg->mesh_vertices.begin(), dReg->mesh_vertices.end(), *itv);
@@ -1640,7 +1644,7 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
}
// set boundary faces for each region
- for (std::vector<discreteRegion*>::iterator it = discRegions.begin();
+ for (std::vector<discreteRegion*>::iterator it = discRegions.begin();
it != discRegions.end(); it++){
std::map<int, std::set<int> >::iterator itr = region2Faces.find((*it)->tag());
if (itr != region2Faces.end()){
@@ -1660,20 +1664,20 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
// map_edges, which associates each MEdge with the tags of the
// adjacent faces
std::map<MEdge, std::vector<int>, Less_Edge > map_edges;
- for (std::vector<discreteFace*>::iterator it = discFaces.begin();
+ for (std::vector<discreteFace*>::iterator it = discFaces.begin();
it != discFaces.end(); it++)
(*it)->findEdges(map_edges);
-
+
// return if no boundary edges (torus, sphere, ...)
if (map_edges.empty()) return;
-
+
// get currently defined discrete edges
std::vector<discreteEdge*> discEdges;
for(eiter it = firstEdge(); it != lastEdge(); it++){
if((*it)->geomType() == GEntity::DiscreteCurve)
discEdges.push_back((discreteEdge*) *it);
}
-
+
// create reverse map storing for each discrete face the list of
// discrete edges on its boundary
std::map<int, std::vector<int> > face2Edges;
@@ -1703,7 +1707,7 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
// candidate discrete edge does contain any of those; if not,
// create a discreteEdge. Then populate the face2Edges map that
// associates for each face its boundary discrete edges
- for (std::vector<discreteEdge*>::iterator itE = discEdges.begin();
+ for (std::vector<discreteEdge*>::iterator itE = discEdges.begin();
itE != discEdges.end(); itE++){
bool candidate = true;
@@ -1724,7 +1728,7 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
std::set<MEdge, Less_Edge >::iterator itset = myEdges.find(me);
if (itset != myEdges.end()) myEdges.erase(itset);
}
- for (std::vector<int>::iterator itFace = tagFaces.begin();
+ for (std::vector<int>::iterator itFace = tagFaces.begin();
itFace != tagFaces.end(); itFace++) {
std::map<int, std::vector<int> >::iterator it = face2Edges.find(*itFace);
if (it == face2Edges.end())
@@ -1737,9 +1741,9 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
}
}
}
-
+
std::vector<std::vector<MEdge> > boundaries;
- int nbBounds = connectedSurfaceBoundaries(myEdges, boundaries);
+ int nbBounds = connectedSurfaceBoundaries(myEdges, boundaries);
//EMI RBF fix
if (ignoreHoles && nbBounds > 0){
@@ -1773,12 +1777,12 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
v1->setEntity(e);
}
e->mesh_vertices.insert(e->mesh_vertices.begin(), allV.begin(), allV.end());
- for (std::vector<int>::iterator itFace = tagFaces.begin();
+ for (std::vector<int>::iterator itFace = tagFaces.begin();
itFace != tagFaces.end(); itFace++) {
// delete mesh vertices of new edge from adjacent faces
GFace *dFace = getFaceByTag(*itFace);
for (std::set<MVertex*>::iterator itv = allV.begin(); itv != allV.end(); itv++) {
- std::vector<MVertex*>::iterator itve =
+ std::vector<MVertex*>::iterator itve =
std::find(dFace->mesh_vertices.begin(), dFace->mesh_vertices.end(), *itv);
if (itve != dFace->mesh_vertices.end()) dFace->mesh_vertices.erase(itve);
}
@@ -1828,7 +1832,7 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
// for (std::vector<discreteFace*>::iterator itF = discFaces.begin();
// itF != discFaces.end(); itF++){
// //EMI, TODO
- // std::list<GEdgeLoop> edgeLoops = (*itF)->edgeLoops;
+ // std::list<GEdgeLoop> edgeLoops = (*itF)->edgeLoops;
// edgeLoops.clear();
// GEdgeLoop el((*itF)->edges());
// edgeLoops.push_back(el);
@@ -1848,9 +1852,9 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
std::vector<MVertex *> v;
e->getVertices(v);
for (unsigned int j = 0; j < v.size(); j++){
- std::map<MVertex*, MVertex*, std::less<MVertex*> >::iterator
+ std::map<MVertex*, MVertex*, std::less<MVertex*> >::iterator
itmap = old2new.find(v[j]);
- if (itmap != old2new.end())
+ if (itmap != old2new.end())
v[j] = itmap->second;
}
MElementFactory factory;
@@ -1867,7 +1871,7 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
gf->triangles = newTriangles;
gf->quadrangles = newQuadrangles;
}
-
+
for (std::map<GRegion*, std::map<MVertex*, MVertex*, std::less<MVertex*> > >::iterator
iRegion = region2Vert.begin(); iRegion != region2Vert.end(); iRegion++){
std::map<MVertex*, MVertex*, std::less<MVertex*> > old2new = iRegion->second;
@@ -1881,9 +1885,9 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
std::vector<MVertex *> v;
e->getVertices(v);
for (unsigned int j = 0; j < v.size(); j++){
- std::map<MVertex*, MVertex*, std::less<MVertex*> >::iterator
+ std::map<MVertex*, MVertex*, std::less<MVertex*> >::iterator
itmap = old2new.find(v[j]);
- if (itmap != old2new.end())
+ if (itmap != old2new.end())
v[j] = itmap->second;
}
MElementFactory factory;
@@ -1912,7 +1916,7 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces, int
GModel *GModel::buildCutGModel(gLevelset *ls, bool cutElem, bool saveTri)
{
-
+
if (saveTri)
CTX::instance()->mesh.saveTri = 1;
else
@@ -1997,7 +2001,7 @@ GEdge *GModel::addLine(GVertex *v1, GVertex *v2)
return 0;
}
-GEdge *GModel::addCircleArcCenter(double x, double y, double z, GVertex *start,
+GEdge *GModel::addCircleArcCenter(double x, double y, double z, GVertex *start,
GVertex *end)
{
if(_factory)
@@ -2009,27 +2013,27 @@ GEdge *GModel::addCircleArcCenter(double x, double y, double z, GVertex *start,
GEdge *GModel::addCircleArc3Points(double x, double y, double z, GVertex *start,
GVertex *end)
{
- if(_factory)
- return _factory->addCircleArc(this, GModelFactory::THREE_POINTS,
+ if(_factory)
+ return _factory->addCircleArc(this, GModelFactory::THREE_POINTS,
start, end, SPoint3(x, y, z));
return 0;
}
-GEdge *GModel::addBezier(GVertex *start, GVertex *end,
- std::vector<std::vector<double> > points)
+GEdge *GModel::addBezier(GVertex *start, GVertex *end,
+ std::vector<std::vector<double> > points)
{
- if(_factory)
- return _factory->addSpline(this, GModelFactory::BEZIER, start, end,
+ if(_factory)
+ return _factory->addSpline(this, GModelFactory::BEZIER, start, end,
points);
return 0;
}
GEdge *GModel::addNURBS(GVertex *start, GVertex *end,
- std::vector<std::vector<double> > points,
+ std::vector<std::vector<double> > points,
std::vector<double> knots,
- std::vector<double> weights,
+ std::vector<double> weights,
std::vector<int> mult)
-{
+{
if(_factory)
return _factory->addNURBS(this, start,end,points,knots,weights, mult);
return 0;
@@ -2072,14 +2076,14 @@ GEntity *GModel::revolve(GEntity *e, std::vector<double> p1, std::vector<double>
GEntity *GModel::extrude(GEntity *e, std::vector<double> p1, std::vector<double> p2)
{
- if(_factory)
+ if(_factory)
return _factory->extrude(this, e, p1, p2);
return 0;
}
GEntity *GModel::addPipe(GEntity *e, std::vector<GEdge *> edges)
{
- if(_factory)
+ if(_factory)
return _factory->addPipe(this,e,edges);
return 0;
}
@@ -2090,14 +2094,14 @@ GEntity *GModel::addSphere(double cx, double cy, double cz, double radius)
return 0;
}
-GEntity *GModel::addCylinder(std::vector<double> p1, std::vector<double> p2,
+GEntity *GModel::addCylinder(std::vector<double> p1, std::vector<double> p2,
double radius)
{
if(_factory) return _factory->addCylinder(this, p1, p2, radius);
return 0;
}
-GEntity *GModel::addTorus(std::vector<double> p1, std::vector<double> p2,
+GEntity *GModel::addTorus(std::vector<double> p1, std::vector<double> p2,
double radius1, double radius2)
{
if(_factory) return _factory->addTorus(this, p1, p2, radius1, radius2);
@@ -2138,7 +2142,7 @@ GModel *GModel::computeBooleanDifference(GModel *tool, int createNewModel)
return 0;
}
-static void computeDuplicates(GModel *model,
+static void computeDuplicates(GModel *model,
std::multimap<GVertex*, GVertex*> &Unique2Duplicates,
std::map<GVertex*, GVertex*> &Duplicates2Unique,
const double &eps)
@@ -2153,7 +2157,7 @@ static void computeDuplicates(GModel *model,
GVertex *pv = *v.begin();
v.erase(v.begin());
bool found = false;
- for (std::multimap<GVertex*,GVertex*>::iterator it = Unique2Duplicates.begin();
+ for (std::multimap<GVertex*,GVertex*>::iterator it = Unique2Duplicates.begin();
it != Unique2Duplicates.end(); ++it){
GVertex *unique = it->first;
const double d = sqrt((unique->x() - pv->x()) * (unique->x() - pv->x()) +
@@ -2170,10 +2174,10 @@ static void computeDuplicates(GModel *model,
Unique2Duplicates.insert(std::make_pair(pv, pv));
Duplicates2Unique[pv] = pv;
}
- }
+ }
}
-static void glueVerticesInEdges(GModel *model,
+static void glueVerticesInEdges(GModel *model,
std::multimap<GVertex*, GVertex*> &Unique2Duplicates,
std::map<GVertex*, GVertex*> &Duplicates2Unique)
{
@@ -2203,25 +2207,25 @@ static void computeDuplicates(GModel *model,
GEdge *pe = *e.begin();
e.erase(e.begin());
bool found = false;
- for (std::multimap<GEdge*,GEdge*>::iterator it = Unique2Duplicates.begin();
+ for (std::multimap<GEdge*,GEdge*>::iterator it = Unique2Duplicates.begin();
it != Unique2Duplicates.end(); ++it ){
GEdge *unique = it->first;
// first check edges that have same endpoints
- if (((unique->getBeginVertex() == pe->getBeginVertex() &&
+ if (((unique->getBeginVertex() == pe->getBeginVertex() &&
unique->getEndVertex() == pe->getEndVertex()) ||
- (unique->getEndVertex() == pe->getBeginVertex() &&
+ (unique->getEndVertex() == pe->getBeginVertex() &&
unique->getBeginVertex() == pe->getEndVertex())) &&
unique->geomType() == pe->geomType()){
if ((unique->geomType() == GEntity::Line && pe->geomType() == GEntity::Line) ||
- unique->geomType() == GEntity::DiscreteCurve ||
+ unique->geomType() == GEntity::DiscreteCurve ||
pe->geomType() == GEntity::DiscreteCurve ||
- unique->geomType() == GEntity::BoundaryLayerCurve ||
+ unique->geomType() == GEntity::BoundaryLayerCurve ||
pe->geomType() == GEntity::BoundaryLayerCurve){
found = true;
Unique2Duplicates.insert(std::make_pair(unique,pe));
Duplicates2Unique[pe] = unique;
- break;
- }
+ break;
+ }
// compute a point
Range<double> r = pe->parBounds(0);
GPoint gp = pe->point(0.5 * (r.low() + r.high()));
@@ -2245,7 +2249,7 @@ static void computeDuplicates(GModel *model,
}
}
-static void glueEdgesInFaces(GModel *model,
+static void glueEdgesInFaces(GModel *model,
std::multimap<GEdge*, GEdge*> &Unique2Duplicates,
std::map<GEdge*, GEdge*> &Duplicates2Unique)
{
@@ -2268,9 +2272,9 @@ static void glueEdgesInFaces(GModel *model,
}
}
-static void computeDuplicates(GModel *model,
+static void computeDuplicates(GModel *model,
std::multimap<GFace*, GFace*> &Unique2Duplicates,
- std::map<GFace*,GFace*> &Duplicates2Unique,
+ std::map<GFace*,GFace*> &Duplicates2Unique,
const double &eps)
{
std::list<GFace*> f;
@@ -2286,9 +2290,9 @@ static void computeDuplicates(GModel *model,
bool found = false;
for (std::multimap<GFace*,GFace*>::iterator it = Unique2Duplicates.begin();
it != Unique2Duplicates.end(); ++it){
- GFace *unique = it->first;
+ GFace *unique = it->first;
std::list<GEdge*> unique_edges = unique->edges();
- if (pf->geomType() == unique->geomType() &&
+ if (pf->geomType() == unique->geomType() &&
unique_edges.size() == pf_edges.size()){
unique_edges.sort();
std::list<GEdge*>::iterator it_pf = pf_edges.begin();
@@ -2303,12 +2307,12 @@ static void computeDuplicates(GModel *model,
found = true;
Unique2Duplicates.insert(std::make_pair(unique,pf));
Duplicates2Unique[pf] = unique;
- break;
- }
+ break;
+ }
double t[2]={0,0};
// FIXME: evaluate a point on the surface (use e.g. buildRepresentationCross)
- const double d = 1.0;
- if (t[0] >= r.low() && t[0] <= r.high() &&
+ const double d = 1.0;
+ if (t[0] >= r.low() && t[0] <= r.high() &&
t[1] >= s.low() && t[1] <= s.high() && d <= eps) {
found = true;
Unique2Duplicates.insert(std::make_pair(unique,pf));
@@ -2365,16 +2369,16 @@ void GModel::glue(double eps)
std::map<GEdge*,GEdge*> Duplicates2Unique;
computeDuplicates(this, Unique2Duplicates, Duplicates2Unique, eps);
glueEdgesInFaces(this, Unique2Duplicates, Duplicates2Unique);
- }
+ }
{
std::multimap<GFace*,GFace*> Unique2Duplicates;
std::map<GFace*,GFace*> Duplicates2Unique;
computeDuplicates(this, Unique2Duplicates, Duplicates2Unique, eps);
glueFacesInRegions(this, Unique2Duplicates, Duplicates2Unique);
- }
+ }
}
-GEdge *getNewModelEdge(GFace *gf1, GFace *gf2,
+GEdge *getNewModelEdge(GFace *gf1, GFace *gf2,
std::map<std::pair<int, int>, GEdge*> &newEdges)
{
int t1 = gf1 ? gf1->tag() : -1;
@@ -2384,7 +2388,7 @@ GEdge *getNewModelEdge(GFace *gf1, GFace *gf2,
if(i1 == i2) return 0;
- std::map<std::pair<int, int>, GEdge*>::iterator it =
+ std::map<std::pair<int, int>, GEdge*>::iterator it =
newEdges.find(std::make_pair<int, int>(i1, i2));
if(it == newEdges.end()){
discreteEdge *ge = new discreteEdge
@@ -2394,7 +2398,7 @@ GEdge *getNewModelEdge(GFace *gf1, GFace *gf2,
return ge;
}
else
- return it->second;
+ return it->second;
}
#if defined(HAVE_MESH)
@@ -2441,12 +2445,12 @@ void recurClassify(MTri3 *t, GFace *gf,
MTri3 *tn = t->getNeigh(i);
if(tn){
edgeXface exf(t, i);
- MLine ml(exf.v[0], exf.v[1]);
+ MLine ml(exf.v[0], exf.v[1]);
std::map<MLine*, GEdge*, compareMLinePtr>::iterator it = lines.find(&ml);
if(it == lines.end())
recurClassify(tn, gf, lines, reverse);
}
- }
+ }
}
}
@@ -2458,10 +2462,10 @@ void GModel::detectEdges(double _tresholdAngle)
e2t_cont adj;
std::vector<MTriangle*> elements;
std::vector<edge_angle> edges_detected, edges_lonly;
- for(GModel::fiter it = GModel::current()->firstFace();
+ for(GModel::fiter it = GModel::current()->firstFace();
it != GModel::current()->lastFace(); ++it)
- elements.insert(elements.end(), (*it)->triangles.begin(),
- (*it)->triangles.end());
+ elements.insert(elements.end(), (*it)->triangles.begin(),
+ (*it)->triangles.end());
buildEdgeToTriangle(elements, adj);
buildListOfEdgeAngle(adj, edges_detected, edges_lonly);
GEdge *selected = new discreteEdge
@@ -2472,12 +2476,12 @@ void GModel::detectEdges(double _tresholdAngle)
edge_angle ea = edges_detected[i];
if(ea.angle <= _tresholdAngle) break;
selected->lines.push_back(new MLine(ea.v1, ea.v2));
- }
-
+ }
+
for(unsigned int i = 0 ; i < edges_lonly.size(); i++){
edge_angle ea = edges_lonly[i];
selected->lines.push_back(new MLine(ea.v1, ea.v2));
- }
+ }
std::set<GFace*> _temp;
_temp.insert(faces.begin(),faces.end());
classifyFaces(_temp);
@@ -2486,14 +2490,14 @@ void GModel::detectEdges(double _tresholdAngle)
#endif
}
-void GModel::classifyFaces(std::set<GFace*> &_faces)
+void GModel::classifyFaces(std::set<GFace*> &_faces)
{
#if defined(HAVE_MESH)
std::map<MLine*, GEdge*, compareMLinePtr> lines;
- for(GModel::eiter it = GModel::current()->firstEdge();
+ for(GModel::eiter it = GModel::current()->firstEdge();
it != GModel::current()->lastEdge(); ++it){
- for(unsigned int i = 0; i < (*it)->lines.size();i++)
+ for(unsigned int i = 0; i < (*it)->lines.size();i++)
lines[(*it)->lines[i]] = *it;
}
@@ -2528,7 +2532,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
recurClassify(*it, gf, lines, reverse);
GModel::current()->add(gf);
newf.push_back(gf);
-
+
for (unsigned int i = 0; i < gf->triangles.size(); i++){
replacedBy.insert(std::make_pair(reverse_old[gf->triangles[i]],gf));
}
@@ -2559,20 +2563,20 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
(*it)->setDeleted(false);
++it;
}
-
+
// classify edges that are bound by different GFaces
std::map<std::pair<int, int>, GEdge*> newEdges;
std::set<MLine*> touched;
std::set<MTri3*> trisTouched;
// bug fix : multiply connected domains
-
+
trisTouched.insert(tris.begin(),tris.end());
while(!trisTouched.empty())
recurClassifyEdges(*trisTouched.begin(), reverse, lines, touched, trisTouched,newEdges);
std::map<discreteFace*,std::vector<int> > newFaceTopology;
-
- // check if new edges should not be splitted
+
+ // check if new edges should not be splitted
// splitted if composed of several open or closed edges
std::map<MVertex*,GVertex*> modelVertices;
@@ -2592,7 +2596,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
while(1){
bool found = false;
for (std::list<MLine*>::iterator it = allSegments.begin();
- it != allSegments.end(); ++it){
+ it != allSegments.end(); ++it){
MVertex *v1 = (*it)->getVertex(0);
MVertex *v2 = (*it)->getVertex(1);
if (v1 == vE || v2 == vE){
@@ -2601,7 +2605,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
vE = (v1 == vE) ? v2 : v1;
found = true;
allSegments.erase(it);
- break;
+ break;
}
if (v1 == vB || v2 == vB){
segmentsForThisDiscreteEdge.push_front(*it);
@@ -2609,7 +2613,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
vB = (v1 == vB) ? v2 : v1;
found = true;
allSegments.erase(it);
- break;
+ break;
}
}
if (vE == vB)break;
@@ -2621,7 +2625,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
GVertex *newGv = new discreteVertex
(GModel::current(), GModel::current()->getMaxElementaryNumber(0) + 1);
newGv->mesh_vertices.push_back(vB);
- vB->setEntity(newGv);
+ vB->setEntity(newGv);
newGv->points.push_back(new MPoint(vB));
GModel::current()->add(newGv);
modelVertices[vB] = newGv;
@@ -2632,7 +2636,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
(GModel::current(), GModel::current()->getMaxElementaryNumber(0) + 1);
newGv->mesh_vertices.push_back(vE);
newGv->points.push_back(new MPoint(vE));
- vE->setEntity(newGv);
+ vE->setEntity(newGv);
GModel::current()->add(newGv);
modelVertices[vE] = newGv;
}
@@ -2654,7 +2658,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
GModel::current()->add(newGe);
discreteFace *gf1 = dynamic_cast<discreteFace*>
(GModel::current()->getFaceByTag(ite->first.first));
- discreteFace *gf2 = dynamic_cast<discreteFace*>
+ discreteFace *gf2 = dynamic_cast<discreteFace*>
(GModel::current()->getFaceByTag(ite->first.second));
if (gf1)newFaceTopology[gf1].push_back(newGe->tag());
if (gf2)newFaceTopology[gf2].push_back(newGe->tag());
@@ -2672,7 +2676,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
GModel::current()->remove(ge);
// delete ge;
}
-
+
it = tris.begin();
while(it != tris.end()){
delete *it;
@@ -2690,7 +2694,7 @@ void GModel::classifyFaces(std::set<GFace*> &_faces)
(*fit)->triangles[i]->getVertex(j)->setEntity(*fit);
_verts.insert((*fit)->triangles[i]->getVertex(j));
}
- }
+ }
}
if ((*fit)->triangles.size())
(*fit)->mesh_vertices.insert((*fit)->mesh_vertices.begin(),
@@ -2707,3 +2711,49 @@ void GModel::createPartitionBoundaries(int createGhostCells)
CreatePartitionBoundaries(this, createGhostCells);
#endif
}
+
+void GModel::addHomologyRequest(const std::string &type, std::vector<int> &domain,
+ std::vector<int> &subdomain)
+{
+ std::pair<std::vector<int>, std::vector<int> > p(domain, subdomain);
+ _homologyRequests.insert
+ (std::pair<std::pair<std::vector<int>, std::vector<int> >, std::string>(p, type));
+}
+
+void GModel::computeHomology()
+{
+#if defined(HAVE_KBIPACK)
+ // find unique domain/subdomain requests
+ typedef std::pair<std::vector<int>, std::vector<int> > dpair;
+ std::set<dpair> domains;
+ for(std::map<dpair, std::string>::iterator it = _homologyRequests.begin();
+ it != _homologyRequests.end(); it++)
+ domains.insert(it->first);
+ Msg::Info("Number of cell complexes to construct: %d", domains.size());
+
+ for(std::set<dpair>::iterator it = domains.begin(); it != domains.end(); it++){
+ std::pair<std::multimap<dpair, std::string>::iterator,
+ std::multimap<dpair, std::string>::iterator> itp =
+ _homologyRequests.equal_range(*it);
+ Homology* homology = new Homology(this, itp.first->first.first, itp.first->first.second);
+ CellComplex *cellcomplex = homology->createCellComplex();
+ if(cellcomplex->getSize(0)){
+ for(std::multimap<dpair, std::string>::iterator itt = itp.first; itt != itp.second; itt++){
+ // make sure to restore cell complex to non-reduced state if we are reuing it
+ if(itt != itp.first) cellcomplex->restoreComplex();
+ std::string type = itt->second;
+ if(type == "Generators")
+ homology->findGenerators(cellcomplex);
+ else if(type == "DualGenerators" || type == "Cuts")
+ homology->findDualGenerators(cellcomplex);
+ else
+ Msg::Error("Unknown type of homology computation: %s", type.c_str());
+ }
+ }
+ delete cellcomplex;
+ delete homology;
+ }
+#else
+ Msg::Error("Homology computation requires KBIPACK");
+#endif
+}
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 7039a68b7a069f75fc62d885a1f537c1d7179098..b1ff1148f2884e78d8d1b3b80e68ae51c90a9722 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -35,7 +35,10 @@ class GModelFactory;
// A geometric model. The model is a "not yet" non-manifold B-Rep.
class GModel
{
+ private:
friend class OCCFactory;
+ std::multimap<std::pair<std::vector<int>, std::vector<int> >, std::string> _homologyRequests;
+
protected:
// the name of the model
std::string _name;
@@ -117,7 +120,7 @@ class GModel
std::set<GFace*, GEntityLessThan> faces;
std::set<GEdge*, GEntityLessThan> edges;
std::set<GVertex*, GEntityLessThan> vertices;
-
+
// map between the pair <dimension, elementary or physical number>
// and an optional associated name
std::map<std::pair<int, int>, std::string> physicalNames, elementaryNames;
@@ -158,7 +161,7 @@ class GModel
OCC_Internals *getOCCInternals(){ return _occ_internals; }
FM_Internals *getFMInternals() { return _fm_internals; }
ACIS_Internals *getACISInternals(){ return _acis_internals; }
-
+
// access characteristic length (mesh size) fields
FieldManager *getFields(){ return _fields; }
@@ -212,7 +215,7 @@ class GModel
std::vector<GFace*> bindingsGetFaces();
std::vector<GEdge*> bindingsGetEdges();
std::vector<GVertex*> bindingsGetVertices();
-
+
// add/remove an entity in the model
void add(GRegion *r) { regions.insert(r); }
void add(GFace *f) { faces.insert(f); }
@@ -308,7 +311,7 @@ class GModel
// return the total number of vertices in the mesh
int getNumMeshVertices();
-
+
// access a mesh vertex by tag, using the vertex cache
MVertex *getMeshVertexByTag(int n);
@@ -364,11 +367,11 @@ class GModel
// mesh the model
int mesh(int dimension);
- // adapt the mesh anisotropically using a metric that is computed from a scalar function f(x,y,z).
- // One can either
+ // adapt the mesh anisotropically using a metric that is computed from a scalar function f(x,y,z).
+ // One can either
// For all algorithms
- // parameters[1] = lcmin (default : in global gmsh options CTX::instance()->mesh.lcMin)
- // parameters[2] = lcmax (default : in global gmsh options CTX::instance()->mesh.lcMax)
+ // parameters[1] = lcmin (default : in global gmsh options CTX::instance()->mesh.lcMin)
+ // parameters[2] = lcmax (default : in global gmsh options CTX::instance()->mesh.lcMax)
// parameters[3] = nb iterations
// 1) Assume that the function is a levelset -> adapt using Coupez technique (technique = 1)
// parameters[0] = thickness of the interface (mandatory)
@@ -376,16 +379,14 @@ class GModel
// parameters[0] = N, the final number of elements
// 3) A variant of 1) by P. Frey (= Coupez + takes curvature function into account)
// parameters[0] = thickness of the interface (mandatory)
- // The algorithm first generate a mesh if no one is available
-
+ // The algorithm first generate a mesh if no one is available
// In this first attempt, only the highest dimensional mesh is adapted, which is ok if
// we assume that boundaries are already adapted.
// This should be fixed.
-
int adaptMesh (int technique, simpleFunction<double> *f, std::vector<double> parameters, bool meshAll=false);
// make the mesh a high order mesh at order N
- // linear is 1 if the high order points are not placed on the geometry of the model
+ // linear is 1 if the high order points are not placed on the geometry of the model
// incomplete is 1 if incomplete basis are used
int setOrderN(int order, int linear, int incomplete);
@@ -462,7 +463,7 @@ class GModel
std::vector<int> &elementary,
std::vector<int> &partition);
- // Store mesh elements of a chain in a new elementary and physical entity
+ // store mesh elements of a chain in a new elementary and physical entity
void storeChain(int dim, std::map<int, std::vector<MElement*> > &entityMap,
std::map<int, std::map<int, std::string> > &physicalMap)
{
@@ -470,7 +471,7 @@ class GModel
_storePhysicalTagsInEntities(dim, physicalMap);
_associateEntityWithMeshVertices();
}
- void storeChain(std::vector<MVertex*> &vertices, int dim,
+ void storeChain(std::vector<MVertex*> &vertices, int dim,
std::map<int, std::vector<MElement*> > &entityMap,
std::map<int, std::map<int, std::string> > &physicalMap)
{
@@ -480,6 +481,11 @@ class GModel
_associateEntityWithMeshVertices();
}
+ // request homology computation
+ void addHomologyRequest(const std::string &type, std::vector<int> &domain,
+ std::vector<int> &subdomain);
+ void computeHomology();
+
// "automatic" IO based on Gmsh global functions
void load(std::string fileName);
void save(std::string fileName);
@@ -585,12 +591,12 @@ class GModel
bool saveAll=false, double scalingFactor=1.0);
// Abaqus
- int writeINP(const std::string &name, bool saveAll=false,
+ int writeINP(const std::string &name, bool saveAll=false,
double scalingFactor=1.0);
// Geomview mesh
int readGEOM(const std::string &name);
-
+
// CEA triangulation
int writeMAIL(const std::string &name, bool saveAll, double scalingFactor);
};
diff --git a/Geo/Homology.cpp b/Geo/Homology.cpp
index 45df3123c05b5f65bdf06033e5acd6cc69cfcb93..197462d8d5a259bd42f16db1bf5a3e31c47a2d8c 100644
--- a/Geo/Homology.cpp
+++ b/Geo/Homology.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
//
// Contributed by Matti Pellikka <matti.pellikka@tut.fi>.
-
+
#include "Homology.h"
#if defined(HAVE_POST)
@@ -13,13 +13,13 @@
#if defined(HAVE_KBIPACK)
-Homology::Homology(GModel* model, std::vector<int> physicalDomain,
- std::vector<int> physicalSubdomain,
+Homology::Homology(GModel* model, std::vector<int> physicalDomain,
+ std::vector<int> physicalSubdomain,
bool combine, bool omit, bool smoothen) :
- _model(model), _domain(physicalDomain), _subdomain(physicalSubdomain),
+ _model(model), _domain(physicalDomain), _subdomain(physicalSubdomain),
_combine(combine), _omit(omit), _smoothen(smoothen)
-{
- _fileName = "";
+{
+ _fileName = "";
// default to the whole model
if(_domain.empty()){
@@ -35,7 +35,7 @@ Homology::Homology(GModel* model, std::vector<int> physicalDomain,
std::map<int, std::vector<GEntity*> > groups[4];
model->getPhysicalGroups(groups);
std::map<int, std::vector<GEntity*> >::iterator it;
-
+
for(unsigned int i = 0; i < _domain.size(); i++){
for(int j = 0; j < 4; j++){
it = groups[j].find(_domain.at(i));
@@ -47,14 +47,14 @@ Homology::Homology(GModel* model, std::vector<int> physicalDomain,
}
}
}
- for(unsigned int i = 0; i < _subdomain.size(); i++){
+ for(unsigned int i = 0; i < _subdomain.size(); i++){
for(int j = 0; j < 4; j++){
it = groups[j].find(_subdomain.at(i));
if(it != groups[j].end()){
std::vector<GEntity*> physicalGroup = (*it).second;
for(unsigned int k = 0; k < physicalGroup.size(); k++){
_subdomainEntities.push_back(physicalGroup.at(k));
- }
+ }
}
}
}
@@ -63,14 +63,14 @@ Homology::Homology(GModel* model, std::vector<int> physicalDomain,
}
CellComplex* Homology::createCellComplex(std::vector<GEntity*>& domainEntities,
- std::vector<GEntity*>& subdomainEntities){
+ std::vector<GEntity*>& subdomainEntities)
+{
Msg::StatusBar(2, true, "Creating cell complex...");
double t1 = Cpu();
-
if(domainEntities.empty()) Msg::Error("Domain is empty");
if(subdomainEntities.empty()) Msg::Info("Subdomain is empty");
-
+
std::vector<MElement*> domainElements;
std::vector<MElement*> subdomainElements;
for(unsigned int j=0; j < domainEntities.size(); j++) {
@@ -87,32 +87,31 @@ CellComplex* Homology::createCellComplex(std::vector<GEntity*>& domainEntities,
}
}
- CellComplex* cellComplex = new CellComplex(_model,
- domainElements,
+ CellComplex* cellComplex = new CellComplex(_model,
+ domainElements,
subdomainElements);
- if(cellComplex->getSize(0) == 0){
- Msg::Error("Cell Complex is empty!");
- Msg::Error("Check the domain & the mesh");
+ if(cellComplex->getSize(0) == 0){
+ Msg::Error("Cell Complex is empty: check the domain and the mesh");
}
double t2 = Cpu();
Msg::StatusBar(2, true, "Done creating cell complex (%g s)", t2 - t1);
Msg::Info("%d volumes, %d faces, %d edges and %d vertices",
- cellComplex->getSize(3), cellComplex->getSize(2),
+ cellComplex->getSize(3), cellComplex->getSize(2),
cellComplex->getSize(1), cellComplex->getSize(0));
return cellComplex;
}
Homology::~Homology()
-{
-
+{
+
}
void Homology::findGenerators(CellComplex* cellComplex)
{
bool ownComplex = false;
if(cellComplex==NULL){
- cellComplex = createCellComplex(_domainEntities,
+ cellComplex = createCellComplex(_domainEntities,
_subdomainEntities);
ownComplex = true;
}
@@ -122,35 +121,35 @@ void Homology::findGenerators(CellComplex* cellComplex)
double t1 = Cpu();
int omitted = cellComplex->reduceComplex(_combine, _omit);
-
+
double t2 = Cpu();
Msg::StatusBar(2, true, "Done reducing cell complex (%g s)", t2 - t1);
Msg::Info("%d volumes, %d faces, %d edges and %d vertices",
- cellComplex->getSize(3), cellComplex->getSize(2),
+ cellComplex->getSize(3), cellComplex->getSize(2),
cellComplex->getSize(1), cellComplex->getSize(0));
-
+
Msg::StatusBar(2, true, "Computing homology spaces...");
t1 = Cpu();
ChainComplex chains = ChainComplex(cellComplex);
chains.computeHomology();
t2 = Cpu();
Msg::StatusBar(2, true, "Done computing homology spaces (%g s)", t2 - t1);
-
+
int HRank[4];
for(int j = 0; j < 4; j++){
HRank[j] = 0;
std::string dimension = "";
convert(j, dimension);
for(int i = 1; i <= chains.getBasisSize(j, 3); i++){
-
+
std::string generator = "";
convert(i, generator);
-
+
std::string name = "H" + dimension + domainString + generator;
std::map<Cell*, int, Less_Cell> protoChain;
chains.getBasisChain(protoChain, i, j, 3, _smoothen);
- Chain* chain = new Chain(protoChain, cellComplex, ++_maxdomain, name,
- chains.getTorsion(j,i));
+ Chain* chain = new Chain(protoChain, cellComplex, ++_maxdomain, name,
+ chains.getTorsion(j,i));
if(chain->getSize() == 0) {
delete chain;
_maxdomain--;
@@ -158,48 +157,48 @@ void Homology::findGenerators(CellComplex* cellComplex)
}
HRank[j] = HRank[j] + 1;
if(chain->getTorsion() != 1){
- Msg::Warning("H%d %d has torsion coefficient %d!",
+ Msg::Warning("H%d %d has torsion coefficient %d!",
j, i, chain->getTorsion());
}
_basisChains[chain->createPGroup()] = chain;
}
}
-
+
if(_fileName != "") writeGeneratorsMSH();
if(ownComplex) delete cellComplex;
-
+
Msg::Info("Ranks of homology spaces for primal cell complex:");
Msg::Info("H0 = %d", HRank[0]);
Msg::Info("H1 = %d", HRank[1]);
Msg::Info("H2 = %d", HRank[2]);
Msg::Info("H3 = %d", HRank[3]);
if(omitted != 0) Msg::Info("The computation of generators in the highest dimension was omitted");
-
- Msg::StatusBar(2, false, "H0: %d, H1: %d, H2: %d, H3: %d",
+
+ Msg::StatusBar(2, false, "H0: %d, H1: %d, H2: %d, H3: %d",
HRank[0], HRank[1], HRank[2], HRank[3]);
}
void Homology::findDualGenerators(CellComplex* cellComplex)
-{
+{
bool ownComplex = false;
if(cellComplex==NULL){
- cellComplex = createCellComplex(_domainEntities,
+ cellComplex = createCellComplex(_domainEntities,
_subdomainEntities);
ownComplex = true;
}
Msg::StatusBar(2, true, "Reducing cell complex...");
-
+
double t1 = Cpu();
int omitted = cellComplex->coreduceComplex(_combine, _omit);
double t2 = Cpu();
-
+
Msg::StatusBar(2, true, "Done reducing cell complex (%g s)", t2 - t1);
Msg::Info("%d volumes, %d faces, %d edges and %d vertices",
- cellComplex->getSize(3), cellComplex->getSize(2),
+ cellComplex->getSize(3), cellComplex->getSize(2),
cellComplex->getSize(1), cellComplex->getSize(0));
-
+
Msg::StatusBar(2, true, "Computing homology spaces...");
t1 = Cpu();
ChainComplex chains = ChainComplex(cellComplex);
@@ -207,9 +206,9 @@ void Homology::findDualGenerators(CellComplex* cellComplex)
chains.computeHomology(true);
t2 = Cpu();
Msg::StatusBar(2, true, "Done computing homology spaces (%g s)", t2- t1);
-
+
int dim = cellComplex->getDim();
-
+
int HRank[4];
for(int i = 0; i < 4; i++) HRank[i] = 0;
for(int j = 3; j > -1; j--){
@@ -217,15 +216,15 @@ void Homology::findDualGenerators(CellComplex* cellComplex)
convert(dim-j, dimension);
for(int i = 1; i <= chains.getBasisSize(j, 3); i++){
-
+
std::string generator = "";
convert(i, generator);
-
- std::string name = "H" + dimension + "*" +
+
+ std::string name = "H" + dimension + "*" +
getDomainString(_domain, _subdomain) + generator;
std::map<Cell*, int, Less_Cell> protoChain;
chains.getBasisChain(protoChain, i, j, 3, _smoothen);
- Chain* chain = new Chain(protoChain, cellComplex, ++_maxdomain, name,
+ Chain* chain = new Chain(protoChain, cellComplex, ++_maxdomain, name,
chains.getTorsion(j,i));
if(chain->getSize() == 0) {
delete chain;
@@ -234,8 +233,8 @@ void Homology::findDualGenerators(CellComplex* cellComplex)
}
HRank[dim-j] = HRank[dim-j] + 1;
- if(chain->getTorsion() != 1){
- Msg::Warning("H%d* %d has torsion coefficient %d!",
+ if(chain->getTorsion() != 1){
+ Msg::Warning("H%d* %d has torsion coefficient %d!",
dim-j, i, chain->getTorsion());
}
_basisChains[chain->createPGroup()] = chain;
@@ -245,20 +244,20 @@ void Homology::findDualGenerators(CellComplex* cellComplex)
if(_fileName != "") writeGeneratorsMSH();
if(ownComplex) delete cellComplex;
-
+
Msg::Info("Ranks of homology spaces for the dual cell complex:");
Msg::Info("H0* = %d", HRank[0]);
Msg::Info("H1* = %d", HRank[1]);
Msg::Info("H2* = %d", HRank[2]);
Msg::Info("H3* = %d", HRank[3]);
if(omitted != 0) Msg::Info("The computation of %d highest dimension dual generators was omitted", omitted);
-
- Msg::StatusBar(2, false, "H0*: %d, H1*: %d, H2*: %d, H3*: %d",
+
+ Msg::StatusBar(2, false, "H0*: %d, H1*: %d, H2*: %d, H3*: %d",
HRank[0], HRank[1], HRank[2], HRank[3]);
}
/*void Homology::findHomSequence(){
- CellComplex* cellComplex = createCellComplex(_domainEntities,
+ CellComplex* cellComplex = createCellComplex(_domainEntities,
_subdomainEntities);
Msg::StatusBar(2, true, "Reducing cell complex...");
@@ -268,29 +267,29 @@ void Homology::findDualGenerators(CellComplex* cellComplex)
Msg::StatusBar(2, true, "Done reducing cell complex (%g s)", t2 - t1);
Msg::Info("%d volumes, %d faces, %d edges and %d vertices",
- cellComplex->getSize(3), cellComplex->getSize(2),
+ cellComplex->getSize(3), cellComplex->getSize(2),
cellComplex->getSize(1), cellComplex->getSize(0));
-
+
Msg::StatusBar(2, true, "Computing homology spaces...");
t1 = Cpu();
-
+
ChainComplex* subcomplex = new ChainComplex(cellComplex, 2);
ChainComplex* complex = new ChainComplex(cellComplex, 1);
ChainComplex* relcomplex = new ChainComplex(cellComplex, 0);
subcomplex->computeHomology();
complex->computeHomology();
- relcomplex->computeHomology();
+ relcomplex->computeHomology();
t2 = Cpu();
Msg::StatusBar(2, true, "Done compuring homology spaces (%g s)", t2 - t1);
Msg::StatusBar(2, true, "Computing homology sequence...");
- HomologySequence* seq = new HomologySequence(subcomplex,
+ HomologySequence* seq = new HomologySequence(subcomplex,
complex, relcomplex);
t1 = Cpu();
Msg::StatusBar(2, true, "Done computing homology sequence (%g s)", t1 - t2);
-
+
for(int task = 0; task < 3; task++){
ChainComplex* chains;
@@ -308,21 +307,21 @@ void Homology::findDualGenerators(CellComplex* cellComplex)
chains = relcomplex;
domainString = getDomainString(_domain, _subdomain);
}
-
+
int HRank[4];
for(int j = 0; j < 4; j++){
HRank[j] = 0;
std::string dimension = "";
convert(j, dimension);
for(int i = 1; i <= chains->getBasisSize(j, 3); i++){
-
+
std::string generator = "";
convert(i, generator);
-
+
std::string name = "H" + dimension + domainString + generator;
std::map<Cell*, int, Less_Cell> protoChain;
chains->getBasisChain(protoChain, i, j, 3, true);
- Chain* chain = new Chain(protoChain, cellComplex, _model, name,
+ Chain* chain = new Chain(protoChain, cellComplex, _model, name,
chains->getTorsion(j,i));
if(chain->getSize() == 0) {
delete chain;
@@ -330,13 +329,13 @@ void Homology::findDualGenerators(CellComplex* cellComplex)
}
HRank[j] = HRank[j] + 1;
if(chain->getTorsion() != 1){
- Msg::Warning("H%d %d has torsion coefficient %d!",
+ Msg::Warning("H%d %d has torsion coefficient %d!",
j, i, chain->getTorsion());
}
_generators.push_back(chain->createPGroup());
delete chain;
}
-
+
}
if(task == 0){
Msg::Info("Ranks of relative homology spaces:");
@@ -366,7 +365,7 @@ void Homology::findDualGenerators(CellComplex* cellComplex)
}
*/
std::string Homology::getDomainString(const std::vector<int>& domain,
- const std::vector<int>& subdomain)
+ const std::vector<int>& subdomain)
{
std::string domainString = "({";
if(domain.empty()) domainString += "0";
@@ -375,15 +374,15 @@ std::string Homology::getDomainString(const std::vector<int>& domain,
std::string temp = "";
convert(domain.at(i),temp);
domainString += temp;
- if (domain.size()-1 > i){
+ if (domain.size()-1 > i){
domainString += ", ";
}
}
}
domainString += "}";
-
+
if(!subdomain.empty()){
- domainString += ", {";
+ domainString += ", {";
for(unsigned int i = 0; i < subdomain.size(); i++){
std::string temp = "";
convert(subdomain.at(i),temp);
@@ -391,7 +390,7 @@ std::string Homology::getDomainString(const std::vector<int>& domain,
if (subdomain.size()-1 > i){
domainString += ", ";
}
- }
+ }
domainString += "}";
}
domainString += ") ";
@@ -411,15 +410,15 @@ void Homology::storeCells(CellComplex* cellComplex, int dim)
std::vector<MElement*> elements;
MElementFactory factory;
- for(CellComplex::citer cit = cellComplex->firstCell(dim);
+ for(CellComplex::citer cit = cellComplex->firstCell(dim);
cit != cellComplex->lastCell(dim); cit++){
Cell* cell = *cit;
-
+
std::map<Cell*, int, Less_Cell > cells;
cell->getCells(cells);
for(Cell::citer it = cells.begin(); it != cells.end(); it++){
Cell* subCell = it->first;
-
+
std::vector<MVertex*> v;
cell->getMeshVertices(v);
@@ -446,17 +445,17 @@ void Homology::storeCells(CellComplex* cellComplex, int dim)
}
int Chain::writeChainMSH(const std::string &name)
-{
+{
if(getSize() == 0) return 1;
-
+
FILE *fp = fopen(name.c_str(), "a");
if(!fp){
Msg::Error("Unable to open file '%s'", name.c_str());
return 0;
}
-
+
fprintf(fp, "\n$ElementData\n");
-
+
fprintf(fp, "1 \n");
fprintf(fp, "\"%s\" \n", getName().c_str());
fprintf(fp, "1 \n");
@@ -466,21 +465,21 @@ int Chain::writeChainMSH(const std::string &name)
fprintf(fp, "1 \n");
fprintf(fp, "%d \n", getSize());
fprintf(fp, "0 \n");
-
+
for(citer cit = _cells.begin(); cit != _cells.end(); cit++){
Cell* cell = (*cit).first;
int coeff = (*cit).second;
fprintf(fp, "%d %d \n", cell->getIndex(), coeff );
}
-
+
fprintf(fp, "$EndElementData\n");
fclose(fp);
-
+
return 1;
}
int Chain::createPGroup()
-{
+{
std::vector<MElement*> elements;
std::map<int, std::vector<double> > data;
MElementFactory factory;
@@ -491,20 +490,20 @@ int Chain::createPGroup()
std::vector<MVertex*> v;
cell->getMeshVertices(v);
MElement* e = factory.create(cell->getTypeMSH(), v);
-
-
+
+
if(cell->getDim() > 0 && coeff < 0) e->revert(); // flip orientation
- for(int i = 0; i < abs(coeff); i++) elements.push_back(e);
+ for(int i = 0; i < abs(coeff); i++) elements.push_back(e);
std::vector<double> coeffs (1,abs(coeff));
data[e->getNum()] = coeffs;
}
-
+
int max[4];
- for(int i = 0; i < 4; i++)
+ for(int i = 0; i < 4; i++)
max[i] = this->getCellComplex()->getModel()->getMaxElementaryNumber(i);
int entityNum = *std::max_element(max,max+4) + 1;
- for(int i = 0; i < 4; i++)
+ for(int i = 0; i < 4; i++)
max[i] = this->getCellComplex()->getModel()->getMaxPhysicalNumber(i);
int physicalNum = *std::max_element(max,max+4) + 1;
setNum(physicalNum);
@@ -515,7 +514,7 @@ int Chain::createPGroup()
std::map<int, std::string> physicalInfo;
physicalInfo[physicalNum] = getName();
physicalMap[entityNum] = physicalInfo;
-
+
// hide mesh
/*opt_mesh_points(0, GMSH_SET, 0);
opt_mesh_lines(0, GMSH_SET, 0);
@@ -530,27 +529,27 @@ int Chain::createPGroup()
//opt_view_normals(0, GMSH_SET, 20);
//opt_view_tangents(0, GMSH_SET, 20);
//opt_view_show_element(0, GMSH_SET, 1);
-
+
if(!data.empty()){
- this->getCellComplex()->getModel()->storeChain(getDim(),
+ this->getCellComplex()->getModel()->storeChain(getDim(),
entityMap, physicalMap);
- this->getCellComplex()->getModel()->setPhysicalName(getName(),
+ this->getCellComplex()->getModel()->setPhysicalName(getName(),
getDim(), physicalNum);
-#if defined(HAVE_POST)
+#if defined(HAVE_POST)
// create PView for instant visualization
- new PView(getName(), "ElementData", this->getCellComplex()->getModel(),
+ new PView(getName(), "ElementData", this->getCellComplex()->getModel(),
data, 0, 1);
#endif
}
-
+
return physicalNum;
}
-Chain::Chain(std::map<Cell*, int, Less_Cell>& chain,
+Chain::Chain(std::map<Cell*, int, Less_Cell>& chain,
CellComplex* cellComplex, int num,
std::string name, int torsion)
-{
+{
_cells = chain;
if(!_cells.empty()) _dim = firstCell()->first->getDim();
else _dim = 0;
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index a2abd8b623b3955990d99e6f3930e57184a0c897..a06ee9d9a7c81b3fd328b577975e0a46469a906d 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -47,7 +47,7 @@ static MVertex* isEquivalentTo(std::multimap<MVertex*, MVertex*> &m, MVertex *v)
return res;
}
-static void buildASetOfEquivalentMeshVertices(GFace *gf,
+static void buildASetOfEquivalentMeshVertices(GFace *gf,
std::multimap<MVertex*, MVertex *> &equivalent,
std::map<GVertex*, MVertex*> &bm)
{
@@ -94,12 +94,12 @@ static void buildASetOfEquivalentMeshVertices(GFace *gf,
}
}
-struct geomThresholdVertexEquivalence
+struct geomThresholdVertexEquivalence
{
// Initial MVertex associated to one given MVertex
std::map<GVertex*, MVertex*> backward_map;
// initiate the forward and backward maps
- geomThresholdVertexEquivalence(GModel *g);
+ geomThresholdVertexEquivalence(GModel *g);
// restores the initial state
~geomThresholdVertexEquivalence ();
};
@@ -109,9 +109,9 @@ geomThresholdVertexEquivalence::geomThresholdVertexEquivalence(GModel *g)
std::multimap<MVertex*, MVertex*> equivalenceMap;
for (GModel::fiter it = g->firstFace(); it != g->lastFace(); ++it)
buildASetOfEquivalentMeshVertices(*it, equivalenceMap, backward_map);
- // build the structure that identifiate geometrically equivalent
+ // build the structure that identifiate geometrically equivalent
// mesh vertices.
- for (std::map<GVertex*, MVertex*>::iterator it = backward_map.begin();
+ for (std::map<GVertex*, MVertex*>::iterator it = backward_map.begin();
it != backward_map.end(); ++it){
GVertex *g = it->first;
MVertex *v = it->second;
@@ -127,23 +127,23 @@ geomThresholdVertexEquivalence::geomThresholdVertexEquivalence(GModel *g)
MLine *l = (*ite)->lines[i];
MVertex *v1 = l->getVertex(0);
MVertex *v2 = l->getVertex(1);
- if (v1 == v && v2 != other){
- delete l;
+ if (v1 == v && v2 != other){
+ delete l;
l = new MLine(other,v2);
newl.push_back(l);
- }
- else if (v1 != other && v2 == v){
- delete l;
+ }
+ else if (v1 != other && v2 == v){
+ delete l;
l = new MLine(v1,other);
newl.push_back(l);
- }
- else if (v1 != v && v2 != v)
- newl.push_back(l);
- else
+ }
+ else if (v1 != v && v2 != v)
+ newl.push_back(l);
+ else
delete l;
}
(*ite)->lines = newl;
- }
+ }
}
}
}
@@ -161,29 +161,29 @@ geomThresholdVertexEquivalence::~geomThresholdVertexEquivalence()
}
template<class T>
-static void GetQualityMeasure(std::vector<T*> &ele,
- double &gamma, double &gammaMin, double &gammaMax,
- double &eta, double &etaMin, double &etaMax,
+static void GetQualityMeasure(std::vector<T*> &ele,
+ double &gamma, double &gammaMin, double &gammaMax,
+ double &eta, double &etaMin, double &etaMax,
double &rho, double &rhoMin, double &rhoMax,
double &disto, double &distoMin, double &distoMax,
double quality[4][100])
{
for(unsigned int i = 0; i < ele.size(); i++){
double g = ele[i]->gammaShapeMeasure();
- gamma += g;
- gammaMin = std::min(gammaMin, g);
+ gamma += g;
+ gammaMin = std::min(gammaMin, g);
gammaMax = std::max(gammaMax, g);
double e = ele[i]->etaShapeMeasure();
- eta += e;
- etaMin = std::min(etaMin, e);
+ eta += e;
+ etaMin = std::min(etaMin, e);
etaMax = std::max(etaMax, e);
double r = ele[i]->rhoShapeMeasure();
- rho += r;
- rhoMin = std::min(rhoMin, r);
+ rho += r;
+ rhoMin = std::min(rhoMin, r);
rhoMax = std::max(rhoMax, r);
double d = ele[i]->distoShapeMeasure();
- disto += d;
- distoMin = std::min(distoMin, d);
+ disto += d;
+ distoMin = std::min(distoMin, d);
distoMax = std::max(distoMax, d);
for(int j = 0; j < 100; j++){
if(g > j / 100. && g <= (j + 1) / 100.) quality[0][j]++;
@@ -209,18 +209,18 @@ void GetStatistics(double stat[50], double quality[4][100])
std::map<int, std::vector<GEntity*> > physicals[4];
m->getPhysicalGroups(physicals);
- stat[45] = physicals[0].size() + physicals[1].size() +
+ stat[45] = physicals[0].size() + physicals[1].size() +
physicals[2].size() + physicals[3].size();
-
+
for(GModel::eiter it = m->firstEdge(); it != m->lastEdge(); ++it)
stat[4] += (*it)->mesh_vertices.size();
-
+
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
stat[5] += (*it)->mesh_vertices.size();
stat[7] += (*it)->triangles.size();
stat[8] += (*it)->quadrangles.size();
}
-
+
for(GModel::riter it = m->firstRegion(); it != m->lastRegion(); ++it){
stat[6] += (*it)->mesh_vertices.size();
stat[9] += (*it)->tetrahedra.size();
@@ -228,11 +228,11 @@ void GetStatistics(double stat[50], double quality[4][100])
stat[11] += (*it)->prisms.size();
stat[12] += (*it)->pyramids.size();
}
-
+
stat[13] = CTX::instance()->meshTimer[0];
stat[14] = CTX::instance()->meshTimer[1];
stat[15] = CTX::instance()->meshTimer[2];
-
+
if(quality){
for(int i = 0; i < 3; i++)
for(int j = 0; j < 100; j++)
@@ -245,7 +245,7 @@ void GetStatistics(double stat[50], double quality[4][100])
if (m->firstRegion() == m->lastRegion()){
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
GetQualityMeasure((*it)->quadrangles, gamma, gammaMin, gammaMax,
- eta, etaMin, etaMax, rho, rhoMin, rhoMax,
+ eta, etaMin, etaMax, rho, rhoMin, rhoMax,
disto, distoMin, distoMax, quality);
GetQualityMeasure((*it)->triangles, gamma, gammaMin, gammaMax,
eta, etaMin, etaMax, rho, rhoMin, rhoMax,
@@ -256,7 +256,7 @@ void GetStatistics(double stat[50], double quality[4][100])
else{
for(GModel::riter it = m->firstRegion(); it != m->lastRegion(); ++it){
GetQualityMeasure((*it)->tetrahedra, gamma, gammaMin, gammaMax,
- eta, etaMin, etaMax, rho, rhoMin, rhoMax,
+ eta, etaMin, etaMax, rho, rhoMin, rhoMax,
disto, distoMin, distoMax, quality);
GetQualityMeasure((*it)->hexahedra, gamma, gammaMin, gammaMax,
eta, etaMin, etaMax, rho, rhoMin, rhoMax,
@@ -312,7 +312,7 @@ static bool TooManyElements(GModel *m, int dim)
for(GModel::viter it = m->firstVertex(); it != m->lastVertex(); ++it)
sumAllLc += (*it)->prescribedMeshSizeAtVertex() * CTX::instance()->mesh.lcFactor;
sumAllLc /= (double)m->getNumVertices();
- if(!sumAllLc || pow(CTX::instance()->lc / sumAllLc, dim) > 1.e10)
+ if(!sumAllLc || pow(CTX::instance()->lc / sumAllLc, dim) > 1.e10)
return !Msg::GetAnswer
("Your choice of mesh element sizes will likely produce a very\n"
"large mesh. Do you really want to continue?\n\n"
@@ -405,7 +405,7 @@ static void PrintMesh2dStatistics(GModel *m)
e_avg += (*it)->meshStatistics.efficiency_index;//* (*it)->meshStatistics.nbEdge;
e_long = std::max((*it)->meshStatistics.longest_edge_length, e_long);
e_short = std::min((*it)->meshStatistics.smallest_edge_length, e_short);
- if ((*it)->meshStatistics.status == GFace::FAILED ||
+ if ((*it)->meshStatistics.status == GFace::FAILED ||
(*it)->meshStatistics.status == GFace::PENDING) nUnmeshed++;
nTotT += (*it)->meshStatistics.nbTriangle;
nTotE += (*it)->meshStatistics.nbEdge;
@@ -446,7 +446,7 @@ static void Mesh2D(GModel *m)
cf.insert(*it);
else
f.insert(*it);
-
+
int nIter = 0;
while(1){
int nbPending = 0;
@@ -466,7 +466,7 @@ static void Mesh2D(GModel *m)
}
if(!nbPending) break;
if(nIter++ > 10) break;
- }
+ }
}
@@ -487,7 +487,7 @@ static void Mesh2D(GModel *m)
/*
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
GFace *gf = *it;
- if(gf->geomType() == GEntity::DiscreteSurface) continue;
+ if(gf->geomType() == GEntity::DiscreteSurface) continue;
if(gf->geomType() == GEntity::CompoundSurface) {
GFaceCompound *gfc = (GFaceCompound*) gf;
if(gfc->getNbSplit() != 0) continue;
@@ -508,7 +508,7 @@ static void Mesh2D(GModel *m)
PrintMesh2dStatistics(m);
}
-static void FindConnectedRegions(std::vector<GRegion*> &delaunay,
+static void FindConnectedRegions(std::vector<GRegion*> &delaunay,
std::vector<std::vector<GRegion*> > &connected)
{
// FIXME: need to split region vector into connected components here!
@@ -587,7 +587,7 @@ void RecombineMesh(GModel *m)
{
Msg::StatusBar(2, true, "Recombining 2D mesh...");
double t1 = Cpu();
-
+
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
GFace *gf = *it;
recombineIntoQuads(gf);
@@ -642,7 +642,7 @@ void GenerateMesh(GModel *m, int ask)
// Optimize quality of 3D tet mesh
if(m->getMeshStatus() == 3){
- for(int i = 0; i < std::max(CTX::instance()->mesh.optimize,
+ for(int i = 0; i < std::max(CTX::instance()->mesh.optimize,
CTX::instance()->mesh.optimizeNetgen); i++){
if(CTX::instance()->mesh.optimize > i) OptimizeMesh(m);
if(CTX::instance()->mesh.optimizeNetgen > i) OptimizeMeshNetgen(m);
@@ -650,14 +650,17 @@ void GenerateMesh(GModel *m, int ask)
}
// Subdivide into quads or hexas
- if(m->getMeshStatus() == 2 && CTX::instance()->mesh.algoSubdivide == 1)
+ if(m->getMeshStatus() == 2 && CTX::instance()->mesh.algoSubdivide == 1)
RefineMesh(m, CTX::instance()->mesh.secondOrderLinear, true);
- else if(m->getMeshStatus() == 3 && CTX::instance()->mesh.algoSubdivide == 2)
+ else if(m->getMeshStatus() == 3 && CTX::instance()->mesh.algoSubdivide == 2)
RefineMesh(m, CTX::instance()->mesh.secondOrderLinear, false, true);
-
+
+ // Compute homology if necessary
+ if(!Msg::GetErrorCount()) m->computeHomology();
+
// Create high order elements
- if(m->getMeshStatus() && CTX::instance()->mesh.order > 1)
- SetOrderN(m, CTX::instance()->mesh.order, CTX::instance()->mesh.secondOrderLinear,
+ if(m->getMeshStatus() && CTX::instance()->mesh.order > 1)
+ SetOrderN(m, CTX::instance()->mesh.order, CTX::instance()->mesh.secondOrderLinear,
CTX::instance()->mesh.secondOrderIncomplete);
Msg::Info("%d vertices %d elements",
diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index d5aa4fc8e32ffc180ef5a026c1fce9731f4e04f9..5a3bb96bacc2a7057ab51143888455defc314ab9 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -97,6 +97,7 @@ BoundingBox return tBoundingBox;
Ceil return tCeil;
Circle return tCircle;
Coherence return tCoherence;
+Cohomology return tCohomology;
Combine return tCombine;
Cosh return tCosh;
Cos return tCos;
@@ -143,10 +144,7 @@ GMSH_PATCH_VERSION return tGMSH_PATCH_VERSION;
Hide return tHide;
Hole return tHole;
-HomRank return tHomRank;
-HomGen return tHomGen;
-HomCut return tHomCut;
-HomSeq return tHomSeq;
+Homology return tHomology;
Hypot return tHypot;
In return tIn;
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 060578358325aaf803c83ea347cd4d03d67fee39..4b7d5e09122eef2598b93a0629c669a95870958b 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.4.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2009, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -46,7 +45,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -130,10 +129,6 @@
#include "drawContext.h"
#endif
-#if defined(HAVE_KBIPACK)
-#include "Homology.h"
-#endif
-
// Global parser variables
std::string gmsh_yyname;
int gmsh_yyerrorstate = 0;
@@ -168,7 +163,7 @@ fullMatrix<double> ListOfListOfDouble2Matrix(List_T *list);
/* Line 189 of yacc.c */
-#line 172 "Gmsh.tab.cpp"
+#line 167 "Gmsh.tab.cpp"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -312,26 +307,24 @@ fullMatrix<double> ListOfListOfDouble2Matrix(List_T *list);
tGetValue = 372,
tGetEnv = 373,
tGetString = 374,
- tGMSH_MAJOR_VERSION = 375,
- tGMSH_MINOR_VERSION = 376,
- tGMSH_PATCH_VERSION = 377,
- tHomRank = 378,
- tHomGen = 379,
- tHomCut = 380,
- tHomSeq = 381,
- tAFFECTDIVIDE = 382,
- tAFFECTTIMES = 383,
- tAFFECTMINUS = 384,
- tAFFECTPLUS = 385,
- tOR = 386,
- tAND = 387,
- tNOTEQUAL = 388,
- tEQUAL = 389,
- tGREATEROREQUAL = 390,
- tLESSOREQUAL = 391,
- UNARYPREC = 392,
- tMINUSMINUS = 393,
- tPLUSPLUS = 394
+ tHomology = 375,
+ tCohomology = 376,
+ tGMSH_MAJOR_VERSION = 377,
+ tGMSH_MINOR_VERSION = 378,
+ tGMSH_PATCH_VERSION = 379,
+ tAFFECTDIVIDE = 380,
+ tAFFECTTIMES = 381,
+ tAFFECTMINUS = 382,
+ tAFFECTPLUS = 383,
+ tOR = 384,
+ tAND = 385,
+ tNOTEQUAL = 386,
+ tEQUAL = 387,
+ tGREATEROREQUAL = 388,
+ tLESSOREQUAL = 389,
+ UNARYPREC = 390,
+ tMINUSMINUS = 391,
+ tPLUSPLUS = 392
};
#endif
@@ -342,7 +335,7 @@ typedef union YYSTYPE
{
/* Line 214 of yacc.c */
-#line 91 "Gmsh.y"
+#line 87 "Gmsh.y"
char *c;
int i;
@@ -355,7 +348,7 @@ typedef union YYSTYPE
/* Line 214 of yacc.c */
-#line 359 "Gmsh.tab.cpp"
+#line 352 "Gmsh.tab.cpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -367,7 +360,7 @@ typedef union YYSTYPE
/* Line 264 of yacc.c */
-#line 371 "Gmsh.tab.cpp"
+#line 364 "Gmsh.tab.cpp"
#ifdef short
# undef short
@@ -417,7 +410,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -582,20 +575,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 7329
+#define YYLAST 7603
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 160
+#define YYNTOKENS 158
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 86
+#define YYNNTS 87
/* YYNRULES -- Number of rules. */
-#define YYNRULES 412
+#define YYNRULES 413
/* YYNRULES -- Number of states. */
-#define YYNSTATES 1452
+#define YYNSTATES 1420
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 394
+#define YYMAXUTOK 392
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -606,16 +599,16 @@ static const yytype_uint8 yytranslate[] =
0, 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, 2,
- 2, 2, 2, 145, 2, 155, 2, 144, 2, 2,
- 150, 151, 142, 140, 156, 141, 154, 143, 2, 2,
+ 2, 2, 2, 143, 2, 153, 2, 142, 2, 2,
+ 148, 149, 140, 138, 154, 139, 152, 141, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 136, 2, 137, 131, 2, 2, 2, 2, 2, 2,
+ 134, 2, 135, 129, 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, 152, 2, 153, 149, 2, 2, 2, 2, 2,
+ 2, 150, 2, 151, 147, 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, 157, 2, 158, 159, 2, 2, 2,
+ 2, 2, 2, 155, 2, 156, 157, 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, 2, 2, 2, 2, 2,
@@ -641,8 +634,8 @@ static const yytype_uint8 yytranslate[] =
95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 132, 133, 134, 135,
- 138, 139, 146, 147, 148
+ 125, 126, 127, 128, 130, 131, 132, 133, 136, 137,
+ 144, 145, 146
};
#if YYDEBUG
@@ -677,309 +670,306 @@ static const yytype_uint16 yyprhs[] =
1504, 1507, 1510, 1514, 1517, 1521, 1531, 1538, 1539, 1543,
1544, 1546, 1547, 1550, 1551, 1554, 1562, 1569, 1578, 1584,
1588, 1594, 1601, 1608, 1621, 1632, 1643, 1654, 1665, 1668,
- 1672, 1679, 1691, 1703, 1715, 1727, 1729, 1733, 1736, 1739,
- 1742, 1746, 1750, 1754, 1758, 1762, 1766, 1770, 1774, 1778,
- 1782, 1786, 1790, 1794, 1798, 1804, 1809, 1814, 1819, 1824,
- 1829, 1834, 1839, 1844, 1849, 1854, 1861, 1866, 1871, 1876,
- 1881, 1886, 1891, 1898, 1905, 1912, 1917, 1922, 1927, 1932,
- 1937, 1942, 1947, 1952, 1957, 1962, 1967, 1974, 1979, 1984,
- 1989, 1994, 1999, 2004, 2011, 2018, 2025, 2030, 2032, 2034,
- 2036, 2038, 2040, 2042, 2044, 2046, 2052, 2057, 2062, 2065,
- 2071, 2075, 2082, 2087, 2095, 2102, 2104, 2107, 2110, 2114,
- 2118, 2130, 2140, 2148, 2156, 2158, 2162, 2164, 2166, 2169,
- 2173, 2178, 2184, 2186, 2188, 2191, 2195, 2199, 2205, 2210,
- 2213, 2216, 2219, 2222, 2224, 2226, 2230, 2235, 2242, 2244,
- 2246, 2250, 2254, 2264, 2272, 2274, 2280, 2284, 2291, 2293,
- 2297, 2299, 2301, 2305, 2312, 2314, 2316, 2321, 2328, 2335,
- 2340, 2345, 2350
+ 1672, 1679, 1681, 1683, 1686, 1692, 1700, 1702, 1706, 1709,
+ 1712, 1715, 1719, 1723, 1727, 1731, 1735, 1739, 1743, 1747,
+ 1751, 1755, 1759, 1763, 1767, 1771, 1777, 1782, 1787, 1792,
+ 1797, 1802, 1807, 1812, 1817, 1822, 1827, 1834, 1839, 1844,
+ 1849, 1854, 1859, 1864, 1871, 1878, 1885, 1890, 1895, 1900,
+ 1905, 1910, 1915, 1920, 1925, 1930, 1935, 1940, 1947, 1952,
+ 1957, 1962, 1967, 1972, 1977, 1984, 1991, 1998, 2003, 2005,
+ 2007, 2009, 2011, 2013, 2015, 2017, 2019, 2025, 2030, 2035,
+ 2038, 2044, 2048, 2055, 2060, 2068, 2075, 2077, 2080, 2083,
+ 2087, 2091, 2103, 2113, 2121, 2129, 2131, 2135, 2137, 2139,
+ 2142, 2146, 2151, 2157, 2159, 2161, 2164, 2168, 2172, 2178,
+ 2183, 2186, 2189, 2192, 2195, 2197, 2199, 2203, 2208, 2215,
+ 2217, 2219, 2223, 2227, 2237, 2245, 2247, 2253, 2257, 2264,
+ 2266, 2270, 2272, 2274, 2278, 2285, 2287, 2289, 2294, 2301,
+ 2308, 2313, 2318, 2323
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 161, 0, -1, 162, -1, 1, 6, -1, -1, 162,
- 163, -1, 166, -1, 165, -1, 184, -1, 193, -1,
- 198, -1, 202, -1, 203, -1, 204, -1, 207, -1,
- 227, -1, 228, -1, 229, -1, 230, -1, 206, -1,
- 205, -1, 201, -1, 231, -1, 137, -1, 137, 137,
- -1, 36, 150, 5, 151, 6, -1, 36, 150, 5,
- 151, 164, 244, 6, -1, 36, 150, 5, 156, 240,
- 151, 6, -1, 36, 150, 5, 156, 240, 151, 164,
- 244, 6, -1, 4, 5, 157, 167, 158, 6, -1,
- 87, 4, 152, 232, 153, 6, -1, 88, 4, 152,
- 232, 153, 6, -1, -1, 167, 170, -1, 167, 174,
- -1, 167, 177, -1, 167, 179, -1, 167, 180, -1,
- 232, -1, 168, 156, 232, -1, 232, -1, 169, 156,
- 232, -1, -1, -1, 4, 171, 150, 168, 151, 172,
- 157, 169, 158, 6, -1, 244, -1, 173, 156, 244,
- -1, -1, 93, 150, 232, 156, 232, 156, 232, 151,
- 175, 157, 173, 158, 6, -1, 244, -1, 176, 156,
- 244, -1, -1, 94, 150, 232, 156, 232, 156, 232,
- 156, 232, 151, 178, 157, 176, 158, 6, -1, 95,
- 157, 236, 158, 157, 236, 158, 6, -1, 95, 157,
- 236, 158, 157, 236, 158, 157, 236, 158, 157, 236,
- 158, 6, -1, -1, 96, 181, 157, 169, 158, 6,
- -1, 7, -1, 130, -1, 129, -1, 128, -1, 127,
- -1, 148, -1, 147, -1, 48, 152, 186, 153, 6,
- -1, 4, 182, 237, 6, -1, 4, 152, 153, 182,
- 237, 6, -1, 4, 152, 232, 153, 182, 232, 6,
- -1, 4, 152, 157, 240, 158, 153, 182, 237, 6,
- -1, 4, 183, 6, -1, 4, 152, 232, 153, 183,
- 6, -1, 4, 7, 245, 6, -1, 4, 154, 4,
- 7, 245, 6, -1, 4, 152, 232, 153, 154, 4,
- 7, 245, 6, -1, 4, 154, 4, 182, 232, 6,
- -1, 4, 152, 232, 153, 154, 4, 182, 232, 6,
- -1, 4, 154, 4, 183, 6, -1, 4, 152, 232,
- 153, 154, 4, 183, 6, -1, 4, 154, 103, 154,
- 4, 7, 241, 6, -1, 4, 152, 232, 153, 154,
- 103, 154, 4, 7, 241, 6, -1, 4, 154, 104,
- 7, 242, 6, -1, 4, 152, 232, 153, 154, 104,
- 7, 242, 6, -1, 4, 111, 7, 232, 6, -1,
- 111, 152, 232, 153, 7, 4, 6, -1, 111, 152,
- 232, 153, 154, 4, 7, 232, 6, -1, 111, 152,
- 232, 153, 154, 4, 7, 245, 6, -1, 111, 152,
- 232, 153, 154, 4, 7, 157, 240, 158, 6, -1,
- 71, 150, 4, 151, 154, 4, 7, 232, 6, -1,
- 71, 150, 4, 151, 154, 4, 7, 245, 6, -1,
- -1, 156, -1, -1, 186, 185, 4, -1, 186, 185,
- 4, 7, 232, -1, -1, 186, 185, 4, 7, 157,
- 232, 187, 188, 158, -1, -1, 188, 189, -1, 156,
- 4, 237, -1, 156, 4, 5, -1, 232, -1, 245,
- -1, -1, 106, 53, 157, 232, 158, -1, -1, 63,
- 234, -1, 49, 150, 232, 151, 7, 234, 6, -1,
- -1, 67, 49, 194, 150, 190, 151, 7, 237, 6,
- -1, 58, 59, 237, 7, 232, 6, -1, 52, 150,
- 232, 151, 7, 237, 6, -1, 72, 52, 237, 6,
- -1, 56, 150, 232, 151, 7, 237, 6, -1, 50,
- 150, 232, 151, 7, 237, 192, 6, -1, 51, 150,
- 232, 151, 7, 237, 192, 6, -1, 98, 150, 232,
- 151, 7, 237, 6, -1, 99, 150, 232, 151, 7,
- 237, 6, -1, 100, 150, 232, 151, 7, 237, 102,
- 237, 101, 232, 6, -1, 52, 4, 150, 232, 151,
- 7, 237, 6, -1, 68, 52, 150, 232, 151, 7,
- 237, 6, -1, -1, 67, 52, 195, 150, 190, 151,
- 7, 237, 6, -1, 63, 55, 150, 232, 151, 7,
- 237, 6, -1, 64, 55, 150, 232, 151, 7, 237,
- 191, 6, -1, 12, 13, 6, -1, 13, 55, 232,
- 6, -1, 60, 55, 150, 232, 151, 7, 5, 5,
- 5, 6, -1, 53, 150, 232, 151, 7, 237, 6,
- -1, 54, 150, 232, 151, 7, 237, 6, -1, 55,
- 4, 150, 232, 151, 7, 237, 6, -1, 68, 55,
- 150, 232, 151, 7, 237, 6, -1, 68, 55, 150,
- 232, 151, 7, 237, 4, 157, 236, 158, 6, -1,
- -1, 67, 55, 196, 150, 190, 151, 7, 237, 6,
- -1, 66, 57, 150, 232, 151, 7, 237, 6, -1,
- 57, 150, 232, 151, 7, 237, 6, -1, 68, 57,
- 150, 232, 151, 7, 237, 6, -1, -1, 67, 57,
- 197, 150, 190, 151, 7, 237, 6, -1, 74, 234,
- 157, 199, 158, -1, 73, 157, 234, 156, 234, 156,
- 232, 158, 157, 199, 158, -1, 75, 234, 157, 199,
- 158, -1, 76, 157, 234, 156, 232, 158, 157, 199,
- 158, -1, 4, 157, 199, 158, -1, 84, 52, 157,
- 240, 158, 55, 157, 232, 158, -1, 81, 52, 150,
- 232, 151, 157, 240, 158, 6, -1, 200, -1, 198,
- -1, -1, 200, 193, -1, 200, 49, 157, 240, 158,
- 6, -1, 200, 52, 157, 240, 158, 6, -1, 200,
- 55, 157, 240, 158, 6, -1, 200, 57, 157, 240,
- 158, 6, -1, 78, 63, 150, 232, 151, 7, 237,
- 6, -1, 78, 49, 150, 232, 151, 7, 157, 236,
- 158, 6, -1, 78, 63, 150, 232, 151, 7, 157,
- 234, 156, 234, 156, 240, 158, 6, -1, 78, 63,
- 150, 232, 151, 7, 157, 234, 156, 234, 156, 234,
- 156, 240, 158, 6, -1, 78, 53, 150, 232, 151,
- 7, 157, 234, 156, 240, 158, 6, -1, 78, 4,
- 150, 232, 151, 7, 237, 6, -1, 78, 4, 150,
- 232, 151, 7, 5, 6, -1, 78, 4, 157, 232,
- 158, 6, -1, 78, 4, 150, 232, 151, 7, 157,
- 234, 156, 234, 156, 240, 158, 6, -1, 82, 157,
- 200, 158, -1, 82, 111, 152, 232, 153, 6, -1,
- 82, 4, 152, 232, 153, 6, -1, 82, 4, 6,
- -1, 82, 4, 4, 6, -1, 103, 241, 157, 200,
- 158, -1, 115, 5, 6, -1, 116, 5, 6, -1,
- 115, 157, 200, 158, -1, 116, 157, 200, 158, -1,
- 4, 245, 6, -1, 4, 4, 152, 232, 153, 244,
- 6, -1, 4, 4, 4, 152, 232, 153, 6, -1,
- 4, 232, 6, -1, 71, 150, 4, 151, 154, 4,
+ 159, 0, -1, 160, -1, 1, 6, -1, -1, 160,
+ 161, -1, 164, -1, 163, -1, 182, -1, 191, -1,
+ 196, -1, 200, -1, 201, -1, 202, -1, 205, -1,
+ 225, -1, 226, -1, 227, -1, 228, -1, 204, -1,
+ 203, -1, 199, -1, 230, -1, 135, -1, 135, 135,
+ -1, 36, 148, 5, 149, 6, -1, 36, 148, 5,
+ 149, 162, 243, 6, -1, 36, 148, 5, 154, 239,
+ 149, 6, -1, 36, 148, 5, 154, 239, 149, 162,
+ 243, 6, -1, 4, 5, 155, 165, 156, 6, -1,
+ 87, 4, 150, 231, 151, 6, -1, 88, 4, 150,
+ 231, 151, 6, -1, -1, 165, 168, -1, 165, 172,
+ -1, 165, 175, -1, 165, 177, -1, 165, 178, -1,
+ 231, -1, 166, 154, 231, -1, 231, -1, 167, 154,
+ 231, -1, -1, -1, 4, 169, 148, 166, 149, 170,
+ 155, 167, 156, 6, -1, 243, -1, 171, 154, 243,
+ -1, -1, 93, 148, 231, 154, 231, 154, 231, 149,
+ 173, 155, 171, 156, 6, -1, 243, -1, 174, 154,
+ 243, -1, -1, 94, 148, 231, 154, 231, 154, 231,
+ 154, 231, 149, 176, 155, 174, 156, 6, -1, 95,
+ 155, 235, 156, 155, 235, 156, 6, -1, 95, 155,
+ 235, 156, 155, 235, 156, 155, 235, 156, 155, 235,
+ 156, 6, -1, -1, 96, 179, 155, 167, 156, 6,
+ -1, 7, -1, 128, -1, 127, -1, 126, -1, 125,
+ -1, 146, -1, 145, -1, 48, 150, 184, 151, 6,
+ -1, 4, 180, 236, 6, -1, 4, 150, 151, 180,
+ 236, 6, -1, 4, 150, 231, 151, 180, 231, 6,
+ -1, 4, 150, 155, 239, 156, 151, 180, 236, 6,
+ -1, 4, 181, 6, -1, 4, 150, 231, 151, 181,
+ 6, -1, 4, 7, 244, 6, -1, 4, 152, 4,
+ 7, 244, 6, -1, 4, 150, 231, 151, 152, 4,
+ 7, 244, 6, -1, 4, 152, 4, 180, 231, 6,
+ -1, 4, 150, 231, 151, 152, 4, 180, 231, 6,
+ -1, 4, 152, 4, 181, 6, -1, 4, 150, 231,
+ 151, 152, 4, 181, 6, -1, 4, 152, 103, 152,
+ 4, 7, 240, 6, -1, 4, 150, 231, 151, 152,
+ 103, 152, 4, 7, 240, 6, -1, 4, 152, 104,
+ 7, 241, 6, -1, 4, 150, 231, 151, 152, 104,
+ 7, 241, 6, -1, 4, 111, 7, 231, 6, -1,
+ 111, 150, 231, 151, 7, 4, 6, -1, 111, 150,
+ 231, 151, 152, 4, 7, 231, 6, -1, 111, 150,
+ 231, 151, 152, 4, 7, 244, 6, -1, 111, 150,
+ 231, 151, 152, 4, 7, 155, 239, 156, 6, -1,
+ 71, 148, 4, 149, 152, 4, 7, 231, 6, -1,
+ 71, 148, 4, 149, 152, 4, 7, 244, 6, -1,
+ -1, 154, -1, -1, 184, 183, 4, -1, 184, 183,
+ 4, 7, 231, -1, -1, 184, 183, 4, 7, 155,
+ 231, 185, 186, 156, -1, -1, 186, 187, -1, 154,
+ 4, 236, -1, 154, 4, 5, -1, 231, -1, 244,
+ -1, -1, 106, 53, 155, 231, 156, -1, -1, 63,
+ 233, -1, 49, 148, 231, 149, 7, 233, 6, -1,
+ -1, 67, 49, 192, 148, 188, 149, 7, 236, 6,
+ -1, 58, 59, 236, 7, 231, 6, -1, 52, 148,
+ 231, 149, 7, 236, 6, -1, 72, 52, 236, 6,
+ -1, 56, 148, 231, 149, 7, 236, 6, -1, 50,
+ 148, 231, 149, 7, 236, 190, 6, -1, 51, 148,
+ 231, 149, 7, 236, 190, 6, -1, 98, 148, 231,
+ 149, 7, 236, 6, -1, 99, 148, 231, 149, 7,
+ 236, 6, -1, 100, 148, 231, 149, 7, 236, 102,
+ 236, 101, 231, 6, -1, 52, 4, 148, 231, 149,
+ 7, 236, 6, -1, 68, 52, 148, 231, 149, 7,
+ 236, 6, -1, -1, 67, 52, 193, 148, 188, 149,
+ 7, 236, 6, -1, 63, 55, 148, 231, 149, 7,
+ 236, 6, -1, 64, 55, 148, 231, 149, 7, 236,
+ 189, 6, -1, 12, 13, 6, -1, 13, 55, 231,
+ 6, -1, 60, 55, 148, 231, 149, 7, 5, 5,
+ 5, 6, -1, 53, 148, 231, 149, 7, 236, 6,
+ -1, 54, 148, 231, 149, 7, 236, 6, -1, 55,
+ 4, 148, 231, 149, 7, 236, 6, -1, 68, 55,
+ 148, 231, 149, 7, 236, 6, -1, 68, 55, 148,
+ 231, 149, 7, 236, 4, 155, 235, 156, 6, -1,
+ -1, 67, 55, 194, 148, 188, 149, 7, 236, 6,
+ -1, 66, 57, 148, 231, 149, 7, 236, 6, -1,
+ 57, 148, 231, 149, 7, 236, 6, -1, 68, 57,
+ 148, 231, 149, 7, 236, 6, -1, -1, 67, 57,
+ 195, 148, 188, 149, 7, 236, 6, -1, 74, 233,
+ 155, 197, 156, -1, 73, 155, 233, 154, 233, 154,
+ 231, 156, 155, 197, 156, -1, 75, 233, 155, 197,
+ 156, -1, 76, 155, 233, 154, 231, 156, 155, 197,
+ 156, -1, 4, 155, 197, 156, -1, 84, 52, 155,
+ 239, 156, 55, 155, 231, 156, -1, 81, 52, 148,
+ 231, 149, 155, 239, 156, 6, -1, 198, -1, 196,
+ -1, -1, 198, 191, -1, 198, 49, 155, 239, 156,
+ 6, -1, 198, 52, 155, 239, 156, 6, -1, 198,
+ 55, 155, 239, 156, 6, -1, 198, 57, 155, 239,
+ 156, 6, -1, 78, 63, 148, 231, 149, 7, 236,
+ 6, -1, 78, 49, 148, 231, 149, 7, 155, 235,
+ 156, 6, -1, 78, 63, 148, 231, 149, 7, 155,
+ 233, 154, 233, 154, 239, 156, 6, -1, 78, 63,
+ 148, 231, 149, 7, 155, 233, 154, 233, 154, 233,
+ 154, 239, 156, 6, -1, 78, 53, 148, 231, 149,
+ 7, 155, 233, 154, 239, 156, 6, -1, 78, 4,
+ 148, 231, 149, 7, 236, 6, -1, 78, 4, 148,
+ 231, 149, 7, 5, 6, -1, 78, 4, 155, 231,
+ 156, 6, -1, 78, 4, 148, 231, 149, 7, 155,
+ 233, 154, 233, 154, 239, 156, 6, -1, 82, 155,
+ 198, 156, -1, 82, 111, 150, 231, 151, 6, -1,
+ 82, 4, 150, 231, 151, 6, -1, 82, 4, 6,
+ -1, 82, 4, 4, 6, -1, 103, 240, 155, 198,
+ 156, -1, 115, 5, 6, -1, 116, 5, 6, -1,
+ 115, 155, 198, 156, -1, 116, 155, 198, 156, -1,
+ 4, 244, 6, -1, 4, 4, 150, 231, 151, 243,
+ 6, -1, 4, 4, 4, 150, 231, 151, 6, -1,
+ 4, 231, 6, -1, 71, 148, 4, 149, 152, 4,
6, -1, 97, 4, 6, -1, 110, 6, -1, 44,
- 6, -1, 41, 6, -1, 41, 157, 232, 156, 232,
- 156, 232, 156, 232, 156, 232, 156, 232, 158, 6,
+ 6, -1, 41, 6, -1, 41, 155, 231, 154, 231,
+ 154, 231, 154, 231, 154, 231, 154, 231, 156, 6,
-1, 42, 6, -1, 45, 6, -1, 46, 6, -1,
- 62, 6, -1, 105, 150, 232, 8, 232, 151, -1,
- 105, 150, 232, 8, 232, 8, 232, 151, -1, 105,
- 4, 106, 157, 232, 8, 232, 158, -1, 105, 4,
- 106, 157, 232, 8, 232, 8, 232, 158, -1, 107,
+ 62, 6, -1, 105, 148, 231, 8, 231, 149, -1,
+ 105, 148, 231, 8, 231, 8, 231, 149, -1, 105,
+ 4, 106, 155, 231, 8, 231, 156, -1, 105, 4,
+ 106, 155, 231, 8, 231, 8, 231, 156, -1, 107,
-1, 114, 4, -1, 112, -1, 113, 4, 6, -1,
- 108, 150, 232, 151, -1, 109, -1, 77, 234, 157,
- 200, 158, -1, 77, 157, 234, 156, 234, 156, 232,
- 158, 157, 200, 158, -1, 77, 157, 234, 156, 234,
- 156, 234, 156, 232, 158, 157, 200, 158, -1, -1,
- 77, 234, 157, 200, 208, 221, 158, -1, -1, 77,
- 157, 234, 156, 234, 156, 232, 158, 157, 200, 209,
- 221, 158, -1, -1, 77, 157, 234, 156, 234, 156,
- 234, 156, 232, 158, 157, 200, 210, 221, 158, -1,
- -1, 77, 157, 200, 211, 221, 158, -1, 77, 49,
- 157, 232, 156, 234, 158, 6, -1, 77, 52, 157,
- 232, 156, 234, 158, 6, -1, 77, 55, 157, 232,
- 156, 234, 158, 6, -1, 77, 49, 157, 232, 156,
- 234, 156, 234, 156, 232, 158, 6, -1, 77, 52,
- 157, 232, 156, 234, 156, 234, 156, 232, 158, 6,
- -1, 77, 55, 157, 232, 156, 234, 156, 234, 156,
- 232, 158, 6, -1, 77, 49, 157, 232, 156, 234,
- 156, 234, 156, 234, 156, 232, 158, 6, -1, 77,
- 52, 157, 232, 156, 234, 156, 234, 156, 234, 156,
- 232, 158, 6, -1, 77, 55, 157, 232, 156, 234,
- 156, 234, 156, 234, 156, 232, 158, 6, -1, -1,
- 77, 49, 157, 232, 156, 234, 158, 212, 157, 221,
- 158, 6, -1, -1, 77, 52, 157, 232, 156, 234,
- 158, 213, 157, 221, 158, 6, -1, -1, 77, 55,
- 157, 232, 156, 234, 158, 214, 157, 221, 158, 6,
- -1, -1, 77, 49, 157, 232, 156, 234, 156, 234,
- 156, 232, 158, 215, 157, 221, 158, 6, -1, -1,
- 77, 52, 157, 232, 156, 234, 156, 234, 156, 232,
- 158, 216, 157, 221, 158, 6, -1, -1, 77, 55,
- 157, 232, 156, 234, 156, 234, 156, 232, 158, 217,
- 157, 221, 158, 6, -1, -1, 77, 49, 157, 232,
- 156, 234, 156, 234, 156, 234, 156, 232, 158, 218,
- 157, 221, 158, 6, -1, -1, 77, 52, 157, 232,
- 156, 234, 156, 234, 156, 234, 156, 232, 158, 219,
- 157, 221, 158, 6, -1, -1, 77, 55, 157, 232,
- 156, 234, 156, 234, 156, 234, 156, 232, 158, 220,
- 157, 221, 158, 6, -1, 222, -1, 221, 222, -1,
- 85, 157, 232, 158, 6, -1, 85, 157, 237, 156,
- 237, 158, 6, -1, 85, 157, 237, 156, 237, 156,
- 237, 158, 6, -1, 79, 6, -1, 89, 6, -1,
+ 108, 148, 231, 149, -1, 109, -1, 77, 233, 155,
+ 198, 156, -1, 77, 155, 233, 154, 233, 154, 231,
+ 156, 155, 198, 156, -1, 77, 155, 233, 154, 233,
+ 154, 233, 154, 231, 156, 155, 198, 156, -1, -1,
+ 77, 233, 155, 198, 206, 219, 156, -1, -1, 77,
+ 155, 233, 154, 233, 154, 231, 156, 155, 198, 207,
+ 219, 156, -1, -1, 77, 155, 233, 154, 233, 154,
+ 233, 154, 231, 156, 155, 198, 208, 219, 156, -1,
+ -1, 77, 155, 198, 209, 219, 156, -1, 77, 49,
+ 155, 231, 154, 233, 156, 6, -1, 77, 52, 155,
+ 231, 154, 233, 156, 6, -1, 77, 55, 155, 231,
+ 154, 233, 156, 6, -1, 77, 49, 155, 231, 154,
+ 233, 154, 233, 154, 231, 156, 6, -1, 77, 52,
+ 155, 231, 154, 233, 154, 233, 154, 231, 156, 6,
+ -1, 77, 55, 155, 231, 154, 233, 154, 233, 154,
+ 231, 156, 6, -1, 77, 49, 155, 231, 154, 233,
+ 154, 233, 154, 233, 154, 231, 156, 6, -1, 77,
+ 52, 155, 231, 154, 233, 154, 233, 154, 233, 154,
+ 231, 156, 6, -1, 77, 55, 155, 231, 154, 233,
+ 154, 233, 154, 233, 154, 231, 156, 6, -1, -1,
+ 77, 49, 155, 231, 154, 233, 156, 210, 155, 219,
+ 156, 6, -1, -1, 77, 52, 155, 231, 154, 233,
+ 156, 211, 155, 219, 156, 6, -1, -1, 77, 55,
+ 155, 231, 154, 233, 156, 212, 155, 219, 156, 6,
+ -1, -1, 77, 49, 155, 231, 154, 233, 154, 233,
+ 154, 231, 156, 213, 155, 219, 156, 6, -1, -1,
+ 77, 52, 155, 231, 154, 233, 154, 233, 154, 231,
+ 156, 214, 155, 219, 156, 6, -1, -1, 77, 55,
+ 155, 231, 154, 233, 154, 233, 154, 231, 156, 215,
+ 155, 219, 156, 6, -1, -1, 77, 49, 155, 231,
+ 154, 233, 154, 233, 154, 233, 154, 231, 156, 216,
+ 155, 219, 156, 6, -1, -1, 77, 52, 155, 231,
+ 154, 233, 154, 233, 154, 233, 154, 231, 156, 217,
+ 155, 219, 156, 6, -1, -1, 77, 55, 155, 231,
+ 154, 233, 154, 233, 154, 233, 154, 231, 156, 218,
+ 155, 219, 156, 6, -1, 220, -1, 219, 220, -1,
+ 85, 155, 231, 156, 6, -1, 85, 155, 236, 154,
+ 236, 156, 6, -1, 85, 155, 236, 154, 236, 154,
+ 236, 156, 6, -1, 79, 6, -1, 89, 6, -1,
89, 91, 6, -1, 90, 6, -1, 90, 91, 6,
- -1, 86, 150, 232, 151, 7, 237, 70, 232, 6,
- -1, 70, 4, 152, 232, 153, 6, -1, -1, 70,
- 4, 232, -1, -1, 4, -1, -1, 7, 237, -1,
- -1, 7, 232, -1, 65, 52, 238, 7, 232, 223,
- 6, -1, 65, 55, 238, 225, 224, 6, -1, 61,
- 55, 157, 232, 158, 7, 237, 6, -1, 65, 57,
- 238, 225, 6, -1, 92, 238, 6, -1, 79, 55,
- 238, 226, 6, -1, 80, 55, 237, 7, 232, 6,
- -1, 69, 52, 237, 7, 237, 6, -1, 69, 55,
- 232, 157, 240, 158, 7, 232, 157, 240, 158, 6,
- -1, 49, 157, 240, 158, 106, 55, 157, 232, 158,
- 6, -1, 52, 157, 240, 158, 106, 55, 157, 232,
- 158, 6, -1, 52, 157, 240, 158, 106, 57, 157,
- 232, 158, 6, -1, 55, 157, 240, 158, 106, 57,
- 157, 232, 158, 6, -1, 83, 6, -1, 83, 4,
- 6, -1, 83, 49, 157, 240, 158, 6, -1, 123,
- 150, 244, 151, 7, 157, 237, 156, 237, 158, 6,
- -1, 124, 150, 244, 151, 7, 157, 237, 156, 237,
- 158, 6, -1, 125, 150, 244, 151, 7, 157, 237,
- 156, 237, 158, 6, -1, 126, 150, 244, 151, 7,
- 157, 237, 156, 237, 158, 6, -1, 233, -1, 150,
- 232, 151, -1, 141, 232, -1, 140, 232, -1, 145,
- 232, -1, 232, 141, 232, -1, 232, 140, 232, -1,
- 232, 142, 232, -1, 232, 143, 232, -1, 232, 144,
- 232, -1, 232, 149, 232, -1, 232, 136, 232, -1,
- 232, 137, 232, -1, 232, 139, 232, -1, 232, 138,
- 232, -1, 232, 135, 232, -1, 232, 134, 232, -1,
- 232, 133, 232, -1, 232, 132, 232, -1, 232, 131,
- 232, 8, 232, -1, 14, 150, 232, 151, -1, 15,
- 150, 232, 151, -1, 16, 150, 232, 151, -1, 17,
- 150, 232, 151, -1, 18, 150, 232, 151, -1, 19,
- 150, 232, 151, -1, 20, 150, 232, 151, -1, 21,
- 150, 232, 151, -1, 22, 150, 232, 151, -1, 24,
- 150, 232, 151, -1, 25, 150, 232, 156, 232, 151,
- -1, 26, 150, 232, 151, -1, 27, 150, 232, 151,
- -1, 28, 150, 232, 151, -1, 29, 150, 232, 151,
- -1, 30, 150, 232, 151, -1, 31, 150, 232, 151,
- -1, 32, 150, 232, 156, 232, 151, -1, 33, 150,
- 232, 156, 232, 151, -1, 34, 150, 232, 156, 232,
- 151, -1, 23, 150, 232, 151, -1, 14, 152, 232,
- 153, -1, 15, 152, 232, 153, -1, 16, 152, 232,
- 153, -1, 17, 152, 232, 153, -1, 18, 152, 232,
- 153, -1, 19, 152, 232, 153, -1, 20, 152, 232,
- 153, -1, 21, 152, 232, 153, -1, 22, 152, 232,
- 153, -1, 24, 152, 232, 153, -1, 25, 152, 232,
- 156, 232, 153, -1, 26, 152, 232, 153, -1, 27,
- 152, 232, 153, -1, 28, 152, 232, 153, -1, 29,
- 152, 232, 153, -1, 30, 152, 232, 153, -1, 31,
- 152, 232, 153, -1, 32, 152, 232, 156, 232, 153,
- -1, 33, 152, 232, 156, 232, 153, -1, 34, 152,
- 232, 156, 232, 153, -1, 23, 152, 232, 153, -1,
- 3, -1, 9, -1, 10, -1, 11, -1, 120, -1,
- 121, -1, 122, -1, 4, -1, 4, 159, 157, 232,
- 158, -1, 4, 152, 232, 153, -1, 155, 4, 152,
- 153, -1, 4, 183, -1, 4, 152, 232, 153, 183,
- -1, 4, 154, 4, -1, 4, 152, 232, 153, 154,
- 4, -1, 4, 154, 4, 183, -1, 4, 152, 232,
- 153, 154, 4, 183, -1, 117, 150, 244, 156, 232,
- 151, -1, 235, -1, 141, 234, -1, 140, 234, -1,
- 234, 141, 234, -1, 234, 140, 234, -1, 157, 232,
- 156, 232, 156, 232, 156, 232, 156, 232, 158, -1,
- 157, 232, 156, 232, 156, 232, 156, 232, 158, -1,
- 157, 232, 156, 232, 156, 232, 158, -1, 150, 232,
- 156, 232, 156, 232, 151, -1, 237, -1, 236, 156,
- 237, -1, 232, -1, 239, -1, 157, 158, -1, 157,
- 240, 158, -1, 141, 157, 240, 158, -1, 232, 142,
- 157, 240, 158, -1, 237, -1, 5, -1, 141, 239,
- -1, 232, 142, 239, -1, 232, 8, 232, -1, 232,
- 8, 232, 8, 232, -1, 49, 157, 232, 158, -1,
- 49, 5, -1, 52, 5, -1, 55, 5, -1, 57,
- 5, -1, 198, -1, 207, -1, 4, 152, 153, -1,
- 35, 152, 4, 153, -1, 4, 152, 157, 240, 158,
- 153, -1, 232, -1, 239, -1, 240, 156, 232, -1,
- 240, 156, 239, -1, 157, 232, 156, 232, 156, 232,
- 156, 232, 158, -1, 157, 232, 156, 232, 156, 232,
- 158, -1, 4, -1, 4, 154, 103, 154, 4, -1,
- 157, 243, 158, -1, 4, 152, 232, 153, 154, 104,
- -1, 241, -1, 243, 156, 241, -1, 245, -1, 4,
- -1, 4, 154, 4, -1, 4, 152, 232, 153, 154,
- 4, -1, 5, -1, 43, -1, 118, 150, 244, 151,
- -1, 119, 150, 244, 156, 244, 151, -1, 38, 150,
- 244, 156, 244, 151, -1, 39, 150, 244, 151, -1,
- 40, 150, 244, 151, -1, 37, 150, 244, 151, -1,
- 37, 150, 244, 156, 240, 151, -1
+ -1, 86, 148, 231, 149, 7, 236, 70, 231, 6,
+ -1, 70, 4, 150, 231, 151, 6, -1, -1, 70,
+ 4, 231, -1, -1, 4, -1, -1, 7, 236, -1,
+ -1, 7, 231, -1, 65, 52, 237, 7, 231, 221,
+ 6, -1, 65, 55, 237, 223, 222, 6, -1, 61,
+ 55, 155, 231, 156, 7, 236, 6, -1, 65, 57,
+ 237, 223, 6, -1, 92, 237, 6, -1, 79, 55,
+ 237, 224, 6, -1, 80, 55, 236, 7, 231, 6,
+ -1, 69, 52, 236, 7, 236, 6, -1, 69, 55,
+ 231, 155, 239, 156, 7, 231, 155, 239, 156, 6,
+ -1, 49, 155, 239, 156, 106, 55, 155, 231, 156,
+ 6, -1, 52, 155, 239, 156, 106, 55, 155, 231,
+ 156, 6, -1, 52, 155, 239, 156, 106, 57, 155,
+ 231, 156, 6, -1, 55, 155, 239, 156, 106, 57,
+ 155, 231, 156, 6, -1, 83, 6, -1, 83, 4,
+ 6, -1, 83, 49, 155, 239, 156, 6, -1, 120,
+ -1, 121, -1, 229, 6, -1, 229, 155, 236, 156,
+ 6, -1, 229, 155, 236, 154, 236, 156, 6, -1,
+ 232, -1, 148, 231, 149, -1, 139, 231, -1, 138,
+ 231, -1, 143, 231, -1, 231, 139, 231, -1, 231,
+ 138, 231, -1, 231, 140, 231, -1, 231, 141, 231,
+ -1, 231, 142, 231, -1, 231, 147, 231, -1, 231,
+ 134, 231, -1, 231, 135, 231, -1, 231, 137, 231,
+ -1, 231, 136, 231, -1, 231, 133, 231, -1, 231,
+ 132, 231, -1, 231, 131, 231, -1, 231, 130, 231,
+ -1, 231, 129, 231, 8, 231, -1, 14, 148, 231,
+ 149, -1, 15, 148, 231, 149, -1, 16, 148, 231,
+ 149, -1, 17, 148, 231, 149, -1, 18, 148, 231,
+ 149, -1, 19, 148, 231, 149, -1, 20, 148, 231,
+ 149, -1, 21, 148, 231, 149, -1, 22, 148, 231,
+ 149, -1, 24, 148, 231, 149, -1, 25, 148, 231,
+ 154, 231, 149, -1, 26, 148, 231, 149, -1, 27,
+ 148, 231, 149, -1, 28, 148, 231, 149, -1, 29,
+ 148, 231, 149, -1, 30, 148, 231, 149, -1, 31,
+ 148, 231, 149, -1, 32, 148, 231, 154, 231, 149,
+ -1, 33, 148, 231, 154, 231, 149, -1, 34, 148,
+ 231, 154, 231, 149, -1, 23, 148, 231, 149, -1,
+ 14, 150, 231, 151, -1, 15, 150, 231, 151, -1,
+ 16, 150, 231, 151, -1, 17, 150, 231, 151, -1,
+ 18, 150, 231, 151, -1, 19, 150, 231, 151, -1,
+ 20, 150, 231, 151, -1, 21, 150, 231, 151, -1,
+ 22, 150, 231, 151, -1, 24, 150, 231, 151, -1,
+ 25, 150, 231, 154, 231, 151, -1, 26, 150, 231,
+ 151, -1, 27, 150, 231, 151, -1, 28, 150, 231,
+ 151, -1, 29, 150, 231, 151, -1, 30, 150, 231,
+ 151, -1, 31, 150, 231, 151, -1, 32, 150, 231,
+ 154, 231, 151, -1, 33, 150, 231, 154, 231, 151,
+ -1, 34, 150, 231, 154, 231, 151, -1, 23, 150,
+ 231, 151, -1, 3, -1, 9, -1, 10, -1, 11,
+ -1, 122, -1, 123, -1, 124, -1, 4, -1, 4,
+ 157, 155, 231, 156, -1, 4, 150, 231, 151, -1,
+ 153, 4, 150, 151, -1, 4, 181, -1, 4, 150,
+ 231, 151, 181, -1, 4, 152, 4, -1, 4, 150,
+ 231, 151, 152, 4, -1, 4, 152, 4, 181, -1,
+ 4, 150, 231, 151, 152, 4, 181, -1, 117, 148,
+ 243, 154, 231, 149, -1, 234, -1, 139, 233, -1,
+ 138, 233, -1, 233, 139, 233, -1, 233, 138, 233,
+ -1, 155, 231, 154, 231, 154, 231, 154, 231, 154,
+ 231, 156, -1, 155, 231, 154, 231, 154, 231, 154,
+ 231, 156, -1, 155, 231, 154, 231, 154, 231, 156,
+ -1, 148, 231, 154, 231, 154, 231, 149, -1, 236,
+ -1, 235, 154, 236, -1, 231, -1, 238, -1, 155,
+ 156, -1, 155, 239, 156, -1, 139, 155, 239, 156,
+ -1, 231, 140, 155, 239, 156, -1, 236, -1, 5,
+ -1, 139, 238, -1, 231, 140, 238, -1, 231, 8,
+ 231, -1, 231, 8, 231, 8, 231, -1, 49, 155,
+ 231, 156, -1, 49, 5, -1, 52, 5, -1, 55,
+ 5, -1, 57, 5, -1, 196, -1, 205, -1, 4,
+ 150, 151, -1, 35, 150, 4, 151, -1, 4, 150,
+ 155, 239, 156, 151, -1, 231, -1, 238, -1, 239,
+ 154, 231, -1, 239, 154, 238, -1, 155, 231, 154,
+ 231, 154, 231, 154, 231, 156, -1, 155, 231, 154,
+ 231, 154, 231, 156, -1, 4, -1, 4, 152, 103,
+ 152, 4, -1, 155, 242, 156, -1, 4, 150, 231,
+ 151, 152, 104, -1, 240, -1, 242, 154, 240, -1,
+ 244, -1, 4, -1, 4, 152, 4, -1, 4, 150,
+ 231, 151, 152, 4, -1, 5, -1, 43, -1, 118,
+ 148, 243, 149, -1, 119, 148, 243, 154, 243, 149,
+ -1, 38, 148, 243, 154, 243, 149, -1, 39, 148,
+ 243, 149, -1, 40, 148, 243, 149, -1, 37, 148,
+ 243, 149, -1, 37, 148, 243, 154, 239, 149, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 162, 162, 163, 168, 170, 174, 175, 176, 177,
- 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, 189, 190, 194, 198, 205, 210, 224, 237, 265,
- 279, 290, 305, 310, 311, 312, 313, 314, 318, 320,
- 325, 327, 333, 437, 332, 455, 462, 473, 472, 490,
- 497, 508, 507, 524, 541, 564, 563, 577, 578, 579,
- 580, 581, 585, 586, 592, 594, 657, 687, 720, 766,
- 781, 797, 806, 812, 821, 839, 857, 866, 878, 883,
- 891, 911, 934, 945, 953, 975, 998, 1026, 1038, 1052,
- 1052, 1054, 1056, 1067, 1079, 1078, 1091, 1092, 1096, 1107,
- 1120, 1124, 1135, 1138, 1151, 1154, 1164, 1188, 1187, 1207,
- 1229, 1247, 1268, 1286, 1316, 1346, 1364, 1382, 1408, 1426,
- 1445, 1444, 1467, 1485, 1524, 1530, 1536, 1543, 1568, 1593,
- 1610, 1627, 1659, 1658, 1682, 1700, 1717, 1734, 1733, 1759,
- 1764, 1769, 1774, 1779, 1802, 1808, 1819, 1820, 1825, 1828,
- 1832, 1855, 1878, 1901, 1929, 1950, 1973, 1994, 2016, 2036,
- 2148, 2167, 2205, 2314, 2323, 2329, 2344, 2372, 2389, 2403,
- 2409, 2415, 2424, 2438, 2480, 2497, 2512, 2531, 2543, 2567,
- 2571, 2578, 2584, 2589, 2595, 2599, 2603, 2613, 2630, 2647,
- 2668, 2689, 2724, 2732, 2738, 2745, 2749, 2758, 2766, 2774,
- 2783, 2782, 2796, 2795, 2809, 2808, 2822, 2821, 2834, 2841,
- 2848, 2855, 2862, 2869, 2876, 2883, 2890, 2898, 2897, 2910,
- 2909, 2922, 2921, 2934, 2933, 2946, 2945, 2958, 2957, 2970,
- 2969, 2982, 2981, 2994, 2993, 3009, 3012, 3018, 3027, 3047,
- 3070, 3074, 3078, 3082, 3086, 3090, 3109, 3122, 3125, 3141,
- 3144, 3157, 3160, 3166, 3169, 3176, 3232, 3302, 3307, 3374,
- 3410, 3453, 3478, 3505, 3549, 3572, 3595, 3598, 3607, 3611,
- 3621, 3658, 3690, 3722, 3755, 3792, 3793, 3794, 3795, 3796,
- 3797, 3798, 3799, 3800, 3807, 3808, 3809, 3810, 3811, 3812,
- 3813, 3814, 3815, 3816, 3817, 3818, 3819, 3820, 3821, 3822,
- 3823, 3824, 3825, 3826, 3827, 3828, 3829, 3830, 3831, 3832,
- 3833, 3834, 3835, 3836, 3837, 3838, 3840, 3841, 3842, 3843,
- 3844, 3845, 3846, 3847, 3848, 3849, 3850, 3851, 3852, 3853,
- 3854, 3855, 3856, 3857, 3858, 3859, 3860, 3869, 3870, 3871,
- 3872, 3873, 3874, 3875, 3879, 3899, 3918, 3936, 3948, 3965,
- 3986, 3991, 3996, 4006, 4016, 4024, 4028, 4032, 4036, 4040,
- 4047, 4051, 4055, 4059, 4066, 4071, 4078, 4083, 4087, 4092,
- 4096, 4104, 4115, 4119, 4131, 4139, 4147, 4154, 4165, 4185,
- 4189, 4193, 4197, 4201, 4211, 4221, 4233, 4245, 4266, 4271,
- 4275, 4279, 4291, 4295, 4307, 4314, 4324, 4328, 4343, 4348,
- 4355, 4359, 4372, 4380, 4391, 4395, 4403, 4411, 4419, 4427,
- 4441, 4455, 4459
+ 0, 158, 158, 159, 164, 166, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 190, 194, 201, 206, 220, 233, 261,
+ 275, 286, 301, 306, 307, 308, 309, 310, 314, 316,
+ 321, 323, 329, 433, 328, 451, 458, 469, 468, 486,
+ 493, 504, 503, 520, 537, 560, 559, 573, 574, 575,
+ 576, 577, 581, 582, 588, 590, 653, 683, 716, 762,
+ 777, 793, 802, 808, 817, 835, 853, 862, 874, 879,
+ 887, 907, 930, 941, 949, 971, 994, 1022, 1034, 1048,
+ 1048, 1050, 1052, 1063, 1075, 1074, 1087, 1088, 1092, 1103,
+ 1116, 1120, 1131, 1134, 1147, 1150, 1160, 1184, 1183, 1203,
+ 1225, 1243, 1264, 1282, 1312, 1342, 1360, 1378, 1404, 1422,
+ 1441, 1440, 1463, 1481, 1520, 1526, 1532, 1539, 1564, 1589,
+ 1606, 1623, 1655, 1654, 1678, 1696, 1713, 1730, 1729, 1755,
+ 1760, 1765, 1770, 1775, 1798, 1804, 1815, 1816, 1821, 1824,
+ 1828, 1851, 1874, 1897, 1925, 1946, 1969, 1990, 2012, 2032,
+ 2144, 2163, 2201, 2310, 2319, 2325, 2340, 2368, 2385, 2399,
+ 2405, 2411, 2420, 2434, 2476, 2493, 2508, 2527, 2539, 2563,
+ 2567, 2574, 2580, 2585, 2591, 2595, 2599, 2609, 2626, 2643,
+ 2664, 2685, 2720, 2728, 2734, 2741, 2745, 2754, 2762, 2770,
+ 2779, 2778, 2792, 2791, 2805, 2804, 2818, 2817, 2830, 2837,
+ 2844, 2851, 2858, 2865, 2872, 2879, 2886, 2894, 2893, 2906,
+ 2905, 2918, 2917, 2930, 2929, 2942, 2941, 2954, 2953, 2966,
+ 2965, 2978, 2977, 2990, 2989, 3005, 3008, 3014, 3023, 3043,
+ 3066, 3070, 3074, 3078, 3082, 3086, 3105, 3118, 3121, 3137,
+ 3140, 3153, 3156, 3162, 3165, 3172, 3228, 3298, 3303, 3370,
+ 3406, 3449, 3474, 3501, 3545, 3568, 3591, 3594, 3603, 3607,
+ 3617, 3652, 3653, 3657, 3662, 3673, 3695, 3696, 3697, 3698,
+ 3699, 3700, 3701, 3702, 3703, 3710, 3711, 3712, 3713, 3714,
+ 3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724,
+ 3725, 3726, 3727, 3728, 3729, 3730, 3731, 3732, 3733, 3734,
+ 3735, 3736, 3737, 3738, 3739, 3740, 3741, 3743, 3744, 3745,
+ 3746, 3747, 3748, 3749, 3750, 3751, 3752, 3753, 3754, 3755,
+ 3756, 3757, 3758, 3759, 3760, 3761, 3762, 3763, 3772, 3773,
+ 3774, 3775, 3776, 3777, 3778, 3782, 3802, 3821, 3839, 3851,
+ 3868, 3889, 3894, 3899, 3909, 3919, 3927, 3931, 3935, 3939,
+ 3943, 3950, 3954, 3958, 3962, 3969, 3974, 3981, 3986, 3990,
+ 3995, 3999, 4007, 4018, 4022, 4034, 4042, 4050, 4057, 4068,
+ 4088, 4092, 4096, 4100, 4104, 4114, 4124, 4136, 4148, 4169,
+ 4174, 4178, 4182, 4194, 4198, 4210, 4217, 4227, 4231, 4246,
+ 4251, 4258, 4262, 4275, 4283, 4294, 4298, 4306, 4314, 4322,
+ 4330, 4344, 4358, 4362
};
#endif
@@ -1009,30 +999,29 @@ static const char *const yytname[] =
"tNurbs", "tNurbsOrder", "tNurbsKnots", "tColor", "tColorTable", "tFor",
"tIn", "tEndFor", "tIf", "tEndIf", "tExit", "tField", "tReturn", "tCall",
"tFunction", "tShow", "tHide", "tGetValue", "tGetEnv", "tGetString",
- "tGMSH_MAJOR_VERSION", "tGMSH_MINOR_VERSION", "tGMSH_PATCH_VERSION",
- "tHomRank", "tHomGen", "tHomCut", "tHomSeq", "tAFFECTDIVIDE",
- "tAFFECTTIMES", "tAFFECTMINUS", "tAFFECTPLUS", "'?'", "tOR", "tAND",
- "tNOTEQUAL", "tEQUAL", "'<'", "'>'", "tGREATEROREQUAL", "tLESSOREQUAL",
- "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "UNARYPREC", "tMINUSMINUS",
- "tPLUSPLUS", "'^'", "'('", "')'", "'['", "']'", "'.'", "'#'", "','",
- "'{'", "'}'", "'~'", "$accept", "All", "GeoFormatItems", "GeoFormatItem",
- "SendToFile", "Printf", "View", "Views", "ElementCoords",
- "ElementValues", "Element", "$@1", "$@2", "Text2DValues", "Text2D",
- "$@3", "Text3DValues", "Text3D", "$@4", "InterpolationMatrix", "Time",
- "$@5", "NumericAffectation", "NumericIncrement", "Affectation", "Comma",
- "DefineConstants", "$@6", "FloatParameterOptions",
- "FloatParameterOption", "PhysicalId", "InSphereCenter", "CircleOptions",
- "Shape", "$@7", "$@8", "$@9", "$@10", "Transform", "MultipleShape",
- "ListOfShapes", "LevelSet", "Delete", "Colorify", "Visibility",
- "Command", "Loop", "Extrude", "$@11", "$@12", "$@13", "$@14", "$@15",
- "$@16", "$@17", "$@18", "$@19", "$@20", "$@21", "$@22", "$@23",
- "ExtrudeParameters", "ExtrudeParameter", "TransfiniteType",
- "TransfiniteArrangement", "TransfiniteCorners", "RecombineAngle",
- "Transfinite", "Periodic", "Embedding", "Coherence", "Homology", "FExpr",
- "FExpr_Single", "VExpr", "VExpr_Single", "RecursiveListOfListOfDouble",
- "ListOfDouble", "ListOfDoubleOrAll", "FExpr_Multi",
- "RecursiveListOfDouble", "ColorExpr", "ListOfColor",
- "RecursiveListOfColor", "StringExprVar", "StringExpr", 0
+ "tHomology", "tCohomology", "tGMSH_MAJOR_VERSION", "tGMSH_MINOR_VERSION",
+ "tGMSH_PATCH_VERSION", "tAFFECTDIVIDE", "tAFFECTTIMES", "tAFFECTMINUS",
+ "tAFFECTPLUS", "'?'", "tOR", "tAND", "tNOTEQUAL", "tEQUAL", "'<'", "'>'",
+ "tGREATEROREQUAL", "tLESSOREQUAL", "'+'", "'-'", "'*'", "'/'", "'%'",
+ "'!'", "UNARYPREC", "tMINUSMINUS", "tPLUSPLUS", "'^'", "'('", "')'",
+ "'['", "']'", "'.'", "'#'", "','", "'{'", "'}'", "'~'", "$accept", "All",
+ "GeoFormatItems", "GeoFormatItem", "SendToFile", "Printf", "View",
+ "Views", "ElementCoords", "ElementValues", "Element", "$@1", "$@2",
+ "Text2DValues", "Text2D", "$@3", "Text3DValues", "Text3D", "$@4",
+ "InterpolationMatrix", "Time", "$@5", "NumericAffectation",
+ "NumericIncrement", "Affectation", "Comma", "DefineConstants", "$@6",
+ "FloatParameterOptions", "FloatParameterOption", "PhysicalId",
+ "InSphereCenter", "CircleOptions", "Shape", "$@7", "$@8", "$@9", "$@10",
+ "Transform", "MultipleShape", "ListOfShapes", "LevelSet", "Delete",
+ "Colorify", "Visibility", "Command", "Loop", "Extrude", "$@11", "$@12",
+ "$@13", "$@14", "$@15", "$@16", "$@17", "$@18", "$@19", "$@20", "$@21",
+ "$@22", "$@23", "ExtrudeParameters", "ExtrudeParameter",
+ "TransfiniteType", "TransfiniteArrangement", "TransfiniteCorners",
+ "RecombineAngle", "Transfinite", "Periodic", "Embedding", "Coherence",
+ "HomologyCommand", "Homology", "FExpr", "FExpr_Single", "VExpr",
+ "VExpr_Single", "RecursiveListOfListOfDouble", "ListOfDouble",
+ "ListOfDoubleOrAll", "FExpr_Multi", "RecursiveListOfDouble", "ColorExpr",
+ "ListOfColor", "RecursiveListOfColor", "StringExprVar", "StringExpr", 0
};
#endif
@@ -1053,58 +1042,58 @@ static const yytype_uint16 yytoknum[] =
345, 346, 347, 348, 349, 350, 351, 352, 353, 354,
355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
- 375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 63, 386, 387, 388, 389, 60, 62, 390, 391,
- 43, 45, 42, 47, 37, 33, 392, 393, 394, 94,
- 40, 41, 91, 93, 46, 35, 44, 123, 125, 126
+ 375, 376, 377, 378, 379, 380, 381, 382, 383, 63,
+ 384, 385, 386, 387, 60, 62, 388, 389, 43, 45,
+ 42, 47, 37, 33, 390, 391, 392, 94, 40, 41,
+ 91, 93, 46, 35, 44, 123, 125, 126
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 160, 161, 161, 162, 162, 163, 163, 163, 163,
- 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
- 163, 163, 163, 164, 164, 165, 165, 165, 165, 166,
- 166, 166, 167, 167, 167, 167, 167, 167, 168, 168,
- 169, 169, 171, 172, 170, 173, 173, 175, 174, 176,
- 176, 178, 177, 179, 179, 181, 180, 182, 182, 182,
- 182, 182, 183, 183, 184, 184, 184, 184, 184, 184,
- 184, 184, 184, 184, 184, 184, 184, 184, 184, 184,
- 184, 184, 184, 184, 184, 184, 184, 184, 184, 185,
- 185, 186, 186, 186, 187, 186, 188, 188, 189, 189,
- 190, 190, 191, 191, 192, 192, 193, 194, 193, 193,
- 193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
- 195, 193, 193, 193, 193, 193, 193, 193, 193, 193,
- 193, 193, 196, 193, 193, 193, 193, 197, 193, 198,
- 198, 198, 198, 198, 198, 198, 199, 199, 200, 200,
- 200, 200, 200, 200, 201, 201, 201, 201, 201, 201,
- 201, 201, 201, 202, 202, 202, 202, 202, 203, 204,
- 204, 204, 204, 205, 205, 205, 205, 205, 205, 205,
- 205, 205, 205, 205, 205, 205, 205, 206, 206, 206,
- 206, 206, 206, 206, 206, 206, 206, 207, 207, 207,
- 208, 207, 209, 207, 210, 207, 211, 207, 207, 207,
- 207, 207, 207, 207, 207, 207, 207, 212, 207, 213,
- 207, 214, 207, 215, 207, 216, 207, 217, 207, 218,
- 207, 219, 207, 220, 207, 221, 221, 222, 222, 222,
- 222, 222, 222, 222, 222, 222, 222, 223, 223, 224,
- 224, 225, 225, 226, 226, 227, 227, 227, 227, 227,
- 227, 227, 228, 228, 229, 229, 229, 229, 230, 230,
- 230, 231, 231, 231, 231, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
+ 0, 158, 159, 159, 160, 160, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 162, 162, 163, 163, 163, 163, 164,
+ 164, 164, 165, 165, 165, 165, 165, 165, 166, 166,
+ 167, 167, 169, 170, 168, 171, 171, 173, 172, 174,
+ 174, 176, 175, 177, 177, 179, 178, 180, 180, 180,
+ 180, 180, 181, 181, 182, 182, 182, 182, 182, 182,
+ 182, 182, 182, 182, 182, 182, 182, 182, 182, 182,
+ 182, 182, 182, 182, 182, 182, 182, 182, 182, 183,
+ 183, 184, 184, 184, 185, 184, 186, 186, 187, 187,
+ 188, 188, 189, 189, 190, 190, 191, 192, 191, 191,
+ 191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
+ 193, 191, 191, 191, 191, 191, 191, 191, 191, 191,
+ 191, 191, 194, 191, 191, 191, 191, 195, 191, 196,
+ 196, 196, 196, 196, 196, 196, 197, 197, 198, 198,
+ 198, 198, 198, 198, 199, 199, 199, 199, 199, 199,
+ 199, 199, 199, 200, 200, 200, 200, 200, 201, 202,
+ 202, 202, 202, 203, 203, 203, 203, 203, 203, 203,
+ 203, 203, 203, 203, 203, 203, 203, 204, 204, 204,
+ 204, 204, 204, 204, 204, 204, 204, 205, 205, 205,
+ 206, 205, 207, 205, 208, 205, 209, 205, 205, 205,
+ 205, 205, 205, 205, 205, 205, 205, 210, 205, 211,
+ 205, 212, 205, 213, 205, 214, 205, 215, 205, 216,
+ 205, 217, 205, 218, 205, 219, 219, 220, 220, 220,
+ 220, 220, 220, 220, 220, 220, 220, 221, 221, 222,
+ 222, 223, 223, 224, 224, 225, 225, 225, 225, 225,
+ 225, 225, 226, 226, 227, 227, 227, 227, 228, 228,
+ 228, 229, 229, 230, 230, 230, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 232, 232,
232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 233, 233, 233,
- 233, 233, 233, 233, 233, 233, 233, 233, 233, 233,
- 233, 233, 233, 233, 233, 234, 234, 234, 234, 234,
- 235, 235, 235, 235, 236, 236, 237, 237, 237, 237,
- 237, 237, 238, 238, 239, 239, 239, 239, 239, 239,
- 239, 239, 239, 239, 239, 239, 239, 239, 240, 240,
- 240, 240, 241, 241, 241, 241, 242, 242, 243, 243,
- 244, 244, 244, 244, 245, 245, 245, 245, 245, 245,
- 245, 245, 245
+ 232, 232, 232, 232, 232, 232, 233, 233, 233, 233,
+ 233, 234, 234, 234, 234, 235, 235, 236, 236, 236,
+ 236, 236, 236, 237, 237, 238, 238, 238, 238, 238,
+ 238, 238, 238, 238, 238, 238, 238, 238, 238, 239,
+ 239, 239, 239, 240, 240, 240, 240, 241, 241, 242,
+ 242, 243, 243, 243, 243, 244, 244, 244, 244, 244,
+ 244, 244, 244, 244
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -1137,21 +1126,21 @@ static const yytype_uint8 yyr2[] =
2, 2, 3, 2, 3, 9, 6, 0, 3, 0,
1, 0, 2, 0, 2, 7, 6, 8, 5, 3,
5, 6, 6, 12, 10, 10, 10, 10, 2, 3,
- 6, 11, 11, 11, 11, 1, 3, 2, 2, 2,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 5, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 6, 4, 4, 4, 4,
- 4, 4, 6, 6, 6, 4, 4, 4, 4, 4,
+ 6, 1, 1, 2, 5, 7, 1, 3, 2, 2,
+ 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 5, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 6, 4, 4, 4,
- 4, 4, 4, 6, 6, 6, 4, 1, 1, 1,
- 1, 1, 1, 1, 1, 5, 4, 4, 2, 5,
- 3, 6, 4, 7, 6, 1, 2, 2, 3, 3,
- 11, 9, 7, 7, 1, 3, 1, 1, 2, 3,
- 4, 5, 1, 1, 2, 3, 3, 5, 4, 2,
- 2, 2, 2, 1, 1, 3, 4, 6, 1, 1,
- 3, 3, 9, 7, 1, 5, 3, 6, 1, 3,
- 1, 1, 3, 6, 1, 1, 4, 6, 6, 4,
- 4, 4, 6
+ 4, 4, 4, 6, 6, 6, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 6, 4, 4,
+ 4, 4, 4, 4, 6, 6, 6, 4, 1, 1,
+ 1, 1, 1, 1, 1, 1, 5, 4, 4, 2,
+ 5, 3, 6, 4, 7, 6, 1, 2, 2, 3,
+ 3, 11, 9, 7, 7, 1, 3, 1, 1, 2,
+ 3, 4, 5, 1, 1, 2, 3, 3, 5, 4,
+ 2, 2, 2, 2, 1, 1, 3, 4, 6, 1,
+ 1, 3, 3, 9, 7, 1, 5, 3, 6, 1,
+ 3, 1, 1, 3, 6, 1, 1, 4, 6, 6,
+ 4, 4, 4, 6
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1165,327 +1154,319 @@ static const yytype_uint16 yydefact[] =
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, 191,
- 0, 196, 0, 0, 193, 0, 0, 0, 0, 0,
- 0, 0, 0, 5, 7, 6, 8, 9, 10, 21,
- 11, 12, 13, 20, 19, 14, 15, 16, 17, 18,
- 22, 337, 344, 404, 57, 338, 339, 340, 0, 0,
+ 0, 196, 0, 0, 193, 0, 0, 0, 0, 271,
+ 272, 5, 7, 6, 8, 9, 10, 21, 11, 12,
+ 13, 20, 19, 14, 15, 16, 17, 18, 0, 22,
+ 338, 345, 405, 57, 339, 340, 341, 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, 405, 0, 0, 0, 0, 341, 342,
- 343, 61, 60, 59, 58, 0, 0, 0, 63, 62,
- 0, 0, 0, 0, 148, 0, 0, 0, 275, 0,
- 0, 0, 0, 181, 0, 183, 180, 184, 185, 91,
+ 0, 0, 406, 0, 0, 0, 0, 342, 343, 344,
+ 61, 60, 59, 58, 0, 0, 0, 63, 62, 0,
+ 0, 0, 0, 148, 0, 0, 0, 276, 0, 0,
+ 0, 0, 181, 0, 183, 180, 184, 185, 91, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 186, 0, 0, 0,
- 0, 0, 0, 107, 120, 132, 137, 0, 0, 0,
+ 0, 0, 0, 0, 0, 186, 0, 0, 0, 0,
+ 0, 0, 107, 120, 132, 137, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 356,
+ 0, 0, 0, 0, 0, 148, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 148, 0, 268, 0,
+ 0, 0, 0, 345, 374, 0, 0, 0, 0, 0,
+ 0, 0, 384, 385, 367, 373, 0, 368, 0, 0,
+ 0, 0, 395, 0, 0, 0, 0, 0, 179, 0,
+ 0, 192, 0, 148, 0, 148, 273, 0, 0, 0,
+ 0, 0, 349, 32, 405, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 355, 0, 0, 0, 0, 0, 148, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 148, 0, 268,
- 0, 0, 0, 0, 344, 373, 0, 0, 0, 0,
- 0, 0, 0, 383, 384, 366, 372, 0, 367, 0,
- 0, 0, 0, 394, 0, 0, 0, 0, 0, 179,
- 0, 0, 192, 0, 148, 0, 148, 0, 0, 0,
- 0, 0, 0, 0, 0, 348, 32, 404, 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, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 345, 279, 278, 280,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 147,
+ 0, 146, 0, 69, 176, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 344,
- 278, 277, 279, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 147, 0, 146, 0, 69, 176, 0, 0,
+ 173, 124, 0, 0, 0, 89, 0, 0, 389, 390,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 173, 124, 0, 0, 0, 89, 0,
- 0, 388, 389, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 251, 251,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 251, 251, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 357, 356, 0, 0,
- 0, 0, 148, 148, 0, 0, 0, 0, 0, 0,
- 0, 206, 0, 148, 0, 0, 0, 0, 0, 253,
- 0, 0, 0, 166, 0, 0, 0, 269, 0, 0,
- 0, 0, 0, 0, 379, 0, 380, 381, 382, 0,
- 277, 374, 368, 0, 0, 0, 259, 178, 0, 0,
- 0, 0, 0, 148, 0, 0, 0, 0, 194, 169,
- 0, 170, 0, 401, 0, 400, 0, 0, 0, 0,
- 0, 350, 0, 0, 71, 0, 0, 0, 0, 0,
+ 0, 0, 0, 358, 357, 0, 0, 0, 0, 148,
+ 148, 0, 0, 0, 0, 0, 0, 0, 206, 0,
+ 148, 0, 0, 0, 0, 0, 253, 0, 0, 0,
+ 166, 0, 0, 0, 269, 0, 0, 0, 0, 0,
+ 0, 380, 0, 381, 382, 383, 0, 278, 375, 369,
+ 0, 0, 0, 259, 178, 0, 0, 0, 0, 0,
+ 148, 0, 0, 0, 0, 194, 169, 0, 170, 0,
+ 0, 0, 0, 351, 0, 0, 71, 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, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 402,
+ 0, 401, 0, 0, 0, 0, 0, 0, 0, 0,
+ 277, 57, 0, 0, 0, 57, 0, 0, 0, 0,
+ 0, 143, 0, 0, 0, 0, 149, 65, 0, 294,
+ 293, 292, 291, 287, 288, 290, 289, 282, 281, 283,
+ 284, 285, 286, 125, 0, 0, 0, 0, 90, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 276, 57, 0, 0,
- 0, 57, 0, 0, 0, 0, 0, 143, 0, 0,
- 0, 0, 149, 65, 0, 293, 292, 291, 290, 286,
- 287, 289, 288, 281, 280, 282, 283, 284, 285, 125,
- 0, 0, 0, 0, 90, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 249, 0,
+ 0, 0, 249, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 111, 0, 0, 0, 360,
+ 359, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 200, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 167, 0, 0, 163, 0, 0, 0, 0, 386, 0,
+ 0, 0, 0, 0, 370, 377, 0, 283, 376, 0,
+ 0, 0, 0, 0, 0, 0, 0, 195, 0, 171,
+ 172, 0, 0, 0, 347, 353, 0, 42, 0, 0,
+ 0, 55, 0, 33, 34, 35, 36, 37, 296, 317,
+ 297, 318, 298, 319, 299, 320, 300, 321, 301, 322,
+ 302, 323, 303, 324, 304, 325, 316, 337, 305, 326,
+ 0, 0, 307, 328, 308, 329, 309, 330, 310, 331,
+ 311, 332, 312, 333, 0, 0, 0, 0, 0, 0,
+ 0, 0, 412, 0, 0, 410, 411, 82, 0, 407,
+ 0, 0, 0, 0, 0, 0, 0, 0, 76, 0,
+ 0, 0, 0, 348, 0, 0, 0, 0, 0, 25,
+ 23, 0, 0, 0, 64, 92, 0, 391, 392, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 111, 0, 0, 0, 359, 358, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 200, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 167, 0, 0, 163,
- 0, 0, 0, 0, 385, 0, 0, 0, 0, 0,
- 369, 376, 0, 282, 375, 0, 0, 0, 0, 0,
- 0, 0, 0, 195, 0, 171, 172, 0, 0, 0,
- 0, 0, 0, 0, 346, 352, 0, 42, 0, 0,
- 0, 55, 0, 33, 34, 35, 36, 37, 295, 316,
- 296, 317, 297, 318, 298, 319, 299, 320, 300, 321,
- 301, 322, 302, 323, 303, 324, 315, 336, 304, 325,
- 0, 0, 306, 327, 307, 328, 308, 329, 309, 330,
- 310, 331, 311, 332, 0, 0, 0, 0, 0, 0,
- 411, 0, 0, 409, 410, 82, 0, 406, 0, 0,
- 0, 0, 0, 0, 0, 0, 76, 0, 0, 0,
- 0, 347, 0, 0, 0, 0, 0, 25, 23, 0,
- 0, 0, 64, 92, 0, 390, 391, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 247, 252, 250, 0,
+ 258, 0, 0, 100, 101, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 139, 141, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 247, 252, 250, 0, 258, 0,
- 0, 100, 101, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 139, 141, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 235, 0,
- 197, 0, 0, 0, 0, 0, 0, 254, 260, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 346, 386,
- 378, 370, 0, 0, 0, 0, 0, 0, 0, 168,
- 0, 0, 0, 0, 0, 402, 0, 0, 0, 0,
- 0, 0, 349, 0, 345, 0, 0, 0, 0, 0,
- 29, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 235, 0, 197, 0, 0, 0, 0, 0, 0, 254,
+ 260, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 347, 387, 379, 371, 0, 0, 0, 0, 0, 0,
+ 0, 168, 0, 0, 0, 0, 0, 274, 0, 0,
+ 350, 0, 346, 0, 0, 0, 0, 0, 29, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 403, 0,
0, 0, 0, 66, 0, 0, 0, 0, 0, 70,
- 72, 74, 0, 0, 398, 0, 80, 0, 0, 0,
- 0, 294, 24, 0, 0, 0, 0, 0, 0, 104,
+ 72, 74, 0, 0, 399, 0, 80, 0, 0, 0,
+ 0, 295, 24, 0, 0, 0, 0, 0, 0, 104,
104, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 109, 0, 0, 0, 0, 0, 0, 256, 0,
0, 0, 0, 0, 0, 0, 0, 262, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 240, 0,
0, 241, 0, 243, 0, 207, 236, 0, 0, 0,
161, 0, 0, 0, 261, 0, 165, 164, 270, 0,
- 30, 31, 0, 377, 371, 0, 0, 0, 395, 0,
- 0, 0, 187, 0, 0, 0, 0, 0, 0, 0,
- 175, 351, 174, 0, 0, 0, 0, 364, 0, 305,
- 326, 312, 333, 313, 334, 314, 335, 412, 408, 354,
- 407, 0, 57, 0, 0, 0, 0, 67, 0, 0,
- 0, 396, 0, 0, 0, 0, 26, 27, 0, 0,
- 0, 93, 106, 0, 0, 0, 0, 0, 110, 0,
- 0, 127, 128, 0, 0, 112, 135, 0, 0, 0,
- 102, 0, 255, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 177, 0, 0, 0, 0, 148, 0, 217,
- 0, 219, 0, 221, 0, 366, 0, 0, 242, 244,
- 0, 0, 201, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 387, 115, 116, 0, 0, 0, 0, 83,
- 0, 0, 0, 0, 0, 0, 353, 0, 38, 0,
- 0, 0, 0, 0, 40, 0, 0, 0, 77, 0,
- 0, 78, 0, 399, 150, 151, 152, 153, 0, 0,
- 94, 0, 105, 113, 114, 118, 0, 0, 129, 0,
- 0, 257, 122, 0, 0, 248, 134, 0, 0, 0,
- 0, 119, 0, 130, 136, 0, 0, 0, 0, 363,
- 0, 362, 0, 0, 208, 0, 0, 209, 0, 0,
- 210, 0, 0, 0, 0, 0, 0, 0, 160, 0,
- 0, 159, 0, 0, 0, 154, 0, 0, 0, 0,
- 393, 0, 189, 188, 0, 0, 0, 403, 0, 0,
- 0, 0, 43, 0, 0, 0, 365, 0, 0, 0,
+ 30, 31, 0, 378, 372, 0, 0, 0, 396, 0,
+ 0, 0, 187, 0, 0, 0, 175, 352, 174, 0,
+ 0, 0, 0, 365, 0, 306, 327, 313, 334, 314,
+ 335, 315, 336, 0, 413, 409, 355, 408, 0, 57,
+ 0, 0, 0, 0, 67, 0, 0, 0, 397, 0,
+ 0, 0, 0, 26, 27, 0, 0, 0, 93, 106,
+ 0, 0, 0, 0, 0, 110, 0, 0, 127, 128,
+ 0, 0, 112, 135, 0, 0, 0, 102, 0, 255,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 177,
+ 0, 0, 0, 0, 148, 0, 217, 0, 219, 0,
+ 221, 0, 367, 0, 0, 242, 244, 0, 0, 201,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 388,
+ 115, 116, 0, 0, 0, 0, 83, 0, 275, 354,
+ 0, 38, 0, 0, 0, 0, 0, 40, 0, 0,
+ 0, 0, 77, 0, 0, 78, 0, 400, 150, 151,
+ 152, 153, 0, 0, 94, 0, 105, 113, 114, 118,
+ 0, 0, 129, 0, 0, 257, 122, 0, 0, 248,
+ 134, 0, 0, 0, 0, 119, 0, 130, 136, 0,
+ 0, 0, 0, 364, 0, 363, 0, 0, 208, 0,
+ 0, 209, 0, 0, 210, 0, 0, 0, 0, 0,
+ 0, 0, 160, 0, 0, 159, 0, 0, 0, 154,
+ 0, 0, 0, 0, 394, 0, 189, 188, 0, 0,
+ 0, 43, 0, 0, 0, 366, 0, 0, 0, 404,
68, 73, 75, 0, 81, 0, 28, 0, 96, 0,
0, 0, 0, 0, 0, 123, 108, 121, 133, 138,
0, 0, 87, 88, 148, 0, 142, 0, 0, 0,
0, 0, 0, 0, 237, 0, 0, 148, 0, 0,
0, 0, 0, 145, 144, 0, 0, 0, 0, 84,
- 85, 0, 0, 0, 0, 0, 39, 0, 0, 0,
- 41, 56, 0, 397, 0, 0, 264, 265, 266, 267,
- 126, 0, 0, 0, 0, 0, 361, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 246, 0, 0, 0,
- 202, 0, 0, 155, 0, 0, 0, 392, 190, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 79, 0,
- 0, 95, 97, 0, 0, 0, 140, 0, 223, 0,
- 0, 225, 0, 0, 227, 0, 0, 0, 238, 0,
- 198, 0, 148, 0, 0, 0, 117, 86, 271, 272,
- 273, 274, 0, 47, 0, 53, 0, 0, 0, 103,
- 131, 263, 360, 211, 0, 0, 218, 212, 0, 0,
- 220, 213, 0, 0, 222, 0, 0, 0, 204, 0,
- 158, 0, 0, 0, 0, 0, 0, 0, 99, 98,
- 0, 229, 0, 231, 0, 233, 239, 245, 203, 199,
- 0, 0, 0, 0, 44, 0, 51, 0, 0, 0,
- 214, 0, 0, 215, 0, 0, 216, 0, 0, 162,
- 0, 156, 0, 45, 0, 0, 182, 0, 0, 0,
- 0, 0, 0, 205, 0, 0, 0, 0, 0, 224,
- 0, 226, 0, 228, 0, 157, 46, 48, 0, 49,
- 0, 0, 0, 0, 0, 0, 54, 230, 232, 234,
- 50, 52
+ 85, 0, 39, 0, 0, 0, 41, 56, 0, 398,
+ 0, 0, 264, 265, 266, 267, 126, 0, 0, 0,
+ 0, 0, 362, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 246, 0, 0, 0, 202, 0, 0, 155,
+ 0, 0, 0, 393, 190, 0, 0, 0, 0, 0,
+ 79, 0, 0, 95, 97, 0, 0, 0, 140, 0,
+ 223, 0, 0, 225, 0, 0, 227, 0, 0, 0,
+ 238, 0, 198, 0, 148, 0, 0, 0, 117, 86,
+ 0, 47, 0, 53, 0, 0, 0, 103, 131, 263,
+ 361, 211, 0, 0, 218, 212, 0, 0, 220, 213,
+ 0, 0, 222, 0, 0, 0, 204, 0, 158, 0,
+ 0, 0, 0, 0, 0, 0, 99, 98, 0, 229,
+ 0, 231, 0, 233, 239, 245, 203, 199, 0, 0,
+ 0, 0, 44, 0, 51, 0, 0, 0, 214, 0,
+ 0, 215, 0, 0, 216, 0, 0, 162, 0, 156,
+ 0, 45, 0, 0, 182, 0, 0, 0, 0, 0,
+ 0, 205, 0, 0, 0, 0, 0, 224, 0, 226,
+ 0, 228, 0, 157, 46, 48, 0, 49, 0, 0,
+ 0, 0, 0, 0, 54, 230, 232, 234, 50, 52
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 2, 3, 73, 749, 74, 75, 473, 1097, 1103,
- 673, 855, 1255, 1412, 674, 1374, 1438, 675, 1414, 676,
- 677, 859, 145, 265, 76, 565, 358, 1208, 1265, 1312,
- 780, 1134, 1025, 542, 384, 385, 386, 387, 233, 333,
- 334, 79, 80, 81, 82, 83, 84, 234, 811, 1331,
- 1390, 614, 1155, 1158, 1161, 1354, 1358, 1362, 1401, 1404,
- 1407, 807, 808, 917, 777, 588, 623, 86, 87, 88,
- 89, 90, 235, 148, 397, 200, 986, 987, 237, 238,
- 443, 245, 740, 885, 464, 465
+ -1, 2, 3, 71, 741, 72, 73, 465, 1080, 1086,
+ 663, 843, 1231, 1380, 664, 1342, 1406, 665, 1382, 666,
+ 667, 847, 144, 262, 74, 559, 355, 1188, 1241, 1284,
+ 772, 1118, 1012, 536, 381, 382, 383, 384, 232, 330,
+ 331, 77, 78, 79, 80, 81, 82, 233, 803, 1303,
+ 1358, 608, 1139, 1142, 1145, 1322, 1326, 1330, 1369, 1372,
+ 1375, 799, 800, 907, 769, 582, 617, 84, 85, 86,
+ 87, 88, 89, 234, 147, 394, 199, 972, 973, 236,
+ 237, 440, 244, 732, 875, 510, 511
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -1040
+#define YYPACT_NINF -1059
static const yytype_int16 yypact[] =
{
- 3721, 51, 9, 3836, -1040, -1040, 1784, 6, -2, -119,
- 29, 55, 66, 85, 91, -42, -103, 56, 77, 19,
- 102, 110, 18, 174, 197, 293, 306, 307, 360, 320,
- 340, 202, 341, 918, 270, 206, 257, 361, 263, 105,
- 105, 277, 481, 325, 359, 387, 396, 16, 37, 400,
- 452, 453, 1842, 463, 326, 345, 368, 23, 13, -1040,
- 371, -1040, 465, 334, -1040, 487, 507, -4, 27, 375,
- 381, 385, 388, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- -1040, -1040, 20, 397, 477, -1040, -1040, -1040, 158, 203,
- 331, 335, 355, 358, 382, 407, 419, 431, 432, 478,
- 489, 514, 517, 527, 541, 592, 596, 616, 634, 423,
- 424, 440, 469, -1040, 557, 485, 504, 505, -1040, -1040,
- -1040, -1040, -1040, -1040, -1040, 3548, 3548, 3548, -1040, -1040,
- 3548, 2961, 22, 623, 239, 2289, 670, 726, -1040, 675,
- 680, 3548, 682, -1040, 3548, -1040, -1040, -1040, -1040, -1040,
- 3548, 3364, 3548, 3548, 547, 3548, 3364, 3548, 3548, 551,
- 3364, 3548, 3548, 2289, 571, 559, -1040, 581, 585, 1842,
- 1842, 1842, 591, -1040, -1040, -1040, -1040, 595, 619, 622,
- 2289, 3548, 721, 2289, 105, 105, 105, 3548, 3548, -95,
- -1040, -48, 105, 606, 620, 621, 3183, -24, -75, 637,
- 641, 642, 1842, 2289, 645, 38, 646, -1040, 767, -1040,
- 647, 660, 690, 701, 649, -1040, 720, 31, 813, 877,
- 894, 2438, 1627, -1040, -1040, 1811, -1040, 842, -1040, 850,
- 3548, 3548, 3548, 727, 3548, 745, 826, 3548, 3548, -1040,
- 3548, 931, -1040, 938, -1040, 939, -1040, 354, 354, 354,
- 354, 804, 3548, 953, 812, -1040, -1040, -1040, 955, 3548,
- 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548,
- 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548,
- 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548,
- 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548,
- 3548, 354, 354, 354, 354, 3548, 354, 354, 354, 732,
- 827, 827, 827, 6046, 74, 3364, 5287, 69, 834, 984,
- 856, 838, -1040, 845, 3914, 1006, -1040, -1040, 3548, 3548,
- 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548, 3548,
- 3548, 3548, 3548, -1040, -1040, 774, -123, 3359, 165, 6067,
- 3364, 1836, -1040, 62, 6088, 6109, 3548, 6130, 366, 6151,
- 6172, 3548, 655, 6193, 6214, 1012, 3548, 3548, 3548, 3548,
- 1018, 1019, 1019, 3548, 879, 889, 906, 909, 3548, 3548,
- 3548, 1031, 4531, 912, 1037, -45, -1040, -1040, 4611, 4637,
- 105, 105, 239, 239, 223, 3548, 3548, 3548, 3183, 3183,
- 3548, 3914, 240, -1040, 3548, 3548, 3548, 3548, 3548, 1057,
- 1058, 3548, 1060, -1040, 3548, 3548, 2029, -1040, 3364, 3364,
- 3548, 3548, 3116, 1063, -1040, 3548, -1040, -1040, -1040, 3364,
- 827, -1040, -1040, 665, 3548, 2587, -1040, -1040, 6235, 6256,
- 6277, 967, 4663, -1040, 914, 2955, 6298, 5310, -1040, -1040,
- 2178, -1040, 2327, 653, 922, -1040, 923, 925, 926, 3548,
- 5333, 169, 3548, 12, -1040, 6319, 5356, 6340, 5379, 6361,
- 5402, 6382, 5425, 6403, 5448, 6424, 5471, 6445, 5494, 6466,
- 5517, 6487, 5540, 6508, 5563, 6529, 5586, 4689, 4715, 6550,
- 5609, 6571, 5632, 6592, 5655, 6613, 5678, 6634, 5701, 6655,
- 5724, 4741, 4767, 4793, 4819, 4845, 4871, -68, 927, 934,
- 935, 999, 932, 936, 933, 3548, -1040, -1040, 2289, 666,
- 83, 477, 3548, 1076, 1086, 25, 942, -1040, 57, 21,
- 26, 58, -1040, -1040, 3149, 471, 1016, 1104, 1104, 752,
- 752, 752, 752, 575, 575, 827, 827, 827, 827, -1040,
- 2, 3364, 3548, 1085, -1040, 1088, 1089, 3364, 3364, 991,
- 1092, 1093, 6676, 1094, 996, 1097, 1099, 6697, 1002, 1103,
- 1107, 3548, 6718, 3606, 6739, 6760, 3548, 2289, 1111, 1105,
- 6781, 3507, 3507, 3507, 3507, 6802, 6823, 6844, 2289, 3364,
- 962, -1040, 105, 3548, 3548, -1040, -1040, 959, 960, 3548,
- 4897, 4923, 4949, 4585, 704, 105, 2476, 6865, 3725, 6886,
- 6907, 6928, 3548, 1114, 3548, 6949, -1040, 5747, 5770, -1040,
- 691, 696, 5793, 5816, -1040, 3364, 5839, 968, 3915, 715,
- -1040, 3326, 3364, 827, -1040, 1117, 1118, 1119, 973, 3548,
- 2625, 3548, 3548, -1040, 41, -1040, -1040, 3548, 1125, 1138,
- 1139, 1155, 1157, 5862, 75, -1040, 3943, -1040, 1017, 1020,
- 1009, -1040, 1162, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- 3548, 3548, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- -1040, -1040, -1040, -1040, 3548, 3548, 3548, 3548, 3548, 3548,
- -1040, 3364, 354, -1040, -1040, -1040, 3548, -1040, 354, 1165,
- 1023, 47, 3548, 1166, 1174, 1168, -1040, 1175, 1029, 23,
- 1177, -1040, 3364, 3364, 3364, 3364, 3548, -1040, 1047, 354,
- -7, 4975, -1040, 1178, 105, 1836, -1040, 1131, 2289, 2289,
- 1181, 2289, 821, 2289, 2289, 1182, 1133, 2289, 2289, 1479,
- 1184, 1186, 1187, 1188, 1294, -1040, -1040, 1191, -1040, 1192,
- 1049, 7180, -1040, 1050, 1053, 1055, 1202, 1203, 1206, 1208,
- 729, 1194, 287, 5001, 5027, -1040, -1040, 3971, 105, 105,
- 105, 1212, 1211, 1061, 1069, 33, 114, -30, -1040, 291,
- -1040, 704, 1213, 1216, 1217, 1219, 1221, 7180, -1040, 1581,
- 1072, 1224, 1225, 1226, 1179, 1227, 1230, 742, -11, -1040,
- -1040, -1040, 3548, 763, 2289, 2289, 2289, 1233, 5053, -1040,
- 3575, 409, 1234, 1245, 5885, -1040, 1098, 1100, 1102, 1109,
- 1244, 1250, -1040, 1254, -1040, 1106, 3548, 3548, 2289, 1110,
- -1040, 6970, 5908, 6991, 5931, 7012, 5954, 7033, 5977, 68,
- 1113, 7054, 1120, -1040, 74, 221, 1108, 1261, 1620, -1040,
- -1040, -1040, 23, 3548, -1040, 764, -1040, 772, 773, 782,
- 794, 7180, -1040, 1264, 15, 3548, 3332, 1, 1116, 1214,
- 1214, 2289, 1269, 1124, 1126, 1276, 1279, 2289, 1129, 1282,
- 1283, -1040, 1285, 2289, 2289, 2289, 1288, 1287, -1040, 2289,
- 1289, 1290, 1307, 1308, 2289, 2289, 2289, -1040, 1311, 324,
- 3548, 3548, 3548, 1137, -37, -18, 92, 1143, -1040, 2289,
- 3548, -1040, 1315, -1040, 1316, -1040, -1040, 3183, -12, 1991,
- -1040, 1167, 1169, 2736, -1040, 3364, -1040, -1040, -1040, 1171,
- -1040, -1040, 1172, 7180, -1040, 1324, 1325, 1231, -1040, 3548,
- 3548, 3548, -1040, 1326, 1327, 1183, 2289, 2289, 2289, 2289,
- -1040, 169, -1040, 3548, 5079, 5105, 795, -1040, 3548, -1040,
- -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- -1040, 2289, 477, 3548, 1329, 1332, 25, -1040, 1333, 6000,
- 23, -1040, 1334, 1336, 1337, 1338, -1040, -1040, 354, 5131,
- 3548, 7180, -1040, 3548, 105, 1340, 1341, 1342, -1040, 3548,
- 3548, -1040, -1040, 1343, 3548, -1040, -1040, 1345, 1346, 1347,
- 1248, 3548, -1040, 1349, 2289, 2289, 2289, 2289, 1350, 956,
- 1354, 3548, -1040, 3507, 3999, 7075, 3541, 239, 105, 1355,
- 105, 1356, 105, 1359, 3548, 618, 1210, 7096, -1040, -1040,
- 4027, 319, -1040, 1361, 1449, 1365, 2289, 105, 1449, 1366,
- 810, 3548, -1040, -1040, -1040, 2289, 3859, 697, 7117, -1040,
- 3034, 1369, 1218, 1220, 1222, 1223, -1040, 155, 7180, 3548,
- 3548, 2289, 1228, 823, 7180, 1371, 1375, 1699, -1040, 1368,
- 1376, -1040, 1235, -1040, -1040, -1040, -1040, -1040, 1378, 3548,
- 7180, 4055, 249, -1040, -1040, -1040, 4083, 4111, -1040, 4139,
- 1382, -1040, -1040, 1335, 1384, 7180, -1040, 1385, 1386, 1388,
- 1389, -1040, 1239, -1040, -1040, 4558, 2878, 1392, 1242, -1040,
- 3548, -1040, 1243, 321, -1040, 1246, 338, -1040, 1247, 372,
- -1040, 1249, 6023, 1394, 2289, 1395, 1251, 3548, -1040, 2885,
- 436, -1040, 828, 438, 492, -1040, 1399, 4167, 1306, 3548,
- -1040, 3548, -1040, -1040, 3364, 3027, 1403, -1040, 2289, 2289,
- 2289, 2289, -1040, 3548, 5157, 5183, -1040, 2289, 3548, 1405,
- -1040, -1040, -1040, 23, -1040, 1309, -1040, 5209, -1040, 1406,
- 1409, 1410, 1411, 1412, 1262, -1040, -1040, -1040, -1040, -1040,
- 2289, 3364, -1040, -1040, 239, 3887, -1040, 3183, 704, 3183,
- 704, 3183, 704, 1418, -1040, 829, 2289, -1040, 4195, 105,
- 1433, 3364, 105, -1040, -1040, 3548, 4223, 4251, 840, -1040,
- -1040, 1284, 1286, 1291, 1292, 1297, 7180, 3548, 3548, 843,
- 7180, -1040, 1434, -1040, 3548, 844, -1040, -1040, -1040, -1040,
- -1040, 3548, 848, 851, 1293, 3548, -1040, 4279, 512, 351,
- 4307, 534, 365, 4335, 544, 379, -1040, 2289, 1435, 1377,
- 2774, 1298, 548, -1040, 855, 566, 3109, -1040, -1040, 1440,
- 1442, 1450, 1451, 1455, 3548, 7138, 5235, 32, -1040, 5261,
- 1458, -1040, -1040, 4363, 1480, 1481, -1040, 4391, 1486, 3548,
- 1487, 1488, 3548, 1489, 1490, 3548, 1491, 1344, -1040, 3548,
- -1040, 704, -1040, 3364, 1493, 2885, -1040, -1040, -1040, -1040,
- -1040, -1040, 860, -1040, 3548, -1040, 2289, 3548, 2140, -1040,
- -1040, -1040, -1040, -1040, 1351, 4419, -1040, -1040, 1352, 4447,
- -1040, -1040, 1353, 4475, -1040, 1494, 3176, 414, 3536, 864,
- -1040, 587, 876, 1497, 1357, 7159, 888, 4503, -1040, -1040,
- 704, 1501, 704, 1505, 704, 1506, -1040, -1040, -1040, -1040,
- 704, 1507, 3364, 1509, -1040, 354, -1040, 1360, 1510, 613,
- -1040, 1362, 644, -1040, 1364, 730, -1040, 1370, 857, -1040,
- 892, -1040, 893, -1040, 1374, 2289, -1040, 1512, 704, 1522,
- 704, 1526, 704, -1040, 1528, 354, 1529, 354, 896, -1040,
- 869, -1040, 904, -1040, 951, -1040, -1040, -1040, 897, -1040,
- 1530, 1531, 1532, 1533, 354, 1534, -1040, -1040, -1040, -1040,
- -1040, -1040
+ 3924, 52, 64, 4005, -1059, -1059, 1833, 57, -35, -72,
+ 20, 74, 89, 113, 126, 44, -104, -9, 28, 26,
+ 49, 60, 14, 63, 70, 123, 145, 152, 209, 193,
+ 197, 252, 198, 202, 292, -13, 110, 251, 172, 301,
+ 301, 173, 256, 41, 269, 291, 298, 13, 59, 333,
+ 372, 385, 1986, 388, 245, 262, 270, 15, 4, -1059,
+ 276, -1059, 411, 278, -1059, 433, 444, 2, 32, -1059,
+ -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059,
+ -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, 34, -1059,
+ -1059, 21, 286, 98, -1059, -1059, -1059, 277, 364, 367,
+ 415, 428, 440, 448, 468, 495, 505, 514, 547, 561,
+ 566, 569, 586, 587, 598, 601, 637, 638, 306, 309,
+ 331, 335, -1059, 465, 336, 360, 386, -1059, -1059, -1059,
+ -1059, -1059, -1059, -1059, 3532, 3532, 3532, -1059, -1059, 3532,
+ 1758, 9, 469, 457, 2427, 483, 1142, -1059, 534, 548,
+ 3532, 506, -1059, 3532, -1059, -1059, -1059, -1059, -1059, 3532,
+ 3456, 3532, 3532, 391, 3532, 3456, 3532, 3532, 416, 3456,
+ 3532, 3532, 2427, 424, 430, -1059, 436, 441, 1986, 1986,
+ 1986, 451, -1059, -1059, -1059, -1059, 459, 474, 484, 2427,
+ 3532, 609, 2427, 301, 301, 301, 3532, 3532, -67, -1059,
+ 75, 301, 476, 480, 501, 3244, 81, -100, 521, 522,
+ 526, 1986, 2427, 535, 43, 509, -1059, 676, -1059, 531,
+ 550, 544, 558, 325, -1059, 563, 33, 715, 722, 740,
+ 2574, 1679, -1059, -1059, 3664, -1059, 744, -1059, 747, 3532,
+ 3532, 3532, 602, 3532, 606, 666, 3532, 3532, -1059, 3532,
+ 762, -1059, 769, -1059, 797, -1059, -1059, 2427, 621, 3532,
+ 774, 627, -1059, -1059, -1059, 801, 3532, 3532, 3532, 3532,
+ 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532,
+ 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532,
+ 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532,
+ 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 315, 315,
+ 315, 315, 3532, 315, 315, 315, 624, 643, 643, 643,
+ 6322, 76, 3456, 5563, 319, 661, 809, 673, 674, -1059,
+ 672, 4078, 826, -1059, -1059, 3532, 3532, 3532, 3532, 3532,
+ 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532, 3532,
+ -1059, -1059, 1262, 161, 4861, 29, 6343, 3456, 3696, -1059,
+ 232, 6364, 6385, 3532, 6406, 533, 6427, 6448, 3532, 640,
+ 6469, 6490, 835, 3532, 3532, 3532, 3532, 845, 849, 849,
+ 3532, 695, 712, 713, 717, 3532, 3532, 3532, 861, 4781,
+ 723, 889, -33, -1059, -1059, 4887, 4913, 301, 301, 457,
+ 457, 67, 3532, 3532, 3532, 3244, 3244, 3532, 4078, 93,
+ -1059, 3532, 3532, 3532, 3532, 3532, 869, 893, 3532, 900,
+ -1059, 3532, 3532, 1086, -1059, 3456, 3456, 3532, 3532, 3091,
+ 903, -1059, 3532, -1059, -1059, -1059, 3456, 643, -1059, -1059,
+ 645, 3532, 2721, -1059, -1059, 6511, 6532, 6553, 810, 4939,
+ -1059, 757, 3715, 6574, 5586, -1059, -1059, 1362, -1059, 1423,
+ 646, 3532, 5609, -36, 3532, 6, -1059, 6595, 5632, 6616,
+ 5655, 6637, 5678, 6658, 5701, 6679, 5724, 6700, 5747, 6721,
+ 5770, 6742, 5793, 6763, 5816, 6784, 5839, 6805, 5862, 4965,
+ 4991, 6826, 5885, 6847, 5908, 6868, 5931, 6889, 5954, 6910,
+ 5977, 6931, 6000, 5017, 5043, 5069, 5095, 5121, 5147, 662,
+ 168, -1059, 768, 788, 789, 1495, 775, 802, 779, 3532,
+ -1059, -1059, 2427, 665, 238, 98, 3532, 911, 938, 17,
+ 799, -1059, -86, 31, 30, -57, -1059, -1059, 3734, 838,
+ 1208, 901, 901, 763, 763, 763, 763, 395, 395, 643,
+ 643, 643, 643, -1059, 5, 3456, 3532, 955, -1059, 962,
+ 984, 3456, 3456, 896, 992, 998, 6952, 1002, 906, 1006,
+ 1024, 6973, 927, 1037, 1039, 3532, 6994, 4109, 7015, 7036,
+ 3532, 2427, 1045, 1048, 7057, 3597, 3597, 3597, 3597, 7078,
+ 7099, 7120, 2427, 3456, 905, -1059, 301, 3532, 3532, -1059,
+ -1059, 904, 907, 3532, 5173, 5199, 5225, 4835, 7, 301,
+ 1866, 7141, 4137, 7162, 7183, 7204, 3532, 1055, 3532, 7225,
+ -1059, 6023, 6046, -1059, 668, 692, 6069, 6092, -1059, 3456,
+ 6115, 913, 4165, 693, -1059, 3761, 3456, 643, -1059, 1058,
+ 1059, 1060, 916, 3532, 2033, 3532, 3532, -1059, 46, -1059,
+ -1059, 2427, 1063, 6138, 77, -1059, 4193, -1059, 922, 924,
+ 919, -1059, 1069, -1059, -1059, -1059, -1059, -1059, -1059, -1059,
+ -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059,
+ -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059,
+ 3532, 3532, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059,
+ -1059, -1059, -1059, -1059, 3532, 3532, 3532, 3532, 3532, 3532,
+ 3532, 1074, -1059, 3456, 315, -1059, -1059, -1059, 3532, -1059,
+ 315, 1073, 929, 19, 3532, 1076, 1077, 2383, -1059, 1078,
+ 934, 15, 1080, -1059, 3456, 3456, 3456, 3456, 3532, -1059,
+ 952, 315, 169, 5251, -1059, 1081, 301, 3696, -1059, 1034,
+ 2427, 2427, 1084, 2427, 798, 2427, 2427, 1089, 1036, 2427,
+ 2427, 2530, 1093, 1094, 1095, 1097, 3809, -1059, -1059, 1099,
+ -1059, 1100, 959, 7456, -1059, 963, 980, 982, 1126, 1144,
+ 1148, 1150, 703, 1156, 324, 5277, 5303, -1059, -1059, 4221,
+ 301, 301, 301, 1157, 1158, 1008, 1017, 16, 40, -29,
+ -1059, 352, -1059, 7, 1161, 1163, 1167, 1169, 1172, 7456,
+ -1059, 2677, 1015, 1174, 1177, 1181, 1133, 1183, 1184, 710,
+ -79, -1059, -1059, -1059, 3532, 742, 2427, 2427, 2427, 1187,
+ 5329, -1059, 3780, 985, 1188, 1189, 1038, -1059, 1190, 1193,
+ -1059, 1192, -1059, 1051, 3532, 3532, 2427, 1047, -1059, 7246,
+ 6161, 7267, 6184, 7288, 6207, 7309, 6230, 6253, -1059, 207,
+ 1057, 7330, 1061, -1059, 76, 341, 1052, 1201, 2824, -1059,
+ -1059, -1059, 15, 3532, -1059, 764, -1059, 765, 771, 772,
+ 776, 7456, -1059, 1194, 8, 3532, 3309, 10, 1054, 1149,
+ 1149, 2427, 1205, 1062, 1065, 1207, 1210, 2427, 1066, 1212,
+ 1216, -1059, 1209, 2427, 2427, 2427, 1219, 1218, -1059, 2427,
+ 1222, 1223, 1224, 1225, 2427, 2427, 2427, -1059, 1226, 119,
+ 3532, 3532, 3532, 1070, 88, 221, 275, 1085, -1059, 2427,
+ 3532, -1059, 1220, -1059, 1230, -1059, -1059, 3244, -11, 2133,
+ -1059, 1082, 1083, 2868, -1059, 3456, -1059, -1059, -1059, 1088,
+ -1059, -1059, 1096, 7456, -1059, 1233, 1234, 1151, -1059, 3532,
+ 3532, 3532, -1059, 1238, 1239, 1245, -1059, -36, -1059, 3532,
+ 5355, 5381, 780, -1059, 3532, -1059, -1059, -1059, -1059, -1059,
+ -1059, -1059, -1059, 1103, -1059, -1059, -1059, -1059, 2427, 98,
+ 3532, 1251, 1254, 17, -1059, 1253, 6276, 15, -1059, 1256,
+ 1257, 1259, 1260, -1059, -1059, 315, 5407, 3532, 7456, -1059,
+ 3532, 301, 1263, 1280, 1281, -1059, 3532, 3532, -1059, -1059,
+ 1284, 3532, -1059, -1059, 1255, 1286, 1287, 1191, 3532, -1059,
+ 1288, 2427, 2427, 2427, 2427, 1290, 937, 1292, 3532, -1059,
+ 3597, 4249, 7351, 4025, 457, 301, 1294, 301, 1296, 301,
+ 1297, 3532, 363, 1153, 7372, -1059, -1059, 4277, 419, -1059,
+ 1298, 1531, 1299, 2427, 301, 1531, 1302, 792, 3532, -1059,
+ -1059, -1059, 2427, 4053, 752, 7393, -1059, 3162, -1059, -1059,
+ 224, 7456, 3532, 3532, 2427, 1155, 793, 7456, 1307, 1306,
+ 1308, 3215, -1059, 1309, 1311, -1059, 1166, -1059, -1059, -1059,
+ -1059, -1059, 1314, 3532, 7456, 4305, 12, -1059, -1059, -1059,
+ 4333, 4361, -1059, 4389, 1310, -1059, -1059, 1268, 1316, 7456,
+ -1059, 1317, 1318, 1322, 1323, -1059, 1175, -1059, -1059, 4808,
+ 3276, 1326, 1178, -1059, 3532, -1059, 1179, 421, -1059, 1198,
+ 423, -1059, 1202, 429, -1059, 1203, 6299, 1328, 2427, 1332,
+ 1204, 3532, -1059, 3015, 432, -1059, 806, 470, 482, -1059,
+ 1350, 4417, 1261, 3532, -1059, 3532, -1059, -1059, 3456, 3561,
+ 1354, -1059, 3532, 5433, 5459, -1059, 2427, 3532, 1357, -1059,
+ -1059, -1059, -1059, 15, -1059, 1264, -1059, 5485, -1059, 1358,
+ 1360, 1361, 1363, 1364, 1217, -1059, -1059, -1059, -1059, -1059,
+ 2427, 3456, -1059, -1059, 457, 4081, -1059, 3244, 7, 3244,
+ 7, 3244, 7, 1365, -1059, 811, 2427, -1059, 4445, 301,
+ 1367, 3456, 301, -1059, -1059, 3532, 4473, 4501, 827, -1059,
+ -1059, 1221, 7456, 3532, 3532, 832, 7456, -1059, 1372, -1059,
+ 3532, 833, -1059, -1059, -1059, -1059, -1059, 3532, 836, 840,
+ 1227, 3532, -1059, 4529, 488, 437, 4557, 490, 439, 4585,
+ 511, 582, -1059, 2427, 1373, 1312, 2180, 1229, 537, -1059,
+ 841, 539, 3626, -1059, -1059, 1374, 3532, 7414, 5511, 37,
+ -1059, 5537, 1381, -1059, -1059, 4613, 1380, 1382, -1059, 4641,
+ 1383, 3532, 1399, 1400, 3532, 1401, 1402, 3532, 1415, 1231,
+ -1059, 3532, -1059, 7, -1059, 3456, 1418, 3015, -1059, -1059,
+ 844, -1059, 3532, -1059, 2427, 3532, 2280, -1059, -1059, -1059,
+ -1059, -1059, 1272, 4669, -1059, -1059, 1276, 4697, -1059, -1059,
+ 1277, 4725, -1059, 1427, 3645, 636, 2327, 852, -1059, 542,
+ 863, 1431, 1283, 7435, 864, 4753, -1059, -1059, 7, 1433,
+ 7, 1434, 7, 1435, -1059, -1059, -1059, -1059, 7, 1436,
+ 3456, 1438, -1059, 315, -1059, 1291, 1439, 654, -1059, 1293,
+ 677, -1059, 1295, 694, -1059, 1303, 719, -1059, 867, -1059,
+ 870, -1059, 1304, 2427, -1059, 1441, 7, 1443, 7, 1445,
+ 7, -1059, 1446, 315, 1451, 315, 871, -1059, 741, -1059,
+ 755, -1059, 784, -1059, -1059, -1059, 874, -1059, 1457, 1458,
+ 1459, 1460, 315, 1461, -1059, -1059, -1059, -1059, -1059, -1059
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -1040, -1040, -1040, -1040, 648, -1040, -1040, -1040, -1040, 237,
- -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- -1040, -1040, -309, -1, -1040, -1040, -1040, -1040, -1040, -1040,
- -207, -1040, 643, 1541, -1040, -1040, -1040, -1040, 3, -399,
- -204, -1040, -1040, -1040, -1040, -1040, -1040, 1543, -1040, -1040,
- -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040, -1040,
- -1040, -740, -620, -1040, -1040, 1170, -1040, -1040, -1040, -1040,
- -1040, -1040, -6, -1040, 45, -1040, -1039, 444, -80, 336,
- -72, -705, 542, -1040, -248, 8
+ -1059, -1059, -1059, -1059, 584, -1059, -1059, -1059, -1059, 194,
+ -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059,
+ -1059, -1059, -312, -3, -1059, -1059, -1059, -1059, -1059, -1059,
+ -135, -1059, 581, 1479, -1059, -1059, -1059, -1059, 3, -398,
+ -201, -1059, -1059, -1059, -1059, -1059, -1059, 1482, -1059, -1059,
+ -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059, -1059,
+ -1059, -593, -710, -1059, -1059, 1109, -1059, -1059, -1059, -1059,
+ -1059, -1059, -1059, -6, -1059, 45, -1059, -1058, 422, 134,
+ 316, 222, -695, 499, -1059, -282, 18
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1495,1628 +1476,1680 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -5
static const yytype_int16 yytable[] =
{
- 147, 253, 411, 607, 608, 146, 78, 1022, 747, 5,
- 466, 467, 468, 426, 149, 528, 667, 246, 532, 150,
- 215, 1017, 169, 164, 261, 164, 327, 243, 560, 738,
- 169, 152, 255, 561, 884, 153, 434, 1172, 1345, 941,
- 801, 218, 422, 219, 423, 400, 401, 160, 842, 802,
- 460, 875, 462, 151, 161, 803, 804, 4, 801, 805,
- 806, 155, 402, 517, 518, 519, 520, 802, 522, 523,
- 524, 948, 156, 803, 804, 414, 531, 805, 806, 463,
- 267, 527, 415, 720, 199, 201, 220, 207, 721, 363,
- 527, 157, 400, 401, 368, 400, 401, 158, 372, 380,
- 381, 382, 268, 400, 401, 668, 669, 670, 671, 403,
- 159, 602, 119, 120, 121, 122, 400, 401, 123, 1058,
- 943, 1059, 400, 401, 942, 328, 329, 216, 945, 320,
- 321, 322, 419, 413, 323, 326, 138, 139, 1060, 748,
- 1061, 400, 401, 851, 894, 355, 1072, 332, 357, 568,
- 876, 877, 748, 254, 359, 361, 364, 365, 1259, 367,
- 361, 369, 370, 247, 361, 373, 374, 138, 139, 165,
- 672, 165, 262, 217, 263, 170, 166, 1008, 743, 264,
- 244, 1272, 739, 744, 256, 392, 154, 946, 435, 1346,
- 424, 398, 399, 126, 127, 843, 131, 132, 133, 134,
- 399, 131, 132, 133, 134, 944, 162, 160, 172, 616,
- 131, 132, 133, 134, 742, 745, 138, 139, 568, 997,
- 569, 732, 138, 139, 568, 440, 361, 163, 1002, 851,
- 138, 139, 400, 401, 448, 449, 450, 731, 452, 395,
- 396, 455, 456, 331, 457, 195, 196, 404, 1062, 650,
- 1063, 412, 167, 529, 179, 197, 470, 180, 190, 181,
- 168, 191, 198, 475, 476, 477, 478, 479, 480, 481,
- 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
- 492, 493, 494, 495, 496, 497, 498, 499, 500, 501,
- 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
- 512, 513, 514, 515, 516, 1113, 1192, 1376, 269, 521,
- 270, 1193, 38, 39, 40, 41, 138, 139, 563, 361,
- 46, 564, 187, 49, 171, 188, 533, 189, 946, 208,
- 1052, 1053, 544, 545, 546, 547, 548, 549, 550, 551,
- 552, 553, 554, 555, 556, 557, 558, 172, 131, 132,
- 133, 134, 173, 271, 440, 272, 630, 631, 463, 267,
- 572, 174, 175, 400, 401, 577, 176, 639, 138, 139,
- 582, 583, 584, 585, 209, 177, 1428, 590, 210, 609,
- 400, 401, 595, 596, 597, 783, 784, 785, 211, 400,
- 401, 119, 120, 121, 122, 178, 615, 123, 182, 610,
- 611, 612, 320, 321, 613, 332, 332, 192, 617, 618,
- 619, 620, 621, 193, 212, 625, 853, 971, 627, 628,
- 194, 801, 361, 361, 632, 633, 636, 400, 401, 638,
- 802, 400, 401, 361, 202, 801, 803, 804, 641, 643,
- 805, 806, 213, 930, 802, 605, 606, 947, 214, 801,
- 803, 804, 221, 396, 805, 806, 222, 223, 802, 400,
- 401, 400, 401, 663, 803, 804, 666, 239, 805, 806,
- 665, 249, 126, 127, 870, 1167, 240, 1227, 400, 401,
- 872, 273, 267, 274, 801, 275, 250, 276, 1279, 750,
- 1282, 251, 1285, 802, 1229, 241, 236, 362, 1262, 803,
- 804, 893, 362, 805, 806, 277, 362, 278, 279, 1320,
- 280, 252, 400, 401, 119, 120, 121, 122, 242, 636,
- 123, 248, 568, 1323, 574, 257, 735, 790, 1231, 733,
- 203, 258, 281, 204, 282, 259, 205, 1326, 260, 734,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 266, 361, 751, 283, 352, 284,
- 972, 643, 755, 827, 315, 1001, 1003, 441, 362, 285,
- 833, 286, 1388, 311, 312, 769, 400, 401, 400, 401,
- 774, 287, 289, 288, 290, 781, 781, 781, 781, 335,
- 313, 1367, 1239, 361, 1241, 126, 127, 793, 794, 782,
- 782, 782, 782, 797, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 817, 375, 819, 314,
- 352, 195, 196, 236, 236, 236, 444, 330, 291, 361,
- 292, 197, 400, 401, 391, 316, 361, 394, 206, 293,
- 1399, 294, 1402, 838, 1405, 840, 841, 792, 1242, 869,
- 1408, 844, 400, 401, 317, 318, 236, 420, 1152, 946,
- 809, 362, 946, 852, 295, 946, 296, 297, 1319, 298,
- 887, 888, 889, 890, 400, 401, 336, 299, 1430, 300,
- 1432, 353, 1434, 801, 400, 401, 354, 356, 400, 401,
- 1322, 301, 802, 302, 861, 862, 441, 366, 803, 804,
- 1325, 371, 805, 806, 1333, 1181, 400, 401, 863, 864,
- 865, 866, 867, 868, 801, 361, 377, 349, 350, 351,
- 871, 376, 1335, 802, 352, 393, 878, 400, 401, 803,
- 804, 378, 337, 805, 806, 379, 361, 361, 361, 361,
- 891, 383, 303, 1392, 304, 388, 305, 946, 306, 338,
- 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 445, 350, 351, 405, 362, 362, 307, 352, 308, 389,
- 1118, 1417, 390, 427, 801, 362, 1163, 406, 407, 946,
- 559, 644, 946, 802, 309, 946, 310, 416, 946, 803,
- 804, 417, 418, 805, 806, 421, 138, 139, 425, 897,
- 801, 432, 1419, 263, 428, 657, 144, 658, 264, 802,
- 946, 568, 946, 578, 946, 803, 804, 429, 436, 805,
- 806, 568, 568, 640, 730, 1274, 963, 852, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 430, 934, 935, 936, 352, 568, 446, 823,
- 984, 985, 568, 431, 824, 1182, 447, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 568, 433, 831, 1004, 352, 903, 1009, 904, 138,
- 139, 451, 437, 1080, 525, 568, 263, 928, 1421, 1019,
- 1021, 264, 347, 348, 349, 350, 351, 362, 568, 438,
- 962, 352, 453, 644, 756, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 568,
- 1010, 964, 1011, 352, 1054, 1055, 1056, 801, 568, 568,
- 1012, 1013, 454, 1065, 1067, 362, 802, 458, 568, 801,
- 1014, 1070, 803, 804, 459, 461, 805, 806, 802, 361,
- 568, 1101, 1015, 1102, 803, 804, 469, 471, 805, 806,
- 1142, 474, 1143, 1086, 1087, 1088, 568, 183, 1176, 472,
- 184, 362, 729, 185, 801, 186, 352, 1098, 362, 1198,
- 1096, 1199, 1104, 802, 1101, 1287, 1240, 1288, 534, 803,
- 804, 535, 1071, 805, 806, 144, 568, 1107, 1299, 1101,
- 1310, 1307, 1311, 537, 1101, 725, 1314, 568, 536, 1315,
- 1106, 568, 543, 1334, 1120, 1423, 1198, 1121, 1373, 581,
- 568, 801, 1391, 1126, 1127, 586, 587, 1441, 1129, 591,
- 802, 775, 568, 1290, 1393, 1135, 803, 804, 598, 592,
- 805, 806, 789, 601, 1101, 1145, 1397, 1146, 568, 1425,
- 1424, 1426, 1101, 1444, 1440, 1445, 593, 362, 1162, 594,
- 332, 1147, 1442, 600, 622, 624, 626, 637, 361, 1122,
- 648, 651, 361, 659, 660, 1177, 661, 662, 362, 362,
- 362, 362, 736, 722, 1185, 723, 724, 727, 726, 728,
- 737, 752, 753, 1194, 1195, 741, 754, 757, 1186, 758,
- 759, 761, 762, 1153, 763, 1156, 764, 1159, 766, 1443,
- 767, 778, 1248, 1207, 768, 776, 791, 795, 796, 1170,
- 818, 829, 1173, 1174, 834, 835, 836, 837, 1368, 845,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 1225, 846, 847, 1413, 352, 1273,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 1238, 848, 440, 849, 352, 858, 856, 860, 1294,
- 857, 873, 879, 1246, 881, 1247, 874, 1436, 361, 1439,
- 880, 883, 882, 886, 892, 896, 898, 1256, 901, 907,
- 908, 912, 1260, 913, 914, 915, 1450, 918, 929, 919,
- 920, 921, 899, 900, 922, 902, 923, 905, 906, 924,
- 925, 909, 910, 926, 927, 361, 937, 938, 939, 940,
- 949, 1277, 950, 1280, 951, 1283, 952, 332, 953, 955,
- 956, 957, 958, 960, 959, 361, 961, 968, 973, 1296,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 974,
- 980, 1305, 1306, 352, 981, 976, 983, 977, 1309, 978,
- 982, 1369, 1005, 1372, 998, 1313, 979, 988, 1006, 1317,
- 1016, 1000, 1278, 1023, 1281, 1028, 1284, 1024, 965, 966,
- 967, 1029, 1031, 1030, 1292, 1032, 1034, 1295, 1035, 1036,
- 1037, 362, 1041, 1042, 1057, 1064, 1044, 1045, 1104, 338,
- 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 1355, 1046, 1047, 1359, 352, 1051, 1363,
- 1410, 1068, 1069, 1366, 1076, 1082, 1077, 361, 1081, 361,
- 1083, 1084, 1089, 1085, 1090, 1108, 1109, 1091, 1375, 1111,
- 1114, 1377, 1115, 1116, 1117, 1027, 1123, 1124, 1125, 1128,
- 1130, 1033, 1131, 1132, 1133, 1136, 1141, 1038, 1039, 1040,
- 1144, 1154, 1157, 1043, 916, 1160, 1164, 1168, 1048, 1049,
- 1050, 1171, 1175, 1187, 1188, 1203, 1189, 1200, 1190, 1191,
- 1371, 1201, 1204, 1066, 1206, 1197, 361, 1213, 1214, 1205,
- 1215, 1216, 1217, 1075, 1218, 1219, 1220, 1079, 1223, 1224,
- 1234, 1226, 1236, 1228, 1230, 1243, 1232, 1245, 1237, 1250,
- 362, 1261, 1266, 1263, 362, 1267, 1268, 1269, 1270, 1271,
- 1092, 1093, 1094, 1095, 1286, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 1293,
- 1308, 1328, 1300, 352, 1301, 1105, 1337, 1329, 1338, 1302,
- 1303, 1316, 91, 224, 1304, 1332, 1339, 1340, 95, 96,
- 97, 1341, 1348, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 226, 911, 1350, 1351, 1137, 1138,
- 1139, 1140, 1353, 1356, 1357, 1360, 1361, 1364, 227, 1370,
- 1386, 228, 1365, 1394, 229, 441, 230, 1400, 1380, 1382,
- 1384, 1403, 1406, 1409, 1395, 1411, 1416, 1415, 1429, 1418,
- 362, 1420, 38, 39, 40, 41, 42, 1422, 1431, 1178,
- 46, 1427, 1433, 49, 1435, 1437, 1446, 1447, 1448, 1449,
- 1451, 1342, 1018, 1026, 77, 1196, 85, 0, 1110, 0,
- 0, 0, 589, 0, 0, 0, 0, 362, 0, 0,
- 0, 0, 0, 0, 0, 0, 125, 0, 0, 128,
- 129, 130, 0, 0, 0, 0, 0, 362, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 954, 0, 408,
- 1169, 0, 0, 0, 137, 0, 0, 0, 0, 410,
- 0, 0, 0, 0, 143, 0, 198, 442, 1235, 0,
+ 146, 601, 602, 145, 408, 1156, 76, 252, 245, 522,
+ 657, 739, 526, 324, 1004, 423, 1009, 214, 168, 242,
+ 150, 730, 931, 865, 148, 258, 152, 512, 513, 514,
+ 163, 516, 517, 518, 168, 163, 874, 254, 431, 189,
+ 256, 793, 190, 1313, 159, 207, 933, 419, 411, 420,
+ 794, 160, 457, 834, 459, 412, 795, 796, 4, 793,
+ 797, 798, 159, 217, 5, 218, 137, 138, 794, 734,
+ 149, 397, 398, 839, 795, 796, 151, 793, 797, 798,
+ 154, 509, 264, 521, 198, 200, 794, 206, 399, 936,
+ 208, 171, 795, 796, 209, 155, 797, 798, 737, 658,
+ 659, 660, 661, 264, 210, 397, 398, 932, 219, 137,
+ 138, 265, 325, 326, 118, 119, 120, 121, 1235, 156,
+ 122, 596, 866, 867, 215, 1039, 1040, 935, 317, 318,
+ 319, 934, 157, 320, 323, 118, 119, 120, 121, 161,
+ 740, 122, 1248, 740, 352, 1059, 329, 354, 397, 398,
+ 397, 398, 246, 356, 358, 361, 362, 253, 364, 358,
+ 366, 367, 662, 358, 370, 371, 137, 138, 216, 169,
+ 243, 259, 731, 260, 164, 153, 162, 995, 261, 164,
+ 557, 165, 172, 558, 389, 736, 735, 255, 432, 257,
+ 395, 396, 1314, 421, 158, 125, 126, 166, 835, 396,
+ 173, 130, 131, 132, 133, 397, 398, 174, 167, 610,
+ 938, 170, 724, 397, 398, 175, 125, 126, 171, 397,
+ 398, 603, 137, 138, 437, 358, 397, 398, 936, 839,
+ 400, 397, 398, 445, 446, 447, 410, 449, 392, 393,
+ 452, 453, 1045, 454, 1046, 521, 401, 609, 176, 644,
+ 409, 182, 177, 462, 183, 181, 1344, 184, 191, 185,
+ 467, 468, 469, 470, 471, 472, 473, 474, 475, 476,
+ 477, 478, 479, 480, 481, 482, 483, 484, 485, 486,
+ 487, 488, 489, 490, 491, 492, 493, 494, 495, 496,
+ 497, 498, 499, 500, 501, 502, 503, 504, 505, 506,
+ 507, 508, 1097, 192, 178, 202, 515, 179, 203, 180,
+ 554, 204, 377, 378, 379, 555, 358, 712, 884, 509,
+ 264, 527, 713, 562, 211, 1396, 525, 193, 201, 538,
+ 539, 540, 541, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 551, 552, 186, 416, 212, 187, 989, 188,
+ 213, 437, 118, 119, 120, 121, 984, 566, 122, 397,
+ 398, 562, 571, 130, 131, 132, 133, 576, 577, 578,
+ 579, 441, 841, 1171, 584, 1047, 221, 1048, 1172, 589,
+ 590, 591, 360, 137, 138, 220, 562, 365, 563, 222,
+ 723, 369, 238, 239, 194, 195, 604, 605, 606, 317,
+ 318, 607, 329, 329, 196, 611, 612, 613, 614, 615,
+ 240, 205, 619, 397, 398, 621, 622, 248, 241, 358,
+ 358, 626, 627, 630, 247, 266, 632, 267, 249, 1049,
+ 358, 1050, 860, 125, 126, 635, 637, 250, 862, 194,
+ 195, 263, 599, 600, 130, 131, 132, 133, 251, 196,
+ 393, 775, 776, 777, 308, 653, 197, 309, 656, 883,
+ 655, 328, 397, 398, 137, 138, 130, 131, 132, 133,
+ 137, 138, 312, 327, 235, 429, 359, 260, 920, 310,
+ 143, 359, 261, 311, 313, 359, 137, 138, 1238, 333,
+ 397, 398, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 442, 347, 348, 937, 793, 314, 793,
+ 349, 353, 268, 630, 269, 270, 794, 271, 794, 1147,
+ 727, 725, 795, 796, 795, 796, 797, 798, 797, 798,
+ 38, 39, 40, 41, 315, 346, 347, 348, 46, 363,
+ 350, 49, 349, 726, 523, 936, 438, 359, 936, 358,
+ 743, 936, 988, 990, 351, 637, 747, 397, 398, 397,
+ 398, 397, 398, 272, 368, 273, 332, 397, 398, 761,
+ 397, 398, 373, 1151, 766, 1207, 274, 1209, 275, 773,
+ 773, 773, 773, 1211, 375, 374, 1219, 358, 276, 376,
+ 277, 785, 786, 1292, 372, 1295, 278, 789, 279, 380,
+ 235, 235, 235, 774, 774, 774, 774, 385, 397, 398,
+ 809, 388, 811, 390, 391, 1255, 280, 1258, 281, 1261,
+ 397, 398, 386, 358, 1221, 936, 397, 398, 397, 398,
+ 358, 402, 387, 235, 417, 403, 1222, 830, 359, 832,
+ 833, 784, 1291, 282, 1294, 283, 1136, 624, 625, 397,
+ 398, 840, 793, 284, 801, 285, 404, 936, 633, 422,
+ 936, 794, 286, 936, 287, 1297, 936, 795, 796, 413,
+ 414, 797, 798, 438, 415, 397, 398, 397, 398, 460,
+ 397, 398, 424, 418, 849, 850, 425, 562, 936, 568,
+ 936, 1305, 936, 1307, 427, 288, 1360, 289, 851, 852,
+ 853, 854, 855, 856, 857, 426, 793, 358, 428, 290,
+ 1335, 291, 861, 430, 292, 794, 293, 294, 868, 295,
+ 433, 795, 796, 1102, 793, 797, 798, 434, 358, 358,
+ 358, 358, 881, 794, 296, 298, 297, 299, 1298, 795,
+ 796, 359, 359, 797, 798, 435, 300, 793, 301, 302,
+ 443, 303, 359, 444, 448, 1367, 794, 1370, 638, 1373,
+ 1165, 450, 795, 796, 793, 1376, 797, 798, 455, 137,
+ 138, 461, 451, 794, 519, 456, 260, 742, 463, 795,
+ 796, 261, 464, 797, 798, 304, 306, 305, 307, 793,
+ 349, 887, 1356, 1398, 562, 1400, 572, 1402, 794, 562,
+ 651, 634, 652, 458, 795, 796, 1250, 466, 797, 798,
+ 1385, 793, 710, 528, 711, 782, 529, 840, 953, 562,
+ 794, 722, 562, 530, 815, 793, 795, 796, 531, 143,
+ 797, 798, 537, 1387, 794, 924, 925, 926, 970, 971,
+ 795, 796, 575, 585, 797, 798, 562, 562, 816, 823,
+ 1389, 819, 580, 893, 793, 894, 581, 562, 825, 918,
+ 586, 587, 991, 794, 562, 588, 952, 996, 592, 795,
+ 796, 359, 594, 797, 798, 1391, 616, 638, 748, 1006,
+ 1008, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 595, 562, 1409, 954, 349,
+ 618, 344, 345, 346, 347, 348, 620, 631, 1166, 359,
+ 349, 1410, 645, 642, 1041, 1042, 1043, 728, 997, 562,
+ 998, 999, 714, 1052, 1054, 562, 562, 1000, 1001, 718,
+ 562, 1057, 1002, 720, 1084, 859, 1085, 715, 716, 358,
+ 1411, 1126, 729, 1127, 721, 359, 562, 1177, 1160, 1178,
+ 733, 719, 359, 1073, 1074, 1075, 877, 878, 879, 880,
+ 1084, 744, 1220, 1081, 1079, 1263, 745, 1264, 1087, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 1007, 0, 352, 0,
- 91, 224, 1251, 1252, 1253, 1254, 95, 96, 97, 0,
- 0, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 226, 0, 0, 0, 0, 0, 0, 362,
- 0, 362, 0, 0, 0, 0, 227, 0, 0, 228,
- 1289, 0, 229, 0, 230, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 38, 39, 40, 41, 42, 1202, 0, 0, 46, 0,
- 0, 49, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 362, 0,
- 352, 1327, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 125, 0, 0, 128, 129, 130,
- 0, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 135, 360, 352,
- 0, 0, 137, 0, 0, 0, 0, 140, 0, 0,
- 0, 0, 143, 0, 0, 442, 0, 91, 92, 93,
- 0, 94, 1379, 95, 96, 97, 0, 0, 98, 99,
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 444,
- 0, 119, 120, 121, 122, 0, 0, 123, 0, 0,
+ 348, 562, 1058, 1275, 1091, 349, 1084, 1282, 1279, 1283,
+ 1084, 746, 1286, 961, 562, 562, 1287, 1306, 1177, 750,
+ 1341, 1104, 749, 767, 1105, 751, 562, 1090, 1359, 753,
+ 1110, 1111, 754, 755, 781, 1113, 1266, 562, 1084, 1361,
+ 1365, 562, 1119, 1392, 1393, 1084, 1394, 1408, 1412, 359,
+ 1413, 756, 1129, 758, 1130, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 759, 1146, 760, 329, 349, 768,
+ 359, 359, 359, 359, 770, 358, 1106, 783, 1131, 358,
+ 787, 810, 1161, 788, 821, 826, 827, 828, 829, 837,
+ 844, 1169, 845, 836, 846, 848, 1173, 1174, 858, 863,
+ 864, 1381, 869, 870, 873, 872, 876, 882, 886, 888,
+ 1137, 891, 1140, 898, 1143, 1170, 897, 1187, 7, 8,
+ 902, 903, 904, 1336, 905, 908, 1154, 909, 910, 1157,
+ 1158, 1404, 911, 1407, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 1205, 912,
+ 1418, 913, 349, 914, 962, 532, 17, 18, 533, 20,
+ 21, 534, 23, 535, 25, 1218, 26, 437, 334, 29,
+ 30, 915, 32, 33, 34, 916, 917, 1226, 37, 1227,
+ 919, 927, 358, 929, 928, 930, 1232, 1067, 939, 940,
+ 945, 1236, 889, 890, 941, 892, 942, 895, 896, 943,
+ 946, 899, 900, 947, 54, 55, 56, 948, 949, 950,
+ 951, 958, 963, 964, 965, 358, 966, 967, 968, 969,
+ 1003, 1253, 974, 1256, 992, 1259, 985, 329, 993, 1010,
+ 987, 1015, 1011, 1018, 1024, 358, 1019, 1016, 1022, 1272,
+ 1017, 1021, 1023, 1028, 1029, 1044, 1055, 1277, 1278, 1031,
+ 1032, 1033, 1034, 1038, 1281, 1051, 1056, 1063, 1064, 1070,
+ 1071, 1285, 623, 1068, 1076, 1289, 1077, 1069, 955, 956,
+ 957, 1078, 1254, 1072, 1257, 1088, 1260, 1092, 1093, 1095,
+ 1114, 359, 1098, 1099, 1268, 1100, 1101, 1271, 553, 1107,
+ 1087, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 1323, 1108, 1109, 1327, 349,
+ 1112, 1331, 1115, 1116, 1120, 1334, 1125, 1117, 1128, 358,
+ 1138, 358, 1141, 1144, 1152, 1155, 1343, 1148, 1159, 1345,
+ 1176, 1179, 1180, 1014, 1181, 1193, 1183, 1184, 1185, 1020,
+ 1186, 1194, 1195, 1196, 1197, 1025, 1026, 1027, 1198, 1199,
+ 1200, 1030, 1203, 1204, 1214, 1206, 1035, 1036, 1037, 1216,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 444, 91, 224, 225, 352, 0,
- 0, 95, 96, 97, 0, 0, 98, 99, 100, 101,
+ 348, 1053, 1339, 1208, 358, 349, 1223, 1210, 1212, 1217,
+ 1230, 1062, 1225, 1237, 1242, 1066, 1243, 1244, 1239, 1245,
+ 1246, 1262, 1247, 1269, 7, 8, 1276, 359, 1280, 1300,
+ 1309, 359, 1301, 1288, 1304, 1316, 1318, 1333, 1319, 1321,
+ 1228, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 1324, 1325, 1328, 1329, 349,
+ 1089, 532, 17, 18, 533, 20, 21, 534, 23, 535,
+ 25, 1332, 26, 1249, 1338, 29, 30, 1348, 32, 33,
+ 34, 1350, 1352, 1354, 37, 7, 8, 1362, 1363, 1368,
+ 1371, 1374, 1377, 1270, 1379, 1384, 1383, 1397, 1386, 1399,
+ 1388, 1401, 1403, 1121, 1122, 1123, 1124, 1405, 1390, 1395,
+ 54, 55, 56, 1414, 1415, 1416, 1417, 1419, 1005, 438,
+ 1310, 1013, 532, 17, 18, 533, 20, 21, 534, 23,
+ 535, 25, 75, 26, 359, 83, 29, 30, 583, 32,
+ 33, 34, 1094, 0, 1162, 37, 0, 0, 0, 0,
+ 0, 717, 0, 0, 0, 0, 1175, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 359, 649, 0,
+ 0, 54, 55, 56, 0, 0, 0, 1337, 0, 1340,
+ 0, 0, 0, 0, 90, 223, 0, 359, 0, 0,
+ 94, 95, 96, 0, 0, 97, 98, 99, 100, 101,
102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 226, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 227, 0, 0, 228, 124, 0, 229, 0, 230,
- 0, 125, 126, 127, 128, 129, 130, 0, 0, 0,
- 0, 131, 132, 133, 134, 38, 39, 40, 41, 42,
- 0, 0, 0, 46, 135, 136, 49, 0, 0, 137,
- 0, 138, 139, 0, 140, 0, 141, 0, 142, 143,
- 0, 144, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 445, 350, 351, 0, 0, 0, 125,
- 352, 0, 128, 129, 130, 0, 0, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 567, 350,
- 351, 0, 135, 231, 0, 352, 0, 137, 0, 0,
- 0, 0, 140, 0, 91, 224, 1073, 143, 0, 232,
- 95, 96, 97, 0, 0, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 226, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 227, 7, 8, 228, 0, 0, 229, 0, 230, 0,
+ 112, 113, 114, 115, 116, 117, 225, 0, 0, 0,
+ 1215, 0, 0, 0, 0, 0, 0, 0, 0, 650,
+ 226, 0, 1378, 227, 0, 0, 228, 0, 229, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 38, 39, 40, 41, 42, 0,
- 0, 0, 46, 0, 0, 49, 0, 0, 538, 17,
- 18, 539, 20, 21, 540, 23, 541, 25, 0, 26,
- 0, 0, 29, 30, 0, 32, 33, 34, 0, 0,
- 0, 37, 0, 0, 0, 0, 0, 0, 125, 0,
- 0, 128, 129, 130, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 54, 55, 56,
- 0, 135, 231, 0, 0, 0, 137, 0, 0, 0,
- 0, 140, 0, 91, 224, 1378, 143, 0, 1074, 95,
- 96, 97, 0, 0, 98, 99, 100, 101, 102, 103,
+ 0, 0, 46, 0, 0, 49, 0, 0, 0, 0,
+ 0, 359, 0, 359, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 1265, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 124, 0,
+ 0, 0, 0, 127, 128, 129, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 405,
+ 1153, 0, 0, 0, 136, 0, 359, 0, 0, 407,
+ 0, 0, 90, 223, 142, 1299, 197, 439, 94, 95,
+ 96, 0, 0, 97, 98, 99, 100, 101, 102, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 226, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 629, 0, 227,
- 7, 8, 228, 0, 0, 229, 0, 230, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 38, 39, 40, 41, 42, 0, 0,
- 0, 46, 0, 0, 49, 0, 0, 538, 17, 18,
- 539, 20, 21, 540, 23, 541, 25, 0, 26, 0,
- 0, 29, 30, 0, 32, 33, 34, 0, 0, 0,
- 37, 0, 0, 0, 0, 0, 0, 125, 0, 0,
- 128, 129, 130, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 54, 55, 56, 0,
- 135, 231, 0, 0, 0, 137, 0, 0, 0, 0,
- 140, 0, 91, 224, 0, 143, 0, 232, 95, 96,
- 97, 0, 0, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 226, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 655, 0, 227, 7,
- 8, 228, 0, 0, 229, 0, 230, 0, 0, 0,
+ 114, 115, 116, 117, 225, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 226, 0,
+ 0, 227, 0, 0, 228, 0, 229, 0, 1347, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 38, 39, 40, 41, 42, 0, 0, 0,
- 46, 0, 0, 49, 0, 0, 538, 17, 18, 539,
- 20, 21, 540, 23, 541, 25, 0, 26, 0, 0,
- 29, 30, 0, 32, 33, 34, 0, 0, 0, 37,
- 0, 0, 0, 0, 0, 0, 125, 0, 0, 128,
- 129, 130, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 54, 55, 56, 0, 135,
- 231, 0, 0, 0, 137, 0, 0, 0, 0, 140,
- 0, 91, 224, 0, 143, 0, 232, 95, 96, 97,
- 0, 0, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 226, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 656, 0, 227, 7, 8,
- 228, 0, 0, 229, 0, 230, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 38, 39, 40, 41, 42, 0, 0, 0, 46,
- 0, 0, 49, 0, 0, 538, 17, 18, 539, 20,
- 21, 540, 23, 541, 25, 0, 26, 0, 0, 29,
+ 46, 90, 316, 49, 0, 0, 0, 94, 95, 96,
+ 0, 0, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 0, 0, 0, 124, 0, 0, 0,
+ 0, 127, 128, 129, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 134, 357, 0,
+ 0, 0, 136, 0, 0, 0, 0, 139, 0, 0,
+ 0, 0, 142, 0, 0, 439, 90, 91, 92, 0,
+ 93, 0, 94, 95, 96, 0, 0, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 0, 0,
+ 118, 119, 120, 121, 0, 124, 122, 0, 7, 8,
+ 127, 128, 129, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 134, 135, 0, 0,
+ 0, 136, 0, 0, 0, 0, 139, 0, 0, 321,
+ 0, 142, 0, 322, 0, 532, 17, 18, 533, 20,
+ 21, 534, 23, 535, 25, 0, 26, 0, 0, 29,
30, 0, 32, 33, 34, 0, 0, 0, 37, 0,
- 0, 0, 0, 0, 0, 125, 0, 0, 128, 129,
- 130, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 54, 55, 56, 0, 135, 360,
- 0, 0, 0, 137, 0, 0, 0, 0, 140, 0,
- 91, 224, 0, 143, 0, 439, 95, 96, 97, 0,
- 0, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 0, 0, 0, 0, 123, 0, 0, 0, 0, 0,
+ 124, 125, 126, 0, 0, 127, 128, 129, 130, 131,
+ 132, 133, 0, 0, 54, 55, 56, 0, 0, 0,
+ 0, 134, 135, 0, 0, 0, 136, 0, 137, 138,
+ 0, 139, 0, 140, 0, 141, 142, 0, 143, 90,
+ 223, 224, 0, 0, 0, 94, 95, 96, 0, 0,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 226, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 810, 0, 227, 7, 8, 228,
- 0, 0, 229, 0, 230, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 38, 39, 40, 41, 42, 0, 0, 0, 46, 0,
- 0, 49, 0, 0, 538, 17, 18, 539, 20, 21,
- 540, 23, 541, 25, 0, 26, 0, 0, 29, 30,
- 0, 32, 33, 34, 0, 0, 0, 37, 0, 0,
- 0, 0, 0, 0, 125, 0, 0, 128, 129, 130,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 54, 55, 56, 0, 135, 360, 0,
- 0, 0, 137, 0, 0, 0, 0, 140, 0, 91,
- 224, 0, 143, 0, 642, 95, 96, 97, 0, 0,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 226, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 839, 0, 227, 7, 8, 228, 0,
- 0, 229, 0, 230, 0, 0, 0, 0, 0, 0,
+ 117, 225, 802, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 226, 0, 0, 227, 0,
+ 0, 228, 0, 229, 0, 7, 8, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 38,
39, 40, 41, 42, 0, 0, 0, 46, 0, 0,
- 49, 0, 0, 538, 17, 18, 539, 20, 21, 540,
- 23, 541, 25, 0, 26, 0, 0, 29, 30, 0,
- 32, 33, 34, 0, 0, 0, 37, 0, 0, 0,
- 0, 0, 0, 125, 0, 0, 128, 129, 130, 0,
+ 49, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 532, 17, 18, 533, 20, 21, 534, 23,
+ 535, 25, 0, 26, 0, 0, 29, 30, 0, 32,
+ 33, 34, 0, 124, 0, 37, 0, 0, 127, 128,
+ 129, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 134, 230, 0, 0, 0, 136,
+ 0, 54, 55, 56, 139, 0, 90, 223, 1060, 142,
+ 0, 231, 94, 95, 96, 0, 0, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 225, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 54, 55, 56, 0, 135, 231, 0, 0,
- 0, 137, 0, 0, 1222, 0, 140, 0, 91, 224,
- 0, 143, 0, 1078, 95, 96, 97, 0, 0, 98,
- 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 226, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1330, 0, 227, 0, 0, 228, 0, 0,
- 229, 0, 230, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 38, 39,
- 40, 41, 42, 652, 91, 319, 46, 0, 0, 49,
- 95, 96, 97, 0, 0, 98, 99, 100, 101, 102,
+ 0, 0, 226, 0, 0, 227, 0, 0, 228, 831,
+ 229, 0, 7, 8, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 38, 39, 40, 41,
+ 42, 0, 0, 0, 46, 0, 0, 49, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 532,
+ 17, 18, 533, 20, 21, 534, 23, 535, 25, 0,
+ 26, 0, 0, 29, 30, 0, 32, 33, 34, 0,
+ 124, 0, 37, 0, 0, 127, 128, 129, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 134, 230, 0, 0, 0, 136, 0, 54, 55,
+ 56, 139, 0, 90, 223, 1346, 142, 0, 1061, 94,
+ 95, 96, 0, 0, 97, 98, 99, 100, 101, 102,
103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 0, 0, 0, 0,
- 0, 0, 125, 0, 0, 128, 129, 130, 0, 338,
+ 113, 114, 115, 116, 117, 225, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 226,
+ 0, 0, 227, 0, 0, 228, 1302, 229, 0, 7,
+ 8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 38, 39, 40, 41, 42, 0, 0,
+ 0, 46, 0, 0, 49, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 532, 17, 18, 533,
+ 20, 21, 534, 23, 535, 25, 0, 26, 0, 871,
+ 29, 30, 0, 32, 33, 34, 0, 124, 0, 37,
+ 0, 0, 127, 128, 129, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 134, 230,
+ 0, 0, 0, 136, 0, 54, 55, 56, 139, 0,
+ 90, 223, 0, 142, 0, 231, 94, 95, 96, 0,
+ 0, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 225, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 226, 0, 0, 227,
+ 0, 0, 228, 1357, 229, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 38, 39, 40, 41, 42, 0, 0, 0, 46, 0,
+ 0, 49, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 901, 0, 0, 0,
+ 0, 0, 0, 0, 124, 0, 0, 0, 0, 127,
+ 128, 129, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 134, 230, 0, 0, 0,
+ 136, 0, 0, 0, 0, 139, 0, 90, 223, 0,
+ 142, 0, 231, 94, 95, 96, 0, 0, 97, 98,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 225,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 226, 0, 0, 227, 0, 0, 228,
+ 0, 229, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 38, 39, 40,
+ 41, 42, 0, 0, 0, 46, 0, 0, 49, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 0,
+ 0, 0, 0, 944, 0, 0, 0, 0, 0, 0,
+ 0, 124, 0, 0, 0, 0, 127, 128, 129, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 134, 357, 0, 0, 0, 136, 0, 0,
+ 0, 0, 139, 0, 90, 223, 0, 142, 0, 436,
+ 94, 95, 96, 0, 0, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 225, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 226, 0, 0, 227, 0, 0, 228, 0, 229, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 38, 39, 40, 41, 42, 0,
+ 0, 0, 46, 0, 0, 49, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 408, 1169, 352, 0, 0,
- 137, 0, 0, 1249, 0, 410, 0, 91, 319, 267,
- 143, 0, 198, 95, 96, 97, 0, 0, 98, 99,
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 0,
- 0, 119, 120, 121, 122, 0, 0, 123, 125, 0,
- 0, 128, 129, 130, 0, 0, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 135, 136, 0, 352, 0, 137, 0, 0, 0,
- 0, 140, 0, 0, 324, 1336, 143, 0, 325, 91,
- 319, 0, 0, 0, 0, 95, 96, 97, 0, 0,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 994, 0, 0, 0, 0, 0, 0, 0, 124, 0,
+ 0, 0, 0, 127, 128, 129, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 134,
+ 357, 0, 0, 0, 136, 0, 0, 0, 0, 139,
+ 0, 90, 223, 0, 142, 0, 636, 94, 95, 96,
+ 0, 0, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 225, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 226, 0, 0,
+ 227, 0, 0, 228, 0, 229, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 38, 39, 40, 41, 42, 0, 0, 0, 46,
+ 0, 0, 49, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 124, 0, 0, 0, 0,
+ 127, 128, 129, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 134, 230, 0, 0,
+ 0, 136, 0, 0, 0, 0, 139, 0, 90, 223,
+ 0, 142, 0, 1065, 94, 95, 96, 0, 0, 97,
98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 125, 126, 127, 128, 129, 130, 746, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 135, 136, 352, 0, 0, 137,
- 0, 0, 1387, 0, 140, 0, 91, 319, 0, 143,
- 0, 1184, 95, 96, 97, 0, 0, 98, 99, 100,
+ 225, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 226, 0, 0, 227, 0, 0,
+ 228, 0, 229, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 38, 39,
+ 40, 41, 42, 0, 90, 316, 46, 0, 0, 49,
+ 94, 95, 96, 0, 0, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 0, 0, 0, 0,
+ 0, 0, 124, 0, 0, 0, 0, 127, 128, 129,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 405, 1153, 0, 0, 0, 136, 0,
+ 0, 0, 0, 407, 0, 90, 316, 264, 142, 0,
+ 197, 94, 95, 96, 0, 0, 97, 98, 99, 100,
101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 0, 0,
+ 111, 112, 113, 114, 115, 116, 117, 0, 0, 118,
+ 119, 120, 121, 0, 0, 122, 0, 0, 124, 0,
+ 0, 0, 0, 127, 128, 129, 0, 0, 0, 0,
+ 0, 1182, 0, 0, 0, 0, 0, 0, 0, 134,
+ 135, 0, 0, 0, 136, 0, 0, 0, 0, 139,
+ 0, 0, 628, 0, 142, 0, 629, 90, 316, 0,
+ 0, 0, 0, 94, 95, 96, 0, 0, 97, 98,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 124,
+ 125, 126, 1202, 0, 127, 128, 129, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 125, 0, 0, 128, 129, 130, 0,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 135, 136, 352, 0,
- 0, 137, 0, 0, 0, 0, 140, 0, 0, 634,
- 0, 143, 0, 635, 0, 0, 0, 0, 0, 0,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 125, 0, 0, 128, 129, 130, 0, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 408, 409, 352, 0, 0, 137, 0,
- 0, 0, 0, 410, 832, 91, 319, 0, 143, 0,
- 198, 95, 96, 97, 0, 0, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 91, 224, 0,
- 0, 0, 0, 95, 96, 97, 0, 0, 98, 99,
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 226,
+ 134, 135, 0, 0, 0, 136, 0, 0, 0, 0,
+ 139, 0, 90, 316, 0, 142, 0, 1168, 94, 95,
+ 96, 0, 0, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 124, 349, 0, 0, 0, 127, 128, 129, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 227, 0, 0, 228, 0, 0, 229,
- 0, 230, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 38, 39, 40,
- 41, 42, 0, 0, 0, 46, 0, 0, 49, 125,
- 0, 0, 128, 129, 130, 0, 0, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 135, 136, 0, 352, 0, 137, 0, 0,
- 0, 125, 140, 0, 128, 129, 130, 143, 0, 1020,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 135, 360, 0, 0, 352, 137,
- 91, 319, 267, 0, 140, 562, 95, 96, 97, 143,
- 0, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 0, 0, 405, 406, 0, 0, 0, 136, 0, 0,
+ 0, 0, 407, 0, 0, 0, 0, 142, 0, 197,
+ 0, 0, 0, 0, 0, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 0, 124, 0, 0, 0,
+ 0, 127, 128, 129, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 134, 135, 0,
+ 0, 0, 136, 0, 0, 0, 0, 139, 0, 90,
+ 223, 0, 142, 0, 1007, 94, 95, 96, 0, 0,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 0, 0, 119, 120, 121, 122, 7, 8,
- 123, 91, 319, 0, 0, 0, 0, 95, 96, 97,
- 0, 0, 98, 99, 100, 101, 102, 103, 104, 105,
+ 117, 225, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 226, 0, 0, 227, 0,
+ 0, 228, 0, 229, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 38,
+ 39, 40, 41, 42, 0, 90, 316, 46, 0, 0,
+ 49, 94, 95, 96, 0, 0, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 1229, 0, 0,
+ 0, 0, 0, 124, 0, 0, 0, 0, 127, 128,
+ 129, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 134, 357, 0, 0, 0, 136,
+ 90, 316, 264, 0, 139, 0, 94, 95, 96, 142,
+ 0, 97, 98, 99, 100, 101, 102, 103, 104, 105,
106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 970, 0, 538, 17, 18, 539, 20,
- 21, 540, 23, 541, 25, 0, 26, 0, 0, 29,
- 30, 0, 32, 33, 34, 0, 0, 0, 37, 0,
+ 116, 117, 1308, 0, 118, 119, 120, 121, 0, 0,
+ 122, 0, 0, 0, 0, 0, 0, 0, 0, 124,
+ 0, 1355, 0, 0, 127, 128, 129, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 125, 126, 127, 128, 129, 130,
- 0, 0, 0, 0, 54, 55, 56, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 135, 136, 0,
- 0, 0, 137, 0, 0, 0, 0, 140, 0, 0,
- 0, 0, 143, 0, 0, 125, 0, 0, 128, 129,
- 130, 0, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 135, 136,
- 352, 0, 0, 137, 1389, 0, 0, 1150, 140, 1151,
- 0, 0, 0, 143, 0, 0, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, -4, 1, 0, 352, -4, 0, 0, 0, 0,
- 0, 0, 0, -4, -4, 0, 0, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, -4, 0, 0,
- 0, 0, -4, -4, 771, -4, -4, -4, 0, -4,
- -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
- 0, -4, -4, -4, -4, -4, -4, -4, -4, -4,
+ 134, 135, 441, 0, 0, 136, 0, 0, 0, 0,
+ 139, 0, 0, 0, 0, 142, 0, 0, 0, 0,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 441, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 124, 125, 126, 0, 0, 127,
+ 128, 129, 0, 646, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 134, 135, 0, 0, 0,
+ 136, 0, 738, 0, 0, 139, 0, 0, 0, 0,
+ 142, 0, 0, 0, 0, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 824,
+ 0, 0, 0, 349, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 960, 0,
+ 0, 0, 349, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 442, 347, 348, 0, 0, 0,
+ 0, 349, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 561, 347, 348, 0,
+ 0, 0, 0, 349, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 906,
+ 0, 349, 0, 0, 0, 0, 0, 0, 0, 0,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, -4, 1, 0, 349, -4, 0,
+ 0, 0, 0, 0, 0, 0, -4, -4, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ -4, 0, 0, 0, 0, -4, -4, 0, -4, -4,
-4, 0, -4, -4, -4, -4, -4, -4, -4, -4,
- -4, -4, -4, -4, -4, -4, 0, 0, -4, -4,
- 0, 0, 0, -4, 0, 0, 0, 0, -4, -4,
- -4, -4, 0, 0, -4, 0, -4, 0, -4, -4,
- -4, -4, -4, -4, -4, -4, -4, -4, 0, 0,
- 6, 0, 0, 0, -4, -4, -4, -4, 7, 8,
- 0, 0, 0, 0, 0, 0, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 9, 0, 352, 0, 0, 10, 11, 0,
- 12, 13, 14, 813, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 0, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 0, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 0, 0, 50, 51, 0, 7, 8, 52, 0,
- 0, 0, 0, 53, 54, 55, 56, 0, 0, 57,
- 0, 58, 0, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 0, 0, 0, 0, 0, 0, 69,
- 70, 71, 72, 538, 17, 18, 539, 20, 21, 540,
- 23, 541, 25, 0, 26, 0, 0, 29, 30, 0,
- 32, 33, 34, 0, 0, 0, 37, 0, 0, 0,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 54, 55, 56, 1179, 0, 1180, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 1275, 0, 1276, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 0, 0, 830, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 0,
- 0, 854, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 0, 0, 933,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 0, 0, 1148, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 0, 0, 1166, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 0, 0, 1209, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 0,
- 0, 1210, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 0, 0, 1211,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 0, 0, 1212, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 0, 0, 1244, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 0, 0, 1291, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 0,
- 0, 1297, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 0, 0, 1298,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 0, 0, 1318, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 0, 0, 1321, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 0, 0, 1324, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 0,
- 0, 1349, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 0, 0, 1352,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 0, 0, 1381, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 0, 0, 1383, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 0, 0, 1385, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 0,
- 0, 1398, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 0, 599, 338,
+ -4, -4, -4, 0, -4, -4, -4, -4, -4, -4,
+ -4, -4, -4, -4, 0, -4, -4, -4, -4, -4,
+ -4, -4, -4, -4, -4, -4, -4, -4, -4, 6,
+ 0, -4, -4, 0, 0, 0, -4, 7, 8, 0,
+ 0, -4, -4, -4, -4, 0, 0, -4, 0, -4,
+ 0, -4, -4, -4, -4, -4, -4, -4, -4, -4,
+ -4, 9, 0, 0, -4, -4, 10, 11, 0, 12,
+ 13, 14, 0, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 0, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 0, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 7, 8, 50, 51, 0, 0, 0, 52, 0, 0,
+ 0, 0, 53, 54, 55, 56, 0, 0, 57, 0,
+ 58, 0, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 0, 0, 0, 69, 70, 532, 17, 18,
+ 533, 20, 21, 534, 23, 535, 25, 0, 26, 0,
+ 0, 29, 30, 0, 32, 33, 34, 0, 0, 0,
+ 37, 0, 0, 0, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 54, 55, 56, 1134,
+ 0, 1135, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 1163, 0, 1164,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 1251, 0, 1252, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 0, 0, 763, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 0,
- 0, 0, 0, 0, 0, 1221, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 526, 0, 0, 0,
- 0, 603, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 603, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 604, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 649,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 700, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 701, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 714, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 715, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 716,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 717, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 718, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 719, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 798, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 799,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 800, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 895, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 931, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 932, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 969,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 1099, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 1100, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 1119, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 0, 0, 0, 1257, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 0, 0, 0, 1258,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 0, 0, 0, 1264, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 0, 0,
- 0, 1344, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 0, 0, 0, 1347, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 530, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 0, 0, 654, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 664, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 0, 0, 679,
- 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 681, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 0, 0, 0,
- 0, 352, 0, 0, 0, 683, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 685, 338,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 0, 0, 805, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 0,
+ 0, 822, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 0, 0, 842,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 0, 0, 923, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1132, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1150, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1189, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 0, 0, 1190,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1191, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1192, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1224, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1267, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 0, 0, 1273,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1274, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1290, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 0,
- 0, 687, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 689, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,
- 0, 0, 0, 352, 0, 0, 0, 691, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 693, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 0, 0, 695, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 697, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 0, 0, 699,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1293, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1296, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 0, 0, 1317,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1320, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1349, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1351, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1353, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 0, 0, 1366,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 0, 593, 335, 336, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 703, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 0, 0, 0,
- 0, 352, 0, 0, 0, 705, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 707, 338,
+ 348, 0, 0, 0, 0, 349, 0, 0, 0, 0,
+ 0, 0, 0, 1201, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 520, 0, 0, 0, 0, 597,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 556, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 597, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 598, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 643, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 690,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 691, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 704, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 705, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 706, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 707,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 708, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 0,
- 0, 709, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 711, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,
- 0, 0, 0, 352, 0, 0, 0, 713, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 821, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 0, 0, 822, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 825, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 0, 0, 826,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 709, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 790, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 791, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 792,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 885, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 921, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 922, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 959, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 1082,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 1083, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 1103, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 0, 0, 0, 1233, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 0, 0, 0, 1234, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 0, 0, 0, 1240,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 0, 0, 0, 1312, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 0, 0, 0, 0,
+ 0, 1315, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 524, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 0, 0, 648, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 654, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 0, 0, 669, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 671, 335, 336, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 0, 0, 828, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 0, 0, 0,
- 0, 352, 0, 0, 0, 850, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 0, 0, 975, 338,
+ 348, 0, 0, 0, 0, 349, 0, 0, 0, 673,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 675, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 0, 0, 677, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 0,
- 0, 990, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 0, 0, 992, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,
- 0, 0, 0, 352, 0, 0, 0, 994, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 0, 0,
- 996, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 0, 0, 1112, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 0, 0, 1233, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 526, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 566, 338,
+ 0, 0, 0, 0, 349, 0, 0, 0, 679, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 0,
+ 0, 681, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 683, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 0, 0, 685, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 687, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 0, 0, 689, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 693, 335, 336, 337,
+ 338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
+ 348, 0, 0, 0, 0, 349, 0, 0, 0, 695,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 697, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 0, 0, 699, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 570,
+ 0, 0, 0, 0, 349, 0, 0, 0, 701, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 0,
+ 0, 703, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 813, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 0, 0, 814, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 817, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 0, 0, 818, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 0, 0, 820, 335, 336, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 571, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 573, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 575, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 0, 0, 0,
- 0, 352, 0, 576, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 579, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,
- 0, 0, 0, 352, 0, 580, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 645, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 646, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 647, 338,
+ 348, 0, 0, 0, 0, 349, 0, 0, 0, 838,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 0, 0, 976, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 0, 0, 978, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 653,
+ 0, 0, 0, 0, 349, 0, 0, 0, 980, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 0,
+ 0, 982, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 0, 0, 983, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 0, 0, 1096, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 0, 0,
+ 1213, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 520, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 560, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 564, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 565, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 567, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 0, 0, 0, 0, 349, 0, 569, 335, 336, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 678, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 680, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 682, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 0, 0, 0,
- 0, 352, 0, 684, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 686, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,
- 0, 0, 0, 352, 0, 688, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 690, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 692, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 694, 338,
+ 348, 0, 0, 0, 0, 349, 0, 570, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 573, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 574,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 639, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 640, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 641, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 647, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 668, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 670, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 696,
+ 0, 0, 0, 0, 349, 0, 672, 335, 336, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 698, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 702, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 704, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 0, 0, 0,
- 0, 352, 0, 706, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 708, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,
- 0, 0, 0, 352, 0, 710, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 712, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 760, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 765, 338,
+ 348, 0, 0, 0, 0, 349, 0, 674, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 676, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 678,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 680, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 682, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 684, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 686, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 688, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 692, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 770,
+ 0, 0, 0, 0, 349, 0, 694, 335, 336, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 772, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 773, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 779, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 0, 0, 0,
- 0, 352, 0, 786, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 787, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,
- 0, 0, 0, 352, 0, 788, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 812, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 814, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 815, 338,
+ 348, 0, 0, 0, 0, 349, 0, 696, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 698, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 700,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 702, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 752, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 757, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 762, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 764, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 765, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 816,
+ 0, 0, 0, 0, 349, 0, 771, 335, 336, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 820, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352,
- 0, 989, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 0, 0, 0, 0,
- 352, 0, 991, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 0, 0, 0,
- 0, 352, 0, 993, 338, 339, 340, 341, 342, 343,
- 344, 345, 346, 347, 348, 349, 350, 351, 0, 0,
- 0, 0, 352, 0, 995, 338, 339, 340, 341, 342,
- 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,
- 0, 0, 0, 352, 0, 999, 338, 339, 340, 341,
- 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
- 0, 0, 0, 0, 352, 0, 1149, 338, 339, 340,
- 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 0, 0, 0, 0, 352, 0, 1165, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 0, 0, 0, 0, 352, 0, 1183, 338,
+ 348, 0, 0, 0, 0, 349, 0, 778, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 779, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 780,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 804, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 806, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 807, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 808, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 812, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349, 0, 975, 335, 336, 337, 338,
339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
- 349, 350, 351, 0, 0, 0, 0, 352, 0, 1343,
+ 0, 0, 0, 0, 349, 0, 977, 335, 336, 337,
338, 339, 340, 341, 342, 343, 344, 345, 346, 347,
- 348, 349, 350, 351, 0, 0, 0, 0, 352, 0,
- 1396, 338, 339, 340, 341, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 0, 0, 0, 0, 352
+ 348, 0, 0, 0, 0, 349, 0, 979, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 0, 0, 0, 0, 349, 0, 981, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 0, 0, 0, 0, 349, 0, 986,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 0, 0, 0, 0, 349, 0,
+ 1133, 335, 336, 337, 338, 339, 340, 341, 342, 343,
+ 344, 345, 346, 347, 348, 0, 0, 0, 0, 349,
+ 0, 1149, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 0, 0, 0, 0,
+ 349, 0, 1167, 335, 336, 337, 338, 339, 340, 341,
+ 342, 343, 344, 345, 346, 347, 348, 0, 0, 0,
+ 0, 349, 0, 1311, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 0, 0,
+ 0, 0, 349, 0, 1364, 335, 336, 337, 338, 339,
+ 340, 341, 342, 343, 344, 345, 346, 347, 348, 0,
+ 0, 0, 0, 349
};
static const yytype_int16 yycheck[] =
{
- 6, 5, 206, 402, 403, 6, 3, 6, 6, 0,
- 258, 259, 260, 217, 6, 324, 4, 4, 327, 13,
- 4, 6, 4, 4, 4, 4, 4, 4, 151, 4,
- 4, 150, 5, 156, 739, 6, 5, 1076, 6, 6,
- 70, 4, 4, 6, 6, 140, 141, 150, 7, 79,
- 254, 4, 256, 55, 157, 85, 86, 6, 70, 89,
- 90, 6, 157, 311, 312, 313, 314, 79, 316, 317,
- 318, 811, 6, 85, 86, 150, 7, 89, 90, 4,
- 5, 7, 157, 151, 39, 40, 49, 42, 156, 161,
- 7, 6, 140, 141, 166, 140, 141, 6, 170, 179,
- 180, 181, 94, 140, 141, 93, 94, 95, 96, 157,
- 152, 156, 37, 38, 39, 40, 140, 141, 43, 156,
- 6, 158, 140, 141, 91, 103, 104, 111, 158, 135,
- 136, 137, 212, 157, 140, 141, 147, 148, 156, 137,
- 158, 140, 141, 154, 151, 151, 158, 144, 154, 156,
- 103, 104, 137, 157, 160, 161, 162, 163, 1197, 165,
- 166, 167, 168, 150, 170, 171, 172, 147, 148, 150,
- 158, 150, 152, 157, 154, 157, 157, 882, 157, 159,
- 157, 1220, 157, 157, 157, 191, 157, 807, 157, 157,
- 152, 197, 198, 118, 119, 154, 127, 128, 129, 130,
- 206, 127, 128, 129, 130, 91, 150, 150, 150, 413,
- 127, 128, 129, 130, 157, 157, 147, 148, 156, 151,
- 158, 530, 147, 148, 156, 231, 232, 150, 7, 154,
- 147, 148, 140, 141, 240, 241, 242, 154, 244, 194,
- 195, 247, 248, 4, 250, 140, 141, 202, 156, 453,
- 158, 206, 150, 325, 52, 150, 262, 55, 52, 57,
- 150, 55, 157, 269, 270, 271, 272, 273, 274, 275,
+ 6, 399, 400, 6, 205, 1063, 3, 5, 4, 321,
+ 4, 6, 324, 4, 6, 216, 6, 4, 4, 4,
+ 55, 4, 6, 4, 6, 4, 6, 309, 310, 311,
+ 4, 313, 314, 315, 4, 4, 731, 5, 5, 52,
+ 6, 70, 55, 6, 148, 4, 6, 4, 148, 6,
+ 79, 155, 253, 7, 255, 155, 85, 86, 6, 70,
+ 89, 90, 148, 4, 0, 6, 145, 146, 79, 155,
+ 13, 138, 139, 152, 85, 86, 148, 70, 89, 90,
+ 6, 4, 5, 7, 39, 40, 79, 42, 155, 799,
+ 49, 148, 85, 86, 53, 6, 89, 90, 155, 93,
+ 94, 95, 96, 5, 63, 138, 139, 91, 49, 145,
+ 146, 93, 103, 104, 37, 38, 39, 40, 1176, 6,
+ 43, 154, 103, 104, 111, 6, 7, 156, 134, 135,
+ 136, 91, 6, 139, 140, 37, 38, 39, 40, 148,
+ 135, 43, 1200, 135, 150, 156, 143, 153, 138, 139,
+ 138, 139, 148, 159, 160, 161, 162, 155, 164, 165,
+ 166, 167, 156, 169, 170, 171, 145, 146, 155, 155,
+ 155, 150, 155, 152, 148, 155, 148, 872, 157, 148,
+ 151, 155, 59, 154, 190, 155, 155, 155, 155, 155,
+ 196, 197, 155, 150, 150, 118, 119, 148, 152, 205,
+ 55, 125, 126, 127, 128, 138, 139, 55, 148, 410,
+ 803, 148, 524, 138, 139, 6, 118, 119, 148, 138,
+ 139, 154, 145, 146, 230, 231, 138, 139, 938, 152,
+ 155, 138, 139, 239, 240, 241, 155, 243, 193, 194,
+ 246, 247, 154, 249, 156, 7, 201, 154, 55, 450,
+ 205, 49, 55, 259, 52, 57, 1314, 55, 148, 57,
+ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
276, 277, 278, 279, 280, 281, 282, 283, 284, 285,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
- 306, 307, 308, 309, 310, 1010, 151, 1346, 150, 315,
- 152, 156, 73, 74, 75, 76, 147, 148, 153, 325,
- 81, 156, 52, 84, 150, 55, 327, 57, 948, 4,
- 6, 7, 338, 339, 340, 341, 342, 343, 344, 345,
- 346, 347, 348, 349, 350, 351, 352, 150, 127, 128,
- 129, 130, 59, 150, 360, 152, 428, 429, 4, 5,
- 366, 55, 55, 140, 141, 371, 6, 439, 147, 148,
- 376, 377, 378, 379, 49, 55, 1415, 383, 53, 156,
- 140, 141, 388, 389, 390, 592, 593, 594, 63, 140,
- 141, 37, 38, 39, 40, 55, 156, 43, 57, 405,
- 406, 407, 408, 409, 410, 402, 403, 150, 414, 415,
- 416, 417, 418, 52, 55, 421, 664, 8, 424, 425,
- 157, 70, 428, 429, 430, 431, 432, 140, 141, 435,
- 79, 140, 141, 439, 157, 70, 85, 86, 444, 445,
- 89, 90, 55, 156, 79, 400, 401, 156, 52, 70,
- 85, 86, 52, 408, 89, 90, 4, 4, 79, 140,
- 141, 140, 141, 469, 85, 86, 472, 4, 89, 90,
- 471, 6, 118, 119, 722, 156, 150, 156, 140, 141,
- 728, 150, 5, 152, 70, 150, 152, 152, 1228, 561,
- 1230, 4, 1232, 79, 156, 150, 52, 161, 1203, 85,
- 86, 749, 166, 89, 90, 150, 170, 152, 150, 158,
- 152, 4, 140, 141, 37, 38, 39, 40, 150, 525,
- 43, 150, 156, 158, 158, 150, 532, 599, 156, 530,
- 49, 150, 150, 52, 152, 150, 55, 158, 150, 531,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 157, 561, 562, 150, 149, 152,
- 151, 567, 568, 635, 7, 874, 875, 231, 232, 150,
- 642, 152, 158, 150, 150, 581, 140, 141, 140, 141,
- 586, 150, 150, 152, 152, 591, 592, 593, 594, 145,
- 150, 1331, 156, 599, 156, 118, 119, 603, 604, 591,
- 592, 593, 594, 609, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 622, 173, 624, 150,
- 149, 140, 141, 179, 180, 181, 8, 4, 150, 635,
- 152, 150, 140, 141, 190, 150, 642, 193, 157, 150,
- 1380, 152, 1382, 649, 1384, 651, 652, 602, 156, 721,
- 1390, 657, 140, 141, 150, 150, 212, 213, 1057, 1279,
- 615, 325, 1282, 664, 150, 1285, 152, 150, 156, 152,
- 742, 743, 744, 745, 140, 141, 6, 150, 1418, 152,
- 1420, 6, 1422, 70, 140, 141, 6, 5, 140, 141,
- 156, 150, 79, 152, 700, 701, 360, 150, 85, 86,
- 156, 150, 89, 90, 156, 8, 140, 141, 714, 715,
- 716, 717, 718, 719, 70, 721, 157, 142, 143, 144,
- 726, 150, 156, 79, 149, 4, 732, 140, 141, 85,
- 86, 150, 6, 89, 90, 150, 742, 743, 744, 745,
- 746, 150, 150, 156, 152, 150, 150, 1367, 152, 131,
+ 306, 307, 997, 52, 52, 49, 312, 55, 52, 57,
+ 149, 55, 178, 179, 180, 154, 322, 149, 149, 4,
+ 5, 324, 154, 154, 55, 1383, 7, 155, 155, 335,
+ 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
+ 346, 347, 348, 349, 52, 211, 55, 55, 7, 57,
+ 52, 357, 37, 38, 39, 40, 149, 363, 43, 138,
+ 139, 154, 368, 125, 126, 127, 128, 373, 374, 375,
+ 376, 8, 654, 149, 380, 154, 4, 156, 154, 385,
+ 386, 387, 160, 145, 146, 52, 154, 165, 156, 4,
+ 152, 169, 4, 148, 138, 139, 402, 403, 404, 405,
+ 406, 407, 399, 400, 148, 411, 412, 413, 414, 415,
+ 148, 155, 418, 138, 139, 421, 422, 6, 148, 425,
+ 426, 427, 428, 429, 148, 148, 432, 150, 150, 154,
+ 436, 156, 714, 118, 119, 441, 442, 4, 720, 138,
+ 139, 155, 397, 398, 125, 126, 127, 128, 4, 148,
+ 405, 586, 587, 588, 148, 461, 155, 148, 464, 741,
+ 463, 4, 138, 139, 145, 146, 125, 126, 127, 128,
+ 145, 146, 7, 4, 52, 150, 160, 152, 154, 148,
+ 155, 165, 157, 148, 148, 169, 145, 146, 1183, 6,
+ 138, 139, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 154, 70, 148, 70,
+ 147, 5, 148, 519, 150, 148, 79, 150, 79, 156,
+ 526, 524, 85, 86, 85, 86, 89, 90, 89, 90,
+ 73, 74, 75, 76, 148, 140, 141, 142, 81, 148,
+ 6, 84, 147, 525, 322, 1255, 230, 231, 1258, 555,
+ 556, 1261, 864, 865, 6, 561, 562, 138, 139, 138,
+ 139, 138, 139, 148, 148, 150, 144, 138, 139, 575,
+ 138, 139, 148, 154, 580, 154, 148, 154, 150, 585,
+ 586, 587, 588, 154, 148, 155, 154, 593, 148, 148,
+ 150, 597, 598, 156, 172, 156, 148, 603, 150, 148,
+ 178, 179, 180, 585, 586, 587, 588, 148, 138, 139,
+ 616, 189, 618, 4, 192, 1208, 148, 1210, 150, 1212,
+ 138, 139, 148, 629, 154, 1335, 138, 139, 138, 139,
+ 636, 155, 148, 211, 212, 155, 154, 643, 322, 645,
+ 646, 596, 154, 148, 154, 150, 1044, 425, 426, 138,
+ 139, 654, 70, 148, 609, 150, 155, 1367, 436, 150,
+ 1370, 79, 148, 1373, 150, 154, 1376, 85, 86, 148,
+ 148, 89, 90, 357, 148, 138, 139, 138, 139, 257,
+ 138, 139, 6, 148, 690, 691, 155, 154, 1398, 156,
+ 1400, 154, 1402, 154, 150, 148, 154, 150, 704, 705,
+ 706, 707, 708, 709, 710, 155, 70, 713, 150, 148,
+ 1303, 150, 718, 150, 148, 79, 150, 148, 724, 150,
+ 5, 85, 86, 1005, 70, 89, 90, 5, 734, 735,
+ 736, 737, 738, 79, 148, 148, 150, 150, 156, 85,
+ 86, 425, 426, 89, 90, 5, 148, 70, 150, 148,
+ 6, 150, 436, 6, 152, 1348, 79, 1350, 442, 1352,
+ 8, 155, 85, 86, 70, 1358, 89, 90, 6, 145,
+ 146, 150, 106, 79, 150, 6, 152, 555, 4, 85,
+ 86, 157, 155, 89, 90, 148, 148, 150, 150, 70,
+ 147, 746, 156, 1386, 154, 1388, 156, 1390, 79, 154,
+ 154, 156, 156, 6, 85, 86, 1204, 6, 89, 90,
+ 156, 70, 150, 152, 152, 593, 7, 820, 824, 154,
+ 79, 156, 154, 150, 156, 70, 85, 86, 156, 155,
+ 89, 90, 6, 156, 79, 790, 791, 792, 844, 845,
+ 85, 86, 7, 148, 89, 90, 154, 154, 156, 156,
+ 156, 629, 7, 55, 70, 57, 7, 154, 636, 156,
+ 148, 148, 865, 79, 154, 148, 156, 873, 7, 85,
+ 86, 555, 149, 89, 90, 156, 7, 561, 562, 885,
+ 886, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 6, 154, 156, 156, 147,
+ 7, 138, 139, 140, 141, 142, 6, 4, 156, 593,
+ 147, 156, 155, 103, 920, 921, 922, 6, 154, 154,
+ 156, 156, 154, 929, 930, 154, 154, 156, 156, 154,
+ 154, 937, 156, 154, 154, 713, 156, 149, 149, 945,
+ 156, 4, 4, 6, 522, 629, 154, 154, 156, 156,
+ 151, 149, 636, 959, 960, 961, 734, 735, 736, 737,
+ 154, 6, 156, 969, 967, 154, 4, 156, 974, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, 157, 428, 429, 150, 149, 152, 150,
- 1018, 158, 150, 6, 70, 439, 158, 157, 157, 1399,
- 6, 445, 1402, 79, 150, 1405, 152, 150, 1408, 85,
- 86, 150, 150, 89, 90, 150, 147, 148, 152, 754,
- 70, 152, 158, 154, 157, 152, 157, 154, 159, 79,
- 1430, 156, 1432, 158, 1434, 85, 86, 157, 5, 89,
- 90, 156, 156, 158, 158, 1224, 832, 828, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 152, 798, 799, 800, 149, 156, 6, 158,
- 856, 857, 156, 152, 158, 158, 6, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 156, 152, 158, 875, 149, 55, 883, 57, 147,
- 148, 154, 5, 955, 152, 156, 154, 158, 158, 895,
- 896, 159, 140, 141, 142, 143, 144, 561, 156, 5,
- 158, 149, 157, 567, 568, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 156,
- 156, 158, 158, 149, 930, 931, 932, 70, 156, 156,
- 158, 158, 106, 939, 940, 599, 79, 6, 156, 70,
- 158, 947, 85, 86, 6, 6, 89, 90, 79, 955,
- 156, 156, 158, 158, 85, 86, 152, 4, 89, 90,
- 4, 6, 6, 969, 970, 971, 156, 49, 158, 157,
- 52, 635, 528, 55, 70, 57, 149, 983, 642, 156,
- 981, 158, 988, 79, 156, 156, 158, 158, 154, 85,
- 86, 7, 947, 89, 90, 157, 156, 1003, 158, 156,
- 156, 158, 158, 158, 156, 6, 158, 156, 152, 158,
- 1002, 156, 6, 158, 1020, 158, 156, 1023, 158, 7,
- 156, 70, 158, 1029, 1030, 7, 7, 158, 1034, 150,
- 79, 587, 156, 1237, 158, 1041, 85, 86, 7, 150,
- 89, 90, 598, 6, 156, 1051, 158, 1053, 156, 156,
- 158, 158, 156, 156, 158, 158, 150, 721, 1064, 150,
- 1057, 1053, 158, 151, 7, 7, 6, 4, 1074, 1024,
- 103, 157, 1078, 151, 151, 1081, 151, 151, 742, 743,
- 744, 745, 6, 156, 1090, 151, 151, 151, 156, 156,
- 4, 6, 4, 1099, 1100, 153, 7, 106, 1090, 7,
- 7, 7, 106, 1058, 7, 1060, 7, 1062, 106, 158,
- 7, 6, 1184, 1119, 7, 4, 154, 158, 158, 1074,
- 6, 153, 1077, 1078, 7, 7, 7, 154, 1332, 4,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 1150, 7, 7, 1395, 149, 1221,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 1167, 7, 1169, 7, 149, 157, 150, 6, 1241,
- 150, 6, 6, 1179, 6, 1181, 153, 1425, 1184, 1427,
- 6, 152, 7, 6, 137, 7, 55, 1193, 7, 7,
- 57, 7, 1198, 7, 7, 7, 1444, 6, 4, 7,
- 151, 151, 758, 759, 151, 761, 151, 763, 764, 7,
- 7, 767, 768, 7, 6, 1221, 4, 6, 157, 150,
- 7, 1227, 6, 1229, 7, 1231, 7, 1224, 7, 157,
- 6, 6, 6, 6, 55, 1241, 6, 4, 4, 1245,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 4,
- 6, 1257, 1258, 149, 4, 157, 150, 157, 1264, 157,
- 6, 1333, 154, 1335, 151, 1271, 157, 157, 7, 1275,
- 6, 151, 1227, 157, 1229, 6, 1231, 63, 834, 835,
- 836, 157, 6, 157, 1239, 6, 157, 1242, 6, 6,
- 5, 955, 4, 6, 157, 152, 7, 7, 1304, 131,
+ 142, 154, 937, 156, 990, 147, 154, 154, 156, 156,
+ 154, 7, 156, 8, 154, 154, 156, 156, 154, 7,
+ 156, 1007, 106, 581, 1010, 7, 154, 989, 156, 7,
+ 1016, 1017, 106, 7, 592, 1021, 1217, 154, 154, 156,
+ 156, 154, 1028, 156, 154, 154, 156, 156, 154, 713,
+ 156, 7, 1038, 106, 1040, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 7, 1051, 7, 1044, 147, 4,
+ 734, 735, 736, 737, 6, 1061, 1011, 152, 1040, 1065,
+ 156, 6, 1068, 156, 151, 7, 7, 7, 152, 6,
+ 148, 1077, 148, 651, 155, 6, 1082, 1083, 4, 6,
+ 151, 1363, 6, 6, 150, 7, 6, 135, 7, 55,
+ 1045, 7, 1047, 57, 1049, 1077, 7, 1103, 12, 13,
+ 7, 7, 7, 1304, 7, 6, 1061, 7, 149, 1064,
+ 1065, 1393, 149, 1395, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 1134, 149,
+ 1412, 149, 147, 7, 149, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 1151, 60, 1153, 6, 63,
+ 64, 7, 66, 67, 68, 7, 6, 1163, 72, 1165,
+ 4, 4, 1168, 155, 6, 148, 1172, 945, 7, 6,
+ 155, 1177, 750, 751, 7, 753, 7, 755, 756, 7,
+ 6, 759, 760, 6, 98, 99, 100, 6, 55, 6,
+ 6, 4, 4, 4, 156, 1201, 6, 4, 6, 148,
+ 6, 1207, 155, 1209, 152, 1211, 149, 1204, 7, 155,
+ 149, 6, 63, 6, 5, 1221, 6, 155, 6, 1225,
+ 155, 155, 6, 4, 6, 155, 6, 1233, 1234, 7,
+ 7, 7, 7, 7, 1240, 150, 6, 155, 155, 6,
+ 6, 1247, 156, 155, 6, 1251, 7, 151, 826, 827,
+ 828, 6, 1207, 102, 1209, 152, 1211, 6, 4, 6,
+ 5, 945, 6, 6, 1219, 6, 6, 1222, 6, 6,
+ 1276, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 1291, 6, 6, 1294, 147,
+ 6, 1297, 6, 6, 6, 1301, 6, 106, 6, 1305,
+ 6, 1307, 6, 6, 6, 6, 1312, 154, 6, 1315,
+ 155, 4, 6, 891, 6, 5, 7, 6, 152, 897,
+ 6, 53, 6, 6, 6, 903, 904, 905, 6, 6,
+ 155, 909, 6, 155, 6, 156, 914, 915, 916, 7,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, 1319, 7, 7, 1322, 149, 7, 1325,
- 1392, 6, 6, 1329, 157, 153, 157, 1333, 157, 1335,
- 6, 6, 6, 102, 7, 6, 4, 154, 1344, 6,
- 6, 1347, 6, 6, 6, 901, 6, 6, 6, 6,
- 5, 907, 6, 6, 106, 6, 6, 913, 914, 915,
- 6, 6, 6, 919, 70, 6, 156, 6, 924, 925,
- 926, 6, 6, 4, 156, 7, 156, 6, 156, 156,
- 1335, 6, 6, 939, 6, 157, 1392, 5, 53, 154,
- 6, 6, 6, 949, 6, 6, 157, 953, 6, 157,
- 6, 158, 7, 157, 157, 6, 157, 101, 157, 6,
- 1074, 6, 6, 104, 1078, 6, 6, 6, 6, 157,
- 976, 977, 978, 979, 6, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 6,
- 6, 6, 158, 149, 158, 1001, 6, 70, 6, 158,
- 158, 158, 3, 4, 157, 157, 6, 6, 9, 10,
- 11, 6, 4, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 6, 6, 6, 1044, 1045,
- 1046, 1047, 6, 6, 6, 6, 6, 6, 49, 6,
- 6, 52, 158, 6, 55, 1169, 57, 6, 157, 157,
- 157, 6, 6, 6, 157, 6, 6, 157, 6, 157,
- 1184, 157, 73, 74, 75, 76, 77, 157, 6, 1085,
- 81, 157, 6, 84, 6, 6, 6, 6, 6, 6,
- 6, 1304, 894, 900, 3, 1101, 3, -1, 1006, -1,
- -1, -1, 382, -1, -1, -1, -1, 1221, -1, -1,
- -1, -1, -1, -1, -1, -1, 117, -1, -1, 120,
- 121, 122, -1, -1, -1, -1, -1, 1241, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 6, -1, 140,
- 141, -1, -1, -1, 145, -1, -1, -1, -1, 150,
- -1, -1, -1, -1, 155, -1, 157, 158, 1164, -1,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, 6, -1, 149, -1,
- 3, 4, 1188, 1189, 1190, 1191, 9, 10, 11, -1,
- -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, -1, -1, -1, -1, -1, -1, 1333,
- -1, 1335, -1, -1, -1, -1, 49, -1, -1, 52,
- 1236, -1, 55, -1, 57, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 73, 74, 75, 76, 77, 6, -1, -1, 81, -1,
- -1, 84, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, 1392, -1,
- 149, 1287, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 117, -1, -1, 120, 121, 122,
- -1, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, 140, 141, 149,
- -1, -1, 145, -1, -1, -1, -1, 150, -1, -1,
- -1, -1, 155, -1, -1, 158, -1, 3, 4, 5,
- -1, 7, 1348, 9, 10, 11, -1, -1, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 8,
- -1, 37, 38, 39, 40, -1, -1, 43, -1, -1,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 8, 3, 4, 5, 149, -1,
- -1, 9, 10, 11, -1, -1, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 49, -1, -1, 52, 111, -1, 55, -1, 57,
- -1, 117, 118, 119, 120, 121, 122, -1, -1, -1,
- -1, 127, 128, 129, 130, 73, 74, 75, 76, 77,
- -1, -1, -1, 81, 140, 141, 84, -1, -1, 145,
- -1, 147, 148, -1, 150, -1, 152, -1, 154, 155,
- -1, 157, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, 117,
- 149, -1, 120, 121, 122, -1, -1, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, 140, 141, -1, 149, -1, 145, -1, -1,
- -1, -1, 150, -1, 3, 4, 5, 155, -1, 157,
+ 142, 929, 1307, 155, 1360, 147, 6, 155, 155, 155,
+ 6, 939, 101, 6, 6, 943, 6, 6, 104, 6,
+ 6, 6, 155, 6, 12, 13, 155, 1061, 6, 6,
+ 6, 1065, 70, 156, 155, 4, 6, 156, 6, 6,
+ 1168, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 6, 6, 6, 6, 147,
+ 988, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 6, 60, 1201, 6, 63, 64, 155, 66, 67,
+ 68, 155, 155, 6, 72, 12, 13, 6, 155, 6,
+ 6, 6, 6, 1221, 6, 6, 155, 6, 155, 6,
+ 155, 6, 6, 1031, 1032, 1033, 1034, 6, 155, 155,
+ 98, 99, 100, 6, 6, 6, 6, 6, 884, 1153,
+ 1276, 890, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 3, 60, 1168, 3, 63, 64, 379, 66,
+ 67, 68, 993, -1, 1072, 72, -1, -1, -1, -1,
+ -1, 6, -1, -1, -1, -1, 1084, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 1201, 156, -1,
+ -1, 98, 99, 100, -1, -1, -1, 1305, -1, 1307,
+ -1, -1, -1, -1, 3, 4, -1, 1221, -1, -1,
9, 10, 11, -1, -1, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, 35, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 49, 12, 13, 52, -1, -1, 55, -1, 57, -1,
+ 1148, -1, -1, -1, -1, -1, -1, -1, -1, 156,
+ 49, -1, 1360, 52, -1, -1, 55, -1, 57, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 73, 74, 75, 76, 77, -1,
- -1, -1, 81, -1, -1, 84, -1, -1, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, -1, 60,
- -1, -1, 63, 64, -1, 66, 67, 68, -1, -1,
- -1, 72, -1, -1, -1, -1, -1, -1, 117, -1,
- -1, 120, 121, 122, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 98, 99, 100,
- -1, 140, 141, -1, -1, -1, 145, -1, -1, -1,
- -1, 150, -1, 3, 4, 5, 155, -1, 157, 9,
- 10, 11, -1, -1, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 158, -1, 49,
- 12, 13, 52, -1, -1, 55, -1, 57, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 73, 74, 75, 76, 77, -1, -1,
- -1, 81, -1, -1, 84, -1, -1, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, -1, 60, -1,
- -1, 63, 64, -1, 66, 67, 68, -1, -1, -1,
- 72, -1, -1, -1, -1, -1, -1, 117, -1, -1,
- 120, 121, 122, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 98, 99, 100, -1,
- 140, 141, -1, -1, -1, 145, -1, -1, -1, -1,
- 150, -1, 3, 4, -1, 155, -1, 157, 9, 10,
+ -1, -1, 81, -1, -1, 84, -1, -1, -1, -1,
+ -1, 1305, -1, 1307, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 1216, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, 117, -1,
+ -1, -1, -1, 122, 123, 124, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 138,
+ 139, -1, -1, -1, 143, -1, 1360, -1, -1, 148,
+ -1, -1, 3, 4, 153, 1263, 155, 156, 9, 10,
11, -1, -1, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 158, -1, 49, 12,
- 13, 52, -1, -1, 55, -1, 57, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 49, -1,
+ -1, 52, -1, -1, 55, -1, 57, -1, 1316, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 73, 74, 75, 76, 77, -1, -1, -1,
- 81, -1, -1, 84, -1, -1, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, -1, 60, -1, -1,
- 63, 64, -1, 66, 67, 68, -1, -1, -1, 72,
- -1, -1, -1, -1, -1, -1, 117, -1, -1, 120,
- 121, 122, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 98, 99, 100, -1, 140,
- 141, -1, -1, -1, 145, -1, -1, -1, -1, 150,
- -1, 3, 4, -1, 155, -1, 157, 9, 10, 11,
+ 81, 3, 4, 84, -1, -1, -1, 9, 10, 11,
-1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 158, -1, 49, 12, 13,
- 52, -1, -1, 55, -1, 57, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 73, 74, 75, 76, 77, -1, -1, -1, 81,
- -1, -1, 84, -1, -1, 49, 50, 51, 52, 53,
+ 32, 33, 34, -1, -1, -1, 117, -1, -1, -1,
+ -1, 122, 123, 124, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 138, 139, -1,
+ -1, -1, 143, -1, -1, -1, -1, 148, -1, -1,
+ -1, -1, 153, -1, -1, 156, 3, 4, 5, -1,
+ 7, -1, 9, 10, 11, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, -1, -1,
+ 37, 38, 39, 40, -1, 117, 43, -1, 12, 13,
+ 122, 123, 124, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 138, 139, -1, -1,
+ -1, 143, -1, -1, -1, -1, 148, -1, -1, 151,
+ -1, 153, -1, 155, -1, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, -1, 60, -1, -1, 63,
64, -1, 66, 67, 68, -1, -1, -1, 72, -1,
- -1, -1, -1, -1, -1, 117, -1, -1, 120, 121,
- 122, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 98, 99, 100, -1, 140, 141,
- -1, -1, -1, 145, -1, -1, -1, -1, 150, -1,
- 3, 4, -1, 155, -1, 157, 9, 10, 11, -1,
+ -1, -1, -1, -1, 111, -1, -1, -1, -1, -1,
+ 117, 118, 119, -1, -1, 122, 123, 124, 125, 126,
+ 127, 128, -1, -1, 98, 99, 100, -1, -1, -1,
+ -1, 138, 139, -1, -1, -1, 143, -1, 145, 146,
+ -1, 148, -1, 150, -1, 152, 153, -1, 155, 3,
+ 4, 5, -1, -1, -1, 9, 10, 11, -1, -1,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 156, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 49, -1, -1, 52, -1,
+ -1, 55, -1, 57, -1, 12, 13, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 73,
+ 74, 75, 76, 77, -1, -1, -1, 81, -1, -1,
+ 84, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, -1, 60, -1, -1, 63, 64, -1, 66,
+ 67, 68, -1, 117, -1, 72, -1, -1, 122, 123,
+ 124, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 138, 139, -1, -1, -1, 143,
+ -1, 98, 99, 100, 148, -1, 3, 4, 5, 153,
+ -1, 155, 9, 10, 11, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 49, -1, -1, 52, -1, -1, 55, 156,
+ 57, -1, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 73, 74, 75, 76,
+ 77, -1, -1, -1, 81, -1, -1, 84, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, -1,
+ 60, -1, -1, 63, 64, -1, 66, 67, 68, -1,
+ 117, -1, 72, -1, -1, 122, 123, 124, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 138, 139, -1, -1, -1, 143, -1, 98, 99,
+ 100, 148, -1, 3, 4, 5, 153, -1, 155, 9,
+ 10, 11, -1, -1, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 49,
+ -1, -1, 52, -1, -1, 55, 156, 57, -1, 12,
+ 13, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 73, 74, 75, 76, 77, -1, -1,
+ -1, 81, -1, -1, 84, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, -1, 60, -1, 6,
+ 63, 64, -1, 66, 67, 68, -1, 117, -1, 72,
+ -1, -1, 122, 123, 124, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 138, 139,
+ -1, -1, -1, 143, -1, 98, 99, 100, 148, -1,
+ 3, 4, -1, 153, -1, 155, 9, 10, 11, -1,
-1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 158, -1, 49, 12, 13, 52,
- -1, -1, 55, -1, 57, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 49, -1, -1, 52,
+ -1, -1, 55, 156, 57, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
73, 74, 75, 76, 77, -1, -1, -1, 81, -1,
- -1, 84, -1, -1, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, -1, 60, -1, -1, 63, 64,
- -1, 66, 67, 68, -1, -1, -1, 72, -1, -1,
- -1, -1, -1, -1, 117, -1, -1, 120, 121, 122,
+ -1, 84, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, 6, -1, -1, -1,
+ -1, -1, -1, -1, 117, -1, -1, -1, -1, 122,
+ 123, 124, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 138, 139, -1, -1, -1,
+ 143, -1, -1, -1, -1, 148, -1, 3, 4, -1,
+ 153, -1, 155, 9, 10, 11, -1, -1, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 98, 99, 100, -1, 140, 141, -1,
- -1, -1, 145, -1, -1, -1, -1, 150, -1, 3,
- 4, -1, 155, -1, 157, 9, 10, 11, -1, -1,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 158, -1, 49, 12, 13, 52, -1,
- -1, 55, -1, 57, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 73,
- 74, 75, 76, 77, -1, -1, -1, 81, -1, -1,
- 84, -1, -1, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, -1, 60, -1, -1, 63, 64, -1,
- 66, 67, 68, -1, -1, -1, 72, -1, -1, -1,
- -1, -1, -1, 117, -1, -1, 120, 121, 122, -1,
+ -1, -1, -1, 49, -1, -1, 52, -1, -1, 55,
+ -1, 57, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 73, 74, 75,
+ 76, 77, -1, -1, -1, 81, -1, -1, 84, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, -1,
+ -1, -1, -1, 6, -1, -1, -1, -1, -1, -1,
+ -1, 117, -1, -1, -1, -1, 122, 123, 124, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 98, 99, 100, -1, 140, 141, -1, -1,
- -1, 145, -1, -1, 6, -1, 150, -1, 3, 4,
- -1, 155, -1, 157, 9, 10, 11, -1, -1, 14,
+ -1, -1, 138, 139, -1, -1, -1, 143, -1, -1,
+ -1, -1, 148, -1, 3, 4, -1, 153, -1, 155,
+ 9, 10, 11, -1, -1, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 49, -1, -1, 52, -1, -1, 55, -1, 57, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 73, 74, 75, 76, 77, -1,
+ -1, -1, 81, -1, -1, 84, 129, 130, 131, 132,
+ 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ 6, -1, -1, -1, -1, -1, -1, -1, 117, -1,
+ -1, -1, -1, 122, 123, 124, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 138,
+ 139, -1, -1, -1, 143, -1, -1, -1, -1, 148,
+ -1, 3, 4, -1, 153, -1, 155, 9, 10, 11,
+ -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 49, -1, -1,
+ 52, -1, -1, 55, -1, 57, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 73, 74, 75, 76, 77, -1, -1, -1, 81,
+ -1, -1, 84, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 117, -1, -1, -1, -1,
+ 122, 123, 124, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 138, 139, -1, -1,
+ -1, 143, -1, -1, -1, -1, 148, -1, 3, 4,
+ -1, 153, -1, 155, 9, 10, 11, -1, -1, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 158, -1, 49, -1, -1, 52, -1, -1,
+ -1, -1, -1, -1, 49, -1, -1, 52, -1, -1,
55, -1, 57, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 73, 74,
- 75, 76, 77, 8, 3, 4, 81, -1, -1, 84,
+ 75, 76, 77, -1, 3, 4, 81, -1, -1, 84,
9, 10, 11, -1, -1, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, -1, -1, -1, -1,
- -1, -1, 117, -1, -1, 120, 121, 122, -1, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, 140, 141, 149, -1, -1,
- 145, -1, -1, 6, -1, 150, -1, 3, 4, 5,
- 155, -1, 157, 9, 10, 11, -1, -1, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
- -1, 37, 38, 39, 40, -1, -1, 43, 117, -1,
- -1, 120, 121, 122, -1, -1, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, 140, 141, -1, 149, -1, 145, -1, -1, -1,
- -1, 150, -1, -1, 153, 6, 155, -1, 157, 3,
- 4, -1, -1, -1, -1, 9, 10, 11, -1, -1,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 117, 118, 119, 120, 121, 122, 8, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, 140, 141, 149, -1, -1, 145,
- -1, -1, 6, -1, 150, -1, 3, 4, -1, 155,
- -1, 157, 9, 10, 11, -1, -1, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, -1, -1,
+ -1, -1, 117, -1, -1, -1, -1, 122, 123, 124,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 117, -1, -1, 120, 121, 122, -1,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, 140, 141, 149, -1,
- -1, 145, -1, -1, -1, -1, 150, -1, -1, 153,
- -1, 155, -1, 157, -1, -1, -1, -1, -1, -1,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- 117, -1, -1, 120, 121, 122, -1, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, 140, 141, 149, -1, -1, 145, -1,
- -1, -1, -1, 150, 8, 3, 4, -1, 155, -1,
- 157, 9, 10, 11, -1, -1, 14, 15, 16, 17,
+ -1, -1, -1, 138, 139, -1, -1, -1, 143, -1,
+ -1, -1, -1, 148, -1, 3, 4, 5, 153, -1,
+ 155, 9, 10, 11, -1, -1, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 3, 4, -1,
+ 28, 29, 30, 31, 32, 33, 34, -1, -1, 37,
+ 38, 39, 40, -1, -1, 43, -1, -1, 117, -1,
+ -1, -1, -1, 122, 123, 124, -1, -1, -1, -1,
+ -1, 6, -1, -1, -1, -1, -1, -1, -1, 138,
+ 139, -1, -1, -1, 143, -1, -1, -1, -1, 148,
+ -1, -1, 151, -1, 153, -1, 155, 3, 4, -1,
-1, -1, -1, 9, 10, 11, -1, -1, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 117,
+ 118, 119, 6, -1, 122, 123, 124, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 49, -1, -1, 52, -1, -1, 55,
- -1, 57, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 73, 74, 75,
- 76, 77, -1, -1, -1, 81, -1, -1, 84, 117,
- -1, -1, 120, 121, 122, -1, -1, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, 140, 141, -1, 149, -1, 145, -1, -1,
- -1, 117, 150, -1, 120, 121, 122, 155, -1, 157,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 140, 141, -1, -1, 149, 145,
- 3, 4, 5, -1, 150, 156, 9, 10, 11, 155,
+ 138, 139, -1, -1, -1, 143, -1, -1, -1, -1,
+ 148, -1, 3, 4, -1, 153, -1, 155, 9, 10,
+ 11, -1, -1, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, 117, 147, -1, -1, -1, 122, 123, 124, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 138, 139, -1, -1, -1, 143, -1, -1,
+ -1, -1, 148, -1, -1, -1, -1, 153, -1, 155,
+ -1, -1, -1, -1, -1, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, -1, 117, -1, -1, -1,
+ -1, 122, 123, 124, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 138, 139, -1,
+ -1, -1, 143, -1, -1, -1, -1, 148, -1, 3,
+ 4, -1, 153, -1, 155, 9, 10, 11, -1, -1,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 49, -1, -1, 52, -1,
+ -1, 55, -1, 57, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 73,
+ 74, 75, 76, 77, -1, 3, 4, 81, -1, -1,
+ 84, 9, 10, 11, -1, -1, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 6, -1, -1,
+ -1, -1, -1, 117, -1, -1, -1, -1, 122, 123,
+ 124, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 138, 139, -1, -1, -1, 143,
+ 3, 4, 5, -1, 148, -1, 9, 10, 11, 153,
-1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, -1, -1, 37, 38, 39, 40, 12, 13,
- 43, 3, 4, -1, -1, -1, -1, 9, 10, 11,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 8, -1, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, -1, 60, -1, -1, 63,
- 64, -1, 66, 67, 68, -1, -1, -1, 72, -1,
+ 33, 34, 6, -1, 37, 38, 39, 40, -1, -1,
+ 43, -1, -1, -1, -1, -1, -1, -1, -1, 117,
+ -1, 6, -1, -1, 122, 123, 124, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 117, 118, 119, 120, 121, 122,
- -1, -1, -1, -1, 98, 99, 100, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 140, 141, -1,
- -1, -1, 145, -1, -1, -1, -1, 150, -1, -1,
- -1, -1, 155, -1, -1, 117, -1, -1, 120, 121,
- 122, -1, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, 140, 141,
- 149, -1, -1, 145, 158, -1, -1, 156, 150, 158,
- -1, -1, -1, 155, -1, -1, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, 0, 1, -1, 149, 4, -1, -1, -1, -1,
- -1, -1, -1, 12, 13, -1, -1, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, 36, -1, -1,
- -1, -1, 41, 42, 158, 44, 45, 46, -1, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- -1, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, -1, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, -1, -1, 87, 88,
- -1, -1, -1, 92, -1, -1, -1, -1, 97, 98,
- 99, 100, -1, -1, 103, -1, 105, -1, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, -1, -1,
- 4, -1, -1, -1, 123, 124, 125, 126, 12, 13,
- -1, -1, -1, -1, -1, -1, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, 36, -1, 149, -1, -1, 41, 42, -1,
- 44, 45, 46, 158, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, -1, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, -1, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, -1, -1, 87, 88, -1, 12, 13, 92, -1,
- -1, -1, -1, 97, 98, 99, 100, -1, -1, 103,
- -1, 105, -1, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, -1, -1, -1, -1, -1, -1, 123,
- 124, 125, 126, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, -1, 60, -1, -1, 63, 64, -1,
- 66, 67, 68, -1, -1, -1, 72, -1, -1, -1,
+ 138, 139, 8, -1, -1, 143, -1, -1, -1, -1,
+ 148, -1, -1, -1, -1, 153, -1, -1, -1, -1,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 8, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, 117, 118, 119, -1, -1, 122,
+ 123, 124, -1, 8, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 138, 139, -1, -1, -1,
+ 143, -1, 8, -1, -1, 148, -1, -1, -1, -1,
+ 153, -1, -1, -1, -1, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 8,
+ -1, -1, -1, 147, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 8, -1,
+ -1, -1, 147, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, 70,
+ -1, 147, -1, -1, -1, -1, -1, -1, -1, -1,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, 0, 1, -1, 147, 4, -1,
+ -1, -1, -1, -1, -1, -1, 12, 13, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, 98, 99, 100, 156, -1, 158, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ 36, -1, -1, -1, -1, 41, 42, -1, 44, 45,
+ 46, -1, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, -1, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, -1, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 4,
+ -1, 87, 88, -1, -1, -1, 92, 12, 13, -1,
+ -1, 97, 98, 99, 100, -1, -1, 103, -1, 105,
+ -1, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 36, -1, -1, 120, 121, 41, 42, -1, 44,
+ 45, 46, -1, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, -1, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, -1, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 12, 13, 87, 88, -1, -1, -1, 92, -1, -1,
+ -1, -1, 97, 98, 99, 100, -1, -1, 103, -1,
+ 105, -1, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, -1, -1, -1, 120, 121, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, -1, 60, -1,
+ -1, 63, 64, -1, 66, 67, 68, -1, -1, -1,
+ 72, -1, -1, -1, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, 98, 99, 100, 154,
+ -1, 156, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, 154, -1, 156,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, 154, -1, 156, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, -1, -1, 156, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, 156, -1, 158, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, -1, -1, 158, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, -1,
- -1, 158, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, -1, -1, 158,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, -1, -1, 156, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, -1,
+ -1, 156, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, -1, -1, 156,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, -1, -1, 156, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, -1, -1, 158, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, -1, -1, 156, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, -1, -1, 158, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, -1, -1, 158, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, -1,
- -1, 158, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, -1, -1, 158,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, -1, -1, 156, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, -1,
+ -1, 156, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, -1, -1, 156,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, -1, -1, 156, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, -1, -1, 158, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, -1, -1, 156, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, -1, -1, 158, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, -1, -1, 158, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, -1,
- -1, 158, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, -1, -1, 158,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, -1, -1, 156, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, -1,
+ -1, 156, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, -1, -1, 156,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, -1, -1, 156, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, -1, -1, 158, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, -1, -1, 156, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, -1, -1, 158, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, -1, -1, 158, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, -1,
- -1, 158, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, -1, -1, 158,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, -1, -1, 156, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, -1,
+ -1, 156, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, -1, -1, 156,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, -1, -1, 156, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, -1, -1, 158, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, -1, -1, 156, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, -1, -1, 158, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, -1, -1, 158, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, -1,
- -1, 158, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, -1, 157, 131,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, -1, -1, 156, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, -1,
+ -1, 156, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, -1, -1, 156,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, -1, 155, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, -1,
- -1, -1, -1, -1, -1, 157, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, 151, -1, -1, -1,
- -1, 156, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, 156, 131, 132,
+ 142, -1, -1, -1, -1, 147, -1, -1, -1, -1,
+ -1, -1, -1, 155, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, 149, -1, -1, -1, -1, 154,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, 154, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, 156, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, 156,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, 154, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, 154, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, 156, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, 156, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, 156, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, 154, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, 154,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, 154, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, 156, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, 156,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, 154, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, 154, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, 156, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, 156, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, 156, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, 154, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, 154,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, 154, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, 156, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, 156,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, 154, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, 154, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, 156, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, 156, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, 156, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, 154, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, 154,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, 154, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, 156, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, 156,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, 154, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, 154, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, 156, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, 156, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, 156, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, 154, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, 154,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, 154, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- -1, -1, -1, 156, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, -1, -1, -1, 156,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, 154, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, -1, -1, -1, 154, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, -1, -1, -1, 156, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, -1, -1,
- -1, 156, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, -1, -1, -1, 156, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ -1, -1, -1, 154, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, -1, -1, -1, 154,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, -1, -1, -1, 154, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- 153, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, -1, -1, 153, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, 153, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, -1, -1, 153,
+ -1, -1, -1, -1, 147, -1, -1, -1, -1, -1,
+ -1, 154, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, 151, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, -1, -1, 151, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, 153, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, -1, -1, -1,
- -1, 149, -1, -1, -1, 153, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, 153, 131,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ 151, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, -1, -1, 151, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, 151, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, -1,
- -1, 153, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, 153, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, -1,
- -1, -1, -1, 149, -1, -1, -1, 153, 131, 132,
+ 142, -1, -1, -1, -1, 147, -1, -1, -1, 151,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, 151, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, -1, -1, 151, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- 153, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, -1, -1, 153, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, 153, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, -1, -1, 153,
+ -1, -1, -1, -1, 147, -1, -1, -1, 151, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, -1,
+ -1, 151, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, 151, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, -1, -1, 151, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, 153, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, -1, -1, -1,
- -1, 149, -1, -1, -1, 153, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, 153, 131,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ 151, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, -1, -1, 151, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, 151, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, -1,
- -1, 153, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, 153, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, -1,
- -1, -1, -1, 149, -1, -1, -1, 153, 131, 132,
+ 142, -1, -1, -1, -1, 147, -1, -1, -1, 151,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, 151, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, -1, -1, 151, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- 153, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, -1, -1, 153, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, 153, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, -1, -1, 153,
+ -1, -1, -1, -1, 147, -1, -1, -1, 151, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, -1,
+ -1, 151, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, 151, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, -1, -1, 151, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- -1, -1, 153, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, -1, -1, -1,
- -1, 149, -1, -1, -1, 153, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, -1, -1, 153, 131,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ 151, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, -1, -1, 151, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, -1, -1, 151, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, -1,
- -1, 153, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, -1, -1, 153, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, -1,
- -1, -1, -1, 149, -1, -1, -1, 153, 131, 132,
+ 142, -1, -1, -1, -1, 147, -1, -1, -1, 151,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ -1, -1, 151, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, -1, -1, 151, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, -1, -1,
- 153, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, -1, -1, 153, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, -1, -1, 153, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, 151, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, 151, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, 151,
+ -1, -1, -1, -1, 147, -1, -1, -1, 151, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, -1,
+ -1, 151, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, -1, -1, 151, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, -1, -1, 151, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- 151, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, 151, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, 151, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, -1, -1, -1,
- -1, 149, -1, 151, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, 151, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, -1,
- -1, -1, -1, 149, -1, 151, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, 151, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, 151, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, -1, -1,
+ 151, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, 149, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, 149, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, 149, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, 149, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, 149, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, 151, 131,
+ -1, -1, -1, -1, 147, -1, 149, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, 151,
+ 142, -1, -1, -1, -1, 147, -1, 149, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- 151, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, 151, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, 151, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, -1, -1, -1,
- -1, 149, -1, 151, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, 151, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, -1,
- -1, -1, -1, 149, -1, 151, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, 151, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, 151, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, 149, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, 149,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ 149, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, 149, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, 149, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, 149, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, 149, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, 149, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, 151, 131,
+ -1, -1, -1, -1, 147, -1, 149, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, 151,
+ 142, -1, -1, -1, -1, 147, -1, 149, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- 151, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, 151, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, 151, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, -1, -1, -1,
- -1, 149, -1, 151, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, 151, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, -1,
- -1, -1, -1, 149, -1, 151, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, 151, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, 151, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, 149, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, 149,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ 149, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, 149, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, 149, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, 149, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, 149, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, 149, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, 151, 131,
+ -1, -1, -1, -1, 147, -1, 149, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, 151,
+ 142, -1, -1, -1, -1, 147, -1, 149, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- 151, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, 151, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, 151, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, -1, -1, -1,
- -1, 149, -1, 151, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, 151, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, -1,
- -1, -1, -1, 149, -1, 151, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, 151, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, 151, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, 149, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, 149,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ 149, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, 149, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, 149, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, 149, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, 149, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, 149, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, 151, 131,
+ -1, -1, -1, -1, 147, -1, 149, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, 151,
+ 142, -1, -1, -1, -1, 147, -1, 149, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- 151, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149,
- -1, 151, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, -1, -1, -1, -1,
- 149, -1, 151, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, -1, -1, -1,
- -1, 149, -1, 151, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, -1, -1,
- -1, -1, 149, -1, 151, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, -1,
- -1, -1, -1, 149, -1, 151, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- -1, -1, -1, -1, 149, -1, 151, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, -1, -1, -1, -1, 149, -1, 151, 131, 132,
+ 141, 142, -1, -1, -1, -1, 147, -1, 149, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, 149,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ 149, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, 149, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, 149, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, 149, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, 149, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147, -1, 149, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, -1, -1, -1, -1, 149, -1, 151, 131,
+ -1, -1, -1, -1, 147, -1, 149, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, -1, -1, -1, -1, 149, -1, 151,
+ 142, -1, -1, -1, -1, 147, -1, 149, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, -1, -1, -1, -1, 149, -1,
- 151, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, -1, -1, -1, -1, 149
+ 141, 142, -1, -1, -1, -1, 147, -1, 149, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, -1, -1, -1, -1, 147, -1, 149,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, -1, -1, -1, -1, 147, -1,
+ 149, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, -1, -1, -1, -1, 147,
+ -1, 149, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, -1, -1, -1, -1,
+ 147, -1, 149, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, -1, -1, -1,
+ -1, 147, -1, 149, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, -1, -1,
+ -1, -1, 147, -1, 149, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, -1,
+ -1, -1, -1, 147
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 1, 161, 162, 6, 0, 4, 12, 13, 36,
+ 0, 1, 159, 160, 6, 0, 4, 12, 13, 36,
41, 42, 44, 45, 46, 48, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 60, 61, 62, 63,
64, 65, 66, 67, 68, 69, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
87, 88, 92, 97, 98, 99, 100, 103, 105, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 123,
- 124, 125, 126, 163, 165, 166, 184, 193, 198, 201,
- 202, 203, 204, 205, 206, 207, 227, 228, 229, 230,
- 231, 3, 4, 5, 7, 9, 10, 11, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 37,
- 38, 39, 40, 43, 111, 117, 118, 119, 120, 121,
- 122, 127, 128, 129, 130, 140, 141, 145, 147, 148,
- 150, 152, 154, 155, 157, 182, 183, 232, 233, 245,
- 13, 55, 150, 6, 157, 6, 6, 6, 6, 152,
- 150, 157, 150, 150, 4, 150, 157, 150, 150, 4,
- 157, 150, 150, 59, 55, 55, 6, 55, 55, 52,
- 55, 57, 57, 49, 52, 55, 57, 52, 55, 57,
- 52, 55, 150, 52, 157, 140, 141, 150, 157, 234,
- 235, 234, 157, 49, 52, 55, 157, 234, 4, 49,
- 53, 63, 55, 55, 52, 4, 111, 157, 4, 6,
- 49, 52, 4, 4, 4, 5, 35, 49, 52, 55,
- 57, 141, 157, 198, 207, 232, 237, 238, 239, 4,
- 150, 150, 150, 4, 157, 241, 4, 150, 150, 6,
- 152, 4, 4, 5, 157, 5, 157, 150, 150, 150,
- 150, 4, 152, 154, 159, 183, 157, 5, 245, 150,
- 152, 150, 152, 150, 152, 150, 152, 150, 152, 150,
- 152, 150, 152, 150, 152, 150, 152, 150, 152, 150,
- 152, 150, 152, 150, 152, 150, 152, 150, 152, 150,
- 152, 150, 152, 150, 152, 150, 152, 150, 152, 150,
- 152, 150, 150, 150, 150, 7, 150, 150, 150, 4,
- 232, 232, 232, 232, 153, 157, 232, 4, 103, 104,
- 4, 4, 198, 199, 200, 237, 6, 6, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 149, 6, 6, 232, 5, 232, 186, 232,
- 141, 232, 239, 240, 232, 232, 150, 232, 240, 232,
- 232, 150, 240, 232, 232, 237, 150, 157, 150, 150,
- 238, 238, 238, 150, 194, 195, 196, 197, 150, 150,
- 150, 237, 232, 4, 237, 234, 234, 234, 232, 232,
- 140, 141, 157, 157, 234, 157, 157, 157, 140, 141,
- 150, 200, 234, 157, 150, 157, 150, 150, 150, 238,
- 237, 150, 4, 6, 152, 152, 200, 6, 157, 157,
- 152, 152, 152, 152, 5, 157, 5, 5, 5, 157,
- 232, 239, 158, 240, 8, 142, 6, 6, 232, 232,
- 232, 154, 232, 157, 106, 232, 232, 232, 6, 6,
- 200, 6, 200, 4, 244, 245, 244, 244, 244, 152,
- 232, 4, 157, 167, 6, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 244, 244, 244,
- 244, 232, 244, 244, 244, 152, 151, 7, 182, 240,
- 153, 7, 182, 183, 154, 7, 152, 158, 49, 52,
- 55, 57, 193, 6, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 6,
- 151, 156, 156, 153, 156, 185, 151, 142, 156, 158,
- 151, 151, 232, 151, 158, 151, 151, 232, 158, 151,
- 151, 7, 232, 232, 232, 232, 7, 7, 225, 225,
- 232, 150, 150, 150, 150, 232, 232, 232, 7, 157,
- 151, 6, 156, 156, 156, 234, 234, 199, 199, 156,
- 232, 232, 232, 232, 211, 156, 200, 232, 232, 232,
- 232, 232, 7, 226, 7, 232, 6, 232, 232, 158,
- 240, 240, 232, 232, 153, 157, 232, 4, 232, 240,
- 158, 232, 157, 232, 239, 151, 151, 151, 103, 156,
- 200, 157, 8, 151, 153, 158, 158, 152, 154, 151,
- 151, 151, 151, 232, 153, 183, 232, 4, 93, 94,
- 95, 96, 158, 170, 174, 177, 179, 180, 151, 153,
- 151, 153, 151, 153, 151, 153, 151, 153, 151, 153,
- 151, 153, 151, 153, 151, 153, 151, 153, 151, 153,
- 156, 156, 151, 153, 151, 153, 151, 153, 151, 153,
- 151, 153, 151, 153, 156, 156, 156, 156, 156, 156,
- 151, 156, 156, 151, 151, 6, 156, 151, 156, 237,
- 158, 154, 182, 183, 245, 232, 6, 4, 4, 157,
- 242, 153, 157, 157, 157, 157, 8, 6, 137, 164,
- 240, 232, 6, 4, 7, 232, 239, 106, 7, 7,
- 151, 7, 106, 7, 7, 151, 106, 7, 7, 232,
- 151, 158, 151, 151, 232, 237, 4, 224, 6, 151,
- 190, 232, 245, 190, 190, 190, 151, 151, 151, 237,
- 240, 154, 234, 232, 232, 158, 158, 232, 156, 156,
- 156, 70, 79, 85, 86, 89, 90, 221, 222, 234,
- 158, 208, 151, 158, 151, 151, 151, 232, 6, 232,
- 151, 153, 153, 158, 158, 153, 153, 240, 153, 153,
- 158, 158, 8, 240, 7, 7, 7, 154, 232, 158,
- 232, 232, 7, 154, 232, 4, 7, 7, 7, 7,
- 153, 154, 183, 244, 158, 171, 150, 150, 157, 181,
- 6, 232, 232, 232, 232, 232, 232, 232, 232, 240,
- 244, 232, 244, 6, 153, 4, 103, 104, 232, 6,
- 6, 6, 7, 152, 241, 243, 6, 240, 240, 240,
- 240, 232, 137, 244, 151, 156, 7, 234, 55, 237,
- 237, 7, 237, 55, 57, 237, 237, 7, 57, 237,
- 237, 6, 7, 7, 7, 7, 70, 223, 6, 7,
- 151, 151, 151, 151, 7, 7, 7, 6, 158, 4,
- 156, 156, 156, 158, 234, 234, 234, 4, 6, 157,
- 150, 6, 91, 6, 91, 158, 222, 156, 221, 7,
- 6, 7, 7, 7, 6, 157, 6, 6, 6, 55,
- 6, 6, 158, 232, 158, 237, 237, 237, 4, 156,
- 8, 8, 151, 4, 4, 153, 157, 157, 157, 157,
- 6, 4, 6, 150, 232, 232, 236, 237, 157, 151,
- 153, 151, 153, 151, 153, 151, 153, 151, 151, 151,
- 151, 182, 7, 182, 183, 154, 7, 6, 241, 232,
- 156, 158, 158, 158, 158, 158, 6, 6, 164, 232,
- 157, 232, 6, 157, 63, 192, 192, 237, 6, 157,
- 157, 6, 6, 237, 157, 6, 6, 5, 237, 237,
- 237, 4, 6, 237, 7, 7, 7, 7, 237, 237,
- 237, 7, 6, 7, 232, 232, 232, 157, 156, 158,
- 156, 158, 156, 158, 152, 232, 237, 232, 6, 6,
- 232, 234, 158, 5, 157, 237, 157, 157, 157, 237,
- 240, 157, 153, 6, 6, 102, 232, 232, 232, 6,
- 7, 154, 237, 237, 237, 237, 183, 168, 232, 156,
- 156, 156, 158, 169, 232, 237, 245, 232, 6, 4,
- 242, 6, 153, 241, 6, 6, 6, 6, 244, 156,
- 232, 232, 234, 6, 6, 6, 232, 232, 6, 232,
- 5, 6, 6, 106, 191, 232, 6, 237, 237, 237,
- 237, 6, 4, 6, 6, 232, 232, 245, 158, 151,
- 156, 158, 199, 234, 6, 212, 234, 6, 213, 234,
- 6, 214, 232, 158, 156, 151, 158, 156, 6, 141,
- 234, 6, 236, 234, 234, 6, 158, 232, 237, 156,
- 158, 8, 158, 151, 157, 232, 245, 4, 156, 156,
- 156, 156, 151, 156, 232, 232, 237, 157, 156, 158,
- 6, 6, 6, 7, 6, 154, 6, 232, 187, 158,
- 158, 158, 158, 5, 53, 6, 6, 6, 6, 6,
- 157, 157, 6, 6, 157, 232, 158, 156, 157, 156,
- 157, 156, 157, 153, 6, 237, 7, 157, 232, 156,
- 158, 156, 156, 6, 158, 101, 232, 232, 240, 6,
- 6, 237, 237, 237, 237, 172, 232, 156, 156, 236,
- 232, 6, 241, 104, 156, 188, 6, 6, 6, 6,
- 6, 157, 236, 240, 199, 156, 158, 232, 234, 221,
- 232, 234, 221, 232, 234, 221, 6, 156, 158, 237,
- 200, 158, 234, 6, 240, 234, 232, 158, 158, 158,
- 158, 158, 158, 158, 157, 232, 232, 158, 6, 232,
- 156, 158, 189, 232, 158, 158, 158, 232, 158, 156,
- 158, 158, 156, 158, 158, 156, 158, 237, 6, 70,
- 158, 209, 157, 156, 158, 156, 6, 6, 6, 6,
- 6, 6, 169, 151, 156, 6, 157, 156, 4, 158,
- 6, 6, 158, 6, 215, 232, 6, 6, 216, 232,
- 6, 6, 217, 232, 6, 158, 232, 221, 200, 240,
- 6, 234, 240, 158, 175, 232, 236, 232, 5, 237,
- 157, 158, 157, 158, 157, 158, 6, 6, 158, 158,
- 210, 158, 156, 158, 6, 157, 151, 158, 158, 221,
- 6, 218, 221, 6, 219, 221, 6, 220, 221, 6,
- 240, 6, 173, 244, 178, 157, 6, 158, 157, 158,
- 157, 158, 157, 158, 158, 156, 158, 157, 236, 6,
- 221, 6, 221, 6, 221, 6, 244, 6, 176, 244,
- 158, 158, 158, 158, 156, 158, 6, 6, 6, 6,
- 244, 6
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 120,
+ 121, 161, 163, 164, 182, 191, 196, 199, 200, 201,
+ 202, 203, 204, 205, 225, 226, 227, 228, 229, 230,
+ 3, 4, 5, 7, 9, 10, 11, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 37, 38,
+ 39, 40, 43, 111, 117, 118, 119, 122, 123, 124,
+ 125, 126, 127, 128, 138, 139, 143, 145, 146, 148,
+ 150, 152, 153, 155, 180, 181, 231, 232, 244, 13,
+ 55, 148, 6, 155, 6, 6, 6, 6, 150, 148,
+ 155, 148, 148, 4, 148, 155, 148, 148, 4, 155,
+ 148, 148, 59, 55, 55, 6, 55, 55, 52, 55,
+ 57, 57, 49, 52, 55, 57, 52, 55, 57, 52,
+ 55, 148, 52, 155, 138, 139, 148, 155, 233, 234,
+ 233, 155, 49, 52, 55, 155, 233, 4, 49, 53,
+ 63, 55, 55, 52, 4, 111, 155, 4, 6, 49,
+ 52, 4, 4, 4, 5, 35, 49, 52, 55, 57,
+ 139, 155, 196, 205, 231, 236, 237, 238, 4, 148,
+ 148, 148, 4, 155, 240, 4, 148, 148, 6, 150,
+ 4, 4, 5, 155, 5, 155, 6, 155, 4, 150,
+ 152, 157, 181, 155, 5, 244, 148, 150, 148, 150,
+ 148, 150, 148, 150, 148, 150, 148, 150, 148, 150,
+ 148, 150, 148, 150, 148, 150, 148, 150, 148, 150,
+ 148, 150, 148, 150, 148, 150, 148, 150, 148, 150,
+ 148, 150, 148, 150, 148, 150, 148, 150, 148, 148,
+ 148, 148, 7, 148, 148, 148, 4, 231, 231, 231,
+ 231, 151, 155, 231, 4, 103, 104, 4, 4, 196,
+ 197, 198, 236, 6, 6, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 147,
+ 6, 6, 231, 5, 231, 184, 231, 139, 231, 238,
+ 239, 231, 231, 148, 231, 239, 231, 231, 148, 239,
+ 231, 231, 236, 148, 155, 148, 148, 237, 237, 237,
+ 148, 192, 193, 194, 195, 148, 148, 148, 236, 231,
+ 4, 236, 233, 233, 233, 231, 231, 138, 139, 155,
+ 155, 233, 155, 155, 155, 138, 139, 148, 198, 233,
+ 155, 148, 155, 148, 148, 148, 237, 236, 148, 4,
+ 6, 150, 150, 198, 6, 155, 155, 150, 150, 150,
+ 150, 5, 155, 5, 5, 5, 155, 231, 238, 156,
+ 239, 8, 140, 6, 6, 231, 231, 231, 152, 231,
+ 155, 106, 231, 231, 231, 6, 6, 198, 6, 198,
+ 236, 150, 231, 4, 155, 165, 6, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 4,
+ 243, 244, 243, 243, 243, 231, 243, 243, 243, 150,
+ 149, 7, 180, 239, 151, 7, 180, 181, 152, 7,
+ 150, 156, 49, 52, 55, 57, 191, 6, 231, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
+ 231, 231, 231, 6, 149, 154, 154, 151, 154, 183,
+ 149, 140, 154, 156, 149, 149, 231, 149, 156, 149,
+ 149, 231, 156, 149, 149, 7, 231, 231, 231, 231,
+ 7, 7, 223, 223, 231, 148, 148, 148, 148, 231,
+ 231, 231, 7, 155, 149, 6, 154, 154, 154, 233,
+ 233, 197, 197, 154, 231, 231, 231, 231, 209, 154,
+ 198, 231, 231, 231, 231, 231, 7, 224, 7, 231,
+ 6, 231, 231, 156, 239, 239, 231, 231, 151, 155,
+ 231, 4, 231, 239, 156, 231, 155, 231, 238, 149,
+ 149, 149, 103, 154, 198, 155, 8, 149, 151, 156,
+ 156, 154, 156, 231, 151, 181, 231, 4, 93, 94,
+ 95, 96, 156, 168, 172, 175, 177, 178, 149, 151,
+ 149, 151, 149, 151, 149, 151, 149, 151, 149, 151,
+ 149, 151, 149, 151, 149, 151, 149, 151, 149, 151,
+ 154, 154, 149, 151, 149, 151, 149, 151, 149, 151,
+ 149, 151, 149, 151, 154, 154, 154, 154, 154, 154,
+ 150, 152, 149, 154, 154, 149, 149, 6, 154, 149,
+ 154, 236, 156, 152, 180, 181, 244, 231, 6, 4,
+ 4, 155, 241, 151, 155, 155, 155, 155, 8, 6,
+ 135, 162, 239, 231, 6, 4, 7, 231, 238, 106,
+ 7, 7, 149, 7, 106, 7, 7, 149, 106, 7,
+ 7, 231, 149, 156, 149, 149, 231, 236, 4, 222,
+ 6, 149, 188, 231, 244, 188, 188, 188, 149, 149,
+ 149, 236, 239, 152, 233, 231, 231, 156, 156, 231,
+ 154, 154, 154, 70, 79, 85, 86, 89, 90, 219,
+ 220, 233, 156, 206, 149, 156, 149, 149, 149, 231,
+ 6, 231, 149, 151, 151, 156, 156, 151, 151, 239,
+ 151, 151, 156, 156, 8, 239, 7, 7, 7, 152,
+ 231, 156, 231, 231, 7, 152, 236, 6, 151, 152,
+ 181, 243, 156, 169, 148, 148, 155, 179, 6, 231,
+ 231, 231, 231, 231, 231, 231, 231, 231, 4, 239,
+ 243, 231, 243, 6, 151, 4, 103, 104, 231, 6,
+ 6, 6, 7, 150, 240, 242, 6, 239, 239, 239,
+ 239, 231, 135, 243, 149, 154, 7, 233, 55, 236,
+ 236, 7, 236, 55, 57, 236, 236, 7, 57, 236,
+ 236, 6, 7, 7, 7, 7, 70, 221, 6, 7,
+ 149, 149, 149, 149, 7, 7, 7, 6, 156, 4,
+ 154, 154, 154, 156, 233, 233, 233, 4, 6, 155,
+ 148, 6, 91, 6, 91, 156, 220, 154, 219, 7,
+ 6, 7, 7, 7, 6, 155, 6, 6, 6, 55,
+ 6, 6, 156, 231, 156, 236, 236, 236, 4, 154,
+ 8, 8, 149, 4, 4, 156, 6, 4, 6, 148,
+ 231, 231, 235, 236, 155, 149, 151, 149, 151, 149,
+ 151, 149, 151, 151, 149, 149, 149, 149, 180, 7,
+ 180, 181, 152, 7, 6, 240, 231, 154, 156, 156,
+ 156, 156, 156, 6, 6, 162, 231, 155, 231, 6,
+ 155, 63, 190, 190, 236, 6, 155, 155, 6, 6,
+ 236, 155, 6, 6, 5, 236, 236, 236, 4, 6,
+ 236, 7, 7, 7, 7, 236, 236, 236, 7, 6,
+ 7, 231, 231, 231, 155, 154, 156, 154, 156, 154,
+ 156, 150, 231, 236, 231, 6, 6, 231, 233, 156,
+ 5, 155, 236, 155, 155, 155, 236, 239, 155, 151,
+ 6, 6, 102, 231, 231, 231, 6, 7, 6, 181,
+ 166, 231, 154, 154, 154, 156, 167, 231, 152, 236,
+ 244, 231, 6, 4, 241, 6, 151, 240, 6, 6,
+ 6, 6, 243, 154, 231, 231, 233, 6, 6, 6,
+ 231, 231, 6, 231, 5, 6, 6, 106, 189, 231,
+ 6, 236, 236, 236, 236, 6, 4, 6, 6, 231,
+ 231, 244, 156, 149, 154, 156, 197, 233, 6, 210,
+ 233, 6, 211, 233, 6, 212, 231, 156, 154, 149,
+ 156, 154, 6, 139, 233, 6, 235, 233, 233, 6,
+ 156, 231, 236, 154, 156, 8, 156, 149, 155, 231,
+ 244, 149, 154, 231, 231, 236, 155, 154, 156, 4,
+ 6, 6, 6, 7, 6, 152, 6, 231, 185, 156,
+ 156, 156, 156, 5, 53, 6, 6, 6, 6, 6,
+ 155, 155, 6, 6, 155, 231, 156, 154, 155, 154,
+ 155, 154, 155, 151, 6, 236, 7, 155, 231, 154,
+ 156, 154, 154, 6, 156, 101, 231, 231, 239, 6,
+ 6, 170, 231, 154, 154, 235, 231, 6, 240, 104,
+ 154, 186, 6, 6, 6, 6, 6, 155, 235, 239,
+ 197, 154, 156, 231, 233, 219, 231, 233, 219, 231,
+ 233, 219, 6, 154, 156, 236, 198, 156, 233, 6,
+ 239, 233, 231, 156, 156, 156, 155, 231, 231, 156,
+ 6, 231, 154, 156, 187, 231, 156, 156, 156, 231,
+ 156, 154, 156, 156, 154, 156, 156, 154, 156, 236,
+ 6, 70, 156, 207, 155, 154, 156, 154, 6, 6,
+ 167, 149, 154, 6, 155, 154, 4, 156, 6, 6,
+ 156, 6, 213, 231, 6, 6, 214, 231, 6, 6,
+ 215, 231, 6, 156, 231, 219, 198, 239, 6, 233,
+ 239, 156, 173, 231, 235, 231, 5, 236, 155, 156,
+ 155, 156, 155, 156, 6, 6, 156, 156, 208, 156,
+ 154, 156, 6, 155, 149, 156, 156, 219, 6, 216,
+ 219, 6, 217, 219, 6, 218, 219, 6, 239, 6,
+ 171, 243, 176, 155, 6, 156, 155, 156, 155, 156,
+ 155, 156, 156, 154, 156, 155, 235, 6, 219, 6,
+ 219, 6, 219, 6, 243, 6, 174, 243, 156, 156,
+ 156, 156, 154, 156, 6, 6, 6, 6, 243, 6
};
#define yyerrok (yyerrstatus = 0)
@@ -3131,9 +3164,18 @@ static const yytype_uint8 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
+ Once GCC version 2 has supplanted version 1, this can go. However,
+ YYFAIL appears to be in use. Nevertheless, it is formally deprecated
+ in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+ discussed. */
#define YYFAIL goto yyerrlab
+#if defined YYFAIL
+ /* This is here to suppress warnings from the GCC cpp's
+ -Wunused-macros. Normally we don't worry about that warning, but
+ some users do, and we want to make it easy for users to remove
+ YYFAIL uses, which will produce warnings from Bison 2.5. */
+#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -3190,7 +3232,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -3929,134 +3971,134 @@ yyreduce:
{
case 3:
-/* Line 1455 of yacc.c */
-#line 163 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 159 "Gmsh.y"
{ yyerrok; return 1; ;}
break;
case 6:
-/* Line 1455 of yacc.c */
-#line 174 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 170 "Gmsh.y"
{ return 1; ;}
break;
case 7:
-/* Line 1455 of yacc.c */
-#line 175 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 171 "Gmsh.y"
{ return 1; ;}
break;
case 8:
-/* Line 1455 of yacc.c */
-#line 176 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 172 "Gmsh.y"
{ return 1; ;}
break;
case 9:
-/* Line 1455 of yacc.c */
-#line 177 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 173 "Gmsh.y"
{ return 1; ;}
break;
case 10:
-/* Line 1455 of yacc.c */
-#line 178 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 174 "Gmsh.y"
{ List_Delete((yyvsp[(1) - (1)].l)); return 1; ;}
break;
case 11:
-/* Line 1455 of yacc.c */
-#line 179 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 175 "Gmsh.y"
{ return 1; ;}
break;
case 12:
-/* Line 1455 of yacc.c */
-#line 180 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 176 "Gmsh.y"
{ return 1; ;}
break;
case 13:
-/* Line 1455 of yacc.c */
-#line 181 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 177 "Gmsh.y"
{ return 1; ;}
break;
case 14:
-/* Line 1455 of yacc.c */
-#line 182 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 178 "Gmsh.y"
{ List_Delete((yyvsp[(1) - (1)].l)); return 1; ;}
break;
case 15:
-/* Line 1455 of yacc.c */
-#line 183 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 179 "Gmsh.y"
{ return 1; ;}
break;
case 16:
-/* Line 1455 of yacc.c */
-#line 184 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 180 "Gmsh.y"
{ return 1; ;}
break;
case 17:
-/* Line 1455 of yacc.c */
-#line 185 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 181 "Gmsh.y"
{ return 1; ;}
break;
case 18:
-/* Line 1455 of yacc.c */
-#line 186 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 182 "Gmsh.y"
{ return 1; ;}
break;
case 19:
-/* Line 1455 of yacc.c */
-#line 187 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 183 "Gmsh.y"
{ return 1; ;}
break;
case 20:
-/* Line 1455 of yacc.c */
-#line 188 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 184 "Gmsh.y"
{ return 1; ;}
break;
case 21:
-/* Line 1455 of yacc.c */
-#line 189 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 185 "Gmsh.y"
{ return 1; ;}
break;
case 22:
-/* Line 1455 of yacc.c */
-#line 190 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 186 "Gmsh.y"
{ return 1; ;}
break;
case 23:
-/* Line 1455 of yacc.c */
-#line 195 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 191 "Gmsh.y"
{
(yyval.c) = (char*)"w";
;}
@@ -4064,8 +4106,8 @@ yyreduce:
case 24:
-/* Line 1455 of yacc.c */
-#line 199 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 195 "Gmsh.y"
{
(yyval.c) = (char*)"a";
;}
@@ -4073,8 +4115,8 @@ yyreduce:
case 25:
-/* Line 1455 of yacc.c */
-#line 206 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 202 "Gmsh.y"
{
Msg::Direct((yyvsp[(3) - (5)].c));
Free((yyvsp[(3) - (5)].c));
@@ -4083,8 +4125,8 @@ yyreduce:
case 26:
-/* Line 1455 of yacc.c */
-#line 211 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 207 "Gmsh.y"
{
std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(6) - (7)].c));
FILE *fp = fopen(tmp.c_str(), (yyvsp[(5) - (7)].c));
@@ -4102,8 +4144,8 @@ yyreduce:
case 27:
-/* Line 1455 of yacc.c */
-#line 225 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 221 "Gmsh.y"
{
char tmpstring[1024];
int i = PrintListOfDouble((yyvsp[(3) - (7)].c), (yyvsp[(5) - (7)].l), tmpstring);
@@ -4120,8 +4162,8 @@ yyreduce:
case 28:
-/* Line 1455 of yacc.c */
-#line 238 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 234 "Gmsh.y"
{
char tmpstring[1024];
int i = PrintListOfDouble((yyvsp[(3) - (9)].c), (yyvsp[(5) - (9)].l), tmpstring);
@@ -4148,8 +4190,8 @@ yyreduce:
case 29:
-/* Line 1455 of yacc.c */
-#line 266 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 262 "Gmsh.y"
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[(1) - (6)].c), "View") && ViewData->finalize()){
@@ -4167,8 +4209,8 @@ yyreduce:
case 30:
-/* Line 1455 of yacc.c */
-#line 280 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 276 "Gmsh.y"
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[(2) - (6)].c), "View")){
@@ -4183,8 +4225,8 @@ yyreduce:
case 31:
-/* Line 1455 of yacc.c */
-#line 291 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 287 "Gmsh.y"
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[(2) - (6)].c), "View")){
@@ -4199,8 +4241,8 @@ yyreduce:
case 32:
-/* Line 1455 of yacc.c */
-#line 305 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 301 "Gmsh.y"
{
#if defined(HAVE_POST)
ViewData = new PViewDataList();
@@ -4210,36 +4252,36 @@ yyreduce:
case 38:
-/* Line 1455 of yacc.c */
-#line 319 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 315 "Gmsh.y"
{ ViewCoord.push_back((yyvsp[(1) - (1)].d)); ;}
break;
case 39:
-/* Line 1455 of yacc.c */
-#line 321 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 317 "Gmsh.y"
{ ViewCoord.push_back((yyvsp[(3) - (3)].d)); ;}
break;
case 40:
-/* Line 1455 of yacc.c */
-#line 326 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 322 "Gmsh.y"
{ if(ViewValueList) ViewValueList->push_back((yyvsp[(1) - (1)].d)); ;}
break;
case 41:
-/* Line 1455 of yacc.c */
-#line 328 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 324 "Gmsh.y"
{ if(ViewValueList) ViewValueList->push_back((yyvsp[(3) - (3)].d)); ;}
break;
case 42:
-/* Line 1455 of yacc.c */
-#line 333 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 329 "Gmsh.y"
{
#if defined(HAVE_POST)
if(!strncmp((yyvsp[(1) - (1)].c), "SP", 2)){
@@ -4347,8 +4389,8 @@ yyreduce:
case 43:
-/* Line 1455 of yacc.c */
-#line 437 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 433 "Gmsh.y"
{
#if defined(HAVE_POST)
if(ViewValueList){
@@ -4362,8 +4404,8 @@ yyreduce:
case 44:
-/* Line 1455 of yacc.c */
-#line 447 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 443 "Gmsh.y"
{
#if defined(HAVE_POST)
if(ViewValueList) (*ViewNumList)++;
@@ -4373,8 +4415,8 @@ yyreduce:
case 45:
-/* Line 1455 of yacc.c */
-#line 456 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 452 "Gmsh.y"
{
#if defined(HAVE_POST)
for(int i = 0; i < (int)strlen((yyvsp[(1) - (1)].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[(1) - (1)].c)[i]);
@@ -4385,8 +4427,8 @@ yyreduce:
case 46:
-/* Line 1455 of yacc.c */
-#line 463 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 459 "Gmsh.y"
{
#if defined(HAVE_POST)
for(int i = 0; i < (int)strlen((yyvsp[(3) - (3)].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[(3) - (3)].c)[i]);
@@ -4397,8 +4439,8 @@ yyreduce:
case 47:
-/* Line 1455 of yacc.c */
-#line 473 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 469 "Gmsh.y"
{
#if defined(HAVE_POST)
ViewData->T2D.push_back((yyvsp[(3) - (8)].d));
@@ -4411,8 +4453,8 @@ yyreduce:
case 48:
-/* Line 1455 of yacc.c */
-#line 482 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 478 "Gmsh.y"
{
#if defined(HAVE_POST)
ViewData->NbT2++;
@@ -4422,8 +4464,8 @@ yyreduce:
case 49:
-/* Line 1455 of yacc.c */
-#line 491 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 487 "Gmsh.y"
{
#if defined(HAVE_POST)
for(int i = 0; i < (int)strlen((yyvsp[(1) - (1)].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[(1) - (1)].c)[i]);
@@ -4434,8 +4476,8 @@ yyreduce:
case 50:
-/* Line 1455 of yacc.c */
-#line 498 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 494 "Gmsh.y"
{
#if defined(HAVE_POST)
for(int i = 0; i < (int)strlen((yyvsp[(3) - (3)].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[(3) - (3)].c)[i]);
@@ -4446,8 +4488,8 @@ yyreduce:
case 51:
-/* Line 1455 of yacc.c */
-#line 508 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 504 "Gmsh.y"
{
#if defined(HAVE_POST)
ViewData->T3D.push_back((yyvsp[(3) - (10)].d)); ViewData->T3D.push_back((yyvsp[(5) - (10)].d));
@@ -4459,8 +4501,8 @@ yyreduce:
case 52:
-/* Line 1455 of yacc.c */
-#line 516 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 512 "Gmsh.y"
{
#if defined(HAVE_POST)
ViewData->NbT3++;
@@ -4470,8 +4512,8 @@ yyreduce:
case 53:
-/* Line 1455 of yacc.c */
-#line 526 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 522 "Gmsh.y"
{
#if defined(HAVE_POST)
int type =
@@ -4491,8 +4533,8 @@ yyreduce:
case 54:
-/* Line 1455 of yacc.c */
-#line 545 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 541 "Gmsh.y"
{
#if defined(HAVE_POST)
int type =
@@ -4512,8 +4554,8 @@ yyreduce:
case 55:
-/* Line 1455 of yacc.c */
-#line 564 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 560 "Gmsh.y"
{
#if defined(HAVE_POST)
ViewValueList = &ViewData->Time;
@@ -4523,65 +4565,65 @@ yyreduce:
case 56:
-/* Line 1455 of yacc.c */
-#line 570 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 566 "Gmsh.y"
{
;}
break;
case 57:
-/* Line 1455 of yacc.c */
-#line 577 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 573 "Gmsh.y"
{ (yyval.i) = 0; ;}
break;
case 58:
-/* Line 1455 of yacc.c */
-#line 578 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 574 "Gmsh.y"
{ (yyval.i) = 1; ;}
break;
case 59:
-/* Line 1455 of yacc.c */
-#line 579 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 575 "Gmsh.y"
{ (yyval.i) = 2; ;}
break;
case 60:
-/* Line 1455 of yacc.c */
-#line 580 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 576 "Gmsh.y"
{ (yyval.i) = 3; ;}
break;
case 61:
-/* Line 1455 of yacc.c */
-#line 581 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 577 "Gmsh.y"
{ (yyval.i) = 4; ;}
break;
case 62:
-/* Line 1455 of yacc.c */
-#line 585 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 581 "Gmsh.y"
{ (yyval.i) = 1; ;}
break;
case 63:
-/* Line 1455 of yacc.c */
-#line 586 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 582 "Gmsh.y"
{ (yyval.i) = -1; ;}
break;
case 65:
-/* Line 1455 of yacc.c */
-#line 595 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 591 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c)) && (yyvsp[(2) - (4)].i) && List_Nbr((yyvsp[(3) - (4)].l)) == 1){
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
@@ -4645,8 +4687,8 @@ yyreduce:
case 66:
-/* Line 1455 of yacc.c */
-#line 658 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 654 "Gmsh.y"
{
gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
s.list = true;
@@ -4679,8 +4721,8 @@ yyreduce:
case 67:
-/* Line 1455 of yacc.c */
-#line 688 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 684 "Gmsh.y"
{
int index = (int)(yyvsp[(3) - (7)].d);
if(!gmsh_yysymbols.count((yyvsp[(1) - (7)].c))){
@@ -4717,8 +4759,8 @@ yyreduce:
case 68:
-/* Line 1455 of yacc.c */
-#line 721 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 717 "Gmsh.y"
{
if(List_Nbr((yyvsp[(4) - (9)].l)) != List_Nbr((yyvsp[(8) - (9)].l))){
yymsg(0, "Incompatible array dimensions in affectation");
@@ -4768,8 +4810,8 @@ yyreduce:
case 69:
-/* Line 1455 of yacc.c */
-#line 767 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 763 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (3)].c));
@@ -4788,8 +4830,8 @@ yyreduce:
case 70:
-/* Line 1455 of yacc.c */
-#line 782 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 778 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (6)].c));
@@ -4809,8 +4851,8 @@ yyreduce:
case 71:
-/* Line 1455 of yacc.c */
-#line 798 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 794 "Gmsh.y"
{
gmsh_yystringsymbols[(yyvsp[(1) - (4)].c)] = std::string((yyvsp[(3) - (4)].c));
Free((yyvsp[(1) - (4)].c));
@@ -4820,8 +4862,8 @@ yyreduce:
case 72:
-/* Line 1455 of yacc.c */
-#line 807 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 803 "Gmsh.y"
{
std::string tmp((yyvsp[(5) - (6)].c));
StringOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (6)].c), 0, (yyvsp[(3) - (6)].c), tmp);
@@ -4831,8 +4873,8 @@ yyreduce:
case 73:
-/* Line 1455 of yacc.c */
-#line 813 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 809 "Gmsh.y"
{
std::string tmp((yyvsp[(8) - (9)].c));
StringOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), tmp);
@@ -4842,8 +4884,8 @@ yyreduce:
case 74:
-/* Line 1455 of yacc.c */
-#line 822 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 818 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (6)].c), 0, (yyvsp[(3) - (6)].c), d)){
@@ -4865,8 +4907,8 @@ yyreduce:
case 75:
-/* Line 1455 of yacc.c */
-#line 840 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 836 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), d)){
@@ -4888,8 +4930,8 @@ yyreduce:
case 76:
-/* Line 1455 of yacc.c */
-#line 858 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 854 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (5)].c), 0, (yyvsp[(3) - (5)].c), d)){
@@ -4902,8 +4944,8 @@ yyreduce:
case 77:
-/* Line 1455 of yacc.c */
-#line 867 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 863 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (8)].c), (int)(yyvsp[(3) - (8)].d), (yyvsp[(6) - (8)].c), d)){
@@ -4916,8 +4958,8 @@ yyreduce:
case 78:
-/* Line 1455 of yacc.c */
-#line 879 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 875 "Gmsh.y"
{
ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (8)].c), 0, (yyvsp[(5) - (8)].c), (yyvsp[(7) - (8)].u));
Free((yyvsp[(1) - (8)].c)); Free((yyvsp[(5) - (8)].c));
@@ -4926,8 +4968,8 @@ yyreduce:
case 79:
-/* Line 1455 of yacc.c */
-#line 884 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 880 "Gmsh.y"
{
ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (11)].c), (int)(yyvsp[(3) - (11)].d), (yyvsp[(8) - (11)].c), (yyvsp[(10) - (11)].u));
Free((yyvsp[(1) - (11)].c)); Free((yyvsp[(8) - (11)].c));
@@ -4936,8 +4978,8 @@ yyreduce:
case 80:
-/* Line 1455 of yacc.c */
-#line 892 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 888 "Gmsh.y"
{
GmshColorTable *ct = GetColorTable(0);
if(!ct)
@@ -4961,8 +5003,8 @@ yyreduce:
case 81:
-/* Line 1455 of yacc.c */
-#line 912 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 908 "Gmsh.y"
{
GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (9)].d));
if(!ct)
@@ -4986,8 +5028,8 @@ yyreduce:
case 82:
-/* Line 1455 of yacc.c */
-#line 935 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 931 "Gmsh.y"
{
#if defined(HAVE_MESH)
if(!strcmp((yyvsp[(1) - (5)].c),"Background"))
@@ -5002,8 +5044,8 @@ yyreduce:
case 83:
-/* Line 1455 of yacc.c */
-#line 946 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 942 "Gmsh.y"
{
#if defined(HAVE_MESH)
if(!GModel::current()->getFields()->newField((int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c)))
@@ -5015,8 +5057,8 @@ yyreduce:
case 84:
-/* Line 1455 of yacc.c */
-#line 954 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 950 "Gmsh.y"
{
#if defined(HAVE_MESH)
Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (9)].d));
@@ -5042,8 +5084,8 @@ yyreduce:
case 85:
-/* Line 1455 of yacc.c */
-#line 976 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 972 "Gmsh.y"
{
#if defined(HAVE_MESH)
Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (9)].d));
@@ -5070,8 +5112,8 @@ yyreduce:
case 86:
-/* Line 1455 of yacc.c */
-#line 999 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 995 "Gmsh.y"
{
#if defined(HAVE_MESH)
Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (11)].d));
@@ -5100,8 +5142,8 @@ yyreduce:
case 87:
-/* Line 1455 of yacc.c */
-#line 1027 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1023 "Gmsh.y"
{
#if defined(HAVE_PLUGINS)
try {
@@ -5117,8 +5159,8 @@ yyreduce:
case 88:
-/* Line 1455 of yacc.c */
-#line 1039 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1035 "Gmsh.y"
{
#if defined(HAVE_PLUGINS)
try {
@@ -5134,8 +5176,8 @@ yyreduce:
case 92:
-/* Line 1455 of yacc.c */
-#line 1057 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1053 "Gmsh.y"
{
std::string key((yyvsp[(3) - (3)].c));
std::vector<double> val(1, 0.);
@@ -5150,8 +5192,8 @@ yyreduce:
case 93:
-/* Line 1455 of yacc.c */
-#line 1068 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1064 "Gmsh.y"
{
std::string key((yyvsp[(3) - (5)].c));
std::vector<double> val(1, (yyvsp[(5) - (5)].d));
@@ -5166,15 +5208,15 @@ yyreduce:
case 94:
-/* Line 1455 of yacc.c */
-#line 1079 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1075 "Gmsh.y"
{ floatOptions.clear(); charOptions.clear(); ;}
break;
case 95:
-/* Line 1455 of yacc.c */
-#line 1081 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1077 "Gmsh.y"
{
std::string key((yyvsp[(3) - (9)].c));
std::vector<double> val(1, (yyvsp[(6) - (9)].d));
@@ -5187,8 +5229,8 @@ yyreduce:
case 98:
-/* Line 1455 of yacc.c */
-#line 1097 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1093 "Gmsh.y"
{
std::string key((yyvsp[(2) - (3)].c));
for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
@@ -5203,8 +5245,8 @@ yyreduce:
case 99:
-/* Line 1455 of yacc.c */
-#line 1108 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1104 "Gmsh.y"
{
std::string key((yyvsp[(2) - (3)].c));
std::string val((yyvsp[(3) - (3)].c));
@@ -5216,8 +5258,8 @@ yyreduce:
case 100:
-/* Line 1455 of yacc.c */
-#line 1121 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1117 "Gmsh.y"
{
(yyval.i) = (int)(yyvsp[(1) - (1)].d);
;}
@@ -5225,8 +5267,8 @@ yyreduce:
case 101:
-/* Line 1455 of yacc.c */
-#line 1125 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1121 "Gmsh.y"
{
(yyval.i) = GModel::current()->setPhysicalName
(std::string((yyvsp[(1) - (1)].c)), curPhysDim,
@@ -5237,8 +5279,8 @@ yyreduce:
case 102:
-/* Line 1455 of yacc.c */
-#line 1135 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1131 "Gmsh.y"
{
(yyval.l) = 0;
;}
@@ -5246,8 +5288,8 @@ yyreduce:
case 103:
-/* Line 1455 of yacc.c */
-#line 1139 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1135 "Gmsh.y"
{
(yyval.l) = List_Create(1, 1, sizeof(Vertex*));
Vertex *v = FindPoint((int)(yyvsp[(4) - (5)].d));
@@ -5261,8 +5303,8 @@ yyreduce:
case 104:
-/* Line 1455 of yacc.c */
-#line 1151 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1147 "Gmsh.y"
{
for(int i = 0; i < 4; i++) (yyval.v)[i] = 0.;
;}
@@ -5270,8 +5312,8 @@ yyreduce:
case 105:
-/* Line 1455 of yacc.c */
-#line 1155 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1151 "Gmsh.y"
{
for(int i = 0; i < 4; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
;}
@@ -5279,8 +5321,8 @@ yyreduce:
case 106:
-/* Line 1455 of yacc.c */
-#line 1165 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1161 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if(FindPoint(num)){
@@ -5307,8 +5349,8 @@ yyreduce:
case 107:
-/* Line 1455 of yacc.c */
-#line 1188 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1184 "Gmsh.y"
{
curPhysDim = 0;
;}
@@ -5316,8 +5358,8 @@ yyreduce:
case 108:
-/* Line 1455 of yacc.c */
-#line 1192 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1188 "Gmsh.y"
{
int num = (int)(yyvsp[(5) - (9)].i);
if(FindPhysicalGroup(num, MSH_PHYSICAL_POINT)){
@@ -5337,8 +5379,8 @@ yyreduce:
case 109:
-/* Line 1455 of yacc.c */
-#line 1208 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1204 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
double d;
@@ -5361,8 +5403,8 @@ yyreduce:
case 110:
-/* Line 1455 of yacc.c */
-#line 1230 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1226 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if(FindCurve(num)){
@@ -5384,8 +5426,8 @@ yyreduce:
case 111:
-/* Line 1455 of yacc.c */
-#line 1248 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1244 "Gmsh.y"
{
for (int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
double dnum;
@@ -5410,8 +5452,8 @@ yyreduce:
case 112:
-/* Line 1455 of yacc.c */
-#line 1269 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1265 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if(FindCurve(num)){
@@ -5433,8 +5475,8 @@ yyreduce:
case 113:
-/* Line 1455 of yacc.c */
-#line 1287 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1283 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (8)].d);
if(FindCurve(num)){
@@ -5468,8 +5510,8 @@ yyreduce:
case 114:
-/* Line 1455 of yacc.c */
-#line 1317 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1313 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (8)].d);
if(FindCurve(num)){
@@ -5503,8 +5545,8 @@ yyreduce:
case 115:
-/* Line 1455 of yacc.c */
-#line 1347 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1343 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if(FindCurve(num)){
@@ -5526,8 +5568,8 @@ yyreduce:
case 116:
-/* Line 1455 of yacc.c */
-#line 1365 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1361 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if(FindCurve(num)){
@@ -5549,8 +5591,8 @@ yyreduce:
case 117:
-/* Line 1455 of yacc.c */
-#line 1383 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1379 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (11)].d);
if(List_Nbr((yyvsp[(6) - (11)].l)) + (int)(yyvsp[(10) - (11)].d) + 1 != List_Nbr((yyvsp[(8) - (11)].l))){
@@ -5580,8 +5622,8 @@ yyreduce:
case 118:
-/* Line 1455 of yacc.c */
-#line 1409 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1405 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
if(FindEdgeLoop(num)){
@@ -5603,8 +5645,8 @@ yyreduce:
case 119:
-/* Line 1455 of yacc.c */
-#line 1427 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1423 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
if(FindCurve(num)){
@@ -5626,8 +5668,8 @@ yyreduce:
case 120:
-/* Line 1455 of yacc.c */
-#line 1445 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1441 "Gmsh.y"
{
curPhysDim = 1;
;}
@@ -5635,8 +5677,8 @@ yyreduce:
case 121:
-/* Line 1455 of yacc.c */
-#line 1449 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1445 "Gmsh.y"
{
int num = (int)(yyvsp[(5) - (9)].i);
if(FindPhysicalGroup(num, MSH_PHYSICAL_LINE)){
@@ -5656,8 +5698,8 @@ yyreduce:
case 122:
-/* Line 1455 of yacc.c */
-#line 1468 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1464 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
if(FindSurface(num)){
@@ -5679,8 +5721,8 @@ yyreduce:
case 123:
-/* Line 1455 of yacc.c */
-#line 1486 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1482 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (9)].d), type = 0;
if(FindSurface(num)){
@@ -5723,8 +5765,8 @@ yyreduce:
case 124:
-/* Line 1455 of yacc.c */
-#line 1525 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1521 "Gmsh.y"
{
myGmshSurface = 0;
(yyval.s).Type = 0;
@@ -5734,8 +5776,8 @@ yyreduce:
case 125:
-/* Line 1455 of yacc.c */
-#line 1531 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1527 "Gmsh.y"
{
myGmshSurface = gmshSurface::getSurface((int)(yyvsp[(3) - (4)].d));
(yyval.s).Type = 0;
@@ -5745,8 +5787,8 @@ yyreduce:
case 126:
-/* Line 1455 of yacc.c */
-#line 1537 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1533 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (10)].d);
myGmshSurface = gmshParametricSurface::NewParametricSurface(num, (yyvsp[(7) - (10)].c), (yyvsp[(8) - (10)].c), (yyvsp[(9) - (10)].c));
@@ -5757,8 +5799,8 @@ yyreduce:
case 127:
-/* Line 1455 of yacc.c */
-#line 1544 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1540 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if (List_Nbr((yyvsp[(6) - (7)].l)) != 2){
@@ -5787,8 +5829,8 @@ yyreduce:
case 128:
-/* Line 1455 of yacc.c */
-#line 1569 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1565 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if (List_Nbr((yyvsp[(6) - (7)].l)) != 2){
@@ -5817,8 +5859,8 @@ yyreduce:
case 129:
-/* Line 1455 of yacc.c */
-#line 1594 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1590 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
if(FindSurfaceLoop(num)){
@@ -5839,8 +5881,8 @@ yyreduce:
case 130:
-/* Line 1455 of yacc.c */
-#line 1611 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1607 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
if(FindSurface(num)){
@@ -5861,8 +5903,8 @@ yyreduce:
case 131:
-/* Line 1455 of yacc.c */
-#line 1629 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1625 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (12)].d);
if(FindSurface(num)){
@@ -5896,8 +5938,8 @@ yyreduce:
case 132:
-/* Line 1455 of yacc.c */
-#line 1659 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1655 "Gmsh.y"
{
curPhysDim = 2;
;}
@@ -5905,8 +5947,8 @@ yyreduce:
case 133:
-/* Line 1455 of yacc.c */
-#line 1663 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1659 "Gmsh.y"
{
int num = (int)(yyvsp[(5) - (9)].i);
if(FindPhysicalGroup(num, MSH_PHYSICAL_SURFACE)){
@@ -5926,8 +5968,8 @@ yyreduce:
case 134:
-/* Line 1455 of yacc.c */
-#line 1683 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1679 "Gmsh.y"
{
yymsg(0, "'Complex Volume' command is deprecated: use 'Volume' instead");
int num = (int)(yyvsp[(4) - (8)].d);
@@ -5949,8 +5991,8 @@ yyreduce:
case 135:
-/* Line 1455 of yacc.c */
-#line 1701 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1697 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if(FindVolume(num)){
@@ -5971,8 +6013,8 @@ yyreduce:
case 136:
-/* Line 1455 of yacc.c */
-#line 1718 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1714 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
if(FindVolume(num)){
@@ -5992,8 +6034,8 @@ yyreduce:
case 137:
-/* Line 1455 of yacc.c */
-#line 1734 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1730 "Gmsh.y"
{
curPhysDim = 3;
;}
@@ -6001,8 +6043,8 @@ yyreduce:
case 138:
-/* Line 1455 of yacc.c */
-#line 1738 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1734 "Gmsh.y"
{
int num = (int)(yyvsp[(5) - (9)].i);
if(FindPhysicalGroup(num, MSH_PHYSICAL_VOLUME)){
@@ -6022,8 +6064,8 @@ yyreduce:
case 139:
-/* Line 1455 of yacc.c */
-#line 1760 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1756 "Gmsh.y"
{
TranslateShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(4) - (5)].l));
(yyval.l) = (yyvsp[(4) - (5)].l);
@@ -6032,8 +6074,8 @@ yyreduce:
case 140:
-/* Line 1455 of yacc.c */
-#line 1765 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1761 "Gmsh.y"
{
RotateShapes((yyvsp[(3) - (11)].v)[0], (yyvsp[(3) - (11)].v)[1], (yyvsp[(3) - (11)].v)[2], (yyvsp[(5) - (11)].v)[0], (yyvsp[(5) - (11)].v)[1], (yyvsp[(5) - (11)].v)[2], (yyvsp[(7) - (11)].d), (yyvsp[(10) - (11)].l));
(yyval.l) = (yyvsp[(10) - (11)].l);
@@ -6042,8 +6084,8 @@ yyreduce:
case 141:
-/* Line 1455 of yacc.c */
-#line 1770 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1766 "Gmsh.y"
{
SymmetryShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(2) - (5)].v)[3], (yyvsp[(4) - (5)].l));
(yyval.l) = (yyvsp[(4) - (5)].l);
@@ -6052,8 +6094,8 @@ yyreduce:
case 142:
-/* Line 1455 of yacc.c */
-#line 1775 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1771 "Gmsh.y"
{
DilatShapes((yyvsp[(3) - (9)].v)[0], (yyvsp[(3) - (9)].v)[1], (yyvsp[(3) - (9)].v)[2], (yyvsp[(5) - (9)].d), (yyvsp[(8) - (9)].l));
(yyval.l) = (yyvsp[(8) - (9)].l);
@@ -6062,8 +6104,8 @@ yyreduce:
case 143:
-/* Line 1455 of yacc.c */
-#line 1780 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1776 "Gmsh.y"
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
if(!strcmp((yyvsp[(1) - (4)].c), "Duplicata")){
@@ -6090,8 +6132,8 @@ yyreduce:
case 144:
-/* Line 1455 of yacc.c */
-#line 1803 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1799 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
IntersectCurvesWithSurface((yyvsp[(4) - (9)].l), (int)(yyvsp[(8) - (9)].d), (yyval.l));
@@ -6101,8 +6143,8 @@ yyreduce:
case 145:
-/* Line 1455 of yacc.c */
-#line 1809 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1805 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape*));
List_T *tmp = ListOfDouble2ListOfInt((yyvsp[(7) - (9)].l));
@@ -6114,22 +6156,22 @@ yyreduce:
case 146:
-/* Line 1455 of yacc.c */
-#line 1819 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1815 "Gmsh.y"
{ (yyval.l) = (yyvsp[(1) - (1)].l); ;}
break;
case 147:
-/* Line 1455 of yacc.c */
-#line 1820 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1816 "Gmsh.y"
{ (yyval.l) = (yyvsp[(1) - (1)].l); ;}
break;
case 148:
-/* Line 1455 of yacc.c */
-#line 1825 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1821 "Gmsh.y"
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
;}
@@ -6137,8 +6179,8 @@ yyreduce:
case 149:
-/* Line 1455 of yacc.c */
-#line 1829 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1825 "Gmsh.y"
{
List_Add((yyval.l), &(yyvsp[(2) - (2)].s));
;}
@@ -6146,8 +6188,8 @@ yyreduce:
case 150:
-/* Line 1455 of yacc.c */
-#line 1833 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1829 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -6174,8 +6216,8 @@ yyreduce:
case 151:
-/* Line 1455 of yacc.c */
-#line 1856 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1852 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -6202,8 +6244,8 @@ yyreduce:
case 152:
-/* Line 1455 of yacc.c */
-#line 1879 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1875 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -6230,8 +6272,8 @@ yyreduce:
case 153:
-/* Line 1455 of yacc.c */
-#line 1902 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1898 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -6258,8 +6300,8 @@ yyreduce:
case 154:
-/* Line 1455 of yacc.c */
-#line 1930 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1926 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
if(List_Nbr((yyvsp[(7) - (8)].l)) == 4){
@@ -6284,8 +6326,8 @@ yyreduce:
case 155:
-/* Line 1455 of yacc.c */
-#line 1951 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1947 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
int t = (int)(yyvsp[(4) - (10)].d);
@@ -6312,8 +6354,8 @@ yyreduce:
case 156:
-/* Line 1455 of yacc.c */
-#line 1975 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1971 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
if(List_Nbr((yyvsp[(12) - (14)].l)) == 0){
@@ -6337,8 +6379,8 @@ yyreduce:
case 157:
-/* Line 1455 of yacc.c */
-#line 1996 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 1992 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
if(List_Nbr((yyvsp[(14) - (16)].l)) == 0){
@@ -6363,8 +6405,8 @@ yyreduce:
case 158:
-/* Line 1455 of yacc.c */
-#line 2017 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2013 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
if(List_Nbr((yyvsp[(10) - (12)].l)) == 1){
@@ -6388,8 +6430,8 @@ yyreduce:
case 159:
-/* Line 1455 of yacc.c */
-#line 2037 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2033 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
if(!strcmp((yyvsp[(2) - (8)].c), "Union")){
@@ -6505,8 +6547,8 @@ yyreduce:
case 160:
-/* Line 1455 of yacc.c */
-#line 2149 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2145 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
if(!strcmp((yyvsp[(2) - (8)].c), "MathEval")){
@@ -6529,8 +6571,8 @@ yyreduce:
case 161:
-/* Line 1455 of yacc.c */
-#line 2168 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2164 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
if(!strcmp((yyvsp[(2) - (6)].c), "CutMesh")){
@@ -6572,8 +6614,8 @@ yyreduce:
case 162:
-/* Line 1455 of yacc.c */
-#line 2207 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2203 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
if(!strcmp((yyvsp[(2) - (14)].c), "Cylinder") && List_Nbr((yyvsp[(12) - (14)].l)) == 1){
@@ -6680,8 +6722,8 @@ yyreduce:
case 163:
-/* Line 1455 of yacc.c */
-#line 2315 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2311 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -6694,8 +6736,8 @@ yyreduce:
case 164:
-/* Line 1455 of yacc.c */
-#line 2324 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2320 "Gmsh.y"
{
#if defined(HAVE_MESH)
GModel::current()->getFields()->deleteField((int)(yyvsp[(4) - (6)].d));
@@ -6705,8 +6747,8 @@ yyreduce:
case 165:
-/* Line 1455 of yacc.c */
-#line 2330 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2326 "Gmsh.y"
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[(2) - (6)].c), "View")){
@@ -6725,8 +6767,8 @@ yyreduce:
case 166:
-/* Line 1455 of yacc.c */
-#line 2345 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2341 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Meshes") || !strcmp((yyvsp[(2) - (3)].c), "All")){
ClearProject();
@@ -6758,8 +6800,8 @@ yyreduce:
case 167:
-/* Line 1455 of yacc.c */
-#line 2373 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2369 "Gmsh.y"
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[(2) - (4)].c), "Empty") && !strcmp((yyvsp[(3) - (4)].c), "Views")){
@@ -6775,8 +6817,8 @@ yyreduce:
case 168:
-/* Line 1455 of yacc.c */
-#line 2390 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2386 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
Shape TheShape;
@@ -6789,8 +6831,8 @@ yyreduce:
case 169:
-/* Line 1455 of yacc.c */
-#line 2404 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2400 "Gmsh.y"
{
for(int i = 0; i < 4; i++)
VisibilityShape((yyvsp[(2) - (3)].c), i, 1);
@@ -6800,8 +6842,8 @@ yyreduce:
case 170:
-/* Line 1455 of yacc.c */
-#line 2410 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2406 "Gmsh.y"
{
for(int i = 0; i < 4; i++)
VisibilityShape((yyvsp[(2) - (3)].c), i, 0);
@@ -6811,8 +6853,8 @@ yyreduce:
case 171:
-/* Line 1455 of yacc.c */
-#line 2416 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2412 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -6825,8 +6867,8 @@ yyreduce:
case 172:
-/* Line 1455 of yacc.c */
-#line 2425 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2421 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -6839,8 +6881,8 @@ yyreduce:
case 173:
-/* Line 1455 of yacc.c */
-#line 2439 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2435 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (3)].c), "Include")){
std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
@@ -6886,8 +6928,8 @@ yyreduce:
case 174:
-/* Line 1455 of yacc.c */
-#line 2481 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2477 "Gmsh.y"
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[(1) - (7)].c), "Save") && !strcmp((yyvsp[(2) - (7)].c), "View")){
@@ -6908,8 +6950,8 @@ yyreduce:
case 175:
-/* Line 1455 of yacc.c */
-#line 2498 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2494 "Gmsh.y"
{
#if defined(HAVE_POST) && defined(HAVE_MESH)
if(!strcmp((yyvsp[(1) - (7)].c), "Background") && !strcmp((yyvsp[(2) - (7)].c), "Mesh") && !strcmp((yyvsp[(3) - (7)].c), "View")){
@@ -6928,8 +6970,8 @@ yyreduce:
case 176:
-/* Line 1455 of yacc.c */
-#line 2513 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2509 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (3)].c), "Sleep")){
SleepInSeconds((yyvsp[(2) - (3)].d));
@@ -6952,8 +6994,8 @@ yyreduce:
case 177:
-/* Line 1455 of yacc.c */
-#line 2532 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2528 "Gmsh.y"
{
#if defined(HAVE_PLUGINS)
try {
@@ -6969,8 +7011,8 @@ yyreduce:
case 178:
-/* Line 1455 of yacc.c */
-#line 2544 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2540 "Gmsh.y"
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[(2) - (3)].c), "ElementsFromAllViews"))
@@ -6998,8 +7040,8 @@ yyreduce:
case 179:
-/* Line 1455 of yacc.c */
-#line 2568 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2564 "Gmsh.y"
{
exit(0);
;}
@@ -7007,8 +7049,8 @@ yyreduce:
case 180:
-/* Line 1455 of yacc.c */
-#line 2572 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2568 "Gmsh.y"
{
// FIXME: this is a hack to force a transfer from the old DB to
// the new DB. This will become unnecessary if/when we fill the
@@ -7019,8 +7061,8 @@ yyreduce:
case 181:
-/* Line 1455 of yacc.c */
-#line 2579 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2575 "Gmsh.y"
{
CTX::instance()->forcedBBox = 0;
GModel::current()->importGEOInternals();
@@ -7030,8 +7072,8 @@ yyreduce:
case 182:
-/* Line 1455 of yacc.c */
-#line 2585 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2581 "Gmsh.y"
{
CTX::instance()->forcedBBox = 1;
SetBoundingBox((yyvsp[(3) - (15)].d), (yyvsp[(5) - (15)].d), (yyvsp[(7) - (15)].d), (yyvsp[(9) - (15)].d), (yyvsp[(11) - (15)].d), (yyvsp[(13) - (15)].d));
@@ -7040,8 +7082,8 @@ yyreduce:
case 183:
-/* Line 1455 of yacc.c */
-#line 2590 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2586 "Gmsh.y"
{
#if defined(HAVE_OPENGL)
drawContext::global()->draw();
@@ -7051,8 +7093,8 @@ yyreduce:
case 184:
-/* Line 1455 of yacc.c */
-#line 2596 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2592 "Gmsh.y"
{
GModel::current()->createTopologyFromMesh();
;}
@@ -7060,8 +7102,8 @@ yyreduce:
case 185:
-/* Line 1455 of yacc.c */
-#line 2600 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2596 "Gmsh.y"
{
GModel::current()->createTopologyFromMesh(1);
;}
@@ -7069,8 +7111,8 @@ yyreduce:
case 186:
-/* Line 1455 of yacc.c */
-#line 2604 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2600 "Gmsh.y"
{
GModel::current()->importGEOInternals();
GModel::current()->refineMesh(CTX::instance()->mesh.secondOrderLinear);
@@ -7079,8 +7121,8 @@ yyreduce:
case 187:
-/* Line 1455 of yacc.c */
-#line 2614 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2610 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (6)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (6)].d);
@@ -7101,8 +7143,8 @@ yyreduce:
case 188:
-/* Line 1455 of yacc.c */
-#line 2631 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2627 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (8)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (8)].d);
@@ -7123,8 +7165,8 @@ yyreduce:
case 189:
-/* Line 1455 of yacc.c */
-#line 2648 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2644 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (8)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (8)].d);
@@ -7149,8 +7191,8 @@ yyreduce:
case 190:
-/* Line 1455 of yacc.c */
-#line 2669 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2665 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (10)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (10)].d);
@@ -7175,8 +7217,8 @@ yyreduce:
case 191:
-/* Line 1455 of yacc.c */
-#line 2690 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2686 "Gmsh.y"
{
if(ImbricatedLoop <= 0){
yymsg(0, "Invalid For/EndFor loop");
@@ -7215,8 +7257,8 @@ yyreduce:
case 192:
-/* Line 1455 of yacc.c */
-#line 2725 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2721 "Gmsh.y"
{
if(!FunctionManager::Instance()->createFunction
((yyvsp[(2) - (2)].c), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
@@ -7228,8 +7270,8 @@ yyreduce:
case 193:
-/* Line 1455 of yacc.c */
-#line 2733 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2729 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction
(&gmsh_yyin, gmsh_yyname, gmsh_yylineno))
@@ -7239,8 +7281,8 @@ yyreduce:
case 194:
-/* Line 1455 of yacc.c */
-#line 2739 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2735 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction
((yyvsp[(2) - (3)].c), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
@@ -7251,8 +7293,8 @@ yyreduce:
case 195:
-/* Line 1455 of yacc.c */
-#line 2746 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2742 "Gmsh.y"
{
if(!(yyvsp[(3) - (4)].d)) skip_until("If", "EndIf");
;}
@@ -7260,16 +7302,16 @@ yyreduce:
case 196:
-/* Line 1455 of yacc.c */
-#line 2750 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2746 "Gmsh.y"
{
;}
break;
case 197:
-/* Line 1455 of yacc.c */
-#line 2759 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2755 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (5)].l),
@@ -7281,8 +7323,8 @@ yyreduce:
case 198:
-/* Line 1455 of yacc.c */
-#line 2767 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2763 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(ROTATE, (yyvsp[(10) - (11)].l),
@@ -7294,8 +7336,8 @@ yyreduce:
case 199:
-/* Line 1455 of yacc.c */
-#line 2775 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2771 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (13)].l),
@@ -7307,8 +7349,8 @@ yyreduce:
case 200:
-/* Line 1455 of yacc.c */
-#line 2783 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2779 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7317,8 +7359,8 @@ yyreduce:
case 201:
-/* Line 1455 of yacc.c */
-#line 2788 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2784 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (7)].l),
@@ -7330,8 +7372,8 @@ yyreduce:
case 202:
-/* Line 1455 of yacc.c */
-#line 2796 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2792 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7340,8 +7382,8 @@ yyreduce:
case 203:
-/* Line 1455 of yacc.c */
-#line 2801 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2797 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(ROTATE, (yyvsp[(10) - (13)].l),
@@ -7353,8 +7395,8 @@ yyreduce:
case 204:
-/* Line 1455 of yacc.c */
-#line 2809 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2805 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7363,8 +7405,8 @@ yyreduce:
case 205:
-/* Line 1455 of yacc.c */
-#line 2814 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2810 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (15)].l),
@@ -7376,8 +7418,8 @@ yyreduce:
case 206:
-/* Line 1455 of yacc.c */
-#line 2822 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2818 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7386,8 +7428,8 @@ yyreduce:
case 207:
-/* Line 1455 of yacc.c */
-#line 2827 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2823 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(BOUNDARY_LAYER, (yyvsp[(3) - (6)].l), 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
@@ -7398,8 +7440,8 @@ yyreduce:
case 208:
-/* Line 1455 of yacc.c */
-#line 2835 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2831 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (8)].d),
@@ -7410,8 +7452,8 @@ yyreduce:
case 209:
-/* Line 1455 of yacc.c */
-#line 2842 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2838 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (8)].d),
@@ -7422,8 +7464,8 @@ yyreduce:
case 210:
-/* Line 1455 of yacc.c */
-#line 2849 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2845 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (8)].d),
@@ -7434,8 +7476,8 @@ yyreduce:
case 211:
-/* Line 1455 of yacc.c */
-#line 2856 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2852 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
@@ -7446,8 +7488,8 @@ yyreduce:
case 212:
-/* Line 1455 of yacc.c */
-#line 2863 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2859 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
@@ -7458,8 +7500,8 @@ yyreduce:
case 213:
-/* Line 1455 of yacc.c */
-#line 2870 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2866 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
@@ -7470,8 +7512,8 @@ yyreduce:
case 214:
-/* Line 1455 of yacc.c */
-#line 2877 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2873 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (14)].d),
@@ -7482,8 +7524,8 @@ yyreduce:
case 215:
-/* Line 1455 of yacc.c */
-#line 2884 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2880 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (14)].d),
@@ -7494,8 +7536,8 @@ yyreduce:
case 216:
-/* Line 1455 of yacc.c */
-#line 2891 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2887 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (14)].d),
@@ -7506,8 +7548,8 @@ yyreduce:
case 217:
-/* Line 1455 of yacc.c */
-#line 2898 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2894 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7516,8 +7558,8 @@ yyreduce:
case 218:
-/* Line 1455 of yacc.c */
-#line 2903 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2899 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
@@ -7528,8 +7570,8 @@ yyreduce:
case 219:
-/* Line 1455 of yacc.c */
-#line 2910 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2906 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7538,8 +7580,8 @@ yyreduce:
case 220:
-/* Line 1455 of yacc.c */
-#line 2915 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2911 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
@@ -7550,8 +7592,8 @@ yyreduce:
case 221:
-/* Line 1455 of yacc.c */
-#line 2922 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2918 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7560,8 +7602,8 @@ yyreduce:
case 222:
-/* Line 1455 of yacc.c */
-#line 2927 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2923 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
@@ -7572,8 +7614,8 @@ yyreduce:
case 223:
-/* Line 1455 of yacc.c */
-#line 2934 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2930 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7582,8 +7624,8 @@ yyreduce:
case 224:
-/* Line 1455 of yacc.c */
-#line 2939 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2935 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (16)].d),
@@ -7594,8 +7636,8 @@ yyreduce:
case 225:
-/* Line 1455 of yacc.c */
-#line 2946 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2942 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7604,8 +7646,8 @@ yyreduce:
case 226:
-/* Line 1455 of yacc.c */
-#line 2951 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2947 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (16)].d),
@@ -7616,8 +7658,8 @@ yyreduce:
case 227:
-/* Line 1455 of yacc.c */
-#line 2958 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2954 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7626,8 +7668,8 @@ yyreduce:
case 228:
-/* Line 1455 of yacc.c */
-#line 2963 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2959 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (16)].d),
@@ -7638,8 +7680,8 @@ yyreduce:
case 229:
-/* Line 1455 of yacc.c */
-#line 2970 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2966 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7648,8 +7690,8 @@ yyreduce:
case 230:
-/* Line 1455 of yacc.c */
-#line 2975 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2971 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (18)].d),
@@ -7660,8 +7702,8 @@ yyreduce:
case 231:
-/* Line 1455 of yacc.c */
-#line 2982 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2978 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7670,8 +7712,8 @@ yyreduce:
case 232:
-/* Line 1455 of yacc.c */
-#line 2987 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2983 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (18)].d),
@@ -7682,8 +7724,8 @@ yyreduce:
case 233:
-/* Line 1455 of yacc.c */
-#line 2994 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2990 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
extr.mesh.QuadToTri = NO_QUADTRI;
@@ -7692,8 +7734,8 @@ yyreduce:
case 234:
-/* Line 1455 of yacc.c */
-#line 2999 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 2995 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (18)].d),
@@ -7704,24 +7746,24 @@ yyreduce:
case 235:
-/* Line 1455 of yacc.c */
-#line 3010 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3006 "Gmsh.y"
{
;}
break;
case 236:
-/* Line 1455 of yacc.c */
-#line 3013 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3009 "Gmsh.y"
{
;}
break;
case 237:
-/* Line 1455 of yacc.c */
-#line 3019 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3015 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = true;
extr.mesh.NbLayer = 1;
@@ -7734,8 +7776,8 @@ yyreduce:
case 238:
-/* Line 1455 of yacc.c */
-#line 3028 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3024 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = true;
extr.mesh.NbLayer = List_Nbr((yyvsp[(3) - (7)].l));
@@ -7759,8 +7801,8 @@ yyreduce:
case 239:
-/* Line 1455 of yacc.c */
-#line 3048 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3044 "Gmsh.y"
{
yymsg(0, "Explicit region numbers in layers are deprecated");
extr.mesh.ExtrudeMesh = true;
@@ -7787,8 +7829,8 @@ yyreduce:
case 240:
-/* Line 1455 of yacc.c */
-#line 3071 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3067 "Gmsh.y"
{
extr.mesh.Recombine = true;
;}
@@ -7796,8 +7838,8 @@ yyreduce:
case 241:
-/* Line 1455 of yacc.c */
-#line 3075 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3071 "Gmsh.y"
{
extr.mesh.QuadToTri = QUADTRI_DBL_1;
;}
@@ -7805,8 +7847,8 @@ yyreduce:
case 242:
-/* Line 1455 of yacc.c */
-#line 3079 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3075 "Gmsh.y"
{
extr.mesh.QuadToTri = QUADTRI_DBL_1_RECOMB;
;}
@@ -7814,8 +7856,8 @@ yyreduce:
case 243:
-/* Line 1455 of yacc.c */
-#line 3083 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3079 "Gmsh.y"
{
extr.mesh.QuadToTri = QUADTRI_SNGL_1;
;}
@@ -7823,8 +7865,8 @@ yyreduce:
case 244:
-/* Line 1455 of yacc.c */
-#line 3087 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3083 "Gmsh.y"
{
extr.mesh.QuadToTri = QUADTRI_SNGL_1_RECOMB;
;}
@@ -7832,8 +7874,8 @@ yyreduce:
case 245:
-/* Line 1455 of yacc.c */
-#line 3091 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3087 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (9)].d);
if(FindSurface(num)){
@@ -7856,8 +7898,8 @@ yyreduce:
case 246:
-/* Line 1455 of yacc.c */
-#line 3110 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3106 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (6)].c), "Index"))
extr.mesh.BoundaryLayerIndex = (yyvsp[(4) - (6)].d);
@@ -7869,8 +7911,8 @@ yyreduce:
case 247:
-/* Line 1455 of yacc.c */
-#line 3122 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3118 "Gmsh.y"
{
(yyval.v)[0] = (yyval.v)[1] = 1.;
;}
@@ -7878,8 +7920,8 @@ yyreduce:
case 248:
-/* Line 1455 of yacc.c */
-#line 3126 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3122 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Progression") || !strcmp((yyvsp[(2) - (3)].c), "Power"))
(yyval.v)[0] = 1.;
@@ -7896,8 +7938,8 @@ yyreduce:
case 249:
-/* Line 1455 of yacc.c */
-#line 3141 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3137 "Gmsh.y"
{
(yyval.i) = -1; // left
;}
@@ -7905,8 +7947,8 @@ yyreduce:
case 250:
-/* Line 1455 of yacc.c */
-#line 3145 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3141 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (1)].c), "Right"))
(yyval.i) = 1;
@@ -7920,8 +7962,8 @@ yyreduce:
case 251:
-/* Line 1455 of yacc.c */
-#line 3157 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3153 "Gmsh.y"
{
(yyval.l) = List_Create(1, 1, sizeof(double));
;}
@@ -7929,8 +7971,8 @@ yyreduce:
case 252:
-/* Line 1455 of yacc.c */
-#line 3161 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3157 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (2)].l);
;}
@@ -7938,8 +7980,8 @@ yyreduce:
case 253:
-/* Line 1455 of yacc.c */
-#line 3166 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3162 "Gmsh.y"
{
(yyval.i) = 45;
;}
@@ -7947,8 +7989,8 @@ yyreduce:
case 254:
-/* Line 1455 of yacc.c */
-#line 3170 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3166 "Gmsh.y"
{
(yyval.i) = (int)(yyvsp[(2) - (2)].d);
;}
@@ -7956,8 +7998,8 @@ yyreduce:
case 255:
-/* Line 1455 of yacc.c */
-#line 3177 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3173 "Gmsh.y"
{
int type = (int)(yyvsp[(6) - (7)].v)[0];
double coef = fabs((yyvsp[(6) - (7)].v)[1]);
@@ -8017,8 +8059,8 @@ yyreduce:
case 256:
-/* Line 1455 of yacc.c */
-#line 3233 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3229 "Gmsh.y"
{
int k = List_Nbr((yyvsp[(4) - (6)].l));
if(k != 0 && k != 3 && k != 4){
@@ -8092,8 +8134,8 @@ yyreduce:
case 257:
-/* Line 1455 of yacc.c */
-#line 3303 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3299 "Gmsh.y"
{
yymsg(1, "Elliptic Surface is deprecated: use Transfinite instead (with smoothing)");
List_Delete((yyvsp[(7) - (8)].l));
@@ -8102,8 +8144,8 @@ yyreduce:
case 258:
-/* Line 1455 of yacc.c */
-#line 3308 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3304 "Gmsh.y"
{
int k = List_Nbr((yyvsp[(4) - (5)].l));
if(k != 0 && k != 6 && k != 8){
@@ -8174,8 +8216,8 @@ yyreduce:
case 259:
-/* Line 1455 of yacc.c */
-#line 3375 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3371 "Gmsh.y"
{
if(!(yyvsp[(2) - (3)].l)){
List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Volumes);
@@ -8215,8 +8257,8 @@ yyreduce:
case 260:
-/* Line 1455 of yacc.c */
-#line 3411 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3407 "Gmsh.y"
{
if(!(yyvsp[(3) - (5)].l)){
List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Surfaces);
@@ -8263,8 +8305,8 @@ yyreduce:
case 261:
-/* Line 1455 of yacc.c */
-#line 3454 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3450 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
double d;
@@ -8288,8 +8330,8 @@ yyreduce:
case 262:
-/* Line 1455 of yacc.c */
-#line 3479 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3475 "Gmsh.y"
{
if(List_Nbr((yyvsp[(5) - (6)].l)) != List_Nbr((yyvsp[(3) - (6)].l))){
yymsg(0, "Number of master (%d) different from number of slave (%d) lines",
@@ -8320,8 +8362,8 @@ yyreduce:
case 263:
-/* Line 1455 of yacc.c */
-#line 3507 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3503 "Gmsh.y"
{
if (List_Nbr((yyvsp[(5) - (12)].l)) != List_Nbr((yyvsp[(10) - (12)].l))){
yymsg(0, "Number of master surface edges (%d) different from number of "
@@ -8361,8 +8403,8 @@ yyreduce:
case 264:
-/* Line 1455 of yacc.c */
-#line 3550 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3546 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
if(s){
@@ -8389,8 +8431,8 @@ yyreduce:
case 265:
-/* Line 1455 of yacc.c */
-#line 3573 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3569 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
if(s){
@@ -8417,24 +8459,24 @@ yyreduce:
case 266:
-/* Line 1455 of yacc.c */
-#line 3596 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3592 "Gmsh.y"
{
;}
break;
case 267:
-/* Line 1455 of yacc.c */
-#line 3599 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3595 "Gmsh.y"
{
;}
break;
case 268:
-/* Line 1455 of yacc.c */
-#line 3608 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3604 "Gmsh.y"
{
ReplaceAllDuplicates();
;}
@@ -8442,8 +8484,8 @@ yyreduce:
case 269:
-/* Line 1455 of yacc.c */
-#line 3612 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3608 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Geometry"))
ReplaceAllDuplicates();
@@ -8457,8 +8499,8 @@ yyreduce:
case 270:
-/* Line 1455 of yacc.c */
-#line 3622 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3618 "Gmsh.y"
{
if(List_Nbr((yyvsp[(4) - (6)].l)) >= 2){
double d;
@@ -8492,213 +8534,126 @@ yyreduce:
case 271:
-/* Line 1455 of yacc.c */
-#line 3659 "Gmsh.y"
- {
- List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (11)].l));
- std::vector<int> domain;
- for (int i = 0; i < List_Nbr(temp); i++){
- int item = 0;
- List_Read(temp, i, &item);
- domain.push_back(item);
- }
- List_Delete((yyvsp[(7) - (11)].l));
- List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt((yyvsp[(9) - (11)].l));
- std::vector<int> subdomain;
- for (int i = 0; i < List_Nbr(temp2); i++){
- int item = 0;
- List_Read(temp2, i, &item);
- subdomain.push_back(item);
- }
- List_Delete((yyvsp[(9) - (11)].l));
- List_Delete(temp2);
- std::string fileName = "";
- fileName = (yyvsp[(3) - (11)].c);
- if(!fileName.empty()) fileName = FixRelativePath(gmsh_yyname, (yyvsp[(3) - (11)].c));
-#if defined(HAVE_KBIPACK)
- Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->setFileName(fileName);
- homology->computeRanks();
- delete homology;
-#else
- yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation");
-#endif
- ;}
+/* Line 1464 of yacc.c */
+#line 3652 "Gmsh.y"
+ { (yyval.c) = (char*)"Generators"; ;}
break;
case 272:
-/* Line 1455 of yacc.c */
-#line 3691 "Gmsh.y"
- {
- List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (11)].l));
- std::vector<int> domain;
- for (int i = 0; i < List_Nbr(temp); i++){
- int item = 0;
- List_Read(temp, i, &item);
- domain.push_back(item);
- }
- List_Delete((yyvsp[(7) - (11)].l));
- List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt((yyvsp[(9) - (11)].l));
- std::vector<int> subdomain;
- for (int i = 0; i < List_Nbr(temp2); i++){
- int item = 0;
- List_Read(temp2, i, &item);
- subdomain.push_back(item);
- }
- List_Delete((yyvsp[(9) - (11)].l));
- List_Delete(temp2);
- std::string fileName = "";
- fileName = (yyvsp[(3) - (11)].c);
- if(!fileName.empty()) fileName = FixRelativePath(gmsh_yyname, (yyvsp[(3) - (11)].c));
-#if defined(HAVE_KBIPACK)
- Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->setFileName(fileName);
- homology->findGenerators();
- delete homology;
-#else
- yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation");
-#endif
- ;}
+/* Line 1464 of yacc.c */
+#line 3653 "Gmsh.y"
+ { (yyval.c) = (char*)"DualGenerators"; ;}
break;
case 273:
-/* Line 1455 of yacc.c */
-#line 3723 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3658 "Gmsh.y"
{
- List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (11)].l));
- std::vector<int> domain;
- for (int i = 0; i < List_Nbr(temp); i++){
- int item = 0;
- List_Read(temp, i, &item);
- domain.push_back(item);
- }
- List_Delete((yyvsp[(7) - (11)].l));
- List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt((yyvsp[(9) - (11)].l));
- std::vector<int> subdomain;
- for (int i = 0; i < List_Nbr(temp2); i++){
- int item = 0;
- List_Read(temp2, i, &item);
- subdomain.push_back(item);
- }
- List_Delete((yyvsp[(9) - (11)].l));
- List_Delete(temp2);
- std::string fileName = "";
- fileName = (yyvsp[(3) - (11)].c);
- if(!fileName.empty()) fileName = FixRelativePath(gmsh_yyname, (yyvsp[(3) - (11)].c));
- printf("laa %s \n", fileName.c_str());
-#if defined(HAVE_KBIPACK)
- Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->setFileName(fileName);
- homology->findDualGenerators();
- delete homology;
-#else
- yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation");
-#endif
+ std::vector<int> domain, subdomain;
+ GModel::current()->addHomologyRequest((yyvsp[(1) - (2)].c), domain, subdomain);
;}
break;
case 274:
-/* Line 1455 of yacc.c */
-#line 3756 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3663 "Gmsh.y"
{
- List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (11)].l));
- std::vector<int> domain;
- for (int i = 0; i < List_Nbr(temp); i++){
- int item = 0;
- List_Read(temp, i, &item);
- domain.push_back(item);
- }
- List_Delete((yyvsp[(7) - (11)].l));
- List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt((yyvsp[(9) - (11)].l));
- std::vector<int> subdomain;
- for (int i = 0; i < List_Nbr(temp2); i++){
- int item = 0;
- List_Read(temp2, i, &item);
- subdomain.push_back(item);
+ std::vector<int> domain, subdomain;
+ for(int i = 0; i < List_Nbr((yyvsp[(3) - (5)].l)); i++){
+ double d;
+ List_Read((yyvsp[(3) - (5)].l), i, &d);
+ domain.push_back((int)d);
}
- List_Delete((yyvsp[(9) - (11)].l));
- List_Delete(temp2);
- std::string fileName = "";
- fileName = (yyvsp[(3) - (11)].c);
- if(!fileName.empty()) fileName = FixRelativePath(gmsh_yyname, (yyvsp[(3) - (11)].c));
-#if defined(HAVE_KBIPACK)
- Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->setFileName(fileName);
- homology->findHomSequence();
- delete homology;
-#else
- yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation");
-#endif
+ GModel::current()->addHomologyRequest((yyvsp[(1) - (5)].c), domain, subdomain);
+ List_Delete((yyvsp[(3) - (5)].l));
;}
break;
case 275:
-/* Line 1455 of yacc.c */
-#line 3792 "Gmsh.y"
- { (yyval.d) = (yyvsp[(1) - (1)].d); ;}
+/* Line 1464 of yacc.c */
+#line 3674 "Gmsh.y"
+ {
+ std::vector<int> domain, subdomain;
+ for(int i = 0; i < List_Nbr((yyvsp[(3) - (7)].l)); i++){
+ double d;
+ List_Read((yyvsp[(3) - (7)].l), i, &d);
+ domain.push_back((int)d);
+ }
+ for(int i = 0; i < List_Nbr((yyvsp[(5) - (7)].l)); i++){
+ double d;
+ List_Read((yyvsp[(5) - (7)].l), i, &d);
+ subdomain.push_back((int)d);
+ }
+ GModel::current()->addHomologyRequest((yyvsp[(1) - (7)].c), domain, subdomain);
+ List_Delete((yyvsp[(3) - (7)].l));
+ List_Delete((yyvsp[(5) - (7)].l));
+ ;}
break;
case 276:
-/* Line 1455 of yacc.c */
-#line 3793 "Gmsh.y"
- { (yyval.d) = (yyvsp[(2) - (3)].d); ;}
+/* Line 1464 of yacc.c */
+#line 3695 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(1) - (1)].d); ;}
break;
case 277:
-/* Line 1455 of yacc.c */
-#line 3794 "Gmsh.y"
- { (yyval.d) = -(yyvsp[(2) - (2)].d); ;}
+/* Line 1464 of yacc.c */
+#line 3696 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(2) - (3)].d); ;}
break;
case 278:
-/* Line 1455 of yacc.c */
-#line 3795 "Gmsh.y"
- { (yyval.d) = (yyvsp[(2) - (2)].d); ;}
+/* Line 1464 of yacc.c */
+#line 3697 "Gmsh.y"
+ { (yyval.d) = -(yyvsp[(2) - (2)].d); ;}
break;
case 279:
-/* Line 1455 of yacc.c */
-#line 3796 "Gmsh.y"
- { (yyval.d) = !(yyvsp[(2) - (2)].d); ;}
+/* Line 1464 of yacc.c */
+#line 3698 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(2) - (2)].d); ;}
break;
case 280:
-/* Line 1455 of yacc.c */
-#line 3797 "Gmsh.y"
- { (yyval.d) = (yyvsp[(1) - (3)].d) - (yyvsp[(3) - (3)].d); ;}
+/* Line 1464 of yacc.c */
+#line 3699 "Gmsh.y"
+ { (yyval.d) = !(yyvsp[(2) - (2)].d); ;}
break;
case 281:
-/* Line 1455 of yacc.c */
-#line 3798 "Gmsh.y"
- { (yyval.d) = (yyvsp[(1) - (3)].d) + (yyvsp[(3) - (3)].d); ;}
+/* Line 1464 of yacc.c */
+#line 3700 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(1) - (3)].d) - (yyvsp[(3) - (3)].d); ;}
break;
case 282:
-/* Line 1455 of yacc.c */
-#line 3799 "Gmsh.y"
- { (yyval.d) = (yyvsp[(1) - (3)].d) * (yyvsp[(3) - (3)].d); ;}
+/* Line 1464 of yacc.c */
+#line 3701 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(1) - (3)].d) + (yyvsp[(3) - (3)].d); ;}
break;
case 283:
-/* Line 1455 of yacc.c */
-#line 3801 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3702 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(1) - (3)].d) * (yyvsp[(3) - (3)].d); ;}
+ break;
+
+ case 284:
+
+/* Line 1464 of yacc.c */
+#line 3704 "Gmsh.y"
{
if(!(yyvsp[(3) - (3)].d))
yymsg(0, "Division by zero in '%g / %g'", (yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));
@@ -8707,430 +8662,430 @@ yyreduce:
;}
break;
- case 284:
+ case 285:
-/* Line 1455 of yacc.c */
-#line 3807 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3710 "Gmsh.y"
{ (yyval.d) = (int)(yyvsp[(1) - (3)].d) % (int)(yyvsp[(3) - (3)].d); ;}
break;
- case 285:
+ case 286:
-/* Line 1455 of yacc.c */
-#line 3808 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3711 "Gmsh.y"
{ (yyval.d) = pow((yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d)); ;}
break;
- case 286:
+ case 287:
-/* Line 1455 of yacc.c */
-#line 3809 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3712 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d); ;}
break;
- case 287:
+ case 288:
-/* Line 1455 of yacc.c */
-#line 3810 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3713 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) > (yyvsp[(3) - (3)].d); ;}
break;
- case 288:
+ case 289:
-/* Line 1455 of yacc.c */
-#line 3811 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3714 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) <= (yyvsp[(3) - (3)].d); ;}
break;
- case 289:
+ case 290:
-/* Line 1455 of yacc.c */
-#line 3812 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3715 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) >= (yyvsp[(3) - (3)].d); ;}
break;
- case 290:
+ case 291:
-/* Line 1455 of yacc.c */
-#line 3813 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3716 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) == (yyvsp[(3) - (3)].d); ;}
break;
- case 291:
+ case 292:
-/* Line 1455 of yacc.c */
-#line 3814 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3717 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) != (yyvsp[(3) - (3)].d); ;}
break;
- case 292:
+ case 293:
-/* Line 1455 of yacc.c */
-#line 3815 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3718 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) && (yyvsp[(3) - (3)].d); ;}
break;
- case 293:
+ case 294:
-/* Line 1455 of yacc.c */
-#line 3816 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3719 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) || (yyvsp[(3) - (3)].d); ;}
break;
- case 294:
+ case 295:
-/* Line 1455 of yacc.c */
-#line 3817 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3720 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (5)].d) ? (yyvsp[(3) - (5)].d) : (yyvsp[(5) - (5)].d); ;}
break;
- case 295:
+ case 296:
-/* Line 1455 of yacc.c */
-#line 3818 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3721 "Gmsh.y"
{ (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
break;
- case 296:
+ case 297:
-/* Line 1455 of yacc.c */
-#line 3819 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3722 "Gmsh.y"
{ (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
break;
- case 297:
+ case 298:
-/* Line 1455 of yacc.c */
-#line 3820 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3723 "Gmsh.y"
{ (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
break;
- case 298:
+ case 299:
-/* Line 1455 of yacc.c */
-#line 3821 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3724 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
break;
- case 299:
+ case 300:
-/* Line 1455 of yacc.c */
-#line 3822 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3725 "Gmsh.y"
{ (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
break;
- case 300:
+ case 301:
-/* Line 1455 of yacc.c */
-#line 3823 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3726 "Gmsh.y"
{ (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
break;
- case 301:
+ case 302:
-/* Line 1455 of yacc.c */
-#line 3824 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3727 "Gmsh.y"
{ (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
break;
- case 302:
+ case 303:
-/* Line 1455 of yacc.c */
-#line 3825 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3728 "Gmsh.y"
{ (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
break;
- case 303:
+ case 304:
-/* Line 1455 of yacc.c */
-#line 3826 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3729 "Gmsh.y"
{ (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
break;
- case 304:
+ case 305:
-/* Line 1455 of yacc.c */
-#line 3827 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3730 "Gmsh.y"
{ (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
break;
- case 305:
+ case 306:
-/* Line 1455 of yacc.c */
-#line 3828 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3731 "Gmsh.y"
{ (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
break;
- case 306:
+ case 307:
-/* Line 1455 of yacc.c */
-#line 3829 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3732 "Gmsh.y"
{ (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
break;
- case 307:
+ case 308:
-/* Line 1455 of yacc.c */
-#line 3830 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3733 "Gmsh.y"
{ (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
break;
- case 308:
+ case 309:
-/* Line 1455 of yacc.c */
-#line 3831 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3734 "Gmsh.y"
{ (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
break;
- case 309:
+ case 310:
-/* Line 1455 of yacc.c */
-#line 3832 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3735 "Gmsh.y"
{ (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
break;
- case 310:
+ case 311:
-/* Line 1455 of yacc.c */
-#line 3833 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3736 "Gmsh.y"
{ (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
break;
- case 311:
+ case 312:
-/* Line 1455 of yacc.c */
-#line 3834 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3737 "Gmsh.y"
{ (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
break;
- case 312:
+ case 313:
-/* Line 1455 of yacc.c */
-#line 3835 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3738 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
- case 313:
+ case 314:
-/* Line 1455 of yacc.c */
-#line 3836 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3739 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
- case 314:
+ case 315:
-/* Line 1455 of yacc.c */
-#line 3837 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3740 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
break;
- case 315:
+ case 316:
-/* Line 1455 of yacc.c */
-#line 3838 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3741 "Gmsh.y"
{ (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
break;
- case 316:
+ case 317:
-/* Line 1455 of yacc.c */
-#line 3840 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3743 "Gmsh.y"
{ (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
break;
- case 317:
+ case 318:
-/* Line 1455 of yacc.c */
-#line 3841 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3744 "Gmsh.y"
{ (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
break;
- case 318:
+ case 319:
-/* Line 1455 of yacc.c */
-#line 3842 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3745 "Gmsh.y"
{ (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
break;
- case 319:
+ case 320:
-/* Line 1455 of yacc.c */
-#line 3843 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3746 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
break;
- case 320:
+ case 321:
-/* Line 1455 of yacc.c */
-#line 3844 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3747 "Gmsh.y"
{ (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
break;
- case 321:
+ case 322:
-/* Line 1455 of yacc.c */
-#line 3845 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3748 "Gmsh.y"
{ (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
break;
- case 322:
+ case 323:
-/* Line 1455 of yacc.c */
-#line 3846 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3749 "Gmsh.y"
{ (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
break;
- case 323:
+ case 324:
-/* Line 1455 of yacc.c */
-#line 3847 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3750 "Gmsh.y"
{ (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
break;
- case 324:
+ case 325:
-/* Line 1455 of yacc.c */
-#line 3848 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3751 "Gmsh.y"
{ (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
break;
- case 325:
+ case 326:
-/* Line 1455 of yacc.c */
-#line 3849 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3752 "Gmsh.y"
{ (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
break;
- case 326:
+ case 327:
-/* Line 1455 of yacc.c */
-#line 3850 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3753 "Gmsh.y"
{ (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
break;
- case 327:
+ case 328:
-/* Line 1455 of yacc.c */
-#line 3851 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3754 "Gmsh.y"
{ (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
break;
- case 328:
+ case 329:
-/* Line 1455 of yacc.c */
-#line 3852 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3755 "Gmsh.y"
{ (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
break;
- case 329:
+ case 330:
-/* Line 1455 of yacc.c */
-#line 3853 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3756 "Gmsh.y"
{ (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
break;
- case 330:
+ case 331:
-/* Line 1455 of yacc.c */
-#line 3854 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3757 "Gmsh.y"
{ (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
break;
- case 331:
+ case 332:
-/* Line 1455 of yacc.c */
-#line 3855 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3758 "Gmsh.y"
{ (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
break;
- case 332:
+ case 333:
-/* Line 1455 of yacc.c */
-#line 3856 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3759 "Gmsh.y"
{ (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
break;
- case 333:
+ case 334:
-/* Line 1455 of yacc.c */
-#line 3857 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3760 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
- case 334:
+ case 335:
-/* Line 1455 of yacc.c */
-#line 3858 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3761 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
- case 335:
+ case 336:
-/* Line 1455 of yacc.c */
-#line 3859 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3762 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
break;
- case 336:
+ case 337:
-/* Line 1455 of yacc.c */
-#line 3860 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3763 "Gmsh.y"
{ (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
break;
- case 337:
+ case 338:
-/* Line 1455 of yacc.c */
-#line 3869 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3772 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (1)].d); ;}
break;
- case 338:
+ case 339:
-/* Line 1455 of yacc.c */
-#line 3870 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3773 "Gmsh.y"
{ (yyval.d) = 3.141592653589793; ;}
break;
- case 339:
+ case 340:
-/* Line 1455 of yacc.c */
-#line 3871 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3774 "Gmsh.y"
{ (yyval.d) = Msg::GetCommRank(); ;}
break;
- case 340:
+ case 341:
-/* Line 1455 of yacc.c */
-#line 3872 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3775 "Gmsh.y"
{ (yyval.d) = Msg::GetCommSize(); ;}
break;
- case 341:
+ case 342:
-/* Line 1455 of yacc.c */
-#line 3873 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3776 "Gmsh.y"
{ (yyval.d) = GetGmshMajorVersion(); ;}
break;
- case 342:
+ case 343:
-/* Line 1455 of yacc.c */
-#line 3874 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3777 "Gmsh.y"
{ (yyval.d) = GetGmshMinorVersion(); ;}
break;
- case 343:
+ case 344:
-/* Line 1455 of yacc.c */
-#line 3875 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3778 "Gmsh.y"
{ (yyval.d) = GetGmshPatchVersion(); ;}
break;
- case 344:
+ case 345:
-/* Line 1455 of yacc.c */
-#line 3880 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3783 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (1)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (1)].c));
@@ -9149,10 +9104,10 @@ yyreduce:
;}
break;
- case 345:
+ case 346:
-/* Line 1455 of yacc.c */
-#line 3900 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3803 "Gmsh.y"
{
char tmpstring[1024];
sprintf(tmpstring, "%s_%d", (yyvsp[(1) - (5)].c), (int)(yyvsp[(4) - (5)].d)) ;
@@ -9173,10 +9128,10 @@ yyreduce:
;}
break;
- case 346:
+ case 347:
-/* Line 1455 of yacc.c */
-#line 3919 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3822 "Gmsh.y"
{
int index = (int)(yyvsp[(3) - (4)].d);
if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
@@ -9196,10 +9151,10 @@ yyreduce:
;}
break;
- case 347:
+ case 348:
-/* Line 1455 of yacc.c */
-#line 3937 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3840 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(2) - (4)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(2) - (4)].c));
@@ -9213,10 +9168,10 @@ yyreduce:
;}
break;
- case 348:
+ case 349:
-/* Line 1455 of yacc.c */
-#line 3949 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3852 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (2)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (2)].c));
@@ -9235,10 +9190,10 @@ yyreduce:
;}
break;
- case 349:
+ case 350:
-/* Line 1455 of yacc.c */
-#line 3966 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3869 "Gmsh.y"
{
int index = (int)(yyvsp[(3) - (5)].d);
if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
@@ -9258,30 +9213,30 @@ yyreduce:
;}
break;
- case 350:
+ case 351:
-/* Line 1455 of yacc.c */
-#line 3987 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3890 "Gmsh.y"
{
NumberOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), (yyval.d));
Free((yyvsp[(1) - (3)].c)); Free((yyvsp[(3) - (3)].c));
;}
break;
- case 351:
+ case 352:
-/* Line 1455 of yacc.c */
-#line 3992 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3895 "Gmsh.y"
{
NumberOption(GMSH_GET, (yyvsp[(1) - (6)].c), (int)(yyvsp[(3) - (6)].d), (yyvsp[(6) - (6)].c), (yyval.d));
Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(6) - (6)].c));
;}
break;
- case 352:
+ case 353:
-/* Line 1455 of yacc.c */
-#line 3997 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3900 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (4)].c), 0, (yyvsp[(3) - (4)].c), d)){
@@ -9293,10 +9248,10 @@ yyreduce:
;}
break;
- case 353:
+ case 354:
-/* Line 1455 of yacc.c */
-#line 4007 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3910 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c), d)){
@@ -9308,158 +9263,158 @@ yyreduce:
;}
break;
- case 354:
+ case 355:
-/* Line 1455 of yacc.c */
-#line 4017 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3920 "Gmsh.y"
{
(yyval.d) = Msg::GetValue((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
Free((yyvsp[(3) - (6)].c));
;}
break;
- case 355:
+ case 356:
-/* Line 1455 of yacc.c */
-#line 4025 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3928 "Gmsh.y"
{
memcpy((yyval.v), (yyvsp[(1) - (1)].v), 5*sizeof(double));
;}
break;
- case 356:
+ case 357:
-/* Line 1455 of yacc.c */
-#line 4029 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3932 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = -(yyvsp[(2) - (2)].v)[i];
;}
break;
- case 357:
+ case 358:
-/* Line 1455 of yacc.c */
-#line 4033 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3936 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
;}
break;
- case 358:
+ case 359:
-/* Line 1455 of yacc.c */
-#line 4037 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3940 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] - (yyvsp[(3) - (3)].v)[i];
;}
break;
- case 359:
+ case 360:
-/* Line 1455 of yacc.c */
-#line 4041 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3944 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] + (yyvsp[(3) - (3)].v)[i];
;}
break;
- case 360:
+ case 361:
-/* Line 1455 of yacc.c */
-#line 4048 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3951 "Gmsh.y"
{
(yyval.v)[0] = (yyvsp[(2) - (11)].d); (yyval.v)[1] = (yyvsp[(4) - (11)].d); (yyval.v)[2] = (yyvsp[(6) - (11)].d); (yyval.v)[3] = (yyvsp[(8) - (11)].d); (yyval.v)[4] = (yyvsp[(10) - (11)].d);
;}
break;
- case 361:
+ case 362:
-/* Line 1455 of yacc.c */
-#line 4052 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3955 "Gmsh.y"
{
(yyval.v)[0] = (yyvsp[(2) - (9)].d); (yyval.v)[1] = (yyvsp[(4) - (9)].d); (yyval.v)[2] = (yyvsp[(6) - (9)].d); (yyval.v)[3] = (yyvsp[(8) - (9)].d); (yyval.v)[4] = 1.0;
;}
break;
- case 362:
+ case 363:
-/* Line 1455 of yacc.c */
-#line 4056 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3959 "Gmsh.y"
{
(yyval.v)[0] = (yyvsp[(2) - (7)].d); (yyval.v)[1] = (yyvsp[(4) - (7)].d); (yyval.v)[2] = (yyvsp[(6) - (7)].d); (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
;}
break;
- case 363:
+ case 364:
-/* Line 1455 of yacc.c */
-#line 4060 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3963 "Gmsh.y"
{
(yyval.v)[0] = (yyvsp[(2) - (7)].d); (yyval.v)[1] = (yyvsp[(4) - (7)].d); (yyval.v)[2] = (yyvsp[(6) - (7)].d); (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
;}
break;
- case 364:
+ case 365:
-/* Line 1455 of yacc.c */
-#line 4067 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3970 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(List_T*));
List_Add((yyval.l), &((yyvsp[(1) - (1)].l)));
;}
break;
- case 365:
+ case 366:
-/* Line 1455 of yacc.c */
-#line 4072 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3975 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].l)));
;}
break;
- case 366:
+ case 367:
-/* Line 1455 of yacc.c */
-#line 4079 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3982 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
;}
break;
- case 367:
+ case 368:
-/* Line 1455 of yacc.c */
-#line 4084 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3987 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
- case 368:
+ case 369:
-/* Line 1455 of yacc.c */
-#line 4088 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3991 "Gmsh.y"
{
// creates an empty list
(yyval.l) = List_Create(2, 1, sizeof(double));
;}
break;
- case 369:
+ case 370:
-/* Line 1455 of yacc.c */
-#line 4093 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 3996 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (3)].l);
;}
break;
- case 370:
+ case 371:
-/* Line 1455 of yacc.c */
-#line 4097 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4000 "Gmsh.y"
{
(yyval.l) = (yyvsp[(3) - (4)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -9469,10 +9424,10 @@ yyreduce:
;}
break;
- case 371:
+ case 372:
-/* Line 1455 of yacc.c */
-#line 4105 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4008 "Gmsh.y"
{
(yyval.l) = (yyvsp[(4) - (5)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -9482,19 +9437,19 @@ yyreduce:
;}
break;
- case 372:
+ case 373:
-/* Line 1455 of yacc.c */
-#line 4116 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4019 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
- case 373:
+ case 374:
-/* Line 1455 of yacc.c */
-#line 4120 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4023 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (1)].c), "*") || !strcmp((yyvsp[(1) - (1)].c), "all"))
(yyval.l) = 0;
@@ -9505,10 +9460,10 @@ yyreduce:
;}
break;
- case 374:
+ case 375:
-/* Line 1455 of yacc.c */
-#line 4132 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4035 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (2)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -9518,10 +9473,10 @@ yyreduce:
;}
break;
- case 375:
+ case 376:
-/* Line 1455 of yacc.c */
-#line 4140 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4043 "Gmsh.y"
{
(yyval.l) = (yyvsp[(3) - (3)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -9531,10 +9486,10 @@ yyreduce:
;}
break;
- case 376:
+ case 377:
-/* Line 1455 of yacc.c */
-#line 4148 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4051 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
for(double d = (yyvsp[(1) - (3)].d); ((yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d)) ? (d <= (yyvsp[(3) - (3)].d)) : (d >= (yyvsp[(3) - (3)].d));
@@ -9543,10 +9498,10 @@ yyreduce:
;}
break;
- case 377:
+ case 378:
-/* Line 1455 of yacc.c */
-#line 4155 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4058 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!(yyvsp[(5) - (5)].d) || ((yyvsp[(1) - (5)].d) < (yyvsp[(3) - (5)].d) && (yyvsp[(5) - (5)].d) < 0) || ((yyvsp[(1) - (5)].d) > (yyvsp[(3) - (5)].d) && (yyvsp[(5) - (5)].d) > 0)){
@@ -9559,10 +9514,10 @@ yyreduce:
;}
break;
- case 378:
+ case 379:
-/* Line 1455 of yacc.c */
-#line 4166 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4069 "Gmsh.y"
{
// Returns the coordinates of a point and fills a list with it.
// This allows to ensure e.g. that relative point positions are
@@ -9584,46 +9539,46 @@ yyreduce:
;}
break;
- case 379:
+ case 380:
-/* Line 1455 of yacc.c */
-#line 4186 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4089 "Gmsh.y"
{
(yyval.l) = GetAllEntityNumbers(0);
;}
break;
- case 380:
+ case 381:
-/* Line 1455 of yacc.c */
-#line 4190 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4093 "Gmsh.y"
{
(yyval.l) = GetAllEntityNumbers(1);
;}
break;
- case 381:
+ case 382:
-/* Line 1455 of yacc.c */
-#line 4194 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4097 "Gmsh.y"
{
(yyval.l) = GetAllEntityNumbers(2);
;}
break;
- case 382:
+ case 383:
-/* Line 1455 of yacc.c */
-#line 4198 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4101 "Gmsh.y"
{
(yyval.l) = GetAllEntityNumbers(3);
;}
break;
- case 383:
+ case 384:
-/* Line 1455 of yacc.c */
-#line 4202 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4105 "Gmsh.y"
{
(yyval.l) = List_Create(List_Nbr((yyvsp[(1) - (1)].l)), 1, sizeof(double));
for(int i = 0; i < List_Nbr((yyvsp[(1) - (1)].l)); i++){
@@ -9635,10 +9590,10 @@ yyreduce:
;}
break;
- case 384:
+ case 385:
-/* Line 1455 of yacc.c */
-#line 4212 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4115 "Gmsh.y"
{
(yyval.l) = List_Create(List_Nbr((yyvsp[(1) - (1)].l)), 1, sizeof(double));
for(int i = 0; i < List_Nbr((yyvsp[(1) - (1)].l)); i++){
@@ -9650,10 +9605,10 @@ yyreduce:
;}
break;
- case 385:
+ case 386:
-/* Line 1455 of yacc.c */
-#line 4222 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4125 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
@@ -9667,10 +9622,10 @@ yyreduce:
;}
break;
- case 386:
+ case 387:
-/* Line 1455 of yacc.c */
-#line 4234 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4137 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!gmsh_yysymbols.count((yyvsp[(3) - (4)].c)))
@@ -9684,10 +9639,10 @@ yyreduce:
;}
break;
- case 387:
+ case 388:
-/* Line 1455 of yacc.c */
-#line 4246 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4149 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
@@ -9707,38 +9662,38 @@ yyreduce:
;}
break;
- case 388:
+ case 389:
-/* Line 1455 of yacc.c */
-#line 4267 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4170 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
;}
break;
- case 389:
+ case 390:
-/* Line 1455 of yacc.c */
-#line 4272 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4175 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
- case 390:
+ case 391:
-/* Line 1455 of yacc.c */
-#line 4276 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4179 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].d)));
;}
break;
- case 391:
+ case 392:
-/* Line 1455 of yacc.c */
-#line 4280 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4183 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
double d;
@@ -9749,28 +9704,28 @@ yyreduce:
;}
break;
- case 392:
+ case 393:
-/* Line 1455 of yacc.c */
-#line 4292 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4195 "Gmsh.y"
{
(yyval.u) = CTX::instance()->packColor((int)(yyvsp[(2) - (9)].d), (int)(yyvsp[(4) - (9)].d), (int)(yyvsp[(6) - (9)].d), (int)(yyvsp[(8) - (9)].d));
;}
break;
- case 393:
+ case 394:
-/* Line 1455 of yacc.c */
-#line 4296 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4199 "Gmsh.y"
{
(yyval.u) = CTX::instance()->packColor((int)(yyvsp[(2) - (7)].d), (int)(yyvsp[(4) - (7)].d), (int)(yyvsp[(6) - (7)].d), 255);
;}
break;
- case 394:
+ case 395:
-/* Line 1455 of yacc.c */
-#line 4308 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4211 "Gmsh.y"
{
int flag;
(yyval.u) = GetColorForString(ColorString, -1, (yyvsp[(1) - (1)].c), &flag);
@@ -9779,10 +9734,10 @@ yyreduce:
;}
break;
- case 395:
+ case 396:
-/* Line 1455 of yacc.c */
-#line 4315 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4218 "Gmsh.y"
{
unsigned int val = 0;
ColorOption(GMSH_GET, (yyvsp[(1) - (5)].c), 0, (yyvsp[(5) - (5)].c), val);
@@ -9791,19 +9746,19 @@ yyreduce:
;}
break;
- case 396:
+ case 397:
-/* Line 1455 of yacc.c */
-#line 4325 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4228 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (3)].l);
;}
break;
- case 397:
+ case 398:
-/* Line 1455 of yacc.c */
-#line 4329 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4232 "Gmsh.y"
{
(yyval.l) = List_Create(256, 10, sizeof(unsigned int));
GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (6)].d));
@@ -9817,38 +9772,38 @@ yyreduce:
;}
break;
- case 398:
+ case 399:
-/* Line 1455 of yacc.c */
-#line 4344 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4247 "Gmsh.y"
{
(yyval.l) = List_Create(256, 10, sizeof(unsigned int));
List_Add((yyval.l), &((yyvsp[(1) - (1)].u)));
;}
break;
- case 399:
+ case 400:
-/* Line 1455 of yacc.c */
-#line 4349 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4252 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].u)));
;}
break;
- case 400:
+ case 401:
-/* Line 1455 of yacc.c */
-#line 4356 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4259 "Gmsh.y"
{
(yyval.c) = (yyvsp[(1) - (1)].c);
;}
break;
- case 401:
+ case 402:
-/* Line 1455 of yacc.c */
-#line 4360 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4263 "Gmsh.y"
{
if(!gmsh_yystringsymbols.count((yyvsp[(1) - (1)].c))){
yymsg(0, "Unknown string variable '%s'", (yyvsp[(1) - (1)].c));
@@ -9863,10 +9818,10 @@ yyreduce:
;}
break;
- case 402:
+ case 403:
-/* Line 1455 of yacc.c */
-#line 4373 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4276 "Gmsh.y"
{
std::string out;
StringOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), out);
@@ -9876,10 +9831,10 @@ yyreduce:
;}
break;
- case 403:
+ case 404:
-/* Line 1455 of yacc.c */
-#line 4381 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4284 "Gmsh.y"
{
std::string out;
StringOption(GMSH_GET, (yyvsp[(1) - (6)].c), (int)(yyvsp[(3) - (6)].d), (yyvsp[(6) - (6)].c), out);
@@ -9889,19 +9844,19 @@ yyreduce:
;}
break;
- case 404:
+ case 405:
-/* Line 1455 of yacc.c */
-#line 4392 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4295 "Gmsh.y"
{
(yyval.c) = (yyvsp[(1) - (1)].c);
;}
break;
- case 405:
+ case 406:
-/* Line 1455 of yacc.c */
-#line 4396 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4299 "Gmsh.y"
{
(yyval.c) = (char *)Malloc(32 * sizeof(char));
time_t now;
@@ -9911,10 +9866,10 @@ yyreduce:
;}
break;
- case 406:
+ case 407:
-/* Line 1455 of yacc.c */
-#line 4404 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4307 "Gmsh.y"
{
const char *env = GetEnvironmentVar((yyvsp[(3) - (4)].c));
if(!env) env = "";
@@ -9924,10 +9879,10 @@ yyreduce:
;}
break;
- case 407:
+ case 408:
-/* Line 1455 of yacc.c */
-#line 4412 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4315 "Gmsh.y"
{
std::string s = Msg::GetString((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].c));
(yyval.c) = (char *)Malloc((s.size() + 1) * sizeof(char));
@@ -9937,10 +9892,10 @@ yyreduce:
;}
break;
- case 408:
+ case 409:
-/* Line 1455 of yacc.c */
-#line 4420 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4323 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (6)].c)) + strlen((yyvsp[(5) - (6)].c)) + 1) * sizeof(char));
strcpy((yyval.c), (yyvsp[(3) - (6)].c));
@@ -9950,10 +9905,10 @@ yyreduce:
;}
break;
- case 409:
+ case 410:
-/* Line 1455 of yacc.c */
-#line 4428 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4331 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
int i;
@@ -9969,10 +9924,10 @@ yyreduce:
;}
break;
- case 410:
+ case 411:
-/* Line 1455 of yacc.c */
-#line 4442 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4345 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
int i;
@@ -9988,19 +9943,19 @@ yyreduce:
;}
break;
- case 411:
+ case 412:
-/* Line 1455 of yacc.c */
-#line 4456 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4359 "Gmsh.y"
{
(yyval.c) = (yyvsp[(3) - (4)].c);
;}
break;
- case 412:
+ case 413:
-/* Line 1455 of yacc.c */
-#line 4460 "Gmsh.y"
+/* Line 1464 of yacc.c */
+#line 4363 "Gmsh.y"
{
char tmpstring[1024];
int i = PrintListOfDouble((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].l), tmpstring);
@@ -10023,8 +9978,8 @@ yyreduce:
-/* Line 1455 of yacc.c */
-#line 10028 "Gmsh.tab.cpp"
+/* Line 1464 of yacc.c */
+#line 9983 "Gmsh.tab.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -10235,8 +10190,8 @@ yyreturn:
-/* Line 1675 of yacc.c */
-#line 4480 "Gmsh.y"
+/* Line 1684 of yacc.c */
+#line 4383 "Gmsh.y"
int PrintListOfDouble(char *format, List_T *list, char *buffer)
diff --git a/Parser/Gmsh.tab.hpp b/Parser/Gmsh.tab.hpp
index f559f998657c86ff9dde0d7246f299d28a2716b6..74b36e603bcef7a57059b2d4f50b08146d20e118 100644
--- a/Parser/Gmsh.tab.hpp
+++ b/Parser/Gmsh.tab.hpp
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.4.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2009, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -156,26 +155,24 @@
tGetValue = 372,
tGetEnv = 373,
tGetString = 374,
- tGMSH_MAJOR_VERSION = 375,
- tGMSH_MINOR_VERSION = 376,
- tGMSH_PATCH_VERSION = 377,
- tHomRank = 378,
- tHomGen = 379,
- tHomCut = 380,
- tHomSeq = 381,
- tAFFECTDIVIDE = 382,
- tAFFECTTIMES = 383,
- tAFFECTMINUS = 384,
- tAFFECTPLUS = 385,
- tOR = 386,
- tAND = 387,
- tNOTEQUAL = 388,
- tEQUAL = 389,
- tGREATEROREQUAL = 390,
- tLESSOREQUAL = 391,
- UNARYPREC = 392,
- tMINUSMINUS = 393,
- tPLUSPLUS = 394
+ tHomology = 375,
+ tCohomology = 376,
+ tGMSH_MAJOR_VERSION = 377,
+ tGMSH_MINOR_VERSION = 378,
+ tGMSH_PATCH_VERSION = 379,
+ tAFFECTDIVIDE = 380,
+ tAFFECTTIMES = 381,
+ tAFFECTMINUS = 382,
+ tAFFECTPLUS = 383,
+ tOR = 384,
+ tAND = 385,
+ tNOTEQUAL = 386,
+ tEQUAL = 387,
+ tGREATEROREQUAL = 388,
+ tLESSOREQUAL = 389,
+ UNARYPREC = 390,
+ tMINUSMINUS = 391,
+ tPLUSPLUS = 392
};
#endif
@@ -185,8 +182,8 @@
typedef union YYSTYPE
{
-/* Line 1676 of yacc.c */
-#line 91 "Gmsh.y"
+/* Line 1685 of yacc.c */
+#line 87 "Gmsh.y"
char *c;
int i;
@@ -198,8 +195,8 @@ typedef union YYSTYPE
-/* Line 1676 of yacc.c */
-#line 203 "Gmsh.tab.hpp"
+/* Line 1685 of yacc.c */
+#line 200 "Gmsh.tab.hpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index d4e2563ed746dfde4a1a55d7d9c4eab99158ac9c..ebffdf95e4191678122c95f7090f92a8763be6a6 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -51,10 +51,6 @@
#include "drawContext.h"
#endif
-#if defined(HAVE_KBIPACK)
-#include "Homology.h"
-#endif
-
// Global parser variables
std::string gmsh_yyname;
int gmsh_yyerrorstate = 0;
@@ -120,15 +116,15 @@ fullMatrix<double> ListOfListOfDouble2Matrix(List_T *list);
%token tBSpline tBezier tNurbs tNurbsOrder tNurbsKnots
%token tColor tColorTable tFor tIn tEndFor tIf tEndIf tExit
%token tField tReturn tCall tFunction tShow tHide tGetValue tGetEnv tGetString
+%token tHomology tCohomology
%token tGMSH_MAJOR_VERSION tGMSH_MINOR_VERSION tGMSH_PATCH_VERSION
-%token tHomRank tHomGen tHomCut tHomSeq
%type <d> FExpr FExpr_Single
%type <v> VExpr VExpr_Single CircleOptions TransfiniteType
%type <i> NumericAffectation NumericIncrement PhysicalId
%type <i> TransfiniteArrangement RecombineAngle
%type <u> ColorExpr
-%type <c> StringExpr StringExprVar SendToFile
+%type <c> StringExpr StringExprVar SendToFile HomologyCommand
%type <l> FExpr_Multi ListOfDouble ListOfDoubleOrAll RecursiveListOfDouble
%type <l> RecursiveListOfListOfDouble
%type <l> ListOfColor RecursiveListOfColor
@@ -3650,138 +3646,46 @@ Coherence :
}
;
-
// H O M O L O G Y
-Homology :
+HomologyCommand :
+tHomology { $$ = (char*)"Generators"; }
+| tCohomology { $$ = (char*)"DualGenerators"; }
+;
- tHomRank '(' StringExprVar ')' tAFFECT '{' ListOfDouble ',' ListOfDouble '}' tEND
+Homology :
+ HomologyCommand tEND
{
- List_T *temp = ListOfDouble2ListOfInt($7);
- std::vector<int> domain;
- for (int i = 0; i < List_Nbr(temp); i++){
- int item = 0;
- List_Read(temp, i, &item);
- domain.push_back(item);
- }
- List_Delete($7);
- List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt($9);
- std::vector<int> subdomain;
- for (int i = 0; i < List_Nbr(temp2); i++){
- int item = 0;
- List_Read(temp2, i, &item);
- subdomain.push_back(item);
- }
- List_Delete($9);
- List_Delete(temp2);
- std::string fileName = "";
- fileName = $3;
- if(!fileName.empty()) fileName = FixRelativePath(gmsh_yyname, $3);
-#if defined(HAVE_KBIPACK)
- Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->setFileName(fileName);
- homology->computeRanks();
- delete homology;
-#else
- yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation");
-#endif
+ std::vector<int> domain, subdomain;
+ GModel::current()->addHomologyRequest($1, domain, subdomain);
}
- | tHomGen '(' StringExprVar ')' tAFFECT '{' ListOfDouble ',' ListOfDouble '}' tEND
+ | HomologyCommand '{' ListOfDouble '}' tEND
{
- List_T *temp = ListOfDouble2ListOfInt($7);
- std::vector<int> domain;
- for (int i = 0; i < List_Nbr(temp); i++){
- int item = 0;
- List_Read(temp, i, &item);
- domain.push_back(item);
- }
- List_Delete($7);
- List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt($9);
- std::vector<int> subdomain;
- for (int i = 0; i < List_Nbr(temp2); i++){
- int item = 0;
- List_Read(temp2, i, &item);
- subdomain.push_back(item);
- }
- List_Delete($9);
- List_Delete(temp2);
- std::string fileName = "";
- fileName = $3;
- if(!fileName.empty()) fileName = FixRelativePath(gmsh_yyname, $3);
-#if defined(HAVE_KBIPACK)
- Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->setFileName(fileName);
- homology->findGenerators();
- delete homology;
-#else
- yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation");
-#endif
- }
- | tHomCut '(' StringExprVar ')' tAFFECT '{' ListOfDouble ',' ListOfDouble '}' tEND
- {
- List_T *temp = ListOfDouble2ListOfInt($7);
- std::vector<int> domain;
- for (int i = 0; i < List_Nbr(temp); i++){
- int item = 0;
- List_Read(temp, i, &item);
- domain.push_back(item);
- }
- List_Delete($7);
- List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt($9);
- std::vector<int> subdomain;
- for (int i = 0; i < List_Nbr(temp2); i++){
- int item = 0;
- List_Read(temp2, i, &item);
- subdomain.push_back(item);
+ std::vector<int> domain, subdomain;
+ for(int i = 0; i < List_Nbr($3); i++){
+ double d;
+ List_Read($3, i, &d);
+ domain.push_back((int)d);
}
- List_Delete($9);
- List_Delete(temp2);
- std::string fileName = "";
- fileName = $3;
- if(!fileName.empty()) fileName = FixRelativePath(gmsh_yyname, $3);
-#if defined(HAVE_KBIPACK)
- Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->setFileName(fileName);
- homology->findDualGenerators();
- delete homology;
-#else
- yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation");
-#endif
+ GModel::current()->addHomologyRequest($1, domain, subdomain);
+ List_Delete($3);
}
- | tHomSeq '(' StringExprVar ')' tAFFECT '{' ListOfDouble ',' ListOfDouble '}' tEND
+ | HomologyCommand '{' ListOfDouble ',' ListOfDouble '}' tEND
{
- List_T *temp = ListOfDouble2ListOfInt($7);
- std::vector<int> domain;
- for (int i = 0; i < List_Nbr(temp); i++){
- int item = 0;
- List_Read(temp, i, &item);
- domain.push_back(item);
+ std::vector<int> domain, subdomain;
+ for(int i = 0; i < List_Nbr($3); i++){
+ double d;
+ List_Read($3, i, &d);
+ domain.push_back((int)d);
}
- List_Delete($7);
- List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt($9);
- std::vector<int> subdomain;
- for (int i = 0; i < List_Nbr(temp2); i++){
- int item = 0;
- List_Read(temp2, i, &item);
- subdomain.push_back(item);
+ for(int i = 0; i < List_Nbr($5); i++){
+ double d;
+ List_Read($5, i, &d);
+ subdomain.push_back((int)d);
}
- List_Delete($9);
- List_Delete(temp2);
- std::string fileName = "";
- fileName = $3;
- if(!fileName.empty()) fileName = FixRelativePath(gmsh_yyname, $3);
-#if defined(HAVE_KBIPACK)
- Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->setFileName(fileName);
- homology->findHomSequence();
- delete homology;
-#else
- yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation");
-#endif
+ GModel::current()->addHomologyRequest($1, domain, subdomain);
+ List_Delete($3);
+ List_Delete($5);
}
;
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 70eddfa8e9c6d30080839458e2f06375f4f647b6..89d2286925d312d64262c9eab5ae5844b59be4ab 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -73,6 +73,7 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -103,8 +104,6 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
-#endif /* ! C99 */
-
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -161,15 +160,7 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -181,7 +172,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-extern int gmsh_yyleng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t gmsh_yyleng;
extern FILE *gmsh_yyin, *gmsh_yyout;
@@ -207,11 +203,6 @@ extern FILE *gmsh_yyin, *gmsh_yyout;
#define unput(c) yyunput( c, (yytext_ptr) )
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -229,7 +220,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -299,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when gmsh_yytext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int gmsh_yyleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t gmsh_yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -328,7 +319,7 @@ static void gmsh_yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE gmsh_yy_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE gmsh_yy_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE gmsh_yy_scan_bytes (yyconst char *bytes,int len );
+YY_BUFFER_STATE gmsh_yy_scan_bytes (yyconst char *bytes,yy_size_t len );
void *gmsh_yyalloc (yy_size_t );
void *gmsh_yyrealloc (void *,yy_size_t );
@@ -388,8 +379,8 @@ static void yy_fatal_error (yyconst char msg[] );
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 160
-#define YY_END_OF_BUFFER 161
+#define YY_NUM_RULES 158
+#define YY_END_OF_BUFFER 159
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -397,87 +388,87 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[713] =
+static yyconst flex_int16_t yy_accept[712] =
{ 0,
- 0, 0, 161, 159, 1, 1, 159, 5, 159, 6,
- 159, 159, 159, 159, 159, 154, 21, 2, 159, 16,
- 159, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 159, 28, 24, 19, 25, 17,
- 26, 18, 0, 156, 3, 4, 20, 155, 154, 0,
- 29, 27, 30, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 94, 93, 158,
-
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 112, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 143, 144,
- 158, 158, 158, 158, 158, 158, 158, 23, 22, 0,
- 155, 0, 0, 157, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 49, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 65, 158, 158, 158, 158, 158, 78, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 101, 158, 158, 158, 158, 158,
-
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 130, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 150, 158, 158, 158,
- 158, 158, 0, 156, 0, 0, 155, 31, 158, 158,
- 158, 158, 35, 37, 158, 158, 158, 57, 158, 44,
- 158, 158, 158, 158, 158, 158, 158, 48, 158, 158,
- 158, 158, 158, 64, 158, 158, 158, 158, 73, 158,
- 74, 158, 158, 77, 158, 158, 158, 158, 158, 86,
- 87, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 99, 100, 158, 158, 158, 158, 158, 158,
-
- 158, 158, 158, 158, 158, 158, 158, 158, 125, 158,
- 158, 158, 158, 158, 140, 131, 158, 158, 158, 158,
- 129, 158, 158, 158, 158, 158, 158, 145, 149, 158,
- 158, 158, 158, 10, 15, 9, 8, 158, 12, 14,
- 0, 155, 33, 158, 158, 158, 39, 158, 158, 158,
- 158, 158, 158, 158, 52, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 71, 158, 158, 75,
- 76, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 92, 158, 158, 97, 158, 158, 158, 102, 158, 158,
- 158, 108, 109, 158, 158, 158, 113, 158, 114, 158,
-
- 158, 158, 158, 158, 158, 158, 124, 158, 158, 158,
- 134, 158, 158, 158, 158, 158, 158, 158, 151, 158,
- 152, 158, 11, 158, 13, 158, 32, 36, 38, 158,
- 41, 158, 158, 158, 45, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 61, 63, 158, 158, 70, 158,
- 158, 158, 158, 158, 80, 158, 158, 90, 89, 158,
- 91, 158, 158, 103, 98, 158, 158, 158, 105, 158,
- 158, 158, 118, 158, 117, 158, 158, 158, 127, 123,
- 158, 132, 133, 158, 137, 158, 158, 158, 158, 158,
- 158, 158, 153, 7, 158, 40, 42, 158, 158, 158,
-
- 158, 158, 47, 51, 158, 158, 158, 158, 158, 67,
- 158, 158, 158, 68, 158, 158, 158, 158, 158, 158,
- 88, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 136, 158, 158, 135, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 54, 158, 158, 158, 158, 66, 69, 158, 79, 158,
- 158, 158, 158, 82, 158, 158, 104, 106, 107, 158,
- 110, 111, 158, 158, 158, 158, 158, 158, 128, 158,
- 158, 141, 158, 158, 158, 158, 158, 158, 158, 158,
- 46, 158, 158, 158, 158, 158, 72, 158, 158, 158,
-
- 81, 158, 95, 158, 158, 158, 158, 158, 121, 158,
- 138, 158, 142, 158, 158, 148, 158, 158, 56, 158,
- 53, 158, 158, 158, 158, 158, 158, 158, 158, 115,
- 158, 119, 158, 158, 126, 158, 158, 158, 158, 43,
- 158, 55, 158, 158, 62, 158, 158, 158, 158, 116,
- 120, 158, 139, 158, 146, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 147, 158, 50, 58, 60, 158,
- 158, 158, 158, 122, 158, 158, 158, 158, 158, 158,
- 34, 158, 158, 158, 158, 158, 158, 158, 158, 158,
-
- 158, 158, 83, 84, 85, 158, 158, 158, 158, 96,
- 59, 0
+ 0, 0, 159, 157, 1, 1, 157, 5, 157, 6,
+ 157, 157, 157, 157, 157, 152, 21, 2, 157, 16,
+ 157, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 157, 28, 24, 19, 25, 17,
+ 26, 18, 0, 154, 3, 4, 20, 153, 152, 0,
+ 29, 27, 30, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 92, 91, 156,
+
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 110, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 141, 142,
+ 156, 156, 156, 156, 156, 156, 156, 23, 22, 0,
+ 153, 0, 0, 155, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 50, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 66, 156, 156, 156, 156, 156, 79, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 99, 156, 156, 156, 156, 156,
+
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 128, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 148, 156, 156, 156,
+ 156, 156, 0, 154, 0, 0, 153, 31, 156, 156,
+ 156, 156, 35, 37, 156, 156, 156, 58, 156, 44,
+ 156, 156, 156, 156, 156, 156, 156, 156, 49, 156,
+ 156, 156, 156, 156, 65, 156, 156, 156, 156, 74,
+ 156, 75, 156, 156, 78, 156, 156, 156, 156, 156,
+ 87, 88, 156, 156, 156, 156, 156, 156, 156, 156,
+ 97, 98, 156, 156, 156, 156, 156, 156, 156, 156,
+
+ 156, 156, 156, 156, 156, 156, 123, 156, 156, 156,
+ 156, 156, 138, 129, 156, 156, 156, 156, 127, 156,
+ 156, 156, 156, 156, 156, 143, 147, 156, 156, 156,
+ 156, 10, 15, 9, 8, 156, 12, 14, 0, 153,
+ 33, 156, 156, 156, 39, 156, 156, 156, 156, 156,
+ 156, 156, 156, 53, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 72, 156, 156, 76, 77,
+ 156, 156, 156, 156, 156, 156, 90, 156, 156, 95,
+ 156, 156, 156, 100, 156, 156, 156, 106, 107, 156,
+ 156, 156, 111, 156, 112, 156, 156, 156, 156, 156,
+
+ 156, 156, 122, 156, 156, 156, 132, 156, 156, 156,
+ 156, 156, 156, 156, 149, 156, 150, 156, 11, 156,
+ 13, 156, 32, 36, 38, 156, 41, 156, 156, 156,
+ 45, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 62, 64, 156, 156, 71, 156, 156, 156, 156,
+ 156, 81, 156, 156, 156, 156, 156, 101, 96, 156,
+ 156, 156, 103, 156, 156, 156, 116, 156, 115, 156,
+ 156, 156, 125, 121, 156, 130, 131, 156, 135, 156,
+ 156, 156, 156, 156, 156, 156, 151, 7, 156, 40,
+ 42, 156, 156, 156, 156, 156, 156, 48, 52, 156,
+
+ 156, 156, 156, 156, 68, 156, 156, 156, 69, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 134, 156, 156, 133, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 55, 156, 156, 156,
+ 156, 67, 70, 156, 80, 156, 156, 156, 156, 83,
+ 89, 156, 156, 102, 104, 105, 156, 108, 109, 156,
+ 156, 156, 156, 156, 156, 126, 156, 156, 139, 156,
+ 156, 156, 156, 156, 156, 156, 156, 46, 156, 156,
+ 156, 156, 156, 156, 73, 156, 156, 156, 82, 156,
+
+ 93, 156, 156, 156, 156, 156, 119, 156, 136, 156,
+ 140, 156, 156, 146, 156, 156, 57, 156, 47, 54,
+ 156, 156, 156, 156, 156, 156, 156, 156, 113, 156,
+ 117, 156, 156, 124, 156, 156, 156, 156, 43, 156,
+ 56, 156, 156, 63, 156, 156, 156, 156, 114, 118,
+ 156, 137, 156, 144, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 145, 156, 51, 59, 61, 156, 156,
+ 156, 156, 120, 156, 156, 156, 156, 156, 156, 34,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+
+ 156, 84, 85, 86, 156, 156, 156, 156, 94, 60,
+ 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -524,173 +515,173 @@ static yyconst flex_int32_t yy_meta[74] =
2, 2, 1
} ;
-static yyconst flex_int16_t yy_base[714] =
+static yyconst flex_int16_t yy_base[713] =
{ 0,
- 0, 0, 840, 841, 841, 841, 818, 841, 832, 841,
- 816, 65, 66, 64, 76, 78, 841, 841, 815, 814,
- 813, 46, 57, 65, 50, 64, 77, 47, 29, 79,
- 0, 773, 89, 81, 765, 767, 99, 763, 100, 103,
- 92, 764, 767, 775, 753, 841, 841, 841, 841, 841,
- 841, 841, 814, 162, 841, 841, 841, 167, 182, 191,
- 841, 841, 841, 0, 763, 767, 772, 765, 772, 757,
- 746, 750, 106, 760, 767, 750, 157, 761, 132, 754,
- 763, 752, 758, 758, 155, 758, 754, 744, 743, 739,
- 742, 760, 734, 748, 69, 736, 755, 0, 730, 734,
-
- 723, 142, 108, 739, 761, 740, 726, 738, 724, 723,
- 715, 0, 165, 45, 729, 736, 723, 170, 716, 723,
- 719, 719, 717, 169, 713, 712, 711, 128, 0, 0,
- 739, 713, 721, 723, 714, 711, 699, 841, 841, 228,
- 233, 242, 248, 253, 702, 718, 246, 705, 704, 705,
- 706, 701, 702, 700, 700, 693, 706, 703, 693, 177,
+ 0, 0, 839, 840, 840, 840, 817, 840, 831, 840,
+ 815, 65, 66, 64, 76, 78, 840, 840, 814, 813,
+ 812, 46, 57, 65, 50, 64, 77, 47, 29, 79,
+ 0, 772, 89, 81, 764, 766, 99, 762, 100, 103,
+ 92, 763, 766, 774, 752, 840, 840, 840, 840, 840,
+ 840, 840, 813, 162, 840, 840, 840, 167, 182, 191,
+ 840, 840, 840, 0, 762, 766, 771, 764, 771, 756,
+ 745, 749, 106, 759, 766, 749, 157, 760, 132, 753,
+ 762, 751, 757, 757, 155, 757, 753, 743, 742, 738,
+ 741, 759, 733, 747, 69, 735, 754, 0, 729, 733,
+
+ 722, 142, 108, 738, 760, 739, 725, 737, 723, 722,
+ 714, 0, 165, 45, 728, 735, 722, 170, 715, 722,
+ 718, 718, 716, 169, 712, 711, 710, 128, 0, 0,
+ 738, 712, 720, 722, 713, 710, 698, 840, 840, 228,
+ 233, 242, 248, 253, 701, 717, 246, 704, 703, 704,
+ 705, 700, 701, 699, 699, 692, 705, 174, 693, 191,
689, 697, 703, 694, 697, 696, 699, 677, 689, 115,
686, 677, 0, 678, 676, 682, 678, 687, 0, 687,
- 706, 245, 683, 682, 250, 672, 705, 679, 664, 677,
- 674, 675, 674, 659, 710, 676, 655, 672, 668, 671,
-
- 662, 652, 656, 661, 654, 665, 652, 660, 659, 648,
- 652, 640, 658, 653, 635, 648, 641, 649, 644, 643,
- 632, 255, 644, 637, 645, 667, 638, 644, 631, 630,
- 622, 244, 300, 305, 314, 319, 324, 0, 623, 626,
- 630, 637, 0, 669, 627, 630, 630, 0, 613, 0,
- 631, 620, 613, 612, 619, 167, 623, 0, 607, 612,
- 611, 604, 603, 0, 606, 606, 613, 609, 0, 597,
- 0, 612, 598, 0, 595, 613, 599, 592, 609, 0,
- 0, 589, 603, 606, 601, 586, 611, 586, 584, 584,
- 581, 588, 0, 0, 632, 151, 586, 578, 578, 582,
-
- 579, 583, 586, 581, 570, 571, 568, 187, 0, 574,
- 572, 567, 564, 578, 0, 0, 562, 563, 216, 566,
- 0, 577, 560, 571, 574, 569, 585, 0, 0, 548,
- 553, 563, 557, 0, 0, 557, 0, 562, 555, 0,
- 329, 334, 567, 546, 550, 549, 0, 548, 543, 550,
- 547, 554, 551, 550, 559, 540, 547, 531, 541, 544,
- 543, 542, 541, 540, 165, 527, 0, 539, 538, 0,
- 0, 532, 239, 519, 522, 527, 518, 523, 522, 518,
- 0, 542, 514, 0, 513, 522, 511, 0, 527, 518,
- 512, 0, 0, 520, 520, 520, 0, 509, 0, 527,
-
- 514, 502, 516, 512, 503, 510, 0, 506, 508, 507,
- 0, 492, 491, 504, 497, 504, 487, 491, 0, 182,
- 0, 499, 0, 496, 0, 493, 0, 0, 533, 495,
- 0, 486, 487, 478, 0, 483, 494, 489, 470, 479,
- 478, 495, 511, 471, 0, 0, 240, 478, 0, 477,
- 480, 470, 250, 507, 0, 473, 461, 0, 0, 470,
- 0, 489, 473, 0, 0, 472, 463, 450, 0, 455,
- 464, 471, 0, 456, 0, 461, 249, 481, 0, 0,
- 463, 0, 0, 461, 0, 460, 464, 459, 446, 458,
- 313, 460, 0, 0, 441, 0, 0, 452, 465, 452,
-
- 453, 453, 0, 0, 450, 452, 438, 437, 449, 0,
- 431, 445, 446, 0, 433, 460, 455, 448, 429, 436,
- 0, 453, 436, 419, 427, 431, 418, 431, 422, 424,
- 327, 430, 417, 424, 411, 0, 418, 407, 0, 401,
- 419, 403, 409, 402, 412, 442, 404, 400, 411, 404,
- 0, 395, 398, 399, 392, 0, 0, 397, 0, 419,
- 418, 429, 399, 0, 429, 385, 0, 0, 0, 394,
- 0, 0, 397, 399, 387, 380, 393, 379, 0, 373,
- 386, 0, 383, 392, 383, 386, 400, 375, 376, 378,
- 0, 381, 380, 370, 365, 377, 0, 388, 387, 396,
-
- 0, 383, 0, 374, 359, 364, 367, 368, 0, 364,
- 0, 350, 0, 366, 350, 0, 353, 344, 0, 348,
- 0, 347, 353, 344, 358, 361, 360, 359, 374, 0,
- 352, 0, 345, 338, 0, 349, 212, 348, 333, 0,
- 332, 0, 336, 348, 0, 351, 350, 349, 354, 0,
- 0, 342, 0, 325, 0, 332, 331, 332, 325, 357,
- 356, 355, 345, 322, 323, 316, 325, 303, 307, 332,
- 331, 330, 320, 301, 0, 305, 0, 328, 0, 322,
- 321, 320, 319, 0, 294, 297, 326, 325, 324, 329,
- 0, 296, 288, 274, 273, 274, 242, 265, 264, 263,
-
- 271, 226, 0, 0, 0, 168, 119, 122, 51, 0,
- 0, 841, 81
+ 706, 245, 683, 682, 672, 671, 704, 678, 663, 676,
+ 673, 674, 673, 658, 709, 675, 654, 671, 667, 670,
+
+ 661, 651, 655, 660, 653, 664, 651, 659, 658, 647,
+ 651, 639, 657, 652, 634, 647, 640, 648, 643, 642,
+ 631, 252, 643, 636, 644, 666, 637, 643, 630, 629,
+ 621, 241, 265, 297, 306, 311, 316, 0, 622, 625,
+ 629, 636, 0, 668, 626, 629, 629, 0, 612, 0,
+ 630, 619, 612, 616, 610, 617, 167, 621, 0, 605,
+ 610, 609, 602, 601, 0, 604, 604, 611, 607, 0,
+ 595, 0, 610, 596, 0, 593, 611, 597, 590, 607,
+ 0, 0, 596, 587, 612, 587, 585, 585, 582, 589,
+ 0, 0, 633, 151, 587, 579, 579, 583, 580, 584,
+
+ 587, 582, 571, 572, 569, 188, 0, 575, 573, 568,
+ 565, 579, 0, 0, 563, 564, 235, 567, 0, 578,
+ 561, 572, 575, 570, 586, 0, 0, 549, 554, 564,
+ 558, 0, 0, 558, 0, 563, 556, 0, 321, 326,
+ 568, 547, 551, 550, 0, 549, 544, 551, 548, 555,
+ 552, 551, 541, 559, 540, 547, 531, 541, 544, 543,
+ 542, 541, 540, 208, 527, 0, 539, 538, 0, 0,
+ 532, 258, 519, 522, 527, 523, 0, 545, 517, 0,
+ 516, 525, 514, 0, 530, 521, 515, 0, 0, 523,
+ 523, 523, 0, 512, 0, 530, 517, 505, 519, 515,
+
+ 506, 513, 0, 509, 511, 510, 0, 495, 494, 507,
+ 500, 507, 490, 494, 0, 244, 0, 502, 0, 499,
+ 0, 496, 0, 0, 536, 498, 0, 489, 490, 481,
+ 0, 486, 487, 496, 491, 472, 481, 480, 497, 513,
+ 473, 0, 0, 248, 480, 0, 479, 482, 472, 208,
+ 509, 0, 475, 463, 475, 491, 475, 0, 0, 474,
+ 465, 452, 0, 457, 466, 473, 0, 458, 0, 463,
+ 310, 483, 0, 0, 465, 0, 0, 463, 0, 462,
+ 466, 461, 448, 460, 306, 462, 0, 0, 443, 0,
+ 0, 454, 467, 454, 455, 443, 454, 0, 0, 451,
+
+ 453, 439, 438, 450, 0, 432, 446, 447, 0, 434,
+ 461, 456, 449, 430, 437, 417, 453, 436, 419, 427,
+ 431, 418, 431, 422, 424, 320, 430, 417, 424, 411,
+ 0, 418, 407, 0, 401, 419, 403, 409, 402, 412,
+ 442, 404, 400, 411, 408, 403, 0, 394, 397, 398,
+ 391, 0, 0, 396, 0, 418, 417, 428, 398, 0,
+ 0, 428, 384, 0, 0, 0, 393, 0, 0, 396,
+ 398, 386, 379, 392, 378, 0, 372, 385, 0, 382,
+ 391, 382, 385, 399, 374, 375, 377, 0, 361, 379,
+ 378, 368, 363, 375, 0, 386, 385, 394, 0, 381,
+
+ 0, 372, 357, 362, 365, 366, 0, 362, 0, 348,
+ 0, 364, 348, 0, 351, 342, 0, 346, 0, 0,
+ 345, 351, 342, 356, 359, 358, 357, 372, 0, 350,
+ 0, 343, 336, 0, 347, 241, 346, 331, 0, 330,
+ 0, 334, 346, 0, 349, 348, 347, 353, 0, 0,
+ 341, 0, 324, 0, 331, 330, 330, 323, 355, 354,
+ 353, 343, 320, 321, 315, 325, 303, 307, 332, 330,
+ 327, 318, 299, 0, 303, 0, 324, 0, 318, 317,
+ 316, 315, 0, 290, 293, 322, 321, 320, 325, 0,
+ 319, 311, 310, 281, 287, 247, 262, 248, 240, 248,
+
+ 171, 0, 0, 0, 168, 119, 122, 51, 0, 0,
+ 840, 81
} ;
-static yyconst flex_int16_t yy_def[714] =
+static yyconst flex_int16_t yy_def[713] =
{ 0,
- 712, 1, 712, 712, 712, 712, 712, 712, 712, 712,
+ 711, 1, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 711, 711, 711,
+ 711, 711, 711, 711, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 711, 711, 711, 711, 711, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 711, 711,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 712, 712, 712, 712, 712, 712,
712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
-
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 712, 712, 712,
- 712, 712, 712, 712, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
-
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 712, 712, 712, 712, 712, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
-
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 712, 712, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
-
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
-
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
-
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
-
- 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
- 713, 0, 712
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+
+ 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
+ 0, 711
} ;
-static yyconst flex_int16_t yy_nxt[915] =
+static yyconst flex_int16_t yy_nxt[914] =
{ 0,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 16, 16, 16, 16, 17, 18, 19,
@@ -704,98 +695,98 @@ static yyconst flex_int16_t yy_nxt[915] =
59, 59, 59, 59, 59, 65, 57, 70, 93, 96,
205, 79, 206, 66, 60, 80, 129, 130, 71, 67,
- 68, 69, 73, 81, 97, 711, 74, 72, 105, 75,
+ 68, 69, 73, 81, 97, 710, 74, 72, 105, 75,
76, 82, 131, 83, 86, 77, 184, 185, 78, 60,
84, 98, 87, 85, 88, 89, 101, 90, 99, 132,
- 102, 106, 266, 91, 103, 267, 109, 117, 710, 104,
+ 102, 106, 267, 91, 103, 268, 109, 117, 709, 104,
110, 118, 133, 111, 112, 134, 113, 121, 122, 114,
119, 123, 115, 153, 124, 125, 120, 193, 126, 127,
- 709, 154, 194, 128, 54, 54, 54, 54, 54, 141,
+ 708, 154, 194, 128, 54, 54, 54, 54, 54, 141,
141, 141, 141, 141, 164, 165, 224, 225, 140, 166,
- 389, 390, 58, 142, 59, 59, 59, 59, 59, 143,
+ 385, 386, 58, 142, 59, 59, 59, 59, 59, 143,
- 143, 191, 708, 144, 144, 144, 144, 144, 60, 192,
+ 143, 191, 707, 144, 144, 144, 144, 144, 60, 192,
172, 158, 203, 140, 159, 160, 173, 161, 142, 210,
- 174, 162, 211, 218, 357, 255, 219, 358, 402, 447,
- 448, 204, 220, 60, 491, 212, 233, 233, 256, 492,
+ 174, 162, 211, 218, 356, 253, 219, 357, 706, 398,
+ 511, 204, 220, 60, 254, 212, 233, 233, 512, 256,
234, 234, 234, 234, 234, 141, 141, 141, 141, 141,
- 236, 236, 402, 654, 237, 237, 237, 237, 237, 235,
+ 236, 236, 257, 398, 237, 237, 237, 237, 237, 235,
144, 144, 144, 144, 144, 144, 144, 144, 144, 144,
- 240, 277, 516, 453, 282, 410, 454, 654, 283, 322,
- 517, 411, 532, 707, 235, 278, 241, 242, 279, 284,
- 285, 510, 323, 334, 324, 511, 335, 706, 705, 704,
-
- 703, 336, 702, 701, 533, 337, 532, 338, 339, 700,
- 699, 340, 234, 234, 234, 234, 234, 234, 234, 234,
- 234, 234, 341, 341, 698, 697, 342, 342, 342, 342,
- 342, 237, 237, 237, 237, 237, 237, 237, 237, 237,
- 237, 342, 342, 342, 342, 342, 342, 342, 342, 342,
- 342, 542, 574, 696, 695, 694, 693, 692, 691, 690,
- 689, 688, 687, 686, 685, 684, 683, 575, 543, 682,
- 681, 680, 679, 678, 677, 542, 676, 574, 675, 674,
- 673, 672, 671, 670, 669, 668, 667, 666, 665, 664,
- 663, 575, 662, 661, 660, 659, 658, 657, 656, 655,
-
- 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, 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, 548, 547, 546, 545, 544, 541, 540,
- 539, 538, 537, 536, 535, 534, 531, 530, 529, 528,
- 527, 526, 525, 524, 523, 522, 521, 520, 519, 518,
- 515, 514, 513, 512, 509, 508, 507, 506, 505, 504,
- 503, 502, 501, 500, 499, 498, 497, 496, 495, 494,
- 493, 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, 452, 451, 450,
- 449, 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, 409, 408, 407, 406,
- 405, 404, 403, 401, 400, 399, 398, 397, 396, 395,
- 394, 393, 392, 391, 388, 387, 386, 385, 384, 383,
- 382, 381, 380, 379, 378, 377, 376, 375, 374, 373,
- 372, 371, 370, 369, 368, 367, 366, 365, 364, 363,
- 362, 361, 360, 359, 356, 355, 354, 353, 352, 351,
- 350, 349, 348, 347, 346, 345, 344, 343, 333, 332,
- 331, 330, 329, 328, 327, 326, 325, 321, 320, 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, 290, 289,
- 288, 287, 286, 281, 280, 276, 275, 274, 273, 272,
- 271, 270, 269, 268, 265, 264, 263, 262, 261, 260,
- 259, 258, 257, 254, 253, 252, 251, 250, 249, 248,
- 247, 246, 245, 244, 243, 239, 238, 232, 231, 230,
- 229, 228, 227, 226, 223, 222, 221, 217, 216, 215,
- 214, 213, 209, 208, 207, 202, 201, 200, 199, 198,
- 197, 196, 195, 190, 189, 188, 187, 186, 183, 182,
-
- 181, 180, 179, 178, 177, 176, 175, 171, 170, 169,
- 168, 167, 163, 157, 156, 155, 152, 151, 150, 149,
- 148, 147, 146, 145, 139, 138, 137, 136, 135, 116,
- 108, 107, 100, 63, 62, 61, 48, 47, 46, 712,
- 3, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
-
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712
+ 240, 278, 444, 445, 705, 704, 320, 234, 234, 234,
+ 234, 234, 653, 703, 235, 279, 241, 242, 280, 321,
+ 332, 322, 450, 333, 406, 451, 485, 702, 334, 505,
+
+ 407, 486, 335, 506, 336, 337, 653, 701, 338, 234,
+ 234, 234, 234, 234, 339, 339, 700, 699, 340, 340,
+ 340, 340, 340, 237, 237, 237, 237, 237, 237, 237,
+ 237, 237, 237, 340, 340, 340, 340, 340, 340, 340,
+ 340, 340, 340, 527, 537, 571, 698, 697, 696, 695,
+ 694, 693, 692, 691, 690, 689, 688, 687, 686, 685,
+ 572, 538, 684, 683, 682, 528, 681, 527, 537, 680,
+ 571, 679, 678, 677, 676, 675, 674, 673, 672, 671,
+ 670, 669, 668, 667, 572, 666, 665, 664, 663, 662,
+ 661, 660, 659, 658, 657, 656, 655, 654, 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, 570, 569,
+ 568, 567, 566, 565, 564, 563, 562, 561, 560, 559,
+ 558, 557, 556, 555, 554, 553, 552, 551, 550, 549,
+
+ 548, 547, 546, 545, 544, 543, 542, 541, 540, 539,
+ 536, 535, 534, 533, 532, 531, 530, 529, 526, 525,
+ 524, 523, 522, 521, 520, 519, 518, 517, 516, 515,
+ 514, 513, 510, 509, 508, 507, 504, 503, 502, 501,
+ 500, 499, 498, 497, 496, 495, 494, 493, 492, 491,
+ 490, 489, 488, 487, 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, 449, 448, 447,
+ 446, 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, 405, 404, 403,
+ 402, 401, 400, 399, 397, 396, 395, 394, 393, 392,
+ 391, 390, 389, 388, 387, 384, 383, 382, 381, 380,
+ 379, 378, 377, 376, 375, 374, 373, 372, 371, 370,
+ 369, 368, 367, 366, 365, 364, 363, 362, 361, 360,
+ 359, 358, 355, 354, 353, 352, 351, 350, 349, 348,
+ 347, 346, 345, 344, 343, 342, 341, 331, 330, 329,
+ 328, 327, 326, 325, 324, 323, 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, 290, 289, 288, 287, 286,
+ 285, 284, 283, 282, 281, 277, 276, 275, 274, 273,
+ 272, 271, 270, 269, 266, 265, 264, 263, 262, 261,
+ 260, 259, 258, 255, 252, 251, 250, 249, 248, 247,
+ 246, 245, 244, 243, 239, 238, 232, 231, 230, 229,
+ 228, 227, 226, 223, 222, 221, 217, 216, 215, 214,
+ 213, 209, 208, 207, 202, 201, 200, 199, 198, 197,
+ 196, 195, 190, 189, 188, 187, 186, 183, 182, 181,
+
+ 180, 179, 178, 177, 176, 175, 171, 170, 169, 168,
+ 167, 163, 157, 156, 155, 152, 151, 150, 149, 148,
+ 147, 146, 145, 139, 138, 137, 136, 135, 116, 108,
+ 107, 100, 63, 62, 61, 48, 47, 46, 711, 3,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711
} ;
-static yyconst flex_int16_t yy_chk[915] =
+static yyconst flex_int16_t yy_chk[914] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -805,99 +796,99 @@ static yyconst flex_int16_t yy_chk[915] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 12, 14, 13, 14, 14, 14, 14,
- 14, 28, 713, 15, 29, 12, 13, 15, 16, 29,
+ 14, 28, 712, 15, 29, 12, 13, 15, 16, 29,
16, 16, 16, 16, 16, 22, 15, 23, 28, 29,
114, 25, 114, 22, 16, 25, 41, 41, 23, 22,
- 22, 22, 24, 25, 30, 709, 24, 23, 34, 24,
+ 22, 22, 24, 25, 30, 708, 24, 23, 34, 24,
24, 26, 41, 26, 27, 24, 95, 95, 24, 16,
26, 30, 27, 26, 27, 27, 33, 27, 30, 41,
- 33, 34, 170, 27, 33, 170, 37, 39, 708, 33,
+ 33, 34, 170, 27, 33, 170, 37, 39, 707, 33,
37, 39, 41, 37, 37, 41, 37, 40, 40, 37,
39, 40, 37, 73, 40, 40, 39, 103, 40, 40,
- 707, 73, 103, 40, 54, 54, 54, 54, 54, 58,
+ 706, 73, 103, 40, 54, 54, 54, 54, 54, 58,
58, 58, 58, 58, 79, 79, 128, 128, 54, 79,
- 296, 296, 59, 58, 59, 59, 59, 59, 59, 60,
+ 294, 294, 59, 58, 59, 59, 59, 59, 59, 60,
- 60, 102, 706, 60, 60, 60, 60, 60, 59, 102,
+ 60, 102, 705, 60, 60, 60, 60, 60, 59, 102,
85, 77, 113, 54, 77, 77, 85, 77, 58, 118,
- 85, 77, 118, 124, 256, 160, 124, 256, 308, 365,
- 365, 113, 124, 59, 420, 118, 140, 140, 160, 420,
+ 85, 77, 118, 124, 257, 158, 124, 257, 701, 306,
+ 450, 113, 124, 59, 158, 118, 140, 140, 450, 160,
140, 140, 140, 140, 140, 141, 141, 141, 141, 141,
- 142, 142, 308, 637, 142, 142, 142, 142, 142, 141,
+ 142, 142, 160, 306, 142, 142, 142, 142, 142, 141,
143, 143, 143, 143, 143, 144, 144, 144, 144, 144,
- 147, 182, 453, 373, 185, 319, 373, 637, 185, 222,
- 453, 319, 477, 702, 141, 182, 147, 147, 182, 185,
- 185, 447, 222, 232, 222, 447, 232, 701, 700, 699,
-
- 698, 232, 697, 696, 477, 232, 477, 232, 232, 695,
- 694, 232, 233, 233, 233, 233, 233, 234, 234, 234,
- 234, 234, 235, 235, 693, 692, 235, 235, 235, 235,
- 235, 236, 236, 236, 236, 236, 237, 237, 237, 237,
- 237, 341, 341, 341, 341, 341, 342, 342, 342, 342,
- 342, 491, 531, 690, 689, 688, 687, 686, 685, 683,
- 682, 681, 680, 678, 676, 674, 673, 531, 491, 672,
- 671, 670, 669, 668, 667, 491, 666, 531, 665, 664,
- 663, 662, 661, 660, 659, 658, 657, 656, 654, 652,
- 649, 531, 648, 647, 646, 644, 643, 641, 639, 638,
-
- 636, 634, 633, 631, 629, 628, 627, 626, 625, 624,
- 623, 622, 620, 618, 617, 615, 614, 612, 610, 608,
- 607, 606, 605, 604, 602, 600, 599, 598, 596, 595,
- 594, 593, 592, 590, 589, 588, 587, 586, 585, 584,
- 583, 581, 580, 578, 577, 576, 575, 574, 573, 570,
- 566, 565, 563, 562, 561, 560, 558, 555, 554, 553,
- 552, 550, 549, 548, 547, 546, 545, 544, 543, 542,
- 541, 540, 538, 537, 535, 534, 533, 532, 530, 529,
- 528, 527, 526, 525, 524, 523, 522, 520, 519, 518,
- 517, 516, 515, 513, 512, 511, 509, 508, 507, 506,
-
- 505, 502, 501, 500, 499, 498, 495, 492, 490, 489,
- 488, 487, 486, 484, 481, 478, 476, 474, 472, 471,
- 470, 468, 467, 466, 463, 462, 460, 457, 456, 454,
- 452, 451, 450, 448, 444, 443, 442, 441, 440, 439,
- 438, 437, 436, 434, 433, 432, 430, 429, 426, 424,
- 422, 418, 417, 416, 415, 414, 413, 412, 410, 409,
- 408, 406, 405, 404, 403, 402, 401, 400, 398, 396,
- 395, 394, 391, 390, 389, 387, 386, 385, 383, 382,
- 380, 379, 378, 377, 376, 375, 374, 372, 369, 368,
- 366, 364, 363, 362, 361, 360, 359, 358, 357, 356,
-
- 355, 354, 353, 352, 351, 350, 349, 348, 346, 345,
- 344, 343, 339, 338, 336, 333, 332, 331, 330, 327,
- 326, 325, 324, 323, 322, 320, 318, 317, 314, 313,
- 312, 311, 310, 307, 306, 305, 304, 303, 302, 301,
- 300, 299, 298, 297, 295, 292, 291, 290, 289, 288,
- 287, 286, 285, 284, 283, 282, 279, 278, 277, 276,
- 275, 273, 272, 270, 268, 267, 266, 265, 263, 262,
- 261, 260, 259, 257, 255, 254, 253, 252, 251, 249,
- 247, 246, 245, 244, 242, 241, 240, 239, 231, 230,
- 229, 228, 227, 226, 225, 224, 223, 221, 220, 219,
-
- 218, 217, 216, 215, 214, 213, 212, 211, 210, 209,
- 208, 207, 206, 205, 204, 203, 202, 201, 200, 199,
- 198, 197, 196, 195, 194, 193, 192, 191, 190, 189,
- 188, 187, 186, 184, 183, 181, 180, 178, 177, 176,
+ 147, 182, 364, 364, 700, 699, 222, 233, 233, 233,
+ 233, 233, 636, 698, 141, 182, 147, 147, 182, 222,
+ 232, 222, 372, 232, 317, 372, 416, 697, 232, 444,
+
+ 317, 416, 232, 444, 232, 232, 636, 696, 232, 234,
+ 234, 234, 234, 234, 235, 235, 695, 694, 235, 235,
+ 235, 235, 235, 236, 236, 236, 236, 236, 237, 237,
+ 237, 237, 237, 339, 339, 339, 339, 339, 340, 340,
+ 340, 340, 340, 471, 485, 526, 693, 692, 691, 689,
+ 688, 687, 686, 685, 684, 682, 681, 680, 679, 677,
+ 526, 485, 675, 673, 672, 471, 671, 471, 485, 670,
+ 526, 669, 668, 667, 666, 665, 664, 663, 662, 661,
+ 660, 659, 658, 657, 526, 656, 655, 653, 651, 648,
+ 647, 646, 645, 643, 642, 640, 638, 637, 635, 633,
+
+ 632, 630, 628, 627, 626, 625, 624, 623, 622, 621,
+ 618, 616, 615, 613, 612, 610, 608, 606, 605, 604,
+ 603, 602, 600, 598, 597, 596, 594, 593, 592, 591,
+ 590, 589, 587, 586, 585, 584, 583, 582, 581, 580,
+ 578, 577, 575, 574, 573, 572, 571, 570, 567, 563,
+ 562, 559, 558, 557, 556, 554, 551, 550, 549, 548,
+ 546, 545, 544, 543, 542, 541, 540, 539, 538, 537,
+ 536, 535, 533, 532, 530, 529, 528, 527, 525, 524,
+ 523, 522, 521, 520, 519, 518, 517, 516, 515, 514,
+ 513, 512, 511, 510, 508, 507, 506, 504, 503, 502,
+
+ 501, 500, 497, 496, 495, 494, 493, 492, 489, 486,
+ 484, 483, 482, 481, 480, 478, 475, 472, 470, 468,
+ 466, 465, 464, 462, 461, 460, 457, 456, 455, 454,
+ 453, 451, 449, 448, 447, 445, 441, 440, 439, 438,
+ 437, 436, 435, 434, 433, 432, 430, 429, 428, 426,
+ 425, 422, 420, 418, 414, 413, 412, 411, 410, 409,
+ 408, 406, 405, 404, 402, 401, 400, 399, 398, 397,
+ 396, 394, 392, 391, 390, 387, 386, 385, 383, 382,
+ 381, 379, 378, 376, 375, 374, 373, 371, 368, 367,
+ 365, 363, 362, 361, 360, 359, 358, 357, 356, 355,
+
+ 354, 353, 352, 351, 350, 349, 348, 347, 346, 344,
+ 343, 342, 341, 337, 336, 334, 331, 330, 329, 328,
+ 325, 324, 323, 322, 321, 320, 318, 316, 315, 312,
+ 311, 310, 309, 308, 305, 304, 303, 302, 301, 300,
+ 299, 298, 297, 296, 295, 293, 290, 289, 288, 287,
+ 286, 285, 284, 283, 280, 279, 278, 277, 276, 274,
+ 273, 271, 269, 268, 267, 266, 264, 263, 262, 261,
+ 260, 258, 256, 255, 254, 253, 252, 251, 249, 247,
+ 246, 245, 244, 242, 241, 240, 239, 231, 230, 229,
+ 228, 227, 226, 225, 224, 223, 221, 220, 219, 218,
+
+ 217, 216, 215, 214, 213, 212, 211, 210, 209, 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, 181, 180, 178, 177, 176,
175, 174, 172, 171, 169, 168, 167, 166, 165, 164,
- 163, 162, 161, 159, 158, 157, 156, 155, 154, 153,
- 152, 151, 150, 149, 148, 146, 145, 137, 136, 135,
- 134, 133, 132, 131, 127, 126, 125, 123, 122, 121,
- 120, 119, 117, 116, 115, 111, 110, 109, 108, 107,
- 106, 105, 104, 101, 100, 99, 97, 96, 94, 93,
-
- 92, 91, 90, 89, 88, 87, 86, 84, 83, 82,
- 81, 80, 78, 76, 75, 74, 72, 71, 70, 69,
- 68, 67, 66, 65, 53, 45, 44, 43, 42, 38,
- 36, 35, 32, 21, 20, 19, 11, 9, 7, 3,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
-
- 712, 712, 712, 712, 712, 712, 712, 712, 712, 712,
- 712, 712, 712, 712
+ 163, 162, 161, 159, 157, 156, 155, 154, 153, 152,
+ 151, 150, 149, 148, 146, 145, 137, 136, 135, 134,
+ 133, 132, 131, 127, 126, 125, 123, 122, 121, 120,
+ 119, 117, 116, 115, 111, 110, 109, 108, 107, 106,
+ 105, 104, 101, 100, 99, 97, 96, 94, 93, 92,
+
+ 91, 90, 89, 88, 87, 86, 84, 83, 82, 81,
+ 80, 78, 76, 75, 74, 72, 71, 70, 69, 68,
+ 67, 66, 65, 53, 45, 44, 43, 42, 38, 36,
+ 35, 32, 21, 20, 19, 11, 9, 7, 3, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+
+ 711, 711, 711, 711, 711, 711, 711, 711, 711, 711,
+ 711, 711, 711
} ;
static yy_state_type yy_last_accepting_state;
@@ -954,7 +945,7 @@ void skipline(void);
#define YY_NO_UNISTD_H
#endif
-#line 958 "Gmsh.yy.cpp"
+#line 949 "Gmsh.yy.cpp"
#define INITIAL 0
@@ -993,7 +984,7 @@ FILE *gmsh_yyget_out (void );
void gmsh_yyset_out (FILE * out_str );
-int gmsh_yyget_leng (void );
+yy_size_t gmsh_yyget_leng (void );
char *gmsh_yyget_text (void );
@@ -1035,12 +1026,7 @@ static int input (void );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -1048,7 +1034,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( gmsh_yytext, gmsh_yyleng, 1, gmsh_yyout )) {} } while (0)
+#define ECHO fwrite( gmsh_yytext, gmsh_yyleng, 1, gmsh_yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -1059,7 +1045,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- size_t n; \
+ yy_size_t n; \
for ( n = 0; n < max_size && \
(c = getc( gmsh_yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1144,7 +1130,7 @@ YY_DECL
#line 49 "Gmsh.l"
-#line 1148 "Gmsh.yy.cpp"
+#line 1134 "Gmsh.yy.cpp"
if ( !(yy_init) )
{
@@ -1197,13 +1183,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 >= 713 )
+ if ( yy_current_state >= 712 )
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] != 841 );
+ while ( yy_base[yy_current_state] != 840 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -1461,102 +1447,102 @@ return tCoherence;
case 47:
YY_RULE_SETUP
#line 100 "Gmsh.l"
-return tCombine;
+return tCohomology;
YY_BREAK
case 48:
YY_RULE_SETUP
#line 101 "Gmsh.l"
-return tCosh;
+return tCombine;
YY_BREAK
case 49:
YY_RULE_SETUP
#line 102 "Gmsh.l"
-return tCos;
+return tCosh;
YY_BREAK
case 50:
YY_RULE_SETUP
#line 103 "Gmsh.l"
-return tCharacteristic;
+return tCos;
YY_BREAK
case 51:
YY_RULE_SETUP
#line 104 "Gmsh.l"
-return tComplex;
+return tCharacteristic;
YY_BREAK
case 52:
YY_RULE_SETUP
#line 105 "Gmsh.l"
-return tColor;
+return tComplex;
YY_BREAK
case 53:
YY_RULE_SETUP
#line 106 "Gmsh.l"
-return tColorTable;
+return tColor;
YY_BREAK
case 54:
YY_RULE_SETUP
#line 107 "Gmsh.l"
-return tCompound;
+return tColorTable;
YY_BREAK
case 55:
YY_RULE_SETUP
#line 108 "Gmsh.l"
-return tCoordinates;
+return tCompound;
YY_BREAK
case 56:
YY_RULE_SETUP
#line 109 "Gmsh.l"
-return tSpline;
+return tCoordinates;
YY_BREAK
case 57:
YY_RULE_SETUP
#line 110 "Gmsh.l"
-return tCall;
+return tSpline;
YY_BREAK
case 58:
YY_RULE_SETUP
#line 111 "Gmsh.l"
-return tCreateTopology;
+return tCall;
YY_BREAK
case 59:
YY_RULE_SETUP
#line 112 "Gmsh.l"
-return tCreateTopologyNoHoles;
+return tCreateTopology;
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 114 "Gmsh.l"
-return tDefineConstant;
+#line 113 "Gmsh.l"
+return tCreateTopologyNoHoles;
YY_BREAK
case 61:
YY_RULE_SETUP
#line 115 "Gmsh.l"
-return tDelete;
+return tDefineConstant;
YY_BREAK
case 62:
YY_RULE_SETUP
#line 116 "Gmsh.l"
-return tDegenerated;
+return tDelete;
YY_BREAK
case 63:
YY_RULE_SETUP
#line 117 "Gmsh.l"
-return tDilate;
+return tDegenerated;
YY_BREAK
case 64:
YY_RULE_SETUP
#line 118 "Gmsh.l"
-return tDraw;
+return tDilate;
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 120 "Gmsh.l"
-return tExp;
+#line 119 "Gmsh.l"
+return tDraw;
YY_BREAK
case 66:
YY_RULE_SETUP
#line 121 "Gmsh.l"
-return tEllipse;
+return tExp;
YY_BREAK
case 67:
YY_RULE_SETUP
@@ -1566,460 +1552,450 @@ return tEllipse;
case 68:
YY_RULE_SETUP
#line 123 "Gmsh.l"
-return tExtrude;
+return tEllipse;
YY_BREAK
case 69:
YY_RULE_SETUP
#line 124 "Gmsh.l"
-return tElliptic;
+return tExtrude;
YY_BREAK
case 70:
YY_RULE_SETUP
#line 125 "Gmsh.l"
-return tEndFor;
+return tElliptic;
YY_BREAK
case 71:
YY_RULE_SETUP
#line 126 "Gmsh.l"
-return tEndIf;
+return tEndFor;
YY_BREAK
case 72:
YY_RULE_SETUP
#line 127 "Gmsh.l"
-return tEuclidian;
+return tEndIf;
YY_BREAK
case 73:
YY_RULE_SETUP
#line 128 "Gmsh.l"
-return tExit;
+return tEuclidian;
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 130 "Gmsh.l"
-return tFabs;
+#line 129 "Gmsh.l"
+return tExit;
YY_BREAK
case 75:
YY_RULE_SETUP
#line 131 "Gmsh.l"
-return tField;
+return tFabs;
YY_BREAK
case 76:
YY_RULE_SETUP
#line 132 "Gmsh.l"
-return tFloor;
+return tField;
YY_BREAK
case 77:
YY_RULE_SETUP
#line 133 "Gmsh.l"
-return tFmod;
+return tFloor;
YY_BREAK
case 78:
YY_RULE_SETUP
#line 134 "Gmsh.l"
-return tFor;
+return tFmod;
YY_BREAK
case 79:
YY_RULE_SETUP
#line 135 "Gmsh.l"
-return tFunction;
+return tFor;
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 137 "Gmsh.l"
-return tGetEnv;
+#line 136 "Gmsh.l"
+return tFunction;
YY_BREAK
case 81:
YY_RULE_SETUP
#line 138 "Gmsh.l"
-return tGetString;
+return tGetEnv;
YY_BREAK
case 82:
YY_RULE_SETUP
#line 139 "Gmsh.l"
-return tGetValue;
+return tGetString;
YY_BREAK
case 83:
YY_RULE_SETUP
#line 140 "Gmsh.l"
-return tGMSH_MAJOR_VERSION;
+return tGetValue;
YY_BREAK
case 84:
YY_RULE_SETUP
#line 141 "Gmsh.l"
-return tGMSH_MINOR_VERSION;
+return tGMSH_MAJOR_VERSION;
YY_BREAK
case 85:
YY_RULE_SETUP
#line 142 "Gmsh.l"
-return tGMSH_PATCH_VERSION;
+return tGMSH_MINOR_VERSION;
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 144 "Gmsh.l"
-return tHide;
+#line 143 "Gmsh.l"
+return tGMSH_PATCH_VERSION;
YY_BREAK
case 87:
YY_RULE_SETUP
#line 145 "Gmsh.l"
-return tHole;
+return tHide;
YY_BREAK
case 88:
YY_RULE_SETUP
#line 146 "Gmsh.l"
-return tHomRank;
+return tHole;
YY_BREAK
case 89:
YY_RULE_SETUP
#line 147 "Gmsh.l"
-return tHomGen;
+return tHomology;
YY_BREAK
case 90:
YY_RULE_SETUP
#line 148 "Gmsh.l"
-return tHomCut;
+return tHypot;
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 149 "Gmsh.l"
-return tHomSeq;
+#line 150 "Gmsh.l"
+return tIn;
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 150 "Gmsh.l"
-return tHypot;
+#line 151 "Gmsh.l"
+return tIf;
YY_BREAK
case 93:
YY_RULE_SETUP
#line 152 "Gmsh.l"
-return tIn;
+return tIntersect;
YY_BREAK
case 94:
YY_RULE_SETUP
#line 153 "Gmsh.l"
-return tIf;
+return tInterpolationScheme;
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 154 "Gmsh.l"
-return tIntersect;
+#line 155 "Gmsh.l"
+return tNurbsKnots;
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 155 "Gmsh.l"
-return tInterpolationScheme;
+#line 157 "Gmsh.l"
+return tLength;
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 157 "Gmsh.l"
-return tNurbsKnots;
+#line 158 "Gmsh.l"
+return tLine;
YY_BREAK
case 98:
YY_RULE_SETUP
#line 159 "Gmsh.l"
-return tLength;
+return tList;
YY_BREAK
case 99:
YY_RULE_SETUP
#line 160 "Gmsh.l"
-return tLine;
+return tLog;
YY_BREAK
case 100:
YY_RULE_SETUP
#line 161 "Gmsh.l"
-return tList;
+return tLog10;
YY_BREAK
case 101:
YY_RULE_SETUP
#line 162 "Gmsh.l"
-return tLog;
+return tLayers;
YY_BREAK
case 102:
YY_RULE_SETUP
#line 163 "Gmsh.l"
-return tLog10;
+return tLevelset;
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 164 "Gmsh.l"
-return tLayers;
+#line 165 "Gmsh.l"
+return tModulo;
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 165 "Gmsh.l"
-return tLevelset;
+#line 166 "Gmsh.l"
+return tMPI_Rank;
YY_BREAK
case 105:
YY_RULE_SETUP
#line 167 "Gmsh.l"
-return tModulo;
+return tMPI_Size;
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 168 "Gmsh.l"
-return tMPI_Rank;
+#line 169 "Gmsh.l"
+return tNurbs;
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 169 "Gmsh.l"
-return tMPI_Size;
+#line 171 "Gmsh.l"
+return tNurbsOrder;
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 171 "Gmsh.l"
-return tNurbs;
+#line 173 "Gmsh.l"
+return tPeriodic;
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 173 "Gmsh.l"
-return tNurbsOrder;
+#line 174 "Gmsh.l"
+return tPhysical;
YY_BREAK
case 110:
YY_RULE_SETUP
#line 175 "Gmsh.l"
-return tPeriodic;
+return tPi;
YY_BREAK
case 111:
YY_RULE_SETUP
#line 176 "Gmsh.l"
-return tPhysical;
+return tPlane;
YY_BREAK
case 112:
YY_RULE_SETUP
#line 177 "Gmsh.l"
-return tPi;
+return tPoint;
YY_BREAK
case 113:
YY_RULE_SETUP
#line 178 "Gmsh.l"
-return tPlane;
+return tParametric;
YY_BREAK
case 114:
YY_RULE_SETUP
#line 179 "Gmsh.l"
-return tPoint;
+return tPolarSphere;
YY_BREAK
case 115:
YY_RULE_SETUP
#line 180 "Gmsh.l"
-return tParametric;
+return tPrintf;
YY_BREAK
case 116:
YY_RULE_SETUP
#line 181 "Gmsh.l"
-return tPolarSphere;
+return tPlugin;
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 182 "Gmsh.l"
-return tPrintf;
+#line 183 "Gmsh.l"
+return tQuadTriDbl;
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 183 "Gmsh.l"
-return tPlugin;
+#line 184 "Gmsh.l"
+return tQuadTriSngl;
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 185 "Gmsh.l"
-return tQuadTriDbl;
+#line 186 "Gmsh.l"
+return tRecombine;
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 186 "Gmsh.l"
-return tQuadTriSngl;
+#line 187 "Gmsh.l"
+return tRecombLaterals;
YY_BREAK
case 121:
YY_RULE_SETUP
#line 188 "Gmsh.l"
-return tRecombine;
+return tRotate;
YY_BREAK
case 122:
YY_RULE_SETUP
#line 189 "Gmsh.l"
-return tRecombLaterals;
+return tRuled;
YY_BREAK
case 123:
YY_RULE_SETUP
#line 190 "Gmsh.l"
-return tRotate;
+return tRand;
YY_BREAK
case 124:
YY_RULE_SETUP
#line 191 "Gmsh.l"
-return tRuled;
+return tRefineMesh;
YY_BREAK
case 125:
YY_RULE_SETUP
#line 192 "Gmsh.l"
-return tRand;
+return tReturn;
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 193 "Gmsh.l"
-return tRefineMesh;
+#line 194 "Gmsh.l"
+return tSmoother;
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 194 "Gmsh.l"
-return tReturn;
+#line 195 "Gmsh.l"
+return tSqrt;
YY_BREAK
case 128:
YY_RULE_SETUP
#line 196 "Gmsh.l"
-return tSmoother;
+return tSin;
YY_BREAK
case 129:
YY_RULE_SETUP
#line 197 "Gmsh.l"
-return tSqrt;
+return tSinh;
YY_BREAK
case 130:
YY_RULE_SETUP
#line 198 "Gmsh.l"
-return tSin;
+return tSphere;
YY_BREAK
case 131:
YY_RULE_SETUP
#line 199 "Gmsh.l"
-return tSinh;
+return tSpline;
YY_BREAK
case 132:
YY_RULE_SETUP
#line 200 "Gmsh.l"
-return tSphere;
+return tSplit;
YY_BREAK
case 133:
YY_RULE_SETUP
#line 201 "Gmsh.l"
-return tSpline;
+return tSurface;
YY_BREAK
case 134:
YY_RULE_SETUP
#line 202 "Gmsh.l"
-return tSplit;
+return tSprintf;
YY_BREAK
case 135:
YY_RULE_SETUP
#line 203 "Gmsh.l"
-return tSurface;
+return tStrCat;
YY_BREAK
case 136:
YY_RULE_SETUP
#line 204 "Gmsh.l"
-return tSprintf;
+return tStrPrefix;
YY_BREAK
case 137:
YY_RULE_SETUP
#line 205 "Gmsh.l"
-return tStrCat;
+return tStrRelative;
YY_BREAK
case 138:
YY_RULE_SETUP
#line 206 "Gmsh.l"
-return tStrPrefix;
+return tShow;
YY_BREAK
case 139:
YY_RULE_SETUP
#line 207 "Gmsh.l"
-return tStrRelative;
+return tSymmetry;
YY_BREAK
case 140:
YY_RULE_SETUP
#line 208 "Gmsh.l"
-return tShow;
+return tSyncModel;
YY_BREAK
case 141:
YY_RULE_SETUP
-#line 209 "Gmsh.l"
-return tSymmetry;
+#line 210 "Gmsh.l"
+return tText2D;
YY_BREAK
case 142:
YY_RULE_SETUP
-#line 210 "Gmsh.l"
-return tSyncModel;
+#line 211 "Gmsh.l"
+return tText3D;
YY_BREAK
case 143:
YY_RULE_SETUP
#line 212 "Gmsh.l"
-return tText2D;
+return tTime;
YY_BREAK
case 144:
YY_RULE_SETUP
#line 213 "Gmsh.l"
-return tText3D;
+return tTransfinite;
YY_BREAK
case 145:
YY_RULE_SETUP
#line 214 "Gmsh.l"
-return tTime;
+return tTransfQuadTri;
YY_BREAK
case 146:
YY_RULE_SETUP
#line 215 "Gmsh.l"
-return tTransfinite;
+return tTranslate;
YY_BREAK
case 147:
YY_RULE_SETUP
#line 216 "Gmsh.l"
-return tTransfQuadTri;
+return tTanh;
YY_BREAK
case 148:
YY_RULE_SETUP
#line 217 "Gmsh.l"
-return tTranslate;
+return tTan;
YY_BREAK
case 149:
YY_RULE_SETUP
#line 218 "Gmsh.l"
-return tTanh;
+return tToday;
YY_BREAK
case 150:
YY_RULE_SETUP
-#line 219 "Gmsh.l"
-return tTan;
- YY_BREAK
-case 151:
-YY_RULE_SETUP
#line 220 "Gmsh.l"
-return tToday;
- YY_BREAK
-case 152:
-YY_RULE_SETUP
-#line 222 "Gmsh.l"
return tUsing;
YY_BREAK
-case 153:
+case 151:
YY_RULE_SETUP
-#line 224 "Gmsh.l"
+#line 222 "Gmsh.l"
return tVolume;
YY_BREAK
+case 152:
+#line 225 "Gmsh.l"
+case 153:
+#line 226 "Gmsh.l"
case 154:
#line 227 "Gmsh.l"
case 155:
-#line 228 "Gmsh.l"
-case 156:
-#line 229 "Gmsh.l"
-case 157:
YY_RULE_SETUP
-#line 229 "Gmsh.l"
+#line 227 "Gmsh.l"
{ gmsh_yylval.d = atof((char *)gmsh_yytext); return tDOUBLE; }
YY_BREAK
-case 158:
+case 156:
YY_RULE_SETUP
-#line 231 "Gmsh.l"
+#line 229 "Gmsh.l"
{ gmsh_yylval.c = strsave((char*)gmsh_yytext); return tSTRING; }
YY_BREAK
-case 159:
+case 157:
YY_RULE_SETUP
-#line 233 "Gmsh.l"
+#line 231 "Gmsh.l"
return gmsh_yytext[0];
YY_BREAK
-case 160:
+case 158:
YY_RULE_SETUP
-#line 235 "Gmsh.l"
+#line 233 "Gmsh.l"
ECHO;
YY_BREAK
-#line 2023 "Gmsh.yy.cpp"
+#line 1999 "Gmsh.yy.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2205,7 +2181,7 @@ static int yy_get_next_buffer (void)
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -2219,7 +2195,7 @@ static int yy_get_next_buffer (void)
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -2250,7 +2226,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ (yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -2311,7 +2287,7 @@ static int yy_get_next_buffer (void)
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 >= 713 )
+ if ( yy_current_state >= 712 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2339,11 +2315,11 @@ static int yy_get_next_buffer (void)
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 >= 713 )
+ if ( yy_current_state >= 712 )
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 == 712);
+ yy_is_jam = (yy_current_state == 711);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -2360,7 +2336,7 @@ static int yy_get_next_buffer (void)
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- register int number_to_move = (yy_n_chars) + 2;
+ register yy_size_t number_to_move = (yy_n_chars) + 2;
register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
register char *source =
@@ -2409,7 +2385,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- int offset = (yy_c_buf_p) - (yytext_ptr);
+ yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -2433,7 +2409,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE:
{
if ( gmsh_yywrap( ) )
- return EOF;
+ return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE;
@@ -2685,7 +2661,7 @@ void gmsh_yypop_buffer_state (void)
*/
static void gmsh_yyensure_buffer_stack (void)
{
- int num_to_alloc;
+ yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
@@ -2777,17 +2753,16 @@ YY_BUFFER_STATE gmsh_yy_scan_string (yyconst char * yystr )
/** Setup the input buffer state to scan the given bytes. The next call to gmsh_yylex() will
* scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE gmsh_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
+YY_BUFFER_STATE gmsh_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n;
- int i;
+ yy_size_t n, i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -2869,7 +2844,7 @@ FILE *gmsh_yyget_out (void)
/** Get the length of the current token.
*
*/
-int gmsh_yyget_leng (void)
+yy_size_t gmsh_yyget_leng (void)
{
return gmsh_yyleng;
}
@@ -3017,7 +2992,7 @@ void gmsh_yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 235 "Gmsh.l"
+#line 233 "Gmsh.l"
diff --git a/tutorial/t14.geo b/tutorial/t14.geo
index 95e240cda2ff01feab37ea353f5e0c8771f1dc2b..c413219633454d538f6f8b24d2a931d45698381e 100644
--- a/tutorial/t14.geo
+++ b/tutorial/t14.geo
@@ -1,11 +1,11 @@
-/*********************************************************************
+/*********************************************************************
*
* Gmsh tutorial 14
*
* Homology computation
*
*********************************************************************/
-
+
// Homology computation in Gmsh finds representative chains of
// (relative) homology spaces using a mesh of a model. Those
// representatives generate the (relative) homology spaces of the
@@ -61,24 +61,19 @@ Physical Surface(80) = bnd[];
bnd[] -= {36, 44, 52, 60};
Physical Surface(75) = bnd[];
-// Create a mesh of the model
-Mesh 3;
-
// Find generators of relative homology spaces of the domain modulo
-// the four terminals. Save the generator chains to t14_hom.msh.
-HomGen("t14_hom.msh") = {{1}, {70, 71, 72, 73}};
+// the four terminals.
+Homology {{1}, {70, 71, 72, 73}};
// Find the corresponding thin cuts, generators of relative homology
-// spaces modulo the non-terminal domain surface. Save the cut chains
-// to t14_hom.msh.
-HomGen("t14_hom.msh") = {{1}, {75}};
+// spaces modulo the non-terminal domain surface.
+Homology {{1}, {75}};
-// Find the corresponding thick cuts. Save the cut chains to
-// t14_hom.msh.
-HomCut("t14_hom.msh") = {{1}, {70, 71, 72, 73}};
+// Find the corresponding thick cuts.
+Cohomology {{1}, {70, 71, 72, 73}};
// More examples:
-// HomGen("t14_hom.msh") = {{1}, {}};
-// HomGen("t14_hom.msh") = {{}, {}};
-// HomGen("t14_hom.msh") = {{1}, {80}};
-// HomGen("t14_hom.msh") = {{}, {80}};
+// Homology {1};
+// Homology;
+// Homology {{1}, {80}};
+// Homology {{}, {80}};