diff --git a/Common/Context.h b/Common/Context.h
index 709017a86976b8c3f1b89f06e3abd9eea6da8ef6..f3ae108b0bd6bd9a1e5e1cd9bc2d122561190ed2 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -111,6 +111,8 @@ public :
int vis_type;
int points, lines, surfaces, volumes;
int points_num, lines_num, surfaces_num, volumes_num;
+ int point_size, line_width;
+ int point_sel_size, line_sel_width;
int hidden, shade;
int highlight;
int level, old_circle;
@@ -125,6 +127,7 @@ public :
int draw;
int points, lines, surfaces, volumes;
int points_num, lines_num, surfaces_num, volumes_num;
+ int point_size, line_width;
double quality;
double gamma_inf, gamma_sup, radius_inf, radius_sup;
double scaling_factor, lc_factor, rand_factor;
@@ -151,6 +154,7 @@ public :
// post processing options
struct{
int draw, scales, link ;
+ int point_size, line_width;
int smooth ;
int nb_views ;
double anim_delay ;
@@ -159,12 +163,12 @@ public :
// print options
struct{
int format;
- int eps_quality, eps_background;
+ int eps_quality, eps_background, eps_font_size;
+ char *eps_font;
+ int eps_line_width_factor, eps_point_size_factor;
int jpeg_quality;
int gif_dither, gif_sort, gif_interlace, gif_transparent;
- char *font;
- int font_size, gl_fonts;
- int geom_line_width, mesh_line_width, post_line_width;
+ int gl_fonts;
} print;
// color options
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 4c51ca1f0e741dab62f674b672b05822b6d0d382..b8cd72581662c2b23584eb5b5818c9142fbdb53f 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -67,7 +67,7 @@ StringXString ViewOptions_String[] = {
} ;
StringXString PrintOptions_String[] = {
- { F|O, "Font" , opt_print_font , "Courier" ,
+ { F|O, "EpsFont" , opt_print_eps_font , "Courier" ,
"Font used for postscript printing" },
{ 0, NULL , NULL , NULL , NULL }
} ;
@@ -303,6 +303,14 @@ StringXNumber GeometryOptions_Number[] = {
"Display surface numbers?" },
{ F|O, "VolumesNumbers" , opt_geometry_volumes_num , 0. ,
"Display volume numbers? (not implemented yet)" },
+ { F|O, "PointSize" , opt_geometry_point_size , 3. ,
+ "Display size of points (in pixels)" },
+ { F|O, "PointSelectSize" , opt_geometry_point_sel_size , 5. ,
+ "Display size of selected points (in pixels)" },
+ { F|O, "LineWidth" , opt_geometry_line_width , 1. ,
+ "Display width of lines (in pixels)" },
+ { F|O, "LineSelectWidth" , opt_geometry_line_sel_width , 2. ,
+ "Display width of selected lines (in pixels)" },
{ F|O, "Aspect" , opt_geometry_aspect , 0. ,
"Not used" },
{ F|O, "Highlight" , opt_geometry_highlight , 1. ,
@@ -355,6 +363,10 @@ StringXNumber MeshOptions_Number[] = {
"Display mesh surface numbers?" },
{ F|O, "VolumesNumbers" , opt_mesh_volumes_num , 0. ,
"Display mesh elements numbers?" },
+ { F|O, "PointSize" , opt_mesh_point_size , 2. ,
+ "Display size of points (in pixels)" },
+ { F|O, "LineWidth" , opt_mesh_line_width , 1. ,
+ "Display width of lines (in pixels)" },
{ F|O, "Aspect" , opt_mesh_aspect , 0. ,
"Mesh apsect (0=wireframe, 1=hidden lines, 2=solid)" },
{ F|O, "Format" , opt_mesh_format , FORMAT_MSH ,
@@ -417,6 +429,10 @@ StringXNumber PostProcessingOptions_Number[] = {
"Delay (in seconds) between to animation frames" },
{ F, "NbViews" , opt_post_nb_views , 0. ,
"Current number of views merged (do _not_ change this!)" },
+ { F|O, "PointSize" , opt_post_point_size , 2. ,
+ "Display size of points (in pixels)" },
+ { F|O, "LineWidth" , opt_post_line_width , 1. ,
+ "Display width of lines (in pixels)" },
{ 0, NULL , NULL , 0. }
} ;
@@ -505,6 +521,12 @@ StringXNumber PrintOptions_Number[] = {
"Postscript quality (1=simple sort, 2=recursive sort)" },
{ F|O, "EpsBackground" , opt_print_eps_background , 1 ,
"Save image background in postscript output" },
+ { F|O, "EpsFontSize" , opt_print_eps_font_size , 12. ,
+ "Font size used for postscript printing" },
+ { F|O, "EpsPointSizeFactor" , opt_print_eps_point_size_factor , 1. ,
+ "Size factor for points in postscript output" },
+ { F|O, "EpsLineWidthFactor" , opt_print_eps_line_width_factor , 1. ,
+ "Width factor for lines in postscript output" },
{ F|O, "JpegQuality" , opt_print_jpeg_quality , 85 ,
"JPEG quality (between 1 and 100)" },
{ F|O, "GifDither" , opt_print_gif_dither , 0 ,
@@ -515,14 +537,6 @@ StringXNumber PrintOptions_Number[] = {
"Interlace GIF output" },
{ F|O, "GifTransparent" , opt_print_gif_transparent , 0 ,
"Output transparent GIF image" },
- { F|O, "FontSize" , opt_print_font_size , 12. ,
- "Font size used for postscript printing" },
- { F|O, "GeometryLineWidth" , opt_print_geom_line_width , 2. ,
- "Width factor for geometry lines in postscript output (10 looks nice for geometry+mesh display)" },
- { F|O, "MeshLineWidth" , opt_print_mesh_line_width , 1. ,
- "Width factor for mesh lines in postscript output (1 looks nice for geometry+mesh display)" },
- { F|O, "PostProcessingLineWidth" , opt_print_post_line_width , 2. ,
- "Width factor for post-processing lines in postscript output" },
{ 0, NULL , NULL , 0. }
} ;
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 7c76f908759303752a3ad3abbf6e9fabfb5bc61a..7fe48eb51922ed2c7897ac3bb10cf54aab05fa44 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.46 2001-09-05 19:14:05 geuzaine Exp $
+// $Id: Options.cpp,v 1.47 2001-09-25 08:20:50 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -541,9 +541,9 @@ char * opt_view_filename(OPT_ARGS_STR){
}
-char * opt_print_font(OPT_ARGS_STR){
- if(action & GMSH_SET) CTX.print.font = val;
- return CTX.print.font;
+char * opt_print_eps_font(OPT_ARGS_STR){
+ if(action & GMSH_SET) CTX.print.eps_font = val;
+ return CTX.print.eps_font;
}
@@ -1143,6 +1143,26 @@ double opt_geometry_volumes_num(OPT_ARGS_NUM){
#endif
return CTX.geom.volumes_num;
}
+double opt_geometry_point_size(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.geom.point_size = (int)val;
+ return CTX.geom.point_size;
+}
+double opt_geometry_point_sel_size(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.geom.point_sel_size = (int)val;
+ return CTX.geom.point_sel_size;
+}
+double opt_geometry_line_width(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.geom.line_width = (int)val;
+ return CTX.geom.line_width;
+}
+double opt_geometry_line_sel_width(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.geom.line_sel_width = (int)val;
+ return CTX.geom.line_sel_width;
+}
double opt_geometry_aspect(OPT_ARGS_NUM){
if(action & GMSH_SET){
switch((int)val){
@@ -1348,6 +1368,16 @@ double opt_mesh_volumes_num(OPT_ARGS_NUM){
#endif
return CTX.mesh.volumes_num;
}
+double opt_mesh_point_size(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.mesh.point_size = (int)val;
+ return CTX.mesh.point_size;
+}
+double opt_mesh_line_width(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.mesh.line_width = (int)val;
+ return CTX.mesh.line_width;
+}
double opt_mesh_aspect(OPT_ARGS_NUM){
if(action & GMSH_SET){
switch((int)val){
@@ -1565,6 +1595,16 @@ double opt_post_nb_views(OPT_ARGS_NUM){
CTX.post.nb_views = (int)val;
return CTX.post.nb_views;
}
+double opt_post_point_size(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.post.point_size = (int)val;
+ return CTX.post.point_size;
+}
+double opt_post_line_width(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.post.line_width = (int)val;
+ return CTX.post.line_width;
+}
@@ -2043,6 +2083,21 @@ double opt_print_eps_background(OPT_ARGS_NUM){
CTX.print.eps_background = (int)val;
return CTX.print.eps_background;
}
+double opt_print_eps_font_size(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.print.eps_font_size = (int)val;
+ return CTX.print.eps_font_size;
+}
+double opt_print_eps_line_width_factor(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.print.eps_line_width_factor = (int)val;
+ return CTX.print.eps_line_width_factor;
+}
+double opt_print_eps_point_size_factor(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.print.eps_point_size_factor = (int)val;
+ return CTX.print.eps_point_size_factor;
+}
double opt_print_jpeg_quality(OPT_ARGS_NUM){
if(action & GMSH_SET)
CTX.print.jpeg_quality = (int)val;
@@ -2068,26 +2123,6 @@ double opt_print_gif_transparent(OPT_ARGS_NUM){
CTX.print.gif_transparent = (int)val;
return CTX.print.gif_transparent;
}
-double opt_print_font_size(OPT_ARGS_NUM){
- if(action & GMSH_SET)
- CTX.print.font_size = (int)val;
- return CTX.print.font_size;
-}
-double opt_print_geom_line_width(OPT_ARGS_NUM){
- if(action & GMSH_SET)
- CTX.print.geom_line_width = (int)val;
- return CTX.print.geom_line_width;
-}
-double opt_print_mesh_line_width(OPT_ARGS_NUM){
- if(action & GMSH_SET)
- CTX.print.mesh_line_width = (int)val;
- return CTX.print.mesh_line_width;
-}
-double opt_print_post_line_width(OPT_ARGS_NUM){
- if(action & GMSH_SET)
- CTX.print.post_line_width = (int)val;
- return CTX.print.post_line_width;
-}
// ************** Color option routines ****************************
diff --git a/Common/Options.h b/Common/Options.h
index 1060c79389f9c72256088d2eccfd9f97070ae478..f40ab364b3b60cb3da993f682065664fe055146d 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -28,7 +28,7 @@ char * opt_solver_getdp_command(OPT_ARGS_STR);
char * opt_view_name(OPT_ARGS_STR);
char * opt_view_format(OPT_ARGS_STR);
char * opt_view_filename(OPT_ARGS_STR);
-char * opt_print_font(OPT_ARGS_STR);
+char * opt_print_eps_font(OPT_ARGS_STR);
// NUMBERS
@@ -140,6 +140,10 @@ double opt_geometry_points_num(OPT_ARGS_NUM);
double opt_geometry_lines_num(OPT_ARGS_NUM);
double opt_geometry_surfaces_num(OPT_ARGS_NUM);
double opt_geometry_volumes_num(OPT_ARGS_NUM);
+double opt_geometry_point_size(OPT_ARGS_NUM);
+double opt_geometry_point_sel_size(OPT_ARGS_NUM);
+double opt_geometry_line_width(OPT_ARGS_NUM);
+double opt_geometry_line_sel_width(OPT_ARGS_NUM);
double opt_geometry_aspect(OPT_ARGS_NUM);
double opt_geometry_highlight(OPT_ARGS_NUM);
double opt_geometry_old_circle(OPT_ARGS_NUM);
@@ -164,6 +168,8 @@ double opt_mesh_points_num(OPT_ARGS_NUM);
double opt_mesh_lines_num(OPT_ARGS_NUM);
double opt_mesh_surfaces_num(OPT_ARGS_NUM);
double opt_mesh_volumes_num(OPT_ARGS_NUM);
+double opt_mesh_point_size(OPT_ARGS_NUM);
+double opt_mesh_line_width(OPT_ARGS_NUM);
double opt_mesh_aspect(OPT_ARGS_NUM);
double opt_mesh_format(OPT_ARGS_NUM);
double opt_mesh_nb_smoothing(OPT_ARGS_NUM);
@@ -192,6 +198,8 @@ double opt_post_smooth(OPT_ARGS_NUM);
double opt_post_anim_delay(OPT_ARGS_NUM);
double opt_post_nb_views(OPT_ARGS_NUM);
double opt_post_color_scheme(OPT_ARGS_NUM);
+double opt_post_point_size(OPT_ARGS_NUM);
+double opt_post_line_width(OPT_ARGS_NUM);
double opt_view_nb_timestep(OPT_ARGS_NUM);
double opt_view_timestep(OPT_ARGS_NUM);
double opt_view_min(OPT_ARGS_NUM);
@@ -232,15 +240,14 @@ double opt_view_arrow_location(OPT_ARGS_NUM);
double opt_print_format(OPT_ARGS_NUM);
double opt_print_eps_quality(OPT_ARGS_NUM);
double opt_print_eps_background(OPT_ARGS_NUM);
+double opt_print_eps_font_size(OPT_ARGS_NUM);
+double opt_print_eps_line_width_factor(OPT_ARGS_NUM);
+double opt_print_eps_point_size_factor(OPT_ARGS_NUM);
double opt_print_jpeg_quality(OPT_ARGS_NUM);
double opt_print_gif_dither(OPT_ARGS_NUM);
double opt_print_gif_sort(OPT_ARGS_NUM);
double opt_print_gif_interlace(OPT_ARGS_NUM);
double opt_print_gif_transparent(OPT_ARGS_NUM);
-double opt_print_font_size(OPT_ARGS_NUM);
-double opt_print_geom_line_width(OPT_ARGS_NUM);
-double opt_print_mesh_line_width(OPT_ARGS_NUM);
-double opt_print_post_line_width(OPT_ARGS_NUM);
// COLORS
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl.cpp
index 4adbc4fa260fbf97caf31c56ee116de1ea818741..aa45a063808849008c94150ec291b34787c5f360 100644
--- a/Fltk/Opengl.cpp
+++ b/Fltk/Opengl.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.20 2001-08-11 23:28:31 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.21 2001-09-25 08:21:14 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -54,7 +54,7 @@ void Draw_String(char *s){
if(CTX.stream == TO_FILE){
if(!CTX.print.gl_fonts && CTX.print.eps_quality > 0){
- gl2psText(s,CTX.print.font,CTX.print.font_size);
+ gl2psText(s,CTX.print.eps_font,CTX.print.eps_font_size);
return ;
}
}
diff --git a/Geo/ExtrudeParams.cpp b/Geo/ExtrudeParams.cpp
index ec6af7258e3fca05c113020d259c3b36befd8a1b..f2bf4c832fbc06d0e9f6df0e1dabd999642c16e6 100644
--- a/Geo/ExtrudeParams.cpp
+++ b/Geo/ExtrudeParams.cpp
@@ -1,4 +1,4 @@
-// $Id: ExtrudeParams.cpp,v 1.5 2001-08-14 16:25:11 geuzaine Exp $
+// $Id: ExtrudeParams.cpp,v 1.6 2001-09-25 08:21:14 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -17,8 +17,9 @@ void Projette (double p[3],double mat[3][3]) {
}
ExtrudeParams :: ExtrudeParams (int ModeEx){
- mesh.ExtrudeMesh = false;
geo.Mode = ModeEx;
+ geo.Source = -1;
+ mesh.ExtrudeMesh = false;
mesh.Recombine = false;
}
diff --git a/Graphics/Axes.cpp b/Graphics/Axes.cpp
index 07a21d7c8117bd649750be28c3cf6961c1444962..65ae9d2eef3fbd31567475ffcaa3ba9f676dfdb0 100644
--- a/Graphics/Axes.cpp
+++ b/Graphics/Axes.cpp
@@ -1,4 +1,4 @@
-// $Id: Axes.cpp,v 1.5 2001-08-11 23:28:31 geuzaine Exp $
+// $Id: Axes.cpp,v 1.6 2001-09-25 08:20:50 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -23,7 +23,7 @@ void Draw_Axes (double s) {
b = .1 * s;
c = 0.666 * b;
- glLineWidth(1.); gl2psLineWidth(1.);
+ glLineWidth(1.); gl2psLineWidth(1.*CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte*)&CTX.color.axes);
glBegin(GL_LINES);
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index ee87b75ccbeb2cf4af61ad848db203f4324958e4..294c182dc7c2cf31f9abc5c6e7c8d7ac8c7ad4eb 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.28 2001-08-17 15:56:18 geuzaine Exp $
+// $Id: Geom.cpp,v 1.29 2001-09-25 08:20:50 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -35,15 +35,18 @@ void Draw_GeoPoint (void *a, void *b){
}
if((*v)->Frozen){
- glPointSize(5); gl2psPointSize(5);
+ glPointSize(CTX.geom.point_sel_size);
+ gl2psPointSize(CTX.geom.point_sel_size * CTX.print.eps_point_size_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.point_sel);
}
else if(Highlighted){
- glPointSize(5); gl2psPointSize(5);
+ glPointSize(CTX.geom.point_sel_size);
+ gl2psPointSize(CTX.geom.point_sel_size * CTX.print.eps_point_size_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.point_hlt);
}
else{
- glPointSize(3); gl2psPointSize(3);
+ glPointSize(CTX.geom.point_size);
+ gl2psPointSize(CTX.geom.point_size * CTX.print.eps_point_size_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.point);
}
@@ -89,15 +92,18 @@ void Draw_Curve (void *a, void *b){
}
if((c)->ipar[3]){
- glLineWidth(2.); gl2psLineWidth(2.*CTX.print.geom_line_width);
+ glLineWidth(CTX.geom.line_sel_width);
+ gl2psLineWidth(CTX.geom.line_sel_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.line_sel);
}
else if(Highlighted){
- glLineWidth(2.); gl2psLineWidth(2.*CTX.print.geom_line_width);
+ glLineWidth(CTX.geom.line_sel_width);
+ gl2psLineWidth(CTX.geom.line_sel_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.line_hlt);
}
else{
- glLineWidth(1.); gl2psLineWidth(1.*CTX.print.geom_line_width);
+ glLineWidth(CTX.geom.line_width);
+ gl2psLineWidth(CTX.geom.line_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.line);
}
@@ -487,15 +493,18 @@ void Draw_Surface (void *a, void *b){
if(!CTX.geom.shade){
if(s->Mat){
- glLineWidth(2.); gl2psLineWidth(2.);
+ glLineWidth(CTX.geom.line_sel_width);
+ gl2psLineWidth(CTX.geom.line_sel_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.surface_sel);
}
else if (Highlighted){
- glLineWidth(2.); gl2psLineWidth(2.);
+ glLineWidth(CTX.geom.line_sel_width);
+ gl2psLineWidth(CTX.geom.line_sel_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.surface_hlt);
}
else{
- glLineWidth(1.); gl2psLineWidth(1.);
+ glLineWidth(CTX.geom.line_width);
+ gl2psLineWidth(CTX.geom.line_width * CTX.print.eps_line_width_factor);
glColor4ubv((GLubyte*)&CTX.color.geom.surface);
}
glEnable(GL_LINE_STIPPLE);
@@ -538,7 +547,8 @@ void Draw_Curve_For_Volume (void *a, void *b){
Curve *c;
Vertex v;
- glLineWidth(2.); gl2psLineWidth(2.);
+ glLineWidth(CTX.geom.line_width);
+ gl2psLineWidth(CTX.geom.line_width * CTX.print.eps_line_width_factor);
c = *(Curve**)a;
@@ -571,10 +581,6 @@ void Draw_Curve_For_Volume (void *a, void *b){
glPopName ();
}
- if((c)->ipar[3]){
- glLineWidth(1.); gl2psLineWidth(1.);
- }
-
}
diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp
index ba98b03fb21c2e71eb148561198745808553d563..dc4c083ae6a89701e3b4053de14d8c210cd79dea 100644
--- a/Graphics/Mesh.cpp
+++ b/Graphics/Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: Mesh.cpp,v 1.42 2001-09-05 09:35:29 geuzaine Exp $
+// $Id: Mesh.cpp,v 1.43 2001-09-25 08:20:50 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -67,8 +67,12 @@ void Draw_Mesh (Mesh *M) {
if(CTX.clip[i])
glClipPlane((GLenum)(GL_CLIP_PLANE0 + i), CTX.clip_plane[i]);
- glPointSize(2); gl2psPointSize(2);
- glLineWidth(1); gl2psLineWidth(1*CTX.print.mesh_line_width);
+ glPointSize(CTX.mesh.point_size);
+ gl2psPointSize(CTX.mesh.point_size * CTX.print.eps_point_size_factor);
+
+ glLineWidth(CTX.mesh.line_width);
+ gl2psLineWidth(CTX.mesh.line_width * CTX.print.eps_line_width_factor);
+
iColor = 0;
if(CTX.mesh.hidden) glEnable(GL_POLYGON_OFFSET_FILL);
@@ -132,7 +136,6 @@ void Draw_Mesh (Mesh *M) {
DrawVertexSupp = 0 ;
Tree_Action(M->Vertices, Draw_Mesh_Points);
}
- glPointSize(4); gl2psPointSize(4);
if(!CTX.geom.shade) InitNoShading();
Draw_Geom(M);
break;
@@ -194,7 +197,6 @@ void Draw_Mesh_Points (void *a, void *b){
glPushName((*v)->Num);
}
- glPointSize(3); gl2psPointSize(3);
if(DrawVertexSupp)
glColor4ubv((GLubyte*)&CTX.color.mesh.vertex_supp);
else
diff --git a/Graphics/Post.cpp b/Graphics/Post.cpp
index 07e5a154fd6eb7ebf428b23b0964e2cd615c63af..8262821fb4898daf5f595ed7262cadddbd6521e9 100644
--- a/Graphics/Post.cpp
+++ b/Graphics/Post.cpp
@@ -1,4 +1,4 @@
-// $Id: Post.cpp,v 1.23 2001-08-11 23:28:32 geuzaine Exp $
+// $Id: Post.cpp,v 1.24 2001-09-25 08:20:50 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -141,8 +141,11 @@ void Draw_Post (void) {
if(!Post_ViewList) return;
- glPointSize(2); gl2psPointSize(2);
- glLineWidth(1); gl2psLineWidth(1*CTX.print.post_line_width);
+ glPointSize(CTX.post.point_size);
+ gl2psPointSize(CTX.post.point_size * CTX.print.eps_point_size_factor);
+
+ glLineWidth(CTX.post.line_width);
+ gl2psLineWidth(CTX.post.line_width * CTX.print.eps_line_width_factor);
if(!CTX.post.draw){ // draw only the bbox of the visible views
for(iView=0 ; iView<List_Nbr(Post_ViewList) ; iView++){
diff --git a/Makefile b/Makefile
index a662c00ae5b465e60e229bffb13fadf0495d3357..e294928d6edadd1925195453becd79a5717cb26b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.153 2001-09-24 07:11:26 geuzaine Exp $
+# $Id: Makefile,v 1.154 2001-09-25 08:21:14 geuzaine Exp $
-GMSH_RELEASE = 1.261
+GMSH_RELEASE = 1.262
MAKE = make
CXX = c++
diff --git a/Motif/Opengl.cpp b/Motif/Opengl.cpp
index 9d8de37f6edd1f080da2c96f2417be8a0fafd593..5c5783324e79582de8ed9af1527d996c333cf947 100644
--- a/Motif/Opengl.cpp
+++ b/Motif/Opengl.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.5 2001-02-04 12:46:09 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.6 2001-09-25 08:21:14 geuzaine Exp $
#include <X11/IntrinsicP.h>
@@ -73,7 +73,7 @@ void Draw_String(char *s){
if(CTX.stream == TO_FILE){
if(!CTX.print.gl_fonts && CTX.print.eps_quality > 0){
- gl2psText(s,CTX.print.font,CTX.print.font_size);
+ gl2psText(s,CTX.print.eps_font,CTX.print.eps_font_size);
return ;
}
}
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 5bef3223eb0850faa17a423b741f45ab721e2b1f..a8c2b9918b11d07b2ff9ea2d9c4f214dcb7716d0 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -175,7 +175,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.114 2001-09-24 06:56:02 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.115 2001-09-25 08:21:14 geuzaine Exp $
#include <stdarg.h>
#ifndef _NOPLUGIN
@@ -261,7 +261,7 @@ typedef union {
-#define YYFINAL 1630
+#define YYFINAL 1632
#define YYFLAG -32768
#define YYNTBASE 188
@@ -338,20 +338,20 @@ static const short yyprhs[] = { 0,
1480, 1488, 1491, 1494, 1501, 1510, 1519, 1530, 1532, 1535,
1537, 1541, 1546, 1548, 1557, 1570, 1579, 1592, 1593, 1606,
1607, 1624, 1633, 1646, 1647, 1660, 1661, 1678, 1680, 1683,
- 1693, 1696, 1703, 1713, 1723, 1732, 1741, 1750, 1757, 1762,
- 1765, 1768, 1770, 1772, 1774, 1776, 1778, 1780, 1784, 1787,
- 1790, 1793, 1797, 1801, 1805, 1809, 1813, 1817, 1821, 1825,
- 1829, 1833, 1837, 1841, 1845, 1849, 1855, 1860, 1865, 1870,
- 1875, 1880, 1885, 1890, 1895, 1900, 1905, 1912, 1917, 1922,
- 1927, 1932, 1937, 1942, 1949, 1956, 1963, 1968, 1973, 1978,
- 1983, 1988, 1993, 1998, 2003, 2008, 2013, 2018, 2025, 2030,
- 2035, 2040, 2045, 2050, 2055, 2062, 2069, 2076, 2081, 2083,
- 2085, 2087, 2089, 2091, 2096, 2099, 2105, 2109, 2116, 2121,
- 2129, 2131, 2134, 2137, 2141, 2145, 2157, 2167, 2175, 2183,
- 2184, 2188, 2190, 2194, 2195, 2199, 2203, 2205, 2209, 2211,
- 2213, 2217, 2222, 2226, 2232, 2236, 2241, 2248, 2256, 2258,
- 2260, 2264, 2268, 2278, 2286, 2288, 2294, 2298, 2305, 2307,
- 2311, 2313, 2320, 2325, 2330, 2337, 2344
+ 1693, 1701, 1704, 1711, 1721, 1731, 1740, 1749, 1758, 1765,
+ 1770, 1773, 1776, 1778, 1780, 1782, 1784, 1786, 1788, 1792,
+ 1795, 1798, 1801, 1805, 1809, 1813, 1817, 1821, 1825, 1829,
+ 1833, 1837, 1841, 1845, 1849, 1853, 1857, 1863, 1868, 1873,
+ 1878, 1883, 1888, 1893, 1898, 1903, 1908, 1913, 1920, 1925,
+ 1930, 1935, 1940, 1945, 1950, 1957, 1964, 1971, 1976, 1981,
+ 1986, 1991, 1996, 2001, 2006, 2011, 2016, 2021, 2026, 2033,
+ 2038, 2043, 2048, 2053, 2058, 2063, 2070, 2077, 2084, 2089,
+ 2091, 2093, 2095, 2097, 2099, 2104, 2107, 2113, 2117, 2124,
+ 2129, 2137, 2139, 2142, 2145, 2149, 2153, 2165, 2175, 2183,
+ 2191, 2192, 2196, 2198, 2202, 2203, 2207, 2211, 2213, 2217,
+ 2219, 2221, 2225, 2230, 2234, 2240, 2244, 2249, 2256, 2264,
+ 2266, 2268, 2272, 2276, 2286, 2294, 2296, 2302, 2306, 2313,
+ 2315, 2319, 2321, 2328, 2333, 2338, 2345, 2352
};
static const short yyrhs[] = { 191,
@@ -524,73 +524,74 @@ static const short yyrhs[] = { 191,
62, 42, 186, 258, 185, 260, 185, 260, 185, 258,
187, 252, 186, 253, 187, 6, 0, 254, 0, 253,
254, 0, 70, 186, 266, 185, 266, 185, 266, 187,
- 6, 0, 65, 6, 0, 51, 41, 266, 7, 258,
- 6, 0, 51, 41, 266, 7, 258, 54, 56, 258,
- 6, 0, 51, 41, 266, 7, 258, 54, 55, 258,
- 6, 0, 51, 42, 186, 258, 187, 7, 266, 6,
- 0, 48, 42, 186, 258, 187, 7, 266, 6, 0,
- 51, 44, 186, 258, 187, 7, 266, 6, 0, 65,
- 42, 266, 7, 258, 6, 0, 65, 42, 266, 6,
- 0, 67, 6, 0, 68, 6, 0, 105, 0, 106,
- 0, 107, 0, 108, 0, 109, 0, 259, 0, 180,
- 258, 181, 0, 170, 258, 0, 169, 258, 0, 175,
- 258, 0, 258, 170, 258, 0, 258, 169, 258, 0,
- 258, 171, 258, 0, 258, 172, 258, 0, 258, 173,
- 258, 0, 258, 179, 258, 0, 258, 165, 258, 0,
- 258, 167, 258, 0, 258, 166, 258, 0, 258, 168,
- 258, 0, 258, 162, 258, 0, 258, 163, 258, 0,
- 258, 161, 258, 0, 258, 160, 258, 0, 258, 159,
- 258, 8, 258, 0, 12, 180, 258, 181, 0, 13,
- 180, 258, 181, 0, 14, 180, 258, 181, 0, 15,
- 180, 258, 181, 0, 16, 180, 258, 181, 0, 17,
- 180, 258, 181, 0, 18, 180, 258, 181, 0, 19,
- 180, 258, 181, 0, 20, 180, 258, 181, 0, 22,
- 180, 258, 181, 0, 23, 180, 258, 185, 258, 181,
- 0, 24, 180, 258, 181, 0, 25, 180, 258, 181,
- 0, 26, 180, 258, 181, 0, 27, 180, 258, 181,
- 0, 28, 180, 258, 181, 0, 29, 180, 258, 181,
- 0, 30, 180, 258, 185, 258, 181, 0, 31, 180,
- 258, 185, 258, 181, 0, 32, 180, 258, 185, 258,
- 181, 0, 21, 180, 258, 181, 0, 12, 182, 258,
- 183, 0, 13, 182, 258, 183, 0, 14, 182, 258,
- 183, 0, 15, 182, 258, 183, 0, 16, 182, 258,
- 183, 0, 17, 182, 258, 183, 0, 18, 182, 258,
- 183, 0, 19, 182, 258, 183, 0, 20, 182, 258,
- 183, 0, 22, 182, 258, 183, 0, 23, 182, 258,
- 185, 258, 183, 0, 24, 182, 258, 183, 0, 25,
- 182, 258, 183, 0, 26, 182, 258, 183, 0, 27,
- 182, 258, 183, 0, 28, 182, 258, 183, 0, 29,
- 182, 258, 183, 0, 30, 182, 258, 185, 258, 183,
- 0, 31, 182, 258, 185, 258, 183, 0, 32, 182,
- 258, 185, 258, 183, 0, 21, 182, 258, 183, 0,
- 3, 0, 9, 0, 10, 0, 11, 0, 4, 0,
- 4, 182, 258, 183, 0, 4, 238, 0, 4, 182,
- 258, 183, 238, 0, 4, 184, 4, 0, 4, 182,
- 258, 183, 184, 4, 0, 4, 184, 4, 238, 0,
- 4, 182, 258, 183, 184, 4, 238, 0, 261, 0,
- 170, 260, 0, 169, 260, 0, 260, 170, 260, 0,
- 260, 169, 260, 0, 186, 258, 185, 258, 185, 258,
- 185, 258, 185, 258, 187, 0, 186, 258, 185, 258,
- 185, 258, 185, 258, 187, 0, 186, 258, 185, 258,
- 185, 258, 187, 0, 180, 258, 185, 258, 185, 258,
- 181, 0, 0, 180, 263, 181, 0, 5, 0, 263,
- 185, 5, 0, 0, 186, 265, 187, 0, 180, 265,
- 181, 0, 266, 0, 265, 185, 266, 0, 258, 0,
- 267, 0, 186, 268, 187, 0, 170, 186, 268, 187,
- 0, 258, 8, 258, 0, 258, 8, 258, 8, 258,
- 0, 4, 182, 183, 0, 170, 4, 182, 183, 0,
- 4, 182, 186, 268, 187, 183, 0, 170, 4, 182,
- 186, 268, 187, 183, 0, 258, 0, 267, 0, 268,
- 185, 258, 0, 268, 185, 267, 0, 186, 258, 185,
- 258, 185, 258, 185, 258, 187, 0, 186, 258, 185,
- 258, 185, 258, 187, 0, 4, 0, 4, 184, 90,
- 184, 4, 0, 186, 271, 187, 0, 4, 182, 258,
- 183, 184, 91, 0, 269, 0, 271, 185, 269, 0,
- 5, 0, 35, 180, 272, 185, 272, 181, 0, 36,
- 180, 272, 181, 0, 34, 180, 272, 181, 0, 34,
- 180, 272, 185, 268, 181, 0, 34, 180, 4, 184,
- 4, 181, 0, 34, 180, 4, 182, 258, 183, 184,
- 4, 181, 0
+ 6, 0, 70, 186, 266, 185, 266, 187, 6, 0,
+ 65, 6, 0, 51, 41, 266, 7, 258, 6, 0,
+ 51, 41, 266, 7, 258, 54, 56, 258, 6, 0,
+ 51, 41, 266, 7, 258, 54, 55, 258, 6, 0,
+ 51, 42, 186, 258, 187, 7, 266, 6, 0, 48,
+ 42, 186, 258, 187, 7, 266, 6, 0, 51, 44,
+ 186, 258, 187, 7, 266, 6, 0, 65, 42, 266,
+ 7, 258, 6, 0, 65, 42, 266, 6, 0, 67,
+ 6, 0, 68, 6, 0, 105, 0, 106, 0, 107,
+ 0, 108, 0, 109, 0, 259, 0, 180, 258, 181,
+ 0, 170, 258, 0, 169, 258, 0, 175, 258, 0,
+ 258, 170, 258, 0, 258, 169, 258, 0, 258, 171,
+ 258, 0, 258, 172, 258, 0, 258, 173, 258, 0,
+ 258, 179, 258, 0, 258, 165, 258, 0, 258, 167,
+ 258, 0, 258, 166, 258, 0, 258, 168, 258, 0,
+ 258, 162, 258, 0, 258, 163, 258, 0, 258, 161,
+ 258, 0, 258, 160, 258, 0, 258, 159, 258, 8,
+ 258, 0, 12, 180, 258, 181, 0, 13, 180, 258,
+ 181, 0, 14, 180, 258, 181, 0, 15, 180, 258,
+ 181, 0, 16, 180, 258, 181, 0, 17, 180, 258,
+ 181, 0, 18, 180, 258, 181, 0, 19, 180, 258,
+ 181, 0, 20, 180, 258, 181, 0, 22, 180, 258,
+ 181, 0, 23, 180, 258, 185, 258, 181, 0, 24,
+ 180, 258, 181, 0, 25, 180, 258, 181, 0, 26,
+ 180, 258, 181, 0, 27, 180, 258, 181, 0, 28,
+ 180, 258, 181, 0, 29, 180, 258, 181, 0, 30,
+ 180, 258, 185, 258, 181, 0, 31, 180, 258, 185,
+ 258, 181, 0, 32, 180, 258, 185, 258, 181, 0,
+ 21, 180, 258, 181, 0, 12, 182, 258, 183, 0,
+ 13, 182, 258, 183, 0, 14, 182, 258, 183, 0,
+ 15, 182, 258, 183, 0, 16, 182, 258, 183, 0,
+ 17, 182, 258, 183, 0, 18, 182, 258, 183, 0,
+ 19, 182, 258, 183, 0, 20, 182, 258, 183, 0,
+ 22, 182, 258, 183, 0, 23, 182, 258, 185, 258,
+ 183, 0, 24, 182, 258, 183, 0, 25, 182, 258,
+ 183, 0, 26, 182, 258, 183, 0, 27, 182, 258,
+ 183, 0, 28, 182, 258, 183, 0, 29, 182, 258,
+ 183, 0, 30, 182, 258, 185, 258, 183, 0, 31,
+ 182, 258, 185, 258, 183, 0, 32, 182, 258, 185,
+ 258, 183, 0, 21, 182, 258, 183, 0, 3, 0,
+ 9, 0, 10, 0, 11, 0, 4, 0, 4, 182,
+ 258, 183, 0, 4, 238, 0, 4, 182, 258, 183,
+ 238, 0, 4, 184, 4, 0, 4, 182, 258, 183,
+ 184, 4, 0, 4, 184, 4, 238, 0, 4, 182,
+ 258, 183, 184, 4, 238, 0, 261, 0, 170, 260,
+ 0, 169, 260, 0, 260, 170, 260, 0, 260, 169,
+ 260, 0, 186, 258, 185, 258, 185, 258, 185, 258,
+ 185, 258, 187, 0, 186, 258, 185, 258, 185, 258,
+ 185, 258, 187, 0, 186, 258, 185, 258, 185, 258,
+ 187, 0, 180, 258, 185, 258, 185, 258, 181, 0,
+ 0, 180, 263, 181, 0, 5, 0, 263, 185, 5,
+ 0, 0, 186, 265, 187, 0, 180, 265, 181, 0,
+ 266, 0, 265, 185, 266, 0, 258, 0, 267, 0,
+ 186, 268, 187, 0, 170, 186, 268, 187, 0, 258,
+ 8, 258, 0, 258, 8, 258, 8, 258, 0, 4,
+ 182, 183, 0, 170, 4, 182, 183, 0, 4, 182,
+ 186, 268, 187, 183, 0, 170, 4, 182, 186, 268,
+ 187, 183, 0, 258, 0, 267, 0, 268, 185, 258,
+ 0, 268, 185, 267, 0, 186, 258, 185, 258, 185,
+ 258, 185, 258, 187, 0, 186, 258, 185, 258, 185,
+ 258, 187, 0, 4, 0, 4, 184, 90, 184, 4,
+ 0, 186, 271, 187, 0, 4, 182, 258, 183, 184,
+ 91, 0, 269, 0, 271, 185, 269, 0, 5, 0,
+ 35, 180, 272, 185, 272, 181, 0, 36, 180, 272,
+ 181, 0, 34, 180, 272, 181, 0, 34, 180, 272,
+ 185, 268, 181, 0, 34, 180, 4, 184, 4, 181,
+ 0, 34, 180, 4, 182, 258, 183, 184, 4, 181,
+ 0
};
#endif
@@ -620,20 +621,20 @@ static const short yyrline[] = { 0,
1568, 1575, 1579, 1599, 1615, 1629, 1654, 1679, 1705, 1711,
1716, 1721, 1725, 1735, 1742, 1751, 1755, 1759, 1764, 1768,
1773, 1780, 1784, 1788, 1793, 1798, 1804, 1811, 1815, 1820,
- 1850, 1860, 1879, 1897, 1915, 1937, 1958, 1979, 1993, 2014,
- 2019, 2030, 2032, 2033, 2034, 2035, 2038, 2040, 2041, 2042,
- 2043, 2044, 2045, 2046, 2047, 2054, 2055, 2056, 2057, 2058,
- 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068,
- 2069, 2070, 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078,
- 2079, 2080, 2081, 2082, 2083, 2084, 2085, 2087, 2088, 2089,
- 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099,
- 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2112, 2117,
- 2118, 2119, 2123, 2134, 2151, 2162, 2181, 2197, 2213, 2229,
- 2246, 2251, 2255, 2259, 2263, 2268, 2273, 2277, 2281, 2287,
- 2291, 2296, 2300, 2305, 2309, 2313, 2319, 2325, 2332, 2338,
- 2342, 2346, 2356, 2363, 2374, 2388, 2404, 2424, 2448, 2454,
- 2458, 2462, 2473, 2478, 2489, 2494, 2512, 2517, 2530, 2536,
- 2542, 2547, 2555, 2568, 2572, 2597, 2611
+ 1850, 1876, 1886, 1905, 1923, 1941, 1963, 1984, 2005, 2019,
+ 2040, 2045, 2056, 2058, 2059, 2060, 2061, 2064, 2066, 2067,
+ 2068, 2069, 2070, 2071, 2072, 2073, 2080, 2081, 2082, 2083,
+ 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093,
+ 2094, 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103,
+ 2104, 2105, 2106, 2107, 2108, 2109, 2110, 2111, 2113, 2114,
+ 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124,
+ 2125, 2126, 2127, 2128, 2129, 2130, 2131, 2132, 2133, 2138,
+ 2143, 2144, 2145, 2149, 2160, 2177, 2188, 2207, 2223, 2239,
+ 2255, 2272, 2277, 2281, 2285, 2289, 2294, 2299, 2303, 2307,
+ 2313, 2317, 2322, 2326, 2331, 2335, 2339, 2345, 2351, 2358,
+ 2364, 2368, 2372, 2382, 2389, 2400, 2414, 2430, 2450, 2474,
+ 2480, 2484, 2488, 2499, 2504, 2515, 2520, 2538, 2543, 2556,
+ 2562, 2568, 2573, 2581, 2594, 2598, 2623, 2637
};
#endif
@@ -709,20 +710,20 @@ static const short yyr1[] = { 0,
246, 246, 246, 247, 247, 247, 247, 247, 247, 247,
247, 247, 247, 248, 248, 248, 248, 249, 248, 250,
248, 248, 248, 251, 248, 252, 248, 253, 253, 254,
- 254, 255, 255, 255, 255, 255, 255, 255, 255, 256,
- 256, 257, 257, 257, 257, 257, 258, 258, 258, 258,
+ 254, 254, 255, 255, 255, 255, 255, 255, 255, 255,
+ 256, 256, 257, 257, 257, 257, 257, 258, 258, 258,
258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
258, 258, 258, 258, 258, 258, 258, 258, 258, 258,
- 258, 258, 258, 258, 258, 258, 258, 258, 259, 259,
+ 258, 258, 258, 258, 258, 258, 258, 258, 258, 259,
259, 259, 259, 259, 259, 259, 259, 259, 259, 259,
- 260, 260, 260, 260, 260, 261, 261, 261, 261, 262,
- 262, 263, 263, 264, 264, 264, 265, 265, 266, 266,
- 266, 266, 267, 267, 267, 267, 267, 267, 268, 268,
- 268, 268, 269, 269, 269, 269, 270, 270, 271, 271,
- 272, 272, 272, 272, 272, 272, 272
+ 259, 260, 260, 260, 260, 260, 261, 261, 261, 261,
+ 262, 262, 263, 263, 264, 264, 264, 265, 265, 266,
+ 266, 266, 266, 267, 267, 267, 267, 267, 267, 268,
+ 268, 268, 268, 269, 269, 269, 269, 270, 270, 271,
+ 271, 272, 272, 272, 272, 272, 272, 272
};
static const short yyr2[] = { 0,
@@ -749,20 +750,20 @@ static const short yyr2[] = { 0,
7, 2, 2, 6, 8, 8, 10, 1, 2, 1,
3, 4, 1, 8, 12, 8, 12, 0, 12, 0,
16, 8, 12, 0, 12, 0, 16, 1, 2, 9,
- 2, 6, 9, 9, 8, 8, 8, 6, 4, 2,
- 2, 1, 1, 1, 1, 1, 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,
+ 7, 2, 6, 9, 9, 8, 8, 8, 6, 4,
+ 2, 2, 1, 1, 1, 1, 1, 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, 4, 2, 5, 3, 6, 4, 7,
- 1, 2, 2, 3, 3, 11, 9, 7, 7, 0,
- 3, 1, 3, 0, 3, 3, 1, 3, 1, 1,
- 3, 4, 3, 5, 3, 4, 6, 7, 1, 1,
- 3, 3, 9, 7, 1, 5, 3, 6, 1, 3,
- 1, 6, 4, 4, 6, 6, 9
+ 4, 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, 4, 2, 5, 3, 6, 4,
+ 7, 1, 2, 2, 3, 3, 11, 9, 7, 7,
+ 0, 3, 1, 3, 0, 3, 3, 1, 3, 1,
+ 1, 3, 4, 3, 5, 3, 4, 6, 7, 1,
+ 1, 3, 3, 9, 7, 1, 5, 3, 6, 1,
+ 3, 1, 6, 4, 4, 6, 6, 9
};
static const short yydefact[] = { 0,
@@ -774,605 +775,607 @@ static const short yydefact[] = { 0,
0, 0, 0, 0, 0, 0, 208, 0, 213, 0,
210, 0, 0, 0, 54, 56, 55, 57, 58, 59,
60, 61, 66, 65, 62, 63, 64, 5, 0, 0,
- 0, 15, 16, 18, 17, 19, 330, 330, 0, 309,
- 313, 361, 132, 310, 311, 312, 0, 0, 0, 0,
+ 0, 15, 16, 18, 17, 19, 331, 331, 0, 310,
+ 314, 362, 132, 311, 312, 313, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
133, 134, 135, 136, 0, 0, 0, 137, 138, 0,
- 0, 0, 0, 0, 0, 247, 0, 0, 203, 0,
+ 0, 0, 0, 0, 0, 248, 0, 0, 203, 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,
- 321, 0, 0, 0, 0, 0, 193, 0, 0, 0,
- 193, 240, 241, 0, 0, 0, 0, 0, 0, 0,
+ 322, 0, 0, 0, 0, 0, 193, 0, 0, 0,
+ 193, 241, 242, 0, 0, 0, 0, 0, 0, 0,
0, 0, 202, 0, 209, 0, 6, 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, 315, 0, 71, 0, 0, 0,
+ 0, 0, 0, 0, 316, 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, 0,
- 0, 0, 250, 249, 251, 0, 0, 0, 0, 0,
+ 0, 0, 251, 250, 252, 0, 0, 0, 0, 0,
0, 0, 0, 143, 200, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
199, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 313, 0, 0, 339, 0, 340, 0,
+ 0, 0, 0, 314, 0, 0, 340, 0, 341, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 323, 322, 0, 0, 0, 0, 193,
+ 0, 0, 0, 324, 323, 0, 0, 0, 0, 193,
193, 0, 0, 0, 0, 0, 0, 0, 198, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
211, 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, 332, 0, 0, 0, 0, 0, 317,
+ 0, 0, 0, 333, 0, 0, 0, 0, 0, 318,
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, 0, 0, 0, 361, 0, 0, 0, 248,
- 0, 0, 349, 350, 0, 0, 132, 0, 0, 0,
- 0, 139, 0, 265, 264, 262, 263, 258, 260, 259,
- 261, 253, 252, 254, 255, 256, 257, 0, 0, 0,
+ 0, 0, 0, 0, 0, 362, 0, 0, 0, 249,
+ 0, 0, 350, 351, 0, 0, 132, 0, 0, 0,
+ 0, 139, 0, 266, 265, 263, 264, 259, 261, 260,
+ 262, 254, 253, 255, 256, 257, 258, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 313, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 314, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 325, 324, 192, 0, 191, 190, 0, 0,
- 0, 0, 0, 195, 194, 239, 0, 0, 196, 0,
+ 0, 0, 326, 325, 192, 0, 191, 190, 0, 0,
+ 0, 0, 0, 195, 194, 240, 0, 0, 196, 0,
0, 0, 0, 0, 0, 0, 0, 0, 212, 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, 331, 0, 0, 21, 0, 314, 319, 71, 0,
+ 0, 332, 0, 0, 21, 0, 315, 320, 71, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 267, 288, 268, 289, 269, 290,
- 270, 291, 271, 292, 272, 293, 273, 294, 274, 295,
- 275, 296, 287, 308, 276, 297, 0, 0, 278, 299,
- 279, 300, 280, 301, 281, 302, 282, 303, 283, 304,
- 0, 0, 0, 0, 0, 0, 0, 0, 364, 0,
- 0, 363, 0, 0, 0, 0, 0, 0, 0, 0,
+ 80, 81, 82, 83, 268, 289, 269, 290, 270, 291,
+ 271, 292, 272, 293, 273, 294, 274, 295, 275, 296,
+ 276, 297, 288, 309, 277, 298, 0, 0, 279, 300,
+ 280, 301, 281, 302, 282, 303, 283, 304, 284, 305,
+ 0, 0, 0, 0, 0, 0, 0, 0, 365, 0,
+ 0, 364, 0, 0, 0, 0, 0, 0, 0, 0,
149, 0, 0, 0, 0, 0, 67, 0, 0, 161,
- 0, 0, 0, 0, 174, 0, 182, 0, 0, 345,
- 0, 0, 0, 341, 343, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 174, 0, 182, 0, 0, 346,
+ 0, 0, 0, 342, 344, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 186, 188, 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, 0, 0, 0, 0,
- 0, 333, 0, 330, 0, 316, 0, 0, 0, 0,
+ 0, 334, 0, 331, 0, 317, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 69,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 142, 351, 352, 0, 0, 0, 0, 0,
- 144, 145, 147, 0, 0, 355, 0, 359, 0, 153,
- 266, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 346, 0, 342, 0, 160, 0, 0, 0, 0,
- 232, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 238, 197, 0,
- 0, 0, 0, 0, 334, 0, 0, 0, 204, 0,
+ 0, 0, 142, 352, 353, 0, 0, 0, 0, 0,
+ 144, 145, 147, 0, 0, 356, 0, 360, 0, 153,
+ 267, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 347, 0, 343, 0, 160, 0, 0, 0, 0,
+ 233, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 239, 197, 0,
+ 0, 0, 0, 0, 335, 0, 0, 0, 204, 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, 242, 243, 244, 245, 246, 0,
- 0, 0, 0, 0, 0, 0, 20, 0, 318, 0,
+ 0, 0, 0, 0, 243, 244, 245, 246, 247, 0,
+ 0, 0, 0, 0, 0, 0, 20, 0, 319, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 277, 298, 284, 305, 285, 306, 286, 307,
- 0, 366, 365, 362, 0, 132, 0, 0, 0, 0,
- 140, 0, 0, 0, 0, 0, 357, 68, 157, 165,
- 0, 166, 0, 162, 0, 163, 184, 0, 0, 344,
+ 0, 0, 278, 299, 285, 306, 286, 307, 287, 308,
+ 0, 367, 366, 363, 0, 132, 0, 0, 0, 0,
+ 140, 0, 0, 0, 0, 0, 358, 68, 157, 165,
+ 0, 166, 0, 162, 0, 163, 184, 0, 0, 345,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 201, 0, 0, 0, 0, 193, 0,
0, 0, 218, 0, 224, 0, 0, 171, 172, 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, 330, 320,
+ 0, 0, 0, 0, 0, 0, 0, 0, 331, 321,
70, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 150, 0, 0,
- 151, 0, 0, 0, 360, 0, 170, 181, 347, 0,
- 0, 236, 175, 177, 0, 0, 235, 237, 183, 158,
- 169, 180, 185, 0, 0, 0, 329, 0, 328, 0,
+ 151, 0, 0, 0, 361, 0, 170, 181, 348, 0,
+ 0, 237, 175, 177, 0, 0, 236, 238, 183, 158,
+ 169, 180, 185, 0, 0, 0, 330, 0, 329, 0,
0, 214, 0, 216, 0, 0, 222, 0, 0, 0,
- 334, 0, 337, 0, 0, 0, 0, 206, 205, 0,
+ 335, 0, 338, 0, 0, 0, 0, 206, 205, 0,
0, 0, 0, 0, 23, 0, 32, 0, 36, 0,
30, 0, 0, 35, 0, 40, 38, 0, 0, 0,
0, 0, 0, 47, 0, 0, 0, 0, 0, 52,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 141, 146, 148, 0, 154,
- 0, 0, 0, 167, 348, 0, 234, 233, 155, 156,
+ 0, 0, 0, 167, 349, 0, 235, 234, 155, 156,
193, 0, 189, 0, 0, 0, 0, 0, 0, 0,
- 0, 336, 0, 335, 0, 0, 0, 0, 0, 0,
- 334, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 337, 0, 336, 0, 0, 0, 0, 0, 0,
+ 335, 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, 367, 0, 358, 356, 0, 0, 0,
- 0, 327, 0, 0, 0, 0, 0, 228, 0, 0,
- 0, 0, 0, 338, 0, 0, 207, 0, 0, 37,
+ 0, 0, 0, 368, 0, 359, 357, 0, 0, 0,
+ 0, 328, 0, 0, 0, 0, 0, 228, 0, 0,
+ 0, 0, 0, 339, 0, 0, 207, 0, 0, 37,
0, 0, 0, 0, 27, 0, 33, 0, 39, 28,
41, 0, 44, 0, 48, 49, 0, 0, 51, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 152, 0, 0, 187, 0, 0, 220,
- 231, 0, 0, 229, 226, 0, 0, 0, 0, 0,
+ 232, 0, 0, 229, 226, 0, 0, 0, 0, 0,
173, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 86, 90, 94, 0, 354, 0,
- 326, 215, 217, 0, 0, 219, 223, 0, 225, 159,
+ 0, 0, 0, 0, 86, 90, 94, 0, 355, 0,
+ 327, 215, 217, 0, 0, 219, 223, 0, 225, 159,
164, 0, 0, 176, 0, 0, 0, 0, 0, 31,
34, 42, 0, 43, 50, 45, 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, 353, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 354, 0, 0, 0, 0,
0, 0, 0, 0, 0, 26, 29, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 84,
0, 88, 0, 92, 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, 221, 0, 227, 0, 0, 0, 0, 0, 46,
- 22, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 85, 87, 89, 91, 93, 95, 168, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 98,
- 102, 106, 230, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,
+ 0, 0, 221, 0, 231, 227, 0, 0, 0, 0,
+ 0, 46, 22, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 85, 87, 89, 91, 93, 95, 168, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 179, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 96, 0, 100, 0, 104, 0, 0, 0,
+ 0, 98, 102, 106, 230, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 178, 0, 24, 0, 0, 0, 0, 0,
- 0, 97, 99, 101, 103, 105, 107, 0, 0, 0,
- 0, 110, 114, 118, 0, 0, 0, 0, 0, 0,
+ 0, 8, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 179, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 96, 0, 100, 0, 104, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 108, 0, 112, 0, 116, 0, 0,
+ 0, 0, 0, 0, 178, 0, 24, 0, 0, 0,
+ 0, 0, 0, 97, 99, 101, 103, 105, 107, 0,
+ 0, 0, 0, 110, 114, 118, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 109, 111, 113, 115, 117, 119, 0, 122,
- 126, 130, 25, 0, 0, 0, 0, 0, 0, 0,
- 120, 0, 124, 0, 128, 0, 0, 0, 0, 0,
- 0, 121, 123, 125, 127, 129, 131, 0, 0, 0
+ 0, 0, 0, 0, 0, 108, 0, 112, 0, 116,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 109, 111, 113, 115, 117, 119,
+ 0, 122, 126, 130, 25, 0, 0, 0, 0, 0,
+ 0, 0, 120, 0, 124, 0, 128, 0, 0, 0,
+ 0, 0, 0, 121, 123, 125, 127, 129, 131, 0,
+ 0, 0
};
-static const short yydefgoto[] = { 1628,
+static const short yydefgoto[] = { 1630,
80, 5, 6, 19, 20, 21, 22, 7, 65, 66,
67, 412, 1399, 603, 1347, 1401, 604, 1348, 1403, 605,
- 1349, 1512, 606, 1485, 1514, 607, 1486, 1516, 608, 1487,
- 1573, 609, 1559, 1575, 610, 1560, 1577, 611, 1561, 1610,
- 612, 1604, 1612, 613, 1605, 1614, 614, 1606, 133, 235,
+ 1349, 1514, 606, 1487, 1516, 607, 1488, 1518, 608, 1489,
+ 1575, 609, 1561, 1577, 610, 1562, 1579, 611, 1563, 1612,
+ 612, 1606, 1614, 613, 1607, 1616, 614, 1608, 133, 235,
68, 535, 525, 526, 527, 528, 72, 73, 74, 75,
1075, 1314, 1078, 1318, 1217, 1218, 76, 77, 890, 327,
136, 170, 171, 230, 405, 983, 1082, 1083, 329, 465,
808, 675, 809, 137
};
-static const short yypact[] = { 2052,
- 45,-32768,-32768, -73,-32768, 298, 2196,-32768, 14, 102,
- 106, 137, 146, 172, 206, -56, 92, 131,-32768,-32768,
--32768,-32768, 1595, 148, 342, -88, 162, 176, -10, 8,
- 179, 182, 301, 200, 348, 373, 391, 91, 339, 167,
- 260, 276, 154, 154, 295, 435, 319, 466, 10, 506,
- 514, 23, 358, 379, -18, 78,-32768, 394,-32768, 548,
--32768, 563, 586, 554,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 599, 14,
- 2235,-32768,-32768,-32768,-32768,-32768, 441, 441, 615,-32768,
- 85, 9,-32768,-32768,-32768,-32768, 118, 283, 304, 305,
- 320, 321, 324, 333, 336, 337, 341, 346, 349, 350,
- 368, 378, 384, 405, 406, 412, 413, 446, 459, 471,
--32768,-32768,-32768,-32768, 1643, 1643, 1643,-32768,-32768, 1643,
- 17, 49, 1643, 629, 677,-32768, 651, 662,-32768, 1643,
- 1643, 1643, 1643, 498, 1643, 1643, 501, 1643, 1643, 1643,
- 382, 1643, 484, 517, 524, 382, 522, 523, 537, 577,
- 578, 579, 580, 681, 154, 154, 154, 1643, 1643, -99,
--32768, -70, 154, 575, 587, 592,-32768, 382, 518, 737,
--32768,-32768,-32768, 382, 382, 1643, 1643, -32, 1643, 670,
- 1643, 1643,-32768, 758,-32768, 601,-32768, 14, 603, 614,
- 617, 618, 621, 623, 626, 627, 628, 633, 634, 635,
- 636, 637, 641, 642, 643, 644, 645, 646, 647, 648,
- 649, 650, 653, 661, 671, 672, 673, 674, 790, 624,
- 676, 675, 1643, 827,-32768, 154,-32768, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 79,
- 54, 54, 679, 679, 679, 2154, 848, 1673, 5001, 181,
- 680, 852, 756,-32768,-32768, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643,
--32768, -30, 5651, 1261, 5674, 5697, 1643, 5720, 2279, 1643,
- 2302, 5743, 5766, 145, 1239, 1673, 1819, 854,-32768, 5789,
- 1643, 1643, 1643, 856, 1643, 1643, 1643, 1643, 1643, 1643,
- 1643, 684, -64,-32768,-32768, 2670, 2691, 154, 154, 411,
- 411, 185, 1643, 1643, 1643, 727, 483, 1643,-32768, 2142,
- 859, 860, 5812, 5835, 780, 1643, 5858, 683, 1841, 5881,
--32768, 1643, 720, 868, 869, 870, 871, 875, 876, 877,
- 878, 880, 881, 882, 883, 885, 886, 888, 889, 891,
- 892, 893, 894, 895, 896, 897, 765, 900, 901, 902,
- 903, 906, 905,-32768, 114, 908, 914, 925, 5026, -91,
- -39, 376, 5904, 5051, 5927, 5076, 5950, 5101, 5973, 5126,
- 5996, 5151, 6019, 5176, 6042, 5201, 6065, 5226, 6088, 5251,
- 6111, 5276, 6134, 5301, 2712, 2733, 6157, 5326, 6180, 5351,
- 6203, 5376, 6226, 5401, 6249, 5426, 6272, 5451, 2754, 2775,
- 2796, 2817, 2838, 2859, 434,-32768, 160, 726, 750,-32768,
- 382, 1777, 1819,-32768, 437, 149, 54, 1643, 930, 933,
- 12,-32768, 1856, 493, 803, 620, 620, -12, -12, -12,
- -12, 258, 258, 679, 679, 679, 679, 932, 1673, 937,
- 934, 939, 940, 6295, 941, 943, 6318, 944, 945, 948,
- 709, 259, 1673, 440, 1643, 1643, 949, 2325, 6341, 6364,
- 1643, 2348, 2371, 6387, 6410, 6433, 6456, 6479, 755, 154,
- 1643, 1643,-32768,-32768,-32768, 764, 2259,-32768, 770, 1643,
- 2880, 2901, 2922,-32768,-32768,-32768, 1643, 5476,-32768, 772,
- 773, 953, 954, 782, 6502, 956, 1643, 1643,-32768, 6525,
- 826, 794, 795, 796, 798, 802, 805, 807, 808, 809,
- 811, 812, 813, 828, 829, 830, 831, 832, 833, 834,
- 835, 837, 853, 855, 857, 861, 862, 863, 865, 866,
- 872,-32768, 983, 858,-32768, 911, 284,-32768,-32768, 874,
- 913, 917, 919, 935, 936, 942, 946, 950, 955, 958,
- 959, 1005,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+static const short yypact[] = { 2071,
+ 48,-32768,-32768, -78,-32768, 331, 2293,-32768, 19, 70,
+ 78, 93, 176, 181, 185, -88, -48, -10,-32768,-32768,
+-32768,-32768, 1649, 23, 189, -133, 34, 147, -47, -46,
+ 162, 165, 312, 171, 341, 352, 359, 111, 327, 462,
+ 256, 247, -128, -128, 263, 488, 274, 400, 8, 470,
+ 491, 83, 325, 332, -26, 17,-32768, 348,-32768, 515,
+-32768, 533, 543, 512,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 559, 19,
+ 2316,-32768,-32768,-32768,-32768,-32768, 387, 387, 570,-32768,
+ 116, 6,-32768,-32768,-32768,-32768, -144, -15, -3, 26,
+ 84, 87, 108, 119, 190, 200, 211, 220, 297, 368,
+ 386, 390, 391, 396, 399, 402, 403, 422, 433, 436,
+-32768,-32768,-32768,-32768, 1683, 1683, 1683,-32768,-32768, 1683,
+ 394, 25, 1683, 615, 598,-32768, 629, 634,-32768, 1683,
+ 1683, 1683, 1683, 467, 1683, 1683, 501, 1683, 1683, 1683,
+ 1239, 1683, 504, 517, 524, 1239, 510, 514, 528, 537,
+ 562, 563, 564, 705, -128, -128, -128, 1683, 1683, -81,
+-32768, -73, -128, 587, 588, 590,-32768, 1239, 596, 773,
+-32768,-32768,-32768, 1239, 1239, 1683, 1683, -50, 1683, 687,
+ 1683, 1683,-32768, 775,-32768, 603,-32768, 19, 608, 618,
+ 619, 621, 628, 641, 642, 645, 646, 647, 648, 649,
+ 650, 651, 653, 661, 671, 672, 673, 674, 675, 678,
+ 680, 681, 683, 684, 685, 686, 688, 689, 819, 682,
+ 676, 690, 1683, 855,-32768, -128,-32768, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 40,
+ 44, 44, 692, 692, 692, 5651, 865, 1718, 5001, 28,
+ 696, 866, 677,-32768,-32768, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683,
+-32768, 148, 5674, 1919, 5697, 5720, 1683, 5743, 2235, 1683,
+ 2302, 5766, 5789, 164, 1597, 1718, 1824, 867,-32768, 5812,
+ 1683, 1683, 1683, 869, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1683, 700, -84,-32768,-32768, 2670, 2691, -128, -128, 457,
+ 457, -79, 1683, 1683, 1683, 2161, 105, 1683,-32768, 2184,
+ 875, 876, 5835, 5858, 797, 1683, 5881, 701, 1839, 5904,
+-32768, 1683, 735, 883, 885, 886, 888, 889, 891, 892,
+ 893, 894, 895, 896, 897, 898, 900, 901, 902, 903,
+ 904, 905, 906, 908, 909, 915, 792, 926, 931, 932,
+ 933, 936, 935,-32768, 204, 939, 940, 942, 5026, 308,
+ -35, -12, 5927, 5051, 5950, 5076, 5973, 5101, 5996, 5126,
+ 6019, 5151, 6042, 5176, 6065, 5201, 6088, 5226, 6111, 5251,
+ 6134, 5276, 6157, 5301, 2712, 2733, 6180, 5326, 6203, 5351,
+ 6226, 5376, 6249, 5401, 6272, 5426, 6295, 5451, 2754, 2775,
+ 2796, 2817, 2838, 2859, 329,-32768, 253, 763, 768,-32768,
+ 1239, 1927, 1824,-32768, 366, 4, 44, 1683, 944, 947,
+ 10,-32768, 1854, 624, 644, 505, 505, 323, 323, 323,
+ 323, 258, 258, 692, 692, 692, 692, 946, 1718, 948,
+ 950, 951, 952, 6318, 953, 955, 6341, 956, 958, 959,
+ 709, 264, 1718, 416, 1683, 1683, 961, 2325, 6364, 6387,
+ 1683, 2348, 2371, 6410, 6433, 6456, 6479, 6502, 779, -128,
+ 1683, 1683,-32768,-32768,-32768, 770, 2234,-32768, 782, 1683,
+ 2880, 2901, 2922,-32768,-32768,-32768, 1683, 5476,-32768, 784,
+ 785, 965, 966, 794, 6525, 968, 1683, 1683,-32768, 6548,
+ 824, 793, 795, 796, 798, 802, 803, 805, 807, 808,
+ 809, 811, 812, 813, 826, 827, 828, 829, 830, 831,
+ 832, 833, 834, 835, 837, 853, 854, 856, 857, 859,
+ 861,-32768, 974, 801,-32768, 862, 86,-32768,-32768, 860,
+ 868, 870, 871, 874, 877, 911, 913, 916, 917, 919,
+ 920, 1043,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768, 1643, 1643,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768, 1683, 1683,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1008,-32768, 1673,
- 54,-32768, 1035, 1673, 873, 59, 1643, 1038, 1043, 864,
--32768, 1056, 884, 15, 1059, 1643,-32768, 194, 154,-32768,
- 382, 382, 1084, 382,-32768, 1107,-32768, 382, 382,-32768,
- 1673, 1058, 451,-32768, 1878, 1052, 931, 1113, 1114, 1116,
- 410, 1117, 1121, 1122, 1126, 1133, 1134, 1135, 1140, 196,
- 2943, 2964,-32768,-32768, 2394, 154, 154, 154, 1350, 1139,
- 1643, 1643, 382, 382, 1643, 1141, 382, 1899, 438, 1142,
- 998, 1144, 1643, 1643, 154, 1147, 1149, 982, 1151, 1152,
- 382, 382, 1153, 154, 1154, 1155, 382, 382, 1157, 1158,
- 1159, 1160, 1162, 382, 387, 382, 1163, 1176, 1177, 1165,
- 1180,-32768, 1178, 441, 1182,-32768, 1029, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643,-32768,
- 6548, 5501, 6571, 5526, 6594, 5551, 6617, 5576, 5601, 1009,
- 253, 1010,-32768, 1819,-32768, 16, 195, 1011, 1185, 1409,
--32768,-32768,-32768, 15, 1643, 1012, 1643,-32768, 455,-32768,
- 7123, 1187, 44, 52, 1188, 382, 1191, 382, 1192, 1196,
- 458,-32768, 1673,-32768, 1643,-32768, 1643, 382, 382, 382,
--32768, 208, 382, 382, 382, 382, 382, 382, 382, 606,
- 1643, 1643, 1643, 1017, -94, -90, 191,-32768,-32768, 2985,
- 3006, 1220, 1223, 6640, -52, 1143, 1643, 1643,-32768, 1048,
- 14, 1050, 3027, 3048, -103, 1051, 1064, 1054, 1065, 1055,
- 1066, 1087, 1097, -16, 1098, 1105, 1106, 1103, 1104, 1109,
- 1110, 1136, 1145, 1146,-32768,-32768,-32768,-32768,-32768, 1148,
- 1150, 1168, 1169, 1189, 1156, 1190,-32768, 1193, -91, 1231,
+ 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1059,-32768, 1718,
+ 44,-32768, 1050, 1718, 882, 67, 1683, 1060, 1095, 756,
+-32768, 1096, 922, 15, 1099, 1683,-32768, 262, -128,-32768,
+ 1239, 1239, 1100, 1239,-32768, 1101,-32768, 1239, 1239,-32768,
+ 1718, 1058, 420,-32768, 1876, 864, 923, 1103, 1104, 1107,
+ 373, 1108, 1109, 1110, 1113, 1114, 1115, 1116, 1098, 126,
+ 2943, 2964,-32768,-32768, 2394, -128, -128, -128, 1052, 1118,
+ 1683, 1683, 1239, 1239, 1683, 1119, 1239, 1891, 427, 1121,
+ 981, 1127, 1683, 1683, -128, 1130, 1132, 967, 1136, 1137,
+ 1239, 1239, 1138, -128, 1139, 1141, 1239, 1239, 1142, 1143,
+ 1144, 1145, 1146, 1239, 452, 1239, 1147, 1148, 1149, 1152,
+ 1153,-32768, 1151, 387, 1102,-32768, 585, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683,-32768,
+ 6571, 5501, 6594, 5526, 6617, 5551, 6640, 5576, 5601, 971,
+ 305, 977,-32768, 1824,-32768, 16, 149, 976, 1154, 1352,
+-32768,-32768,-32768, 15, 1683, 978, 1683,-32768, 424,-32768,
+ 7146, 1157, 42, 24, 1159, 1239, 1160, 1239, 1162, 1175,
+ 425,-32768, 1718,-32768, 1683,-32768, 1683, 1239, 1239, 1239,
+-32768, 599, 1239, 1239, 1239, 1239, 1239, 1239, 1239, 679,
+ 1683, 1683, 1683, 996, -130, -87, 199,-32768,-32768, 2985,
+ 3006, 1177, 1178, 6663, -93, 1097, 1683, 1683,-32768, 1004,
+ 19, 1006, 3027, 3048, 91, 1007, 1012, 1009, 1014, 1011,
+ 1016, 1013, 1017, 169, 1018, 1035, 1045, 1044, 1047, 1049,
+ 1051, 1054, 1055, 1056,-32768,-32768,-32768,-32768,-32768, 1061,
+ 1062, 1087, 1105, 1140, 1064, 1150,-32768, 1155, 308, 1229,
3069, 3090, 3111, 3132, 3153, 3174, 3195, 3216, 3237, 3258,
3279, 3300,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 1195,-32768,-32768,-32768, 382, 54, 1643, 1284, 1321, 12,
--32768, 1322, 5626, 1241, 3321, 15,-32768,-32768,-32768,-32768,
- 154,-32768, 1323,-32768, 1326,-32768,-32768, 1197, 461, 7123,
- 3342, 1328, 1330, 1332, 1643, 1643, 1333, 1334, 1366, 1367,
- 1370, 1376, 1380,-32768, 1288, 2417, 6663, 1198, 411, 154,
- 1382, 154, 1383, 154, 1384, 1643, 1643,-32768,-32768, 1385,
- 382, 382, 1302, 382, 374, 6686, 1643, 14, 1400, 1643,
- 382, 1399, 1404, 1405, 1242, 1410, 387, 1411, 1407, 1643,
- 1412, 1432, 1433, 1441, 1446, 387, 1643, 1643, 1643, 382,
- 1444, 1448, 387, 1643, 1449, 1450, 1453, 1643, 441,-32768,
--32768, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643, 1451, 1454, 1455, 1548,-32768, 1447, 1456,
--32768, 1272, 1280, 1643,-32768, 90,-32768,-32768,-32768, 1283,
- 1643,-32768,-32768,-32768, 1706, 1732,-32768,-32768,-32768,-32768,
--32768,-32768,-32768, 1755, 1461, 1293,-32768, 1643,-32768, 1282,
- 199,-32768, 204,-32768, 1294, 257,-32768, 1295, 3363, 3384,
- -52, 294,-32768, 462, 1296, 1397, 1643,-32768,-32768, 3405,
- 14, 1303, 3426, 1300,-32768, 1301,-32768, 1304,-32768, 1306,
--32768, 1305, 6709,-32768, 1307,-32768,-32768, 1310, 1312, 6732,
- 3447, 6755, 1309,-32768, 1314, 1315, 3468, 1320, 1316,-32768,
- 3489, 1329, 3510, 3531, 3552, 3573, 3594, 3615, 3636, 3657,
- 3678, 3699, 3720, 3741, 1343,-32768,-32768,-32768, 15,-32768,
- 1416, 1484, 3762,-32768,-32768, 3783,-32768,-32768,-32768,-32768,
- 411, 2221,-32768, 1643, 1643, 223, 1643, 223, 1643, 1643,
- 1436,-32768, 382,-32768, 382, 1643, 2440, 382, 1387, 1524,
- -52, 387, 1528, 1643, 1526, 387, 1527, 1534, 1532, 1540,
- 1541, 1643, 1542, 382, 1543, 1544, 1643, 1549, 1545, 1643,
- 1551, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643,-32768, 1547,-32768,-32768, 1643, 1556, 1378,
- 1643,-32768, 2463, 2486, 1557, 1381, -8,-32768, 2509, -5,
- 2532, 2555, 1401,-32768, 1388, 1804,-32768, 1379, 14,-32768,
- 1398, 1406, 1418, 3804,-32768, 1408,-32768, 1413,-32768,-32768,
--32768, 6778,-32768, 1443,-32768,-32768, 6801, 1415,-32768, 6824,
- 1452, 3825, 3846, 3867, 3888, 3909, 3930, 3951, 3972, 3993,
- 6847, 6870, 6893,-32768, 2250, 1457,-32768, 2578, 1584, 1586,
--32768, 382, 1626,-32768, 1627, 1628, 1629, 1630, 382, 382,
--32768, 1632, 14, 387, 387, 387, 387, 1633, 1634, 1635,
- 387, 1638, 1639, 1642, 1596, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643,-32768,-32768,-32768, 1643,-32768, 1644,
--32768,-32768,-32768, 1492, 1494,-32768,-32768, 1495,-32768,-32768,
--32768, 1521, 1493,-32768, 14, 1537, 1538, 1550, 1552,-32768,
--32768,-32768, 1554,-32768,-32768,-32768, 1555, 4014, 4035, 4056,
- 4077, 4098, 4119, 4140, 4161, 4182, 1539, 1546, 1558, 2601,
- 1560, 223, 382, 223, 382, 1648, 1580, 387, 387, 1723,
- 1724, 387, 1730, 1643, 1643, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643, 1643,-32768, 1731, 3, 1561, 4,
- 1562, 1568, 14, 1563, 1570,-32768,-32768, 1566, 1575, 4203,
- 4224, 4245, 4266, 4287, 4308, 4329, 4350, 4371, 486, 7123,
- 489, 7123, 490, 7123, 1571, 1735, 382, 1736, 1651, 1643,
- 14, 387, 382, 1737, 1751, 1643, 1643, 1643, 1643, 1643,
- 1643, 1643, 1643, 1643, 1643, 1753, 1643, 1754, 1643, 1756,
- 1757,-32768, 1579,-32768, 1581, 4392, 14, 1583, 1588,-32768,
--32768, 4413, 4434, 4455, 4476, 4497, 4518, 6916, 6939, 6962,
- 7123,-32768, 7123,-32768, 7123,-32768,-32768, 1763, 1643, 1643,
- 1621, 387, 382, 1643, 1643, 1643, 1643, 1643, 1643,-32768,
--32768,-32768,-32768, 4539, 2624, 1622, 1597, 1598, 4560, 4581,
- 4602, 4623, 4644, 4665, 1599, 1625, 1631, 1643, 1808,-32768,
- 382, 387, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643,
- 1643, 2647,-32768, 1636, 1641, 4686, 4707, 4728, 4749, 4770,
- 4791, 495, 7123, 499, 7123, 505, 7123, 1809, 382, 1810,
- 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1813, 1643, 1814,
- 1643, 1818,-32768, 1640,-32768, 4812, 4833, 4854, 6985, 7008,
- 7031, 7123,-32768, 7123,-32768, 7123,-32768, 382, 1643, 1643,
- 1643,-32768,-32768,-32768, 1645, 4875, 4896, 4917, 1646, 1647,
- 1649, 382, 1643, 1643, 1643, 1643, 1643, 1643, 1652, 4938,
- 4959, 4980, 508, 7123, 509, 7123, 516, 7123, 387, 1643,
- 1643, 1643, 1643, 1820, 1643, 1822, 1643, 1823, 1650, 7054,
- 7077, 7100, 7123,-32768, 7123,-32768, 7123,-32768, 1830,-32768,
--32768,-32768,-32768, 1653, 1654, 1655, 1643, 1643, 1643, 520,
- 7123, 529, 7123, 557, 7123, 1643, 1832, 1643, 1838, 1643,
- 1839, 7123,-32768, 7123,-32768, 7123,-32768, 1846, 1847,-32768
+ 1111,-32768,-32768,-32768, 1239, 44, 1683, 1276, 1279, 10,
+-32768, 1280, 5626, 1197, 3321, 15,-32768,-32768,-32768,-32768,
+ -128,-32768, 1282,-32768, 1283,-32768,-32768, 1156, 432, 7146,
+ 3342, 1315, 1321, 1322, 1683, 1683, 1323, 1324, 1325, 1326,
+ 1327, 1328, 1330,-32768, 1288, 2417, 6686, 302, 457, -128,
+ 1331, -128, 1332, -128, 1347, 1683, 1683,-32768,-32768, 1287,
+ 1239, 1239, 1265, 1239, 194, 6709, 1683, 19, 1353, 1683,
+ 1239, 1351, 1356, 1354, 1190, 1362, 452, 1372, 1376, 1683,
+ 1374, 1379, 1380, 1381, 1382, 452, 1683, 1683, 1683, 1239,
+ 1384, 1389, 452, 1683, 1390, 1401, 1400, 1683, 387,-32768,
+-32768, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1406, 1405, 1409, 1410,-32768, 1411, 1414,
+-32768, 1228, 1233, 1683,-32768, 89,-32768,-32768,-32768, 1238,
+ 1683,-32768,-32768,-32768, 1592, 1629,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 1710, 1416, 1237,-32768, 1683,-32768, 1240,
+ 167,-32768, 205,-32768, 1242, 207,-32768, 1243, 3363, 3384,
+ -93, 338,-32768, 435, 1244, 1338, 1683,-32768,-32768, 3405,
+ 19, 1245, 3426, 1246,-32768, 1247,-32768, 1248,-32768, 1253,
+-32768, 1250, 6732,-32768, 1251,-32768,-32768, 1256, 1260, 6755,
+ 3447, 6778, 1257,-32768, 1268, 1269, 3468, 1266, 1271,-32768,
+ 3489, 1270, 3510, 3531, 3552, 3573, 3594, 3615, 3636, 3657,
+ 3678, 3699, 3720, 3741, 1272,-32768,-32768,-32768, 15,-32768,
+ 1363, 1452, 3762,-32768,-32768, 3783,-32768,-32768,-32768,-32768,
+ 457, 1204,-32768, 1683, 1683, -19, 1683, -19, 1683, 1683,
+ 1370,-32768, 1239,-32768, 1239, 1683, 2440, 1239, 1312, 1455,
+ -93, 452, 1459, 1683, 1458, 452, 1460, 1462, 1463, 1464,
+ 1465, 1683, 1475, 1239, 1476, 1477, 1683, 1481, 1479, 1683,
+ 1482, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683,-32768, 1480,-32768,-32768, 1683, 1483, 1302,
+ 1683,-32768, 2463, 2486, 1484, 1305, -45,-32768, 2509, -39,
+ 2532, 2555, 1306,-32768, 1308, 1803,-32768, 1307, 19,-32768,
+ 1310, 1311, 1313, 3804,-32768, 1316,-32768, 1318,-32768,-32768,
+-32768, 6801,-32768, 1341,-32768,-32768, 6824, 1335,-32768, 6847,
+ 1342, 3825, 3846, 3867, 3888, 3909, 3930, 3951, 3972, 3993,
+ 6870, 6893, 6916,-32768, 1741, 1348,-32768, 2578, 1501, 1503,
+-32768, 1239, 1526,-32768, 1529, 1531, 1532, 1534, 1239, 1239,
+-32768, 1535, 19, 452, 452, 452, 452, 1542, 1543, 1544,
+ 452, 1545, 1546, 1547, 1549, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683,-32768,-32768,-32768, 1683,-32768, 1551,
+-32768,-32768,-32768, 1371, 1373,-32768,-32768, 1377,-32768,-32768,
+-32768, 1383, 1378,-32768, 19, 1399, 1407, 1386, 1393,-32768,
+-32768,-32768, 1408,-32768,-32768,-32768, 1417, 4014, 4035, 4056,
+ 4077, 4098, 4119, 4140, 4161, 4182, 1404, 1418, 1419, 2601,
+ 1445, -19, 1239, -19, 1239, 1499, 1443, 452, 452, 1588,
+ 1590, 452, 1598, 1683, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683, 1683,-32768, 1626, -38, 439, -37,
+ 1446, 1448, 19, 1447, 1451,-32768,-32768, 1456, 1457, 4203,
+ 4224, 4245, 4266, 4287, 4308, 4329, 4350, 4371, 440, 7146,
+ 451, 7146, 455, 7146, 1453, 1633, 1239, 1635, 1636, 1558,
+ 1683, 19, 452, 1239, 1639, 1640, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 1683, 1683, 1683, 1641, 1683, 1642, 1683,
+ 1643, 1651,-32768, 1468,-32768,-32768, 1496, 4392, 19, 1504,
+ 1505,-32768,-32768, 4413, 4434, 4455, 4476, 4497, 4518, 6939,
+ 6962, 6985, 7146,-32768, 7146,-32768, 7146,-32768,-32768, 1682,
+ 1683, 1683, 1538, 452, 1239, 1683, 1683, 1683, 1683, 1683,
+ 1683,-32768,-32768,-32768,-32768, 4539, 2624, 1563, 1533, 1540,
+ 4560, 4581, 4602, 4623, 4644, 4665, 1537, 1570, 1582, 1683,
+ 1713,-32768, 1239, 452, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1683, 1683, 1683, 2647,-32768, 1584, 1539, 4686, 4707, 4728,
+ 4749, 4770, 4791, 458, 7146, 461, 7146, 464, 7146, 1764,
+ 1239, 1767, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1768,
+ 1683, 1769, 1683, 1770,-32768, 1594,-32768, 4812, 4833, 4854,
+ 7008, 7031, 7054, 7146,-32768, 7146,-32768, 7146,-32768, 1239,
+ 1683, 1683, 1683,-32768,-32768,-32768, 1595, 4875, 4896, 4917,
+ 1596, 1600, 1601, 1239, 1683, 1683, 1683, 1683, 1683, 1683,
+ 1599, 4938, 4959, 4980, 495, 7146, 507, 7146, 508, 7146,
+ 452, 1683, 1683, 1683, 1683, 1775, 1683, 1787, 1683, 1797,
+ 1630, 7077, 7100, 7123, 7146,-32768, 7146,-32768, 7146,-32768,
+ 1804,-32768,-32768,-32768,-32768, 1627, 1628, 1631, 1683, 1683,
+ 1683, 516, 7146, 520, 7146, 529, 7146, 1683, 1806, 1683,
+ 1809, 1683, 1810, 7146,-32768, 7146,-32768, 7146,-32768, 1820,
+ 1821,-32768
};
static const short yypgoto[] = {-32768,
1,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 1262,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 1234,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -286, -22,
--32768, 1843, 1845, -346, 89, 1848,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768, -1148, -1195,-32768,-32768, -995, -23,
--32768, -29,-32768, -85,-32768, -1029, 879, 371, -232, -314,
- -795, 924,-32768, -274
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -288, -22,
+-32768, 1815, 1823, -346, -34, 1827,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768, -1154, -1089,-32768,-32768, -963, -23,
+-32768, -29,-32768, -85,-32768, -1057, 845, 371, -232, -313,
+ -795, 907,-32768, -274
};
-#define YYLAST 7302
+#define YYLAST 7325
static const short yytable[] = { 135,
- 134, 1100, 231, 468, 529, 457, 458, 459, 932, 1220,
- 1109, 504, 236, 179, 172, 673, 78, 1116, 806, 90,
- 91, 1274, 93, 188, 1274, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 939,
- 8, 1161, 290, 144, 365, 464, 1215, 940, 456, 1215,
- 184, 1216, 797, 185, 1216, 348, 349, 1215, 1215, 348,
- 349, 147, 1216, 1216, 348, 349, 9, 992, 348, 349,
- 198, 190, 455, 456, 128, 129, 350, 118, 119, 120,
- 970, 140, 971, 464, 972, 1144, 973, 141, 348, 349,
- 941, 283, 284, 285, 348, 349, 286, 289, 81, 293,
- 180, 82, 118, 119, 120, 351, 313, 314, 315, 316,
- 520, 318, 319, 87, 321, 322, 323, 981, 330, 348,
- 349, 156, 157, 982, 158, 343, 344, 345, 291, 292,
- 1045, 1231, 83, 352, 346, 347, 589, 366, 798, 799,
- 488, 84, 348, 349, 489, 93, 305, 306, 307, 308,
- 309, 189, 363, 364, 1001, 367, 310, 369, 370, 145,
- 121, 122, 123, 124, 678, 146, 1232, 85, 1273, 667,
- 1236, 1276, 1274, 79, 1274, 125, 126, 467, 693, 1406,
- 1408, 127, 669, 148, 237, 181, 130, 674, 373, 287,
- 807, 926, 288, 1378, 160, 1380, 411, 161, 162, 409,
- 163, 86, 348, 349, 413, 414, 415, 416, 417, 418,
+ 134, 468, 231, 1220, 529, 457, 458, 459, 932, 236,
+ 93, 179, 504, 673, 172, 188, 144, 147, 806, 1215,
+ 190, 78, 93, 1161, 1216, 1215, 1215, 1215, 290, 940,
+ 1216, 1216, 1216, 1100, 467, 238, 365, 239, 348, 349,
+ 166, 167, 1109, 455, 456, 1215, 140, 939, 456, 1116,
+ 1216, 168, 141, 8, 970, 464, 971, 169, 590, 591,
+ 592, 593, 594, 595, 596, 597, 598, 599, 600, 601,
+ 797, 9, 941, 118, 119, 120, 81, 118, 119, 120,
+ 198, 348, 349, 82, 348, 349, 981, 348, 349, 348,
+ 349, 87, 982, 464, 1144, 348, 349, 972, 83, 973,
+ 520, 283, 284, 285, 350, 530, 286, 289, 180, 293,
+ 536, 537, 351, 1231, 291, 292, 313, 314, 315, 316,
+ 184, 318, 319, 185, 321, 322, 323, 1274, 330, 366,
+ 1274, 88, 145, 348, 349, 343, 344, 345, 146, 148,
+ 1045, 1273, 356, 352, 346, 347, 360, 1276, 1406, 1409,
+ 589, 156, 157, 189, 158, 926, 798, 799, 121, 122,
+ 123, 124, 363, 364, 240, 367, 241, 369, 370, 89,
+ 121, 122, 123, 124, 602, 678, 242, 667, 243, 128,
+ 129, 84, 121, 122, 123, 124, 85, 666, 79, 693,
+ 86, 237, 669, 181, 139, 674, 191, 1378, 373, 1380,
+ 807, 1087, 138, 128, 129, 244, 411, 245, 1232, 409,
+ 348, 349, 1236, 142, 413, 414, 415, 416, 417, 418,
419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
429, 430, 431, 432, 433, 434, 435, 436, 437, 438,
439, 440, 441, 442, 443, 444, 445, 446, 447, 448,
- 449, 450, 451, 452, 453, 454, 464, 191, 348, 349,
- 128, 129, 955, 956, 463, 356, 233, 469, 234, 360,
- 464, 88, 473, 474, 475, 476, 477, 478, 479, 480,
- 481, 482, 483, 484, 485, 486, 487, 1215, 1326, 1327,
- 1328, 1329, 1216, 494, 582, 1333, 497, 238, 583, 239,
- 10, 284, 463, 121, 122, 123, 124, 508, 509, 510,
- 89, 512, 513, 514, 515, 516, 517, 518, 523, 524,
- 128, 129, 166, 167, 128, 129, 501, 138, 234, 531,
- 532, 533, 666, 168, 538, 121, 122, 123, 124, 169,
- 659, 142, 545, 1205, 660, 791, 151, 139, 550, 121,
- 122, 123, 124, 348, 349, 143, 128, 129, 149, 348,
- 349, 150, 1384, 1385, 348, 349, 1388, 348, 349, 530,
- 128, 129, 348, 349, 812, 974, 821, 975, 664, 152,
- 841, 1087, 159, 1154, 90, 324, 792, 588, 1155, 153,
- 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 154, 831, 1438, 11, 12, 13,
- 14, 15, 16, 17, 18, 348, 349, 464, 307, 308,
- 309, 795, 155, 923, 128, 129, 310, 664, 284, 164,
- 692, 1157, 234, 668, 670, 858, 590, 591, 592, 593,
- 594, 595, 596, 597, 598, 599, 600, 601, 464, 128,
- 129, 165, 240, 832, 241, 463, 1477, 765, 42, 43,
- 44, 45, 174, 47, 1162, 175, 176, 409, 1163, 463,
- 173, 695, 696, 242, 244, 243, 245, 701, 536, 537,
- 710, 885, 886, 887, 888, 889, 1505, 711, 712, 246,
- 248, 247, 249, 250, 177, 251, 715, 178, 949, 925,
- 927, 182, 252, 719, 253, 254, 256, 255, 257, 183,
- 258, 328, 259, 728, 729, 260, 334, 261, 262, 264,
- 263, 265, 296, 297, 298, 299, 300, 186, 301, 302,
- 303, 304, 305, 306, 307, 308, 309, 266, 357, 267,
- 125, 325, 310, 193, 361, 362, 127, 268, 187, 269,
- 1088, 130, 602, 270, 766, 271, 194, 326, 296, 297,
- 298, 299, 300, 192, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 1589, 272, 274, 273, 275, 310, 195,
- 464, 276, 278, 277, 279, 196, 296, 297, 298, 299,
- 300, 197, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 964, 965, 781, 782, 657, 310, 658, 859, 232,
- 229, 664, 1070, 665, 664, 280, 694, 783, 784, 785,
- 786, 787, 788, 789, 294, 664, 463, 824, 281, 936,
- 794, 937, 664, 800, 948, 664, 1163, 1050, 1164, 813,
- 282, 1036, 811, 298, 299, 300, 311, 301, 302, 303,
- 304, 305, 306, 307, 308, 309, 312, 463, 409, 331,
- 1425, 310, 1426, 1427, 1429, 1428, 1430, 317, 898, 1527,
- 320, 1528, 295, 1529, 342, 1530, 845, 846, 847, 1531,
- 1065, 1532, 1583, 1585, 1584, 1586, 332, 850, 851, 358,
- 1587, 854, 1588, 333, 1616, 865, 1617, 335, 336, 863,
- 864, 90, 91, 1618, 874, 1619, 337, 94, 95, 96,
+ 449, 450, 451, 452, 453, 454, 464, 348, 349, 348,
+ 349, 128, 129, 246, 463, 247, 248, 469, 249, 765,
+ 464, 992, 473, 474, 475, 476, 477, 478, 479, 480,
+ 481, 482, 483, 484, 485, 486, 487, 250, 1274, 251,
+ 1274, 128, 129, 494, 348, 349, 497, 233, 252, 234,
+ 253, 284, 463, 121, 122, 123, 124, 508, 509, 510,
+ 841, 512, 513, 514, 515, 516, 517, 518, 523, 524,
+ 1326, 1327, 1328, 1329, 128, 129, 143, 1333, 488, 531,
+ 532, 533, 489, 10, 538, 348, 349, 348, 349, 128,
+ 129, 149, 545, 1205, 150, 501, 791, 234, 550, 1001,
+ 152, 1154, 296, 297, 298, 299, 300, 151, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 348, 349, 254,
+ 159, 255, 310, 348, 349, 348, 349, 821, 831, 256,
+ 1088, 257, 153, 974, 582, 975, 792, 588, 583, 1155,
+ 258, 1157, 259, 154, 1384, 1385, 90, 91, 1388, 260,
+ 155, 261, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 832, 464, 307, 308,
+ 309, 795, 165, 659, 858, 164, 310, 660, 284, 128,
+ 129, 178, 812, 668, 670, 692, 664, 234, 173, 1440,
+ 11, 12, 13, 14, 15, 16, 17, 18, 464, 177,
+ 296, 297, 298, 299, 300, 463, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 182, 262, 409, 263, 463,
+ 310, 695, 696, 128, 129, 923, 1068, 701, 1069, 664,
+ 710, 305, 306, 307, 308, 309, 183, 711, 712, 160,
+ 1479, 310, 161, 162, 186, 163, 715, 925, 927, 949,
+ 657, 187, 658, 719, 42, 43, 44, 45, 1162, 47,
+ 193, 328, 1163, 728, 729, 174, 334, 192, 175, 176,
+ 1507, 296, 297, 298, 299, 300, 194, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 195, 264, 357, 265,
+ 664, 310, 665, 196, 361, 362, 885, 886, 887, 888,
+ 889, 197, 125, 126, 766, 266, 229, 267, 127, 268,
+ 270, 269, 271, 130, 232, 272, 287, 273, 274, 288,
+ 275, 276, 278, 277, 279, 296, 297, 298, 299, 300,
+ 464, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 664, 280, 694, 295, 664, 310, 824, 859, 936, 664,
+ 937, 948, 281, 781, 782, 282, 664, 1591, 1050, 1163,
+ 294, 1164, 1070, 1407, 1426, 1408, 1427, 783, 784, 785,
+ 786, 787, 788, 789, 311, 1428, 463, 1429, 312, 1430,
+ 794, 1431, 1529, 800, 1530, 1531, 317, 1532, 1533, 813,
+ 1534, 1036, 811, 955, 956, 590, 591, 592, 593, 594,
+ 595, 596, 597, 598, 599, 600, 601, 463, 409, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 898, 1585,
+ 320, 1586, 472, 310, 964, 965, 845, 846, 847, 331,
+ 1065, 1587, 1589, 1588, 1590, 335, 332, 850, 851, 336,
+ 1618, 854, 1619, 333, 1620, 865, 1621, 337, 342, 863,
+ 864, 90, 91, 1622, 874, 1623, 338, 94, 95, 96,
97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 1620, 359, 1621, 901, 902, 903, 904, 905, 906,
- 907, 908, 909, 910, 911, 912, 338, 339, 340, 341,
- 353, 472, 368, 371, 26, 27, 28, 29, 30, 31,
- 32, 33, 354, 34, 928, 36, 37, 355, 39, 40,
- 372, 933, 374, 935, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 375, 404, 52, 376, 377, 310, 463,
- 378, 950, 379, 951, 1210, 380, 381, 382, 406, 53,
- 54, 55, 383, 384, 385, 386, 387, 966, 967, 968,
- 388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
- 410, 663, 398, 985, 986, 296, 297, 298, 299, 300,
- 399, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 400, 401, 402, 403, 461, 310, 407, 310, 471, 408,
- 506, 988, 511, 470, 519, 540, 541, 544, 547, 803,
- 551, 64, 552, 553, 554, 555, 1020, 125, 126, 556,
- 557, 558, 559, 127, 560, 561, 562, 563, 130, 564,
- 565, 690, 566, 567, 691, 568, 569, 570, 571, 572,
- 573, 574, 575, 1037, 576, 577, 578, 579, 580, 581,
- 661, 1046, 584, 534, 296, 297, 298, 299, 300, 585,
- 301, 302, 303, 304, 305, 306, 307, 308, 309, 586,
- 662, 1055, 1056, 1122, 310, 671, 672, 677, 709, 680,
- 1071, 1064, 1073, 679, 1076, 681, 682, 684, 685, 687,
- 713, 688, 1079, 1080, 689, 697, 714, 721, 722, 723,
- 724, 725, 727, 1090, 299, 300, 1093, 301, 302, 303,
- 304, 305, 306, 307, 308, 309, 1103, 731, 732, 733,
- 734, 310, 735, 1110, 1111, 1112, 736, 762, 1091, 737,
- 1117, 738, 739, 740, 1121, 741, 742, 743, 1123, 1124,
+ 117, 339, 340, 341, 901, 902, 903, 904, 905, 906,
+ 907, 908, 909, 910, 911, 912, 296, 297, 298, 299,
+ 300, 803, 301, 302, 303, 304, 305, 306, 307, 308,
+ 309, 900, 353, 354, 928, 355, 310, 358, 359, 368,
+ 371, 933, 372, 935, 298, 299, 300, 374, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 375, 376, 463,
+ 377, 950, 310, 951, 1210, 299, 300, 378, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 966, 967, 968,
+ 379, 380, 310, 404, 381, 382, 383, 384, 385, 386,
+ 387, 663, 388, 985, 986, 296, 297, 298, 299, 300,
+ 389, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 390, 391, 392, 393, 394, 310, 407, 395, 410, 396,
+ 397, 988, 398, 399, 400, 401, 406, 402, 403, 826,
+ 310, 461, 471, 506, 408, 511, 1020, 125, 126, 470,
+ 519, 540, 541, 127, 544, 551, 547, 552, 130, 553,
+ 554, 690, 555, 556, 691, 557, 558, 559, 560, 561,
+ 562, 563, 564, 1037, 565, 566, 567, 568, 569, 570,
+ 571, 1046, 572, 573, 296, 297, 298, 299, 300, 574,
+ 301, 302, 303, 304, 305, 306, 307, 308, 309, 575,
+ 576, 1055, 1056, 1122, 310, 577, 578, 579, 580, 581,
+ 1071, 1064, 1073, 584, 1076, 585, 586, 661, 662, 671,
+ 672, 677, 1079, 1080, 679, 680, 713, 681, 682, 684,
+ 685, 687, 709, 1090, 688, 689, 1093, 697, 714, 721,
+ 722, 723, 724, 725, 727, 731, 1103, 732, 762, 733,
+ 734, 763, 735, 1110, 1111, 1112, 736, 737, 1091, 738,
+ 1117, 739, 740, 741, 1121, 742, 743, 744, 1123, 1124,
1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134,
- 780, 790, 744, 745, 746, 747, 748, 749, 750, 751,
- 1143, 752, 296, 297, 298, 299, 300, 1146, 301, 302,
- 303, 304, 305, 306, 307, 308, 309, 753, 763, 754,
- 793, 755, 310, 801, 1152, 756, 757, 758, 802, 759,
- 760, 814, 815, 768, 817, 796, 761, 826, 819, 820,
- 90, 91, 804, 1167, 810, 805, 94, 95, 96, 97,
+ 745, 746, 747, 748, 749, 750, 751, 752, 753, 754,
+ 1143, 755, 296, 297, 298, 299, 300, 1146, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 756, 757, 768,
+ 758, 759, 310, 760, 1152, 761, 764, 769, 780, 770,
+ 771, 814, 815, 772, 817, 793, 773, 848, 819, 820,
+ 90, 91, 790, 1167, 796, 801, 94, 95, 96, 97,
98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 816, 1169, 769, 852, 853, 764, 770, 856, 771, 590,
- 591, 592, 593, 594, 595, 596, 597, 598, 599, 600,
- 601, 871, 872, 818, 772, 773, 827, 877, 878, 828,
- 829, 774, 830, 833, 884, 775, 891, 834, 835, 776,
- 1213, 1214, 836, 1219, 777, 1221, 1222, 778, 779, 837,
- 838, 839, 1226, 840, 849, 861, 862, 855, 860, 866,
- 1234, 867, 868, 869, 870, 873, 875, 876, 1242, 879,
- 880, 881, 882, 1247, 883, 892, 1250, 895, 1252, 1253,
+ 774, 1169, 775, 852, 853, 776, 777, 856, 778, 779,
+ 802, 840, 804, 805, 810, 899, 816, 818, 827, 828,
+ 829, 871, 872, 830, 833, 834, 835, 877, 878, 836,
+ 837, 838, 839, 849, 884, 855, 891, 860, 861, 862,
+ 1213, 1214, 866, 1219, 867, 1221, 1222, 868, 869, 870,
+ 873, 875, 1226, 876, 879, 880, 881, 882, 883, 892,
+ 1234, 922, 893, 894, 895, 896, 897, 924, 1242, 929,
+ 930, 934, 938, 1247, 942, 944, 1250, 946, 1252, 1253,
1254, 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263,
- 893, 894, 896, 897, 1265, 899, 943, 1268, 945, 922,
- 924, 930, 938, 942, 929, 934, 944, 946, 952, 953,
- 954, 947, 969, 957, 958, 959, 960, 961, 962, 963,
- 296, 297, 298, 299, 300, 900, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 978, 125, 126, 979, 1283,
- 310, 984, 127, 987, 989, 993, 1021, 130, 995, 997,
- 822, 90, 502, 823, 994, 996, 998, 94, 95, 96,
+ 947, 969, 978, 979, 1265, 984, 943, 1268, 945, 987,
+ 989, 993, 994, 995, 996, 997, 998, 999, 952, 953,
+ 954, 1000, 1002, 957, 958, 959, 960, 961, 962, 963,
+ 296, 297, 298, 299, 300, 1003, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 1004, 125, 126, 1005, 1283,
+ 310, 1006, 127, 1007, 1021, 1008, 1011, 130, 1009, 1010,
+ 822, 90, 324, 823, 1017, 1012, 1013, 94, 95, 96,
97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 999, 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345,
- 1346, 1000, 1002, 1325, 1350, 1003, 1004, 1005, 1006, 1038,
- 90, 91, 456, 1007, 1008, 1035, 94, 95, 96, 97,
+ 117, 1014, 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345,
+ 1346, 1038, 1039, 1325, 1350, 1041, 1043, 1047, 1048, 1015,
+ 90, 91, 456, 1081, 1034, 1035, 94, 95, 96, 97,
98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 1009, 118, 119, 120, 1039, 1357, 1011, 1041, 1047, 1010,
- 1043, 1048, 1012, 1052, 1013, 1053, 1017, 1054, 1057, 1058,
+ 1052, 118, 119, 120, 1016, 1357, 1053, 1054, 1057, 1058,
+ 1059, 1060, 1061, 1062, 1018, 1063, 1072, 1074, 1049, 1019,
1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1400,
- 1402, 1404, 1014, 1015, 1086, 848, 296, 297, 298, 299,
- 300, 1094, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 1059, 1060, 1016, 1018, 1061, 310, 1019, 1034, 1049,
- 1113, 1062, 1068, 1411, 1069, 1063, 1436, 1072, 1074, 1077,
- 1085, 1081, 1442, 1443, 1444, 1445, 1446, 1447, 1448, 1449,
- 1450, 1451, 1092, 1453, 1095, 1455, 1096, 125, 126, 1102,
- 1097, 1437, 1098, 127, 931, 1099, 1101, 1104, 130, 296,
- 297, 298, 299, 300, 503, 301, 302, 303, 304, 305,
- 306, 307, 308, 309, 1105, 1474, 1475, 1461, 1106, 310,
- 1479, 1480, 1481, 1482, 1483, 1484, 1107, 491, 1108, 1114,
- 1115, 1118, 1119, 1139, 1135, 1141, 125, 126, 1120, 1136,
- 1137, 1140, 127, 1142, 1502, 1145, 1150, 130, 1153, 1506,
- 1507, 1508, 1509, 1510, 1511, 1513, 1515, 1517, 1151, 1156,
- 1158, 1165, 1166, 1170, 1172, 1173, 1175, 1207, 1174, 1176,
- 1179, 1178, 1180, 1184, 1185, 1186, 1189, 1536, 1537, 1538,
- 1539, 1540, 1541, 1542, 1188, 1544, 1206, 1546, 296, 297,
- 298, 299, 300, 1191, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 1204, 1223, 1556, 1557, 1558, 310, 1230,
- 1233, 1235, 1237, 1224, 1229, 1225, 1238, 1239, 1228, 1570,
- 1571, 1572, 1574, 1576, 1578, 1240, 1241, 1243, 1245, 1246,
- 1249, 1248, 1264, 1138, 1244, 1251, 1590, 1591, 1592, 1593,
- 1266, 1595, 1271, 1597, 1267, 1282, 1272, 296, 297, 298,
- 299, 300, 1280, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 1284, 1611, 1613, 1615, 1279, 310, 1288, 1312,
- 1285, 1313, 1622, 1289, 1624, 1293, 1626, 90, 91, 92,
- 1337, 93, 1286, 94, 95, 96, 97, 98, 99, 100,
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 1291, 118, 119,
- 120, 1316, 1317, 1319, 1320, 1321, 1295, 1324, 1330, 1331,
- 1332, 1310, 1315, 1334, 1335, 90, 91, 1336, 1351, 1322,
- 1323, 94, 95, 96, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 90, 324, 1352, 1353, 1356,
- 1354, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+ 1402, 1404, 1077, 1085, 1086, 1092, 1095, 931, 1096, 1097,
+ 1098, 1094, 296, 297, 298, 299, 300, 1099, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 1101, 1102, 1104,
+ 1113, 1105, 310, 1412, 1108, 1106, 1107, 1438, 1211, 1114,
+ 1212, 1115, 1118, 1444, 1445, 1446, 1447, 1448, 1449, 1450,
+ 1451, 1452, 1453, 1119, 1455, 1120, 1457, 125, 325, 1135,
+ 1136, 1141, 1439, 127, 1137, 1138, 1142, 1139, 130, 1140,
+ 1145, 1150, 1151, 1166, 326, 1170, 1153, 1156, 1158, 1165,
+ 1172, 1173, 1174, 1175, 1176, 1178, 1179, 1476, 1477, 1463,
+ 1180, 1184, 1481, 1482, 1483, 1484, 1485, 1486, 1185, 1186,
+ 1188, 1189, 1204, 1206, 1191, 1207, 125, 126, 1223, 1229,
+ 1230, 1233, 127, 1235, 1238, 1237, 1504, 130, 1239, 1240,
+ 1241, 1508, 1509, 1510, 1511, 1512, 1513, 1515, 1517, 1519,
+ 1243, 1245, 1246, 1248, 1249, 1264, 1251, 1266, 1267, 1271,
+ 1272, 1279, 1280, 1282, 1284, 1285, 1288, 1286, 1289, 1538,
+ 1539, 1540, 1541, 1542, 1543, 1544, 1312, 1546, 1313, 1548,
+ 296, 297, 298, 299, 300, 1293, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 1291, 1295, 1558, 1559, 1560,
+ 310, 1316, 1310, 1224, 1317, 1225, 1319, 1320, 1228, 1321,
+ 1324, 1572, 1573, 1574, 1576, 1578, 1580, 1330, 1331, 1332,
+ 1334, 1335, 1336, 1337, 1244, 1351, 1352, 1353, 1592, 1593,
+ 1594, 1595, 1354, 1597, 1356, 1599, 1360, 1355, 296, 297,
+ 298, 299, 300, 1361, 301, 302, 303, 304, 305, 306,
+ 307, 308, 309, 1358, 1382, 1613, 1615, 1617, 310, 1373,
+ 1383, 1359, 1362, 1386, 1624, 1387, 1626, 1147, 1628, 90,
+ 502, 1363, 1389, 1374, 1375, 94, 95, 96, 97, 98,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 1377,
+ 1405, 1413, 1410, 1411, 1148, 1414, 1415, 1416, 1433, 1432,
+ 1435, 1436, 1315, 1437, 1442, 1443, 1454, 1456, 1458, 1322,
+ 1323, 90, 91, 92, 1460, 93, 1459, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 1461, 118, 119, 120, 90, 91, 1475, 1464, 1465,
+ 1478, 94, 95, 96, 97, 98, 99, 100, 101, 102,
103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 1355, 296, 297, 298, 299,
- 300, 1147, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 1358, 1359, 1379, 1373, 1381, 310, 1383, 1386, 1387,
- 1360, 1374, 1361, 1382, 1389, 1405, 1435, 1148, 1362, 1363,
- 1432, 1434, 1440, 1375, 1377, 1407, 1414, 1412, 1409, 121,
- 122, 123, 124, 1410, 1413, 1415, 1441, 1431, 1452, 1454,
- 1149, 1456, 1457, 125, 126, 1458, 1459, 1462, 1473, 127,
- 128, 129, 1463, 1476, 130, 1490, 131, 1433, 132, 90,
- 502, 1491, 1492, 1439, 1499, 94, 95, 96, 97, 98,
+ 113, 114, 115, 116, 117, 1149, 1492, 1493, 1505, 1522,
+ 90, 324, 1501, 1379, 1494, 1381, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 296, 297, 298, 299, 300, 1502, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 125, 126, 1503, 1521, 1535,
+ 310, 127, 1537, 1545, 1547, 1549, 130, 1434, 1550, 1564,
+ 1596, 1568, 503, 1581, 1441, 1569, 1570, 296, 297, 298,
+ 299, 300, 1598, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 1600, 121, 122, 123, 124, 310, 1281, 1605,
+ 1601, 1625, 1609, 1610, 1627, 1629, 1611, 125, 126, 1631,
+ 1632, 69, 767, 127, 128, 129, 1084, 0, 130, 70,
+ 131, 505, 132, 71, 0, 1480, 1040, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 548, 0, 0, 0,
+ 0, 125, 126, 0, 0, 0, 0, 127, 0, 0,
+ 0, 676, 130, 1506, 0, 0, 0, 0, 296, 297,
+ 298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
+ 307, 308, 309, 825, 0, 0, 125, 462, 310, 0,
+ 0, 1536, 127, 0, 0, 0, 0, 130, 857, 296,
+ 297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
+ 1557, 0, 0, 0, 0, 1308, 0, 1309, 0, 90,
+ 502, 0, 0, 0, 1571, 94, 95, 96, 97, 98,
99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 1281,
- 1500, 125, 126, 1503, 1533, 1535, 1501, 127, 1543, 1545,
- 1519, 1520, 130, 1547, 1548, 1594, 505, 1596, 1598, 1562,
- 1599, 1566, 1567, 1478, 1568, 1603, 1579, 1623, 1607, 1608,
- 1609, 125, 462, 1625, 1627, 1629, 1630, 127, 548, 69,
- 767, 70, 130, 1040, 71, 0, 0, 0, 0, 0,
- 1084, 1504, 0, 676, 296, 297, 298, 299, 300, 0,
- 301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
- 0, 0, 0, 0, 310, 825, 0, 0, 0, 1534,
- 296, 297, 298, 299, 300, 0, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 0, 857, 0, 0, 0,
- 310, 0, 0, 296, 297, 298, 299, 300, 1555, 301,
- 302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 1569, 310, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 125, 126, 0, 0, 0,
- 0, 127, 0, 0, 0, 0, 130, 0, 0, 0,
- 0, 0, 296, 297, 298, 299, 300, 0, 301, 302,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 0,
+ 0, 296, 297, 298, 299, 300, 0, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
+ 0, 310, 296, 297, 298, 299, 300, 0, 301, 302,
303, 304, 305, 306, 307, 308, 309, 296, 297, 298,
299, 300, 310, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 296,
- 297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
- 306, 307, 308, 309, 296, 297, 298, 299, 300, 310,
- 301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
- 0, 0, 0, 0, 310, 0, 296, 297, 298, 299,
- 300, 0, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, -10, 1, 0, -10, -53, 310, 296, 297, 298,
+ 308, 309, 296, 297, 298, 299, 300, 310, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
+ 0, 0, 310, 0, 296, 297, 298, 299, 300, 0,
+ 301, 302, 303, 304, 305, 306, 307, 308, 309, 296,
+ 297, 298, 299, 300, 310, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
+ -10, 1, 0, -10, -53, 0, 0, 296, 297, 298,
299, 300, 0, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 0,
- 0, 0, 0, 0, -53, 0, 0, 0, -53, -53,
- -53, -53, -53, -53, -53, -53, -53, 0, -53, -53,
- -53, -53, -53, -53, -53, 0, 0, 0, -53, -53,
- -53, -53, -53, -53, -53, 0, -53, -53, -53, -53,
+ 308, 309, 0, 0, 0, 125, 126, 310, 0, 0,
+ 0, 127, 0, -53, 0, 491, 130, -53, -53, -53,
+ -53, -53, -53, -53, -53, -53, 0, -53, -53, -53,
+ -53, -53, -53, -53, 0, 0, 0, -53, -53, -53,
+ -53, -53, -53, -53, 0, -53, -53, -53, -53, -53,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, -53, -53, -53, 0, 0, 0, 0,
+ 0, 0, -53, 0, -53, -53, -53, -53, -53, -53,
-53, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, -53, -53, -53, 0, 0, 0,
- 0, 0, 0, -53, 0, -53, -53, -53, -53, -53,
- -53, -53, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -10, -10, -10, -10, -10, -10, -10, -10, 26,
- 27, 28, 29, 30, 31, 32, 33, 0, 34, 0,
- 36, 37, 0, 39, 40, 0, -53, 2, 3, 23,
- 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 52, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 53, 54, 55, 0, 24, 0,
- 0, 0, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 0, 34, 35, 36, 37, 38, 39, 40, 0,
- 0, 0, 41, 42, 43, 44, 45, 46, 47, 0,
- 48, 49, 50, 51, 52, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 199, 0, 0, 53, 54,
- 55, 0, 0, 0, 0, 0, 64, 56, 0, 57,
- 58, 59, 60, 61, 62, 63, 26, 27, 28, 29,
- 30, 31, 32, 33, 0, 34, 0, 36, 37, 0,
- 39, 40, 296, 297, 298, 299, 300, 0, 301, 302,
- 303, 304, 305, 306, 307, 308, 309, 52, 539, 0,
- 0, 0, 310, 0, 460, 0, 200, 201, 202, 0,
- 64, 53, 54, 55, 203, 204, 205, 206, 207, 208,
- 209, 210, 211, 212, 0, 0, 0, 0, 0, 0,
- 0, 0, 213, 214, 215, 216, 217, 218, 219, 220,
- 221, 222, 0, 223, 224, 225, 226, 227, 228, 296,
- 297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
- 306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 0, 0, 0, 64, 0, 1211, 0, 1212, 296, 297,
- 298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 0, 0, 0, 0, 0, 310, 0,
- 0, 0, 0, 0, 1308, 0, 1309, 296, 297, 298,
- 299, 300, 0, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 0,
- 296, 297, 298, 299, 300, 496, 301, 302, 303, 304,
+ -10, -10, -10, -10, -10, -10, -10, -10, 26, 27,
+ 28, 29, 30, 31, 32, 33, 0, 34, 0, 36,
+ 37, 0, 39, 40, 0, -53, 2, 3, 0, 4,
+ 0, 26, 27, 28, 29, 30, 31, 32, 33, 52,
+ 34, 0, 36, 37, 0, 39, 40, 0, 0, 0,
+ 0, 0, 0, 53, 54, 55, 0, 0, 0, 0,
+ 0, 0, 52, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 53, 54, 55, 0,
+ 0, 26, 27, 28, 29, 30, 31, 32, 33, 0,
+ 34, 0, 36, 37, 0, 39, 40, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 23, 0, 0, 0,
+ 0, 0, 52, 0, 0, 64, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 53, 54, 55, 0,
+ 0, 0, 0, 0, 0, 24, 0, 0, 64, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 0, 34,
+ 35, 36, 37, 38, 39, 40, 0, 534, 0, 41,
+ 42, 43, 44, 45, 46, 47, 199, 48, 49, 50,
+ 51, 52, 0, 0, 0, 0, 0, 0, 0, 0,
+ 539, 0, 0, 0, 0, 53, 54, 55, 64, 0,
+ 0, 0, 0, 0, 56, 0, 57, 58, 59, 60,
+ 61, 62, 63, 296, 297, 298, 299, 300, 0, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
+ 0, 0, 0, 310, 0, 0, 0, 200, 201, 202,
+ 0, 496, 0, 0, 0, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 0, 0, 64, 0, 0,
+ 0, 0, 0, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 0, 223, 224, 225, 226, 227, 228,
+ 296, 297, 298, 299, 300, 0, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
310, 0, 0, 296, 297, 298, 299, 300, 498, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
@@ -1407,9 +1410,9 @@ static const short yytable[] = { 135,
0, 0, 296, 297, 298, 299, 300, 1376, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
0, 0, 310, 0, 0, 296, 297, 298, 299, 300,
- 1489, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 1491, 301, 302, 303, 304, 305, 306, 307, 308, 309,
0, 0, 0, 0, 0, 310, 0, 0, 296, 297,
- 298, 299, 300, 1518, 301, 302, 303, 304, 305, 306,
+ 298, 299, 300, 1520, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 296,
297, 298, 299, 300, 521, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
@@ -1564,85 +1567,85 @@ static const short yytable[] = { 135,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
310, 296, 297, 298, 299, 300, 1372, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 296, 297, 298, 299, 300, 1416, 301, 302,
+ 0, 310, 296, 297, 298, 299, 300, 1417, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 296, 297, 298, 299, 300, 1417, 301,
+ 0, 0, 310, 296, 297, 298, 299, 300, 1418, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 296, 297, 298, 299, 300, 1418,
+ 0, 0, 0, 310, 296, 297, 298, 299, 300, 1419,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
0, 0, 0, 0, 310, 296, 297, 298, 299, 300,
- 1419, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 1420, 301, 302, 303, 304, 305, 306, 307, 308, 309,
0, 0, 0, 0, 0, 310, 296, 297, 298, 299,
- 300, 1420, 301, 302, 303, 304, 305, 306, 307, 308,
+ 300, 1421, 301, 302, 303, 304, 305, 306, 307, 308,
309, 0, 0, 0, 0, 0, 310, 296, 297, 298,
- 299, 300, 1421, 301, 302, 303, 304, 305, 306, 307,
+ 299, 300, 1422, 301, 302, 303, 304, 305, 306, 307,
308, 309, 0, 0, 0, 0, 0, 310, 296, 297,
- 298, 299, 300, 1422, 301, 302, 303, 304, 305, 306,
+ 298, 299, 300, 1423, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 296,
- 297, 298, 299, 300, 1423, 301, 302, 303, 304, 305,
+ 297, 298, 299, 300, 1424, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 296, 297, 298, 299, 300, 1424, 301, 302, 303, 304,
+ 296, 297, 298, 299, 300, 1425, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 296, 297, 298, 299, 300, 1460, 301, 302, 303,
+ 310, 296, 297, 298, 299, 300, 1462, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 296, 297, 298, 299, 300, 1464, 301, 302,
+ 0, 310, 296, 297, 298, 299, 300, 1466, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 296, 297, 298, 299, 300, 1465, 301,
+ 0, 0, 310, 296, 297, 298, 299, 300, 1467, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 296, 297, 298, 299, 300, 1466,
+ 0, 0, 0, 310, 296, 297, 298, 299, 300, 1468,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
0, 0, 0, 0, 310, 296, 297, 298, 299, 300,
- 1467, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 1469, 301, 302, 303, 304, 305, 306, 307, 308, 309,
0, 0, 0, 0, 0, 310, 296, 297, 298, 299,
- 300, 1468, 301, 302, 303, 304, 305, 306, 307, 308,
+ 300, 1470, 301, 302, 303, 304, 305, 306, 307, 308,
309, 0, 0, 0, 0, 0, 310, 296, 297, 298,
- 299, 300, 1469, 301, 302, 303, 304, 305, 306, 307,
+ 299, 300, 1471, 301, 302, 303, 304, 305, 306, 307,
308, 309, 0, 0, 0, 0, 0, 310, 296, 297,
- 298, 299, 300, 1488, 301, 302, 303, 304, 305, 306,
+ 298, 299, 300, 1490, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 296,
- 297, 298, 299, 300, 1493, 301, 302, 303, 304, 305,
+ 297, 298, 299, 300, 1495, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 296, 297, 298, 299, 300, 1494, 301, 302, 303, 304,
+ 296, 297, 298, 299, 300, 1496, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 296, 297, 298, 299, 300, 1495, 301, 302, 303,
+ 310, 296, 297, 298, 299, 300, 1497, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 296, 297, 298, 299, 300, 1496, 301, 302,
+ 0, 310, 296, 297, 298, 299, 300, 1498, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 296, 297, 298, 299, 300, 1497, 301,
+ 0, 0, 310, 296, 297, 298, 299, 300, 1499, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 296, 297, 298, 299, 300, 1498,
+ 0, 0, 0, 310, 296, 297, 298, 299, 300, 1500,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
0, 0, 0, 0, 310, 296, 297, 298, 299, 300,
- 1521, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 1523, 301, 302, 303, 304, 305, 306, 307, 308, 309,
0, 0, 0, 0, 0, 310, 296, 297, 298, 299,
- 300, 1522, 301, 302, 303, 304, 305, 306, 307, 308,
+ 300, 1524, 301, 302, 303, 304, 305, 306, 307, 308,
309, 0, 0, 0, 0, 0, 310, 296, 297, 298,
- 299, 300, 1523, 301, 302, 303, 304, 305, 306, 307,
+ 299, 300, 1525, 301, 302, 303, 304, 305, 306, 307,
308, 309, 0, 0, 0, 0, 0, 310, 296, 297,
- 298, 299, 300, 1524, 301, 302, 303, 304, 305, 306,
+ 298, 299, 300, 1526, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 296,
- 297, 298, 299, 300, 1525, 301, 302, 303, 304, 305,
+ 297, 298, 299, 300, 1527, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 296, 297, 298, 299, 300, 1526, 301, 302, 303, 304,
+ 296, 297, 298, 299, 300, 1528, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 296, 297, 298, 299, 300, 1549, 301, 302, 303,
+ 310, 296, 297, 298, 299, 300, 1551, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 296, 297, 298, 299, 300, 1550, 301, 302,
+ 0, 310, 296, 297, 298, 299, 300, 1552, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 296, 297, 298, 299, 300, 1551, 301,
+ 0, 0, 310, 296, 297, 298, 299, 300, 1553, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 296, 297, 298, 299, 300, 1563,
+ 0, 0, 0, 310, 296, 297, 298, 299, 300, 1565,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
0, 0, 0, 0, 310, 296, 297, 298, 299, 300,
- 1564, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 1566, 301, 302, 303, 304, 305, 306, 307, 308, 309,
0, 0, 0, 0, 0, 310, 296, 297, 298, 299,
- 300, 1565, 301, 302, 303, 304, 305, 306, 307, 308,
+ 300, 1567, 301, 302, 303, 304, 305, 306, 307, 308,
309, 0, 0, 0, 0, 0, 310, 296, 297, 298,
- 299, 300, 1580, 301, 302, 303, 304, 305, 306, 307,
+ 299, 300, 1582, 301, 302, 303, 304, 305, 306, 307,
308, 309, 0, 0, 0, 0, 0, 310, 296, 297,
- 298, 299, 300, 1581, 301, 302, 303, 304, 305, 306,
+ 298, 299, 300, 1583, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 296,
- 297, 298, 299, 300, 1582, 301, 302, 303, 304, 305,
+ 297, 298, 299, 300, 1584, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
0, 0, 0, 466, 296, 297, 298, 299, 300, 0,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
@@ -1709,404 +1712,406 @@ static const short yytable[] = { 135,
0, 0, 0, 0, 310, 0, 0, 0, 1042, 296,
297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 0, 490, 296, 297, 298, 299, 300, 0, 301, 302,
+ 0, 460, 296, 297, 298, 299, 300, 0, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 0, 492, 296, 297, 298, 299, 300,
+ 0, 0, 310, 0, 490, 296, 297, 298, 299, 300,
0, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 0, 0, 0, 0, 0, 310, 0, 493, 296, 297,
+ 0, 0, 0, 0, 0, 310, 0, 492, 296, 297,
298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 0,
- 495, 296, 297, 298, 299, 300, 0, 301, 302, 303,
+ 493, 296, 297, 298, 299, 300, 0, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 0, 499, 296, 297, 298, 299, 300, 0,
+ 0, 310, 0, 495, 296, 297, 298, 299, 300, 0,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
- 0, 0, 0, 0, 310, 0, 500, 296, 297, 298,
+ 0, 0, 0, 0, 310, 0, 499, 296, 297, 298,
299, 300, 0, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 507,
+ 308, 309, 0, 0, 0, 0, 0, 310, 0, 500,
296, 297, 298, 299, 300, 0, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 0, 542, 296, 297, 298, 299, 300, 0, 301,
+ 310, 0, 507, 296, 297, 298, 299, 300, 0, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 0, 543, 296, 297, 298, 299,
+ 0, 0, 0, 310, 0, 542, 296, 297, 298, 299,
300, 0, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 0, 0, 0, 0, 0, 310, 0, 546, 296,
+ 309, 0, 0, 0, 0, 0, 310, 0, 543, 296,
297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 0, 549, 296, 297, 298, 299, 300, 0, 301, 302,
+ 0, 546, 296, 297, 298, 299, 300, 0, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 0, 615, 296, 297, 298, 299, 300,
+ 0, 0, 310, 0, 549, 296, 297, 298, 299, 300,
0, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 0, 0, 0, 0, 0, 310, 0, 617, 296, 297,
+ 0, 0, 0, 0, 0, 310, 0, 615, 296, 297,
298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 0,
- 619, 296, 297, 298, 299, 300, 0, 301, 302, 303,
+ 617, 296, 297, 298, 299, 300, 0, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 0, 621, 296, 297, 298, 299, 300, 0,
+ 0, 310, 0, 619, 296, 297, 298, 299, 300, 0,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
- 0, 0, 0, 0, 310, 0, 623, 296, 297, 298,
+ 0, 0, 0, 0, 310, 0, 621, 296, 297, 298,
299, 300, 0, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 625,
+ 308, 309, 0, 0, 0, 0, 0, 310, 0, 623,
296, 297, 298, 299, 300, 0, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 0, 627, 296, 297, 298, 299, 300, 0, 301,
+ 310, 0, 625, 296, 297, 298, 299, 300, 0, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 0, 629, 296, 297, 298, 299,
+ 0, 0, 0, 310, 0, 627, 296, 297, 298, 299,
300, 0, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 0, 0, 0, 0, 0, 310, 0, 631, 296,
+ 309, 0, 0, 0, 0, 0, 310, 0, 629, 296,
297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 0, 633, 296, 297, 298, 299, 300, 0, 301, 302,
+ 0, 631, 296, 297, 298, 299, 300, 0, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 0, 635, 296, 297, 298, 299, 300,
+ 0, 0, 310, 0, 633, 296, 297, 298, 299, 300,
0, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 0, 0, 0, 0, 0, 310, 0, 639, 296, 297,
+ 0, 0, 0, 0, 0, 310, 0, 635, 296, 297,
298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 0,
- 641, 296, 297, 298, 299, 300, 0, 301, 302, 303,
+ 639, 296, 297, 298, 299, 300, 0, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 0, 643, 296, 297, 298, 299, 300, 0,
+ 0, 310, 0, 641, 296, 297, 298, 299, 300, 0,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
- 0, 0, 0, 0, 310, 0, 645, 296, 297, 298,
+ 0, 0, 0, 0, 310, 0, 643, 296, 297, 298,
299, 300, 0, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 647,
+ 308, 309, 0, 0, 0, 0, 0, 310, 0, 645,
296, 297, 298, 299, 300, 0, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 0, 649, 296, 297, 298, 299, 300, 0, 301,
+ 310, 0, 647, 296, 297, 298, 299, 300, 0, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 0, 683, 296, 297, 298, 299,
+ 0, 0, 0, 310, 0, 649, 296, 297, 298, 299,
300, 0, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 0, 0, 0, 0, 0, 310, 0, 686, 296,
+ 309, 0, 0, 0, 0, 0, 310, 0, 683, 296,
297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 0, 699, 296, 297, 298, 299, 300, 0, 301, 302,
+ 0, 686, 296, 297, 298, 299, 300, 0, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 0, 700, 296, 297, 298, 299, 300,
+ 0, 0, 310, 0, 699, 296, 297, 298, 299, 300,
0, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 0, 0, 0, 0, 0, 310, 0, 704, 296, 297,
+ 0, 0, 0, 0, 0, 310, 0, 700, 296, 297,
298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 0,
- 705, 296, 297, 298, 299, 300, 0, 301, 302, 303,
+ 704, 296, 297, 298, 299, 300, 0, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 0, 706, 296, 297, 298, 299, 300, 0,
+ 0, 310, 0, 705, 296, 297, 298, 299, 300, 0,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
- 0, 0, 0, 0, 310, 0, 707, 296, 297, 298,
+ 0, 0, 0, 0, 310, 0, 706, 296, 297, 298,
299, 300, 0, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 708,
+ 308, 309, 0, 0, 0, 0, 0, 310, 0, 707,
296, 297, 298, 299, 300, 0, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 0, 726, 296, 297, 298, 299, 300, 0, 301,
+ 310, 0, 708, 296, 297, 298, 299, 300, 0, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 0, 730, 296, 297, 298, 299,
+ 0, 0, 0, 310, 0, 726, 296, 297, 298, 299,
300, 0, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 0, 0, 0, 0, 0, 310, 0, 913, 296,
+ 309, 0, 0, 0, 0, 0, 310, 0, 730, 296,
297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 0, 915, 296, 297, 298, 299, 300, 0, 301, 302,
+ 0, 913, 296, 297, 298, 299, 300, 0, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 0, 917, 296, 297, 298, 299, 300,
+ 0, 0, 310, 0, 915, 296, 297, 298, 299, 300,
0, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 0, 0, 0, 0, 0, 310, 0, 919, 296, 297,
+ 0, 0, 0, 0, 0, 310, 0, 917, 296, 297,
298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 0,
- 980, 296, 297, 298, 299, 300, 0, 301, 302, 303,
+ 919, 296, 297, 298, 299, 300, 0, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 0, 1067, 296, 297, 298, 299, 300, 0,
+ 0, 310, 0, 980, 296, 297, 298, 299, 300, 0,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
- 0, 0, 0, 0, 310, 0, 1089, 296, 297, 298,
+ 0, 0, 0, 0, 310, 0, 1067, 296, 297, 298,
299, 300, 0, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 1177,
+ 308, 309, 0, 0, 0, 0, 0, 310, 0, 1089,
296, 297, 298, 299, 300, 0, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 0, 1181, 296, 297, 298, 299, 300, 0, 301,
+ 310, 0, 1177, 296, 297, 298, 299, 300, 0, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 0, 1183, 296, 297, 298, 299,
+ 0, 0, 0, 310, 0, 1181, 296, 297, 298, 299,
300, 0, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 0, 0, 0, 0, 0, 310, 0, 1290, 296,
+ 309, 0, 0, 0, 0, 0, 310, 0, 1183, 296,
297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 0, 1292, 296, 297, 298, 299, 300, 0, 301, 302,
+ 0, 1290, 296, 297, 298, 299, 300, 0, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 0, 1294, 296, 297, 298, 299, 300,
+ 0, 0, 310, 0, 1292, 296, 297, 298, 299, 300,
0, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 0, 0, 0, 0, 0, 310, 0, 1305, 296, 297,
+ 0, 0, 0, 0, 0, 310, 0, 1294, 296, 297,
298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 0,
- 1306, 296, 297, 298, 299, 300, 0, 301, 302, 303,
+ 1305, 296, 297, 298, 299, 300, 0, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310, 0, 1307, 296, 297, 298, 299, 300, 0,
+ 0, 310, 0, 1306, 296, 297, 298, 299, 300, 0,
301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
- 0, 0, 0, 0, 310, 0, 1470, 296, 297, 298,
+ 0, 0, 0, 0, 310, 0, 1307, 296, 297, 298,
299, 300, 0, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 0, 0, 0, 0, 0, 310, 0, 1471,
+ 308, 309, 0, 0, 0, 0, 0, 310, 0, 1472,
296, 297, 298, 299, 300, 0, 301, 302, 303, 304,
305, 306, 307, 308, 309, 0, 0, 0, 0, 0,
- 310, 0, 1472, 296, 297, 298, 299, 300, 0, 301,
+ 310, 0, 1473, 296, 297, 298, 299, 300, 0, 301,
302, 303, 304, 305, 306, 307, 308, 309, 0, 0,
- 0, 0, 0, 310, 0, 1552, 296, 297, 298, 299,
+ 0, 0, 0, 310, 0, 1474, 296, 297, 298, 299,
300, 0, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 0, 0, 0, 0, 0, 310, 0, 1553, 296,
+ 309, 0, 0, 0, 0, 0, 310, 0, 1554, 296,
297, 298, 299, 300, 0, 301, 302, 303, 304, 305,
306, 307, 308, 309, 0, 0, 0, 0, 0, 310,
- 0, 1554, 296, 297, 298, 299, 300, 0, 301, 302,
+ 0, 1555, 296, 297, 298, 299, 300, 0, 301, 302,
303, 304, 305, 306, 307, 308, 309, 0, 0, 0,
- 0, 0, 310, 0, 1600, 296, 297, 298, 299, 300,
+ 0, 0, 310, 0, 1556, 296, 297, 298, 299, 300,
0, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 0, 0, 0, 0, 0, 310, 0, 1601, 296, 297,
+ 0, 0, 0, 0, 0, 310, 0, 1602, 296, 297,
298, 299, 300, 0, 301, 302, 303, 304, 305, 306,
307, 308, 309, 0, 0, 0, 0, 0, 310, 0,
- 1602, 296, 297, 298, 299, 300, 0, 301, 302, 303,
+ 1603, 296, 297, 298, 299, 300, 0, 301, 302, 303,
304, 305, 306, 307, 308, 309, 0, 0, 0, 0,
- 0, 310
+ 0, 310, 0, 1604, 296, 297, 298, 299, 300, 0,
+ 301, 302, 303, 304, 305, 306, 307, 308, 309, 0,
+ 0, 0, 0, 0, 310
};
static const short yycheck[] = { 23,
- 23, 997, 88, 290, 351, 280, 281, 282, 804, 1158,
- 1006, 326, 4, 4, 44, 4, 3, 1013, 4, 3,
- 4, 1217, 7, 42, 1220, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 6,
- 6, 1081, 4, 64, 87, 288, 65, 6, 5, 65,
- 38, 70, 4, 41, 70, 169, 170, 65, 65, 169,
- 170, 64, 70, 70, 169, 170, 150, 181, 169, 170,
- 80, 4, 4, 5, 176, 177, 186, 34, 35, 36,
- 185, 180, 187, 326, 185, 6, 187, 186, 169, 170,
- 49, 125, 126, 127, 169, 170, 130, 131, 7, 133,
- 101, 6, 34, 35, 36, 186, 140, 141, 142, 143,
- 185, 145, 146, 180, 148, 149, 150, 180, 152, 169,
- 170, 41, 42, 186, 44, 165, 166, 167, 90, 91,
- 936, 1171, 6, 173, 168, 169, 186, 180, 90, 91,
- 181, 6, 169, 170, 185, 7, 169, 170, 171, 172,
- 173, 180, 186, 187, 181, 189, 179, 191, 192, 180,
- 155, 156, 157, 158, 489, 186, 1172, 6, 187, 466,
- 1176, 187, 1378, 170, 1380, 169, 170, 7, 503, 187,
- 187, 175, 467, 186, 186, 186, 180, 186, 198, 183,
- 186, 7, 186, 1352, 38, 1354, 236, 41, 42, 233,
- 44, 6, 169, 170, 238, 239, 240, 241, 242, 243,
+ 23, 290, 88, 1158, 351, 280, 281, 282, 804, 4,
+ 7, 4, 326, 4, 44, 42, 64, 64, 4, 65,
+ 4, 3, 7, 1081, 70, 65, 65, 65, 4, 6,
+ 70, 70, 70, 997, 7, 180, 87, 182, 169, 170,
+ 169, 170, 1006, 4, 5, 65, 180, 6, 5, 1013,
+ 70, 180, 186, 6, 185, 288, 187, 186, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 4, 150, 49, 34, 35, 36, 7, 34, 35, 36,
+ 80, 169, 170, 6, 169, 170, 180, 169, 170, 169,
+ 170, 180, 186, 326, 6, 169, 170, 185, 6, 187,
+ 185, 125, 126, 127, 186, 185, 130, 131, 101, 133,
+ 6, 7, 186, 1171, 90, 91, 140, 141, 142, 143,
+ 38, 145, 146, 41, 148, 149, 150, 1217, 152, 180,
+ 1220, 180, 180, 169, 170, 165, 166, 167, 186, 186,
+ 936, 187, 177, 173, 168, 169, 181, 187, 187, 187,
+ 186, 41, 42, 180, 44, 7, 90, 91, 155, 156,
+ 157, 158, 186, 187, 180, 189, 182, 191, 192, 180,
+ 155, 156, 157, 158, 187, 489, 180, 466, 182, 176,
+ 177, 6, 155, 156, 157, 158, 6, 184, 170, 503,
+ 6, 186, 467, 186, 6, 186, 180, 1352, 198, 1354,
+ 186, 8, 180, 176, 177, 180, 236, 182, 1172, 233,
+ 169, 170, 1176, 180, 238, 239, 240, 241, 242, 243,
244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
- 274, 275, 276, 277, 278, 279, 489, 180, 169, 170,
- 176, 177, 55, 56, 288, 177, 182, 290, 184, 181,
- 503, 180, 296, 297, 298, 299, 300, 301, 302, 303,
- 304, 305, 306, 307, 308, 309, 310, 65, 1284, 1285,
- 1286, 1287, 70, 317, 181, 1291, 320, 180, 185, 182,
- 3, 325, 326, 155, 156, 157, 158, 331, 332, 333,
- 180, 335, 336, 337, 338, 339, 340, 341, 348, 349,
- 176, 177, 169, 170, 176, 177, 182, 180, 184, 353,
- 354, 355, 184, 180, 358, 155, 156, 157, 158, 186,
- 181, 180, 366, 1139, 185, 660, 46, 6, 372, 155,
- 156, 157, 158, 169, 170, 180, 176, 177, 180, 169,
- 170, 180, 1358, 1359, 169, 170, 1362, 169, 170, 185,
- 176, 177, 169, 170, 181, 185, 691, 187, 185, 180,
- 185, 8, 44, 185, 3, 4, 661, 410, 185, 42,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 42, 6, 1412, 120, 121, 122,
- 123, 124, 125, 126, 127, 169, 170, 660, 171, 172,
- 173, 664, 42, 181, 176, 177, 179, 185, 462, 180,
- 182, 185, 184, 466, 468, 8, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 691, 176,
- 177, 186, 180, 54, 182, 489, 1462, 184, 58, 59,
- 60, 61, 38, 63, 181, 41, 42, 501, 185, 503,
- 186, 505, 506, 180, 180, 182, 182, 511, 6, 7,
- 520, 105, 106, 107, 108, 109, 1492, 521, 522, 180,
- 180, 182, 182, 180, 186, 182, 530, 42, 823, 796,
- 797, 6, 180, 537, 182, 180, 180, 182, 182, 6,
- 180, 151, 182, 547, 548, 180, 156, 182, 180, 180,
- 182, 182, 159, 160, 161, 162, 163, 180, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 180, 178, 182,
- 169, 170, 179, 6, 184, 185, 175, 180, 180, 182,
- 187, 180, 187, 180, 587, 182, 4, 186, 159, 160,
- 161, 162, 163, 180, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 1579, 180, 180, 182, 182, 179, 4,
- 823, 180, 180, 182, 182, 42, 159, 160, 161, 162,
- 163, 3, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 6, 7, 637, 638, 182, 179, 184, 181, 5,
- 180, 185, 969, 187, 185, 180, 187, 651, 652, 653,
- 654, 655, 656, 657, 6, 185, 660, 187, 180, 185,
- 664, 187, 185, 667, 187, 185, 185, 187, 187, 679,
- 180, 926, 676, 161, 162, 163, 6, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 5, 691, 692, 186,
- 185, 179, 187, 185, 185, 187, 187, 180, 764, 185,
- 180, 187, 6, 185, 4, 187, 716, 717, 718, 185,
- 965, 187, 185, 185, 187, 187, 180, 721, 722, 182,
- 185, 725, 187, 180, 185, 735, 187, 186, 186, 733,
+ 274, 275, 276, 277, 278, 279, 489, 169, 170, 169,
+ 170, 176, 177, 180, 288, 182, 180, 290, 182, 184,
+ 503, 181, 296, 297, 298, 299, 300, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 180, 1378, 182,
+ 1380, 176, 177, 317, 169, 170, 320, 182, 180, 184,
+ 182, 325, 326, 155, 156, 157, 158, 331, 332, 333,
+ 185, 335, 336, 337, 338, 339, 340, 341, 348, 349,
+ 1284, 1285, 1286, 1287, 176, 177, 180, 1291, 181, 353,
+ 354, 355, 185, 3, 358, 169, 170, 169, 170, 176,
+ 177, 180, 366, 1139, 180, 182, 660, 184, 372, 181,
+ 180, 185, 159, 160, 161, 162, 163, 46, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 169, 170, 180,
+ 44, 182, 179, 169, 170, 169, 170, 691, 6, 180,
+ 187, 182, 42, 185, 181, 187, 661, 410, 185, 185,
+ 180, 185, 182, 42, 1358, 1359, 3, 4, 1362, 180,
+ 42, 182, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 54, 660, 171, 172,
+ 173, 664, 186, 181, 8, 180, 179, 185, 462, 176,
+ 177, 42, 181, 466, 468, 182, 185, 184, 186, 1413,
+ 120, 121, 122, 123, 124, 125, 126, 127, 691, 186,
+ 159, 160, 161, 162, 163, 489, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 6, 180, 501, 182, 503,
+ 179, 505, 506, 176, 177, 181, 185, 511, 187, 185,
+ 520, 169, 170, 171, 172, 173, 6, 521, 522, 38,
+ 1464, 179, 41, 42, 180, 44, 530, 796, 797, 823,
+ 182, 180, 184, 537, 58, 59, 60, 61, 181, 63,
+ 6, 151, 185, 547, 548, 38, 156, 180, 41, 42,
+ 1494, 159, 160, 161, 162, 163, 4, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 4, 180, 178, 182,
+ 185, 179, 187, 42, 184, 185, 105, 106, 107, 108,
+ 109, 3, 169, 170, 587, 180, 180, 182, 175, 180,
+ 180, 182, 182, 180, 5, 180, 183, 182, 180, 186,
+ 182, 180, 180, 182, 182, 159, 160, 161, 162, 163,
+ 823, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 185, 180, 187, 6, 185, 179, 187, 181, 185, 185,
+ 187, 187, 180, 637, 638, 180, 185, 1581, 187, 185,
+ 6, 187, 969, 185, 185, 187, 187, 651, 652, 653,
+ 654, 655, 656, 657, 6, 185, 660, 187, 5, 185,
+ 664, 187, 185, 667, 187, 185, 180, 187, 185, 679,
+ 187, 926, 676, 55, 56, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 691, 692, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 764, 185,
+ 180, 187, 6, 179, 6, 7, 716, 717, 718, 186,
+ 965, 185, 185, 187, 187, 186, 180, 721, 722, 186,
+ 185, 725, 187, 180, 185, 735, 187, 180, 4, 733,
734, 3, 4, 185, 744, 187, 180, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 185, 6, 187, 768, 769, 770, 771, 772, 773,
- 774, 775, 776, 777, 778, 779, 180, 180, 180, 180,
- 186, 6, 93, 6, 38, 39, 40, 41, 42, 43,
- 44, 45, 186, 47, 797, 49, 50, 186, 52, 53,
- 180, 805, 180, 807, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 180, 5, 69, 180, 180, 179, 823,
- 180, 825, 180, 827, 1151, 180, 180, 180, 185, 83,
- 84, 85, 180, 180, 180, 180, 180, 841, 842, 843,
- 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
- 4, 461, 180, 857, 858, 159, 160, 161, 162, 163,
+ 32, 180, 180, 180, 768, 769, 770, 771, 772, 773,
+ 774, 775, 776, 777, 778, 779, 159, 160, 161, 162,
+ 163, 6, 165, 166, 167, 168, 169, 170, 171, 172,
+ 173, 187, 186, 186, 797, 186, 179, 182, 6, 93,
+ 6, 805, 180, 807, 161, 162, 163, 180, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 180, 180, 823,
+ 180, 825, 179, 827, 1151, 162, 163, 180, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 841, 842, 843,
+ 180, 180, 179, 5, 180, 180, 180, 180, 180, 180,
+ 180, 461, 180, 857, 858, 159, 160, 161, 162, 163,
180, 165, 166, 167, 168, 169, 170, 171, 172, 173,
- 180, 180, 180, 180, 7, 179, 181, 179, 7, 185,
- 7, 861, 7, 184, 181, 7, 7, 88, 186, 6,
- 151, 145, 5, 5, 5, 5, 899, 169, 170, 5,
- 5, 5, 5, 175, 5, 5, 5, 5, 180, 5,
+ 180, 180, 180, 180, 180, 179, 181, 180, 4, 180,
+ 180, 861, 180, 180, 180, 180, 185, 180, 180, 6,
+ 179, 7, 7, 7, 185, 7, 899, 169, 170, 184,
+ 181, 7, 7, 175, 88, 151, 186, 5, 180, 5,
5, 183, 5, 5, 186, 5, 5, 5, 5, 5,
- 5, 5, 138, 927, 5, 5, 5, 5, 3, 5,
- 185, 941, 5, 187, 159, 160, 161, 162, 163, 6,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 5,
- 181, 955, 956, 1019, 179, 6, 4, 6, 184, 6,
- 970, 965, 972, 7, 974, 7, 7, 7, 6, 6,
- 187, 7, 976, 977, 7, 7, 187, 186, 186, 7,
- 7, 180, 7, 987, 162, 163, 990, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 1000, 152, 185, 185,
- 185, 179, 185, 1007, 1008, 1009, 185, 5, 988, 185,
+ 5, 5, 5, 927, 5, 5, 5, 5, 5, 5,
+ 5, 941, 5, 5, 159, 160, 161, 162, 163, 5,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 138,
+ 5, 955, 956, 1019, 179, 5, 5, 5, 3, 5,
+ 970, 965, 972, 5, 974, 6, 5, 185, 181, 6,
+ 4, 6, 976, 977, 7, 6, 187, 7, 7, 7,
+ 6, 6, 184, 987, 7, 7, 990, 7, 187, 186,
+ 186, 7, 7, 180, 7, 152, 1000, 185, 5, 185,
+ 185, 181, 185, 1007, 1008, 1009, 185, 185, 988, 185,
1014, 185, 185, 185, 1018, 185, 185, 185, 1022, 1023,
1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033,
- 6, 4, 185, 185, 185, 185, 185, 185, 185, 185,
+ 185, 185, 185, 185, 185, 185, 185, 185, 185, 185,
1044, 185, 159, 160, 161, 162, 163, 1051, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 185, 181, 185,
- 6, 185, 179, 6, 1068, 185, 185, 185, 6, 185,
- 185, 681, 682, 180, 684, 183, 185, 6, 688, 689,
- 3, 4, 7, 1087, 6, 182, 9, 10, 11, 12,
+ 167, 168, 169, 170, 171, 172, 173, 185, 185, 180,
+ 185, 185, 179, 185, 1068, 185, 185, 180, 6, 180,
+ 180, 681, 682, 180, 684, 6, 180, 6, 688, 689,
+ 3, 4, 4, 1087, 183, 6, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 7, 1091, 180, 723, 724, 185, 180, 727, 180, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 741, 742, 7, 180, 180, 186, 747, 748, 7,
- 7, 180, 7, 7, 754, 180, 756, 7, 7, 180,
- 1154, 1155, 7, 1157, 180, 1159, 1160, 180, 180, 7,
- 7, 7, 1166, 4, 6, 148, 3, 7, 7, 3,
- 1174, 3, 171, 3, 3, 3, 3, 3, 1182, 3,
- 3, 3, 3, 1187, 3, 3, 1190, 3, 1192, 1193,
+ 180, 1091, 180, 723, 724, 180, 180, 727, 180, 180,
+ 6, 4, 7, 182, 6, 4, 7, 7, 186, 7,
+ 7, 741, 742, 7, 7, 7, 7, 747, 748, 7,
+ 7, 7, 7, 6, 754, 7, 756, 7, 148, 3,
+ 1154, 1155, 3, 1157, 3, 1159, 1160, 171, 3, 3,
+ 3, 3, 1166, 3, 3, 3, 3, 3, 3, 3,
+ 1174, 181, 5, 5, 3, 3, 6, 181, 1182, 184,
+ 7, 184, 6, 1187, 6, 6, 1190, 6, 1192, 1193,
1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203,
- 5, 5, 3, 6, 1208, 4, 816, 1211, 818, 181,
- 181, 7, 6, 6, 184, 184, 6, 6, 828, 829,
- 830, 6, 186, 833, 834, 835, 836, 837, 838, 839,
- 159, 160, 161, 162, 163, 187, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 6, 169, 170, 6, 1229,
- 179, 89, 175, 186, 185, 185, 6, 180, 185, 185,
- 183, 3, 4, 186, 181, 181, 181, 9, 10, 11,
+ 6, 186, 6, 6, 1208, 89, 816, 1211, 818, 186,
+ 185, 185, 181, 185, 181, 185, 181, 185, 828, 829,
+ 830, 185, 185, 833, 834, 835, 836, 837, 838, 839,
+ 159, 160, 161, 162, 163, 181, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 181, 169, 170, 185, 1229,
+ 179, 185, 175, 185, 6, 185, 181, 180, 185, 185,
+ 183, 3, 4, 186, 181, 185, 185, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 185, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303,
- 1304, 185, 185, 1283, 1308, 181, 181, 185, 185, 6,
- 3, 4, 5, 185, 185, 925, 9, 10, 11, 12,
+ 1304, 6, 4, 1283, 1308, 6, 90, 6, 6, 185,
+ 3, 4, 5, 7, 184, 925, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 185, 34, 35, 36, 4, 1325, 181, 6, 6, 185,
- 90, 6, 185, 6, 185, 6, 181, 6, 6, 6,
+ 6, 34, 35, 36, 185, 1325, 6, 6, 6, 6,
+ 6, 6, 6, 6, 185, 6, 6, 6, 183, 185,
1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373,
- 1374, 1375, 185, 185, 984, 6, 159, 160, 161, 162,
- 163, 991, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 6, 6, 185, 185, 6, 179, 185, 184, 183,
- 1010, 6, 185, 1383, 187, 6, 1410, 6, 6, 6,
- 89, 7, 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423,
- 1424, 1425, 3, 1427, 6, 1429, 3, 169, 170, 3,
- 6, 1411, 171, 175, 6, 6, 6, 6, 180, 159,
- 160, 161, 162, 163, 186, 165, 166, 167, 168, 169,
- 170, 171, 172, 173, 3, 1459, 1460, 1437, 6, 179,
- 1464, 1465, 1466, 1467, 1468, 1469, 6, 187, 3, 6,
- 3, 3, 3, 7, 4, 184, 169, 170, 6, 6,
- 6, 6, 175, 184, 1488, 183, 6, 180, 187, 1493,
- 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 186, 186,
- 186, 186, 86, 181, 185, 185, 181, 4, 185, 185,
- 181, 185, 181, 185, 181, 181, 181, 1521, 1522, 1523,
- 1524, 1525, 1526, 1527, 185, 1529, 91, 1531, 159, 160,
- 161, 162, 163, 185, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 181, 89, 1549, 1550, 1551, 179, 6,
- 3, 6, 6, 1163, 148, 1165, 3, 6, 1168, 1563,
- 1564, 1565, 1566, 1567, 1568, 6, 6, 6, 6, 6,
- 6, 3, 6, 6, 1184, 5, 1580, 1581, 1582, 1583,
- 5, 1585, 6, 1587, 187, 187, 186, 159, 160, 161,
- 162, 163, 185, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, 185, 1607, 1608, 1609, 186, 179, 181, 6,
- 185, 6, 1616, 181, 1618, 181, 1620, 3, 4, 5,
- 5, 7, 185, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 185, 34, 35,
- 36, 6, 6, 6, 6, 6, 185, 6, 6, 6,
- 6, 185, 1272, 6, 6, 3, 4, 6, 5, 1279,
- 1280, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 3, 4, 186, 185, 187,
- 186, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 1374, 1375, 6, 89, 984, 3, 6, 6, 3, 6,
+ 171, 991, 159, 160, 161, 162, 163, 6, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 6, 3, 6,
+ 1010, 3, 179, 1383, 3, 6, 6, 1411, 185, 6,
+ 187, 3, 3, 1417, 1418, 1419, 1420, 1421, 1422, 1423,
+ 1424, 1425, 1426, 3, 1428, 6, 1430, 169, 170, 4,
+ 6, 184, 1412, 175, 6, 6, 184, 7, 180, 6,
+ 183, 6, 186, 86, 186, 181, 187, 186, 186, 186,
+ 185, 185, 185, 181, 185, 185, 181, 1461, 1462, 1439,
+ 181, 185, 1466, 1467, 1468, 1469, 1470, 1471, 181, 181,
+ 185, 181, 181, 91, 185, 4, 169, 170, 89, 148,
+ 6, 3, 175, 6, 3, 6, 1490, 180, 6, 6,
+ 6, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503,
+ 6, 6, 6, 3, 6, 6, 5, 5, 187, 6,
+ 186, 186, 185, 187, 185, 185, 181, 185, 181, 1523,
+ 1524, 1525, 1526, 1527, 1528, 1529, 6, 1531, 6, 1533,
+ 159, 160, 161, 162, 163, 181, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 185, 185, 1551, 1552, 1553,
+ 179, 6, 185, 1163, 6, 1165, 6, 6, 1168, 6,
+ 6, 1565, 1566, 1567, 1568, 1569, 1570, 6, 6, 6,
+ 6, 6, 6, 5, 1184, 5, 186, 185, 1582, 1583,
+ 1584, 1585, 186, 1587, 187, 1589, 181, 185, 159, 160,
+ 161, 162, 163, 181, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 185, 86, 1609, 1610, 1611, 179, 186,
+ 148, 185, 185, 6, 1618, 6, 1620, 6, 1622, 3,
+ 4, 185, 5, 186, 186, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 185,
+ 5, 185, 187, 186, 6, 185, 181, 181, 6, 187,
+ 6, 6, 1272, 86, 6, 6, 6, 6, 6, 1279,
+ 1280, 3, 4, 5, 187, 7, 6, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 186, 34, 35, 36, 3, 4, 6, 185, 185,
+ 153, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 185, 159, 160, 161, 162,
- 163, 6, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 185, 185, 1353, 186, 1355, 179, 148, 6, 6,
- 181, 186, 181, 86, 5, 5, 86, 6, 185, 185,
- 6, 6, 6, 186, 185, 185, 181, 185, 187, 155,
- 156, 157, 158, 186, 185, 181, 6, 187, 6, 6,
- 6, 6, 6, 169, 170, 187, 186, 185, 6, 175,
- 176, 177, 185, 153, 180, 154, 182, 1407, 184, 3,
- 4, 185, 185, 1413, 186, 9, 10, 11, 12, 13,
+ 28, 29, 30, 31, 32, 6, 154, 185, 6, 181,
+ 3, 4, 186, 1353, 185, 1355, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 159, 160, 161, 162, 163, 186, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 169, 170, 186, 185, 6,
+ 179, 175, 6, 6, 6, 6, 180, 1407, 185, 185,
+ 6, 186, 186, 185, 1414, 186, 186, 159, 160, 161,
+ 162, 163, 6, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 6, 155, 156, 157, 158, 179, 6, 6,
+ 181, 6, 186, 186, 6, 6, 186, 169, 170, 0,
+ 0, 7, 589, 175, 176, 177, 982, -1, 180, 7,
+ 182, 8, 184, 7, -1, 1465, 930, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 8, -1, -1, -1,
+ -1, 169, 170, -1, -1, -1, -1, 175, -1, -1,
+ -1, 8, 180, 1493, -1, -1, -1, -1, 159, 160,
+ 161, 162, 163, -1, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 8, -1, -1, 169, 170, 179, -1,
+ -1, 1521, 175, -1, -1, -1, -1, 180, 8, 159,
+ 160, 161, 162, 163, -1, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, -1, -1, -1, -1, -1, 179,
+ 1550, -1, -1, -1, -1, 185, -1, 187, -1, 3,
+ 4, -1, -1, -1, 1564, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 6,
- 186, 169, 170, 6, 6, 6, 186, 175, 6, 6,
- 185, 181, 180, 6, 185, 6, 8, 6, 6, 185,
- 181, 186, 186, 1463, 186, 6, 185, 6, 186, 186,
- 186, 169, 170, 6, 6, 0, 0, 175, 8, 7,
- 589, 7, 180, 930, 7, -1, -1, -1, -1, -1,
- 982, 1491, -1, 8, 159, 160, 161, 162, 163, -1,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, -1,
- -1, -1, -1, -1, 179, 8, -1, -1, -1, 1519,
- 159, 160, 161, 162, 163, -1, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, -1, 8, -1, -1, -1,
- 179, -1, -1, 159, 160, 161, 162, 163, 1548, 165,
- 166, 167, 168, 169, 170, 171, 172, 173, -1, -1,
- -1, -1, 1562, 179, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 169, 170, -1, -1, -1,
- -1, 175, -1, -1, -1, -1, 180, -1, -1, -1,
- -1, -1, 159, 160, 161, 162, 163, -1, 165, 166,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, -1,
+ -1, 159, 160, 161, 162, 163, -1, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, -1, -1, -1, -1,
+ -1, 179, 159, 160, 161, 162, 163, -1, 165, 166,
167, 168, 169, 170, 171, 172, 173, 159, 160, 161,
162, 163, 179, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, -1, -1, -1, -1, -1, 179, -1, 159,
- 160, 161, 162, 163, -1, 165, 166, 167, 168, 169,
- 170, 171, 172, 173, 159, 160, 161, 162, 163, 179,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, -1,
- -1, -1, -1, -1, 179, -1, 159, 160, 161, 162,
- 163, -1, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 0, 1, -1, 3, 4, 179, 159, 160, 161,
- 162, 163, -1, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, -1, -1, -1, -1, -1, 179, -1, -1,
- -1, -1, -1, -1, 33, -1, -1, -1, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, -1, 47, 48,
- 49, 50, 51, 52, 53, -1, -1, -1, 57, 58,
- 59, 60, 61, 62, 63, -1, 65, 66, 67, 68,
- 69, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 83, 84, 85, -1, -1, -1,
- -1, -1, -1, 92, -1, 94, 95, 96, 97, 98,
- 99, 100, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 120, 121, 122, 123, 124, 125, 126, 127, 38,
- 39, 40, 41, 42, 43, 44, 45, -1, 47, -1,
- 49, 50, -1, 52, 53, -1, 145, 146, 147, 4,
- 149, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 69, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 83, 84, 85, -1, 33, -1,
- -1, -1, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, -1, 47, 48, 49, 50, 51, 52, 53, -1,
- -1, -1, 57, 58, 59, 60, 61, 62, 63, -1,
- 65, 66, 67, 68, 69, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 41, -1, -1, 83, 84,
- 85, -1, -1, -1, -1, -1, 145, 92, -1, 94,
- 95, 96, 97, 98, 99, 100, 38, 39, 40, 41,
- 42, 43, 44, 45, -1, 47, -1, 49, 50, -1,
- 52, 53, 159, 160, 161, 162, 163, -1, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 69, 187, -1,
- -1, -1, 179, -1, 181, -1, 102, 103, 104, -1,
- 145, 83, 84, 85, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, -1, -1, -1, -1, -1, -1,
- -1, -1, 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, -1, 139, 140, 141, 142, 143, 144, 159,
- 160, 161, 162, 163, -1, 165, 166, 167, 168, 169,
+ 172, 173, 159, 160, 161, 162, 163, 179, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, -1, -1, -1,
+ -1, -1, 179, -1, 159, 160, 161, 162, 163, -1,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 159,
+ 160, 161, 162, 163, 179, 165, 166, 167, 168, 169,
170, 171, 172, 173, -1, -1, -1, -1, -1, 179,
- -1, -1, -1, 145, -1, 185, -1, 187, 159, 160,
- 161, 162, 163, -1, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, -1, -1, -1, -1, -1, 179, -1,
- -1, -1, -1, -1, 185, -1, 187, 159, 160, 161,
+ 0, 1, -1, 3, 4, -1, -1, 159, 160, 161,
162, 163, -1, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, -1, -1, -1, -1, -1, 179, -1, -1,
- 159, 160, 161, 162, 163, 187, 165, 166, 167, 168,
+ 172, 173, -1, -1, -1, 169, 170, 179, -1, -1,
+ -1, 175, -1, 33, -1, 187, 180, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, -1, 47, 48, 49,
+ 50, 51, 52, 53, -1, -1, -1, 57, 58, 59,
+ 60, 61, 62, 63, -1, 65, 66, 67, 68, 69,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 83, 84, 85, -1, -1, -1, -1,
+ -1, -1, 92, -1, 94, 95, 96, 97, 98, 99,
+ 100, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 120, 121, 122, 123, 124, 125, 126, 127, 38, 39,
+ 40, 41, 42, 43, 44, 45, -1, 47, -1, 49,
+ 50, -1, 52, 53, -1, 145, 146, 147, -1, 149,
+ -1, 38, 39, 40, 41, 42, 43, 44, 45, 69,
+ 47, -1, 49, 50, -1, 52, 53, -1, -1, -1,
+ -1, -1, -1, 83, 84, 85, -1, -1, -1, -1,
+ -1, -1, 69, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 83, 84, 85, -1,
+ -1, 38, 39, 40, 41, 42, 43, 44, 45, -1,
+ 47, -1, 49, 50, -1, 52, 53, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 4, -1, -1, -1,
+ -1, -1, 69, -1, -1, 145, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 83, 84, 85, -1,
+ -1, -1, -1, -1, -1, 33, -1, -1, 145, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, -1, 47,
+ 48, 49, 50, 51, 52, 53, -1, 187, -1, 57,
+ 58, 59, 60, 61, 62, 63, 41, 65, 66, 67,
+ 68, 69, -1, -1, -1, -1, -1, -1, -1, -1,
+ 187, -1, -1, -1, -1, 83, 84, 85, 145, -1,
+ -1, -1, -1, -1, 92, -1, 94, 95, 96, 97,
+ 98, 99, 100, 159, 160, 161, 162, 163, -1, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, -1, -1,
+ -1, -1, -1, 179, -1, -1, -1, 102, 103, 104,
+ -1, 187, -1, -1, -1, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, -1, -1, 145, -1, -1,
+ -1, -1, -1, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, -1, 139, 140, 141, 142, 143, 144,
+ 159, 160, 161, 162, 163, -1, 165, 166, 167, 168,
169, 170, 171, 172, 173, -1, -1, -1, -1, -1,
179, -1, -1, 159, 160, 161, 162, 163, 187, 165,
166, 167, 168, 169, 170, 171, 172, 173, -1, -1,
@@ -2590,7 +2595,9 @@ static const short yycheck[] = { 23,
171, 172, 173, -1, -1, -1, -1, -1, 179, -1,
181, 159, 160, 161, 162, 163, -1, 165, 166, 167,
168, 169, 170, 171, 172, 173, -1, -1, -1, -1,
- -1, 179
+ -1, 179, -1, 181, 159, 160, 161, 162, 163, -1,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, -1,
+ -1, -1, -1, -1, 179
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/lib/bison.simple"
@@ -4968,11 +4975,39 @@ case 230:
case 231:
#line 1851 "Gmsh.y"
{
- extr.mesh.Recombine = true;
+ double d;
+ int j;
+ extr.mesh.ExtrudeMesh = true;
+ extr.mesh.NbLayer = List_Nbr(yyvsp[-4].l);
+ if(extr.mesh.NbLayer > NB_LAYER_MAX){
+ vyyerror("Too many layers in extrusion");
+ }
+ else if(List_Nbr(yyvsp[-4].l) == List_Nbr(yyvsp[-2].l)){
+ for(int i=0;i<List_Nbr(yyvsp[-4].l);i++){
+ List_Read(yyvsp[-4].l,i,&d);
+ j = (int)d;
+ extr.mesh.NbElmLayer[i] = j;
+ extr.mesh.ZonLayer[i] = 0;
+ List_Read(yyvsp[-2].l,i,&d);
+ extr.mesh.hLayer[i] = d;
+ }
+ }
+ else{
+ vyyerror("Wrong layer definition {%d, %d}",
+ List_Nbr(yyvsp[-4].l), List_Nbr(yyvsp[-2].l));
+ }
+ List_Delete(yyvsp[-4].l);
+ List_Delete(yyvsp[-2].l);
;
break;}
case 232:
-#line 1862 "Gmsh.y"
+#line 1877 "Gmsh.y"
+{
+ extr.mesh.Recombine = true;
+ ;
+ break;}
+case 233:
+#line 1888 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -4991,8 +5026,8 @@ case 232:
List_Delete(yyvsp[-3].l);
;
break;}
-case 233:
-#line 1880 "Gmsh.y"
+case 234:
+#line 1906 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -5011,8 +5046,8 @@ case 233:
List_Delete(yyvsp[-6].l);
;
break;}
-case 234:
-#line 1898 "Gmsh.y"
+case 235:
+#line 1924 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -5031,8 +5066,8 @@ case 234:
List_Delete(yyvsp[-6].l);
;
break;}
-case 235:
-#line 1916 "Gmsh.y"
+case 236:
+#line 1942 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5055,8 +5090,8 @@ case 235:
List_Delete(yyvsp[-1].l);
;
break;}
-case 236:
-#line 1938 "Gmsh.y"
+case 237:
+#line 1964 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5078,8 +5113,8 @@ case 236:
List_Delete(yyvsp[-1].l);
;
break;}
-case 237:
-#line 1959 "Gmsh.y"
+case 238:
+#line 1985 "Gmsh.y"
{
Volume *v = FindVolume((int)yyvsp[-4].d,THEM);
if(!v)
@@ -5101,8 +5136,8 @@ case 237:
List_Delete(yyvsp[-1].l);
;
break;}
-case 238:
-#line 1980 "Gmsh.y"
+case 239:
+#line 2006 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -5117,8 +5152,8 @@ case 238:
List_Delete(yyvsp[-3].l);
;
break;}
-case 239:
-#line 1994 "Gmsh.y"
+case 240:
+#line 2020 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
@@ -5133,72 +5168,72 @@ case 239:
List_Delete(yyvsp[-1].l);
;
break;}
-case 240:
-#line 2016 "Gmsh.y"
+case 241:
+#line 2042 "Gmsh.y"
{
Coherence_PS();
;
break;}
-case 241:
-#line 2020 "Gmsh.y"
+case 242:
+#line 2046 "Gmsh.y"
{
IntersectAllSegmentsTogether();
;
break;}
-case 242:
-#line 2031 "Gmsh.y"
-{yyval.i = 1;;
- break;}
case 243:
-#line 2032 "Gmsh.y"
-{yyval.i = 0;;
+#line 2057 "Gmsh.y"
+{yyval.i = 1;;
break;}
case 244:
-#line 2033 "Gmsh.y"
-{yyval.i = -1;;
+#line 2058 "Gmsh.y"
+{yyval.i = 0;;
break;}
case 245:
-#line 2034 "Gmsh.y"
+#line 2059 "Gmsh.y"
{yyval.i = -1;;
break;}
case 246:
-#line 2035 "Gmsh.y"
+#line 2060 "Gmsh.y"
{yyval.i = -1;;
break;}
case 247:
-#line 2039 "Gmsh.y"
-{ yyval.d = yyvsp[0].d; ;
+#line 2061 "Gmsh.y"
+{yyval.i = -1;;
break;}
case 248:
-#line 2040 "Gmsh.y"
-{ yyval.d = yyvsp[-1].d ; ;
+#line 2065 "Gmsh.y"
+{ yyval.d = yyvsp[0].d; ;
break;}
case 249:
-#line 2041 "Gmsh.y"
-{ yyval.d = -yyvsp[0].d ; ;
+#line 2066 "Gmsh.y"
+{ yyval.d = yyvsp[-1].d ; ;
break;}
case 250:
-#line 2042 "Gmsh.y"
-{ yyval.d = yyvsp[0].d; ;
+#line 2067 "Gmsh.y"
+{ yyval.d = -yyvsp[0].d ; ;
break;}
case 251:
-#line 2043 "Gmsh.y"
-{ yyval.d = !yyvsp[0].d ; ;
+#line 2068 "Gmsh.y"
+{ yyval.d = yyvsp[0].d; ;
break;}
case 252:
-#line 2044 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d - yyvsp[0].d ; ;
+#line 2069 "Gmsh.y"
+{ yyval.d = !yyvsp[0].d ; ;
break;}
case 253:
-#line 2045 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d + yyvsp[0].d ; ;
+#line 2070 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d - yyvsp[0].d ; ;
break;}
case 254:
-#line 2046 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d * yyvsp[0].d ; ;
+#line 2071 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d + yyvsp[0].d ; ;
break;}
case 255:
-#line 2048 "Gmsh.y"
+#line 2072 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d * yyvsp[0].d ; ;
+ break;}
+case 256:
+#line 2074 "Gmsh.y"
{
if(!yyvsp[0].d)
vyyerror("Division by zero in '%g / %g'", yyvsp[-2].d, yyvsp[0].d);
@@ -5206,236 +5241,236 @@ case 255:
yyval.d = yyvsp[-2].d / yyvsp[0].d ;
;
break;}
-case 256:
-#line 2054 "Gmsh.y"
-{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d ; ;
- break;}
case 257:
-#line 2055 "Gmsh.y"
-{ yyval.d = pow(yyvsp[-2].d,yyvsp[0].d) ; ;
+#line 2080 "Gmsh.y"
+{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d ; ;
break;}
case 258:
-#line 2056 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d < yyvsp[0].d ; ;
+#line 2081 "Gmsh.y"
+{ yyval.d = pow(yyvsp[-2].d,yyvsp[0].d) ; ;
break;}
case 259:
-#line 2057 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d > yyvsp[0].d ; ;
+#line 2082 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d < yyvsp[0].d ; ;
break;}
case 260:
-#line 2058 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d <= yyvsp[0].d ; ;
+#line 2083 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d > yyvsp[0].d ; ;
break;}
case 261:
-#line 2059 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d >= yyvsp[0].d ; ;
+#line 2084 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d <= yyvsp[0].d ; ;
break;}
case 262:
-#line 2060 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d == yyvsp[0].d ; ;
+#line 2085 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d >= yyvsp[0].d ; ;
break;}
case 263:
-#line 2061 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d != yyvsp[0].d ; ;
+#line 2086 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d == yyvsp[0].d ; ;
break;}
case 264:
-#line 2062 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d && yyvsp[0].d ; ;
+#line 2087 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d != yyvsp[0].d ; ;
break;}
case 265:
-#line 2063 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d || yyvsp[0].d ; ;
+#line 2088 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d && yyvsp[0].d ; ;
break;}
case 266:
-#line 2064 "Gmsh.y"
-{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d ; ;
+#line 2089 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d || yyvsp[0].d ; ;
break;}
case 267:
-#line 2065 "Gmsh.y"
-{ yyval.d = exp(yyvsp[-1].d); ;
+#line 2090 "Gmsh.y"
+{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d ; ;
break;}
case 268:
-#line 2066 "Gmsh.y"
-{ yyval.d = log(yyvsp[-1].d); ;
+#line 2091 "Gmsh.y"
+{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 269:
-#line 2067 "Gmsh.y"
-{ yyval.d = log10(yyvsp[-1].d); ;
+#line 2092 "Gmsh.y"
+{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 270:
-#line 2068 "Gmsh.y"
-{ yyval.d = sqrt(yyvsp[-1].d); ;
+#line 2093 "Gmsh.y"
+{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 271:
-#line 2069 "Gmsh.y"
-{ yyval.d = sin(yyvsp[-1].d); ;
+#line 2094 "Gmsh.y"
+{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 272:
-#line 2070 "Gmsh.y"
-{ yyval.d = asin(yyvsp[-1].d); ;
+#line 2095 "Gmsh.y"
+{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 273:
-#line 2071 "Gmsh.y"
-{ yyval.d = cos(yyvsp[-1].d); ;
+#line 2096 "Gmsh.y"
+{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 274:
-#line 2072 "Gmsh.y"
-{ yyval.d = acos(yyvsp[-1].d); ;
+#line 2097 "Gmsh.y"
+{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 275:
-#line 2073 "Gmsh.y"
-{ yyval.d = tan(yyvsp[-1].d); ;
+#line 2098 "Gmsh.y"
+{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 276:
-#line 2074 "Gmsh.y"
-{ yyval.d = atan(yyvsp[-1].d); ;
+#line 2099 "Gmsh.y"
+{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 277:
-#line 2075 "Gmsh.y"
-{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2100 "Gmsh.y"
+{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 278:
-#line 2076 "Gmsh.y"
-{ yyval.d = sinh(yyvsp[-1].d); ;
+#line 2101 "Gmsh.y"
+{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 279:
-#line 2077 "Gmsh.y"
-{ yyval.d = cosh(yyvsp[-1].d); ;
+#line 2102 "Gmsh.y"
+{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 280:
-#line 2078 "Gmsh.y"
-{ yyval.d = tanh(yyvsp[-1].d); ;
+#line 2103 "Gmsh.y"
+{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 281:
-#line 2079 "Gmsh.y"
-{ yyval.d = fabs(yyvsp[-1].d); ;
+#line 2104 "Gmsh.y"
+{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 282:
-#line 2080 "Gmsh.y"
-{ yyval.d = floor(yyvsp[-1].d); ;
+#line 2105 "Gmsh.y"
+{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 283:
-#line 2081 "Gmsh.y"
-{ yyval.d = ceil(yyvsp[-1].d); ;
+#line 2106 "Gmsh.y"
+{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 284:
-#line 2082 "Gmsh.y"
-{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2107 "Gmsh.y"
+{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 285:
-#line 2083 "Gmsh.y"
+#line 2108 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 286:
-#line 2084 "Gmsh.y"
-{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
+#line 2109 "Gmsh.y"
+{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 287:
-#line 2085 "Gmsh.y"
-{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
+#line 2110 "Gmsh.y"
+{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 288:
-#line 2087 "Gmsh.y"
-{ yyval.d = exp(yyvsp[-1].d); ;
+#line 2111 "Gmsh.y"
+{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 289:
-#line 2088 "Gmsh.y"
-{ yyval.d = log(yyvsp[-1].d); ;
+#line 2113 "Gmsh.y"
+{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 290:
-#line 2089 "Gmsh.y"
-{ yyval.d = log10(yyvsp[-1].d); ;
+#line 2114 "Gmsh.y"
+{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 291:
-#line 2090 "Gmsh.y"
-{ yyval.d = sqrt(yyvsp[-1].d); ;
+#line 2115 "Gmsh.y"
+{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 292:
-#line 2091 "Gmsh.y"
-{ yyval.d = sin(yyvsp[-1].d); ;
+#line 2116 "Gmsh.y"
+{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 293:
-#line 2092 "Gmsh.y"
-{ yyval.d = asin(yyvsp[-1].d); ;
+#line 2117 "Gmsh.y"
+{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 294:
-#line 2093 "Gmsh.y"
-{ yyval.d = cos(yyvsp[-1].d); ;
+#line 2118 "Gmsh.y"
+{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 295:
-#line 2094 "Gmsh.y"
-{ yyval.d = acos(yyvsp[-1].d); ;
+#line 2119 "Gmsh.y"
+{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 296:
-#line 2095 "Gmsh.y"
-{ yyval.d = tan(yyvsp[-1].d); ;
+#line 2120 "Gmsh.y"
+{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 297:
-#line 2096 "Gmsh.y"
-{ yyval.d = atan(yyvsp[-1].d); ;
+#line 2121 "Gmsh.y"
+{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 298:
-#line 2097 "Gmsh.y"
-{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2122 "Gmsh.y"
+{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 299:
-#line 2098 "Gmsh.y"
-{ yyval.d = sinh(yyvsp[-1].d); ;
+#line 2123 "Gmsh.y"
+{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 300:
-#line 2099 "Gmsh.y"
-{ yyval.d = cosh(yyvsp[-1].d); ;
+#line 2124 "Gmsh.y"
+{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 301:
-#line 2100 "Gmsh.y"
-{ yyval.d = tanh(yyvsp[-1].d); ;
+#line 2125 "Gmsh.y"
+{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 302:
-#line 2101 "Gmsh.y"
-{ yyval.d = fabs(yyvsp[-1].d); ;
+#line 2126 "Gmsh.y"
+{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 303:
-#line 2102 "Gmsh.y"
-{ yyval.d = floor(yyvsp[-1].d); ;
+#line 2127 "Gmsh.y"
+{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 304:
-#line 2103 "Gmsh.y"
-{ yyval.d = ceil(yyvsp[-1].d); ;
+#line 2128 "Gmsh.y"
+{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 305:
-#line 2104 "Gmsh.y"
-{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2129 "Gmsh.y"
+{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 306:
-#line 2105 "Gmsh.y"
+#line 2130 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 307:
-#line 2106 "Gmsh.y"
-{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
+#line 2131 "Gmsh.y"
+{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 308:
-#line 2107 "Gmsh.y"
-{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
+#line 2132 "Gmsh.y"
+{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 309:
-#line 2116 "Gmsh.y"
-{ yyval.d = yyvsp[0].d; ;
+#line 2133 "Gmsh.y"
+{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 310:
-#line 2117 "Gmsh.y"
-{ yyval.d = 3.141592653589793; ;
+#line 2142 "Gmsh.y"
+{ yyval.d = yyvsp[0].d; ;
break;}
case 311:
-#line 2118 "Gmsh.y"
-{ yyval.d = ParUtil::Instance()->rank(); ;
+#line 2143 "Gmsh.y"
+{ yyval.d = 3.141592653589793; ;
break;}
case 312:
-#line 2119 "Gmsh.y"
-{ yyval.d = ParUtil::Instance()->size(); ;
+#line 2144 "Gmsh.y"
+{ yyval.d = ParUtil::Instance()->rank(); ;
break;}
case 313:
-#line 2124 "Gmsh.y"
+#line 2145 "Gmsh.y"
+{ yyval.d = ParUtil::Instance()->size(); ;
+ break;}
+case 314:
+#line 2150 "Gmsh.y"
{
TheSymbol.Name = yyvsp[0].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5446,8 +5481,8 @@ case 313:
yyval.d = *(double*)List_Pointer_Fast(pSymbol->val, 0) ;
;
break;}
-case 314:
-#line 2135 "Gmsh.y"
+case 315:
+#line 2161 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5464,8 +5499,8 @@ case 314:
}
;
break;}
-case 315:
-#line 2152 "Gmsh.y"
+case 316:
+#line 2178 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-1].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5476,8 +5511,8 @@ case 315:
yyval.d = (*(double*)List_Pointer_Fast(pSymbol->val, 0) += yyvsp[0].i) ;
;
break;}
-case 316:
-#line 2163 "Gmsh.y"
+case 317:
+#line 2189 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-4].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5494,8 +5529,8 @@ case 316:
}
;
break;}
-case 317:
-#line 2182 "Gmsh.y"
+case 318:
+#line 2208 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-2].c))){
vyyerror("Unknown numeric option class '%s'", yyvsp[-2].c);
@@ -5511,8 +5546,8 @@ case 317:
}
;
break;}
-case 318:
-#line 2198 "Gmsh.y"
+case 319:
+#line 2224 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c))){
vyyerror("Unknown numeric option class '%s'", yyvsp[-5].c);
@@ -5528,8 +5563,8 @@ case 318:
}
;
break;}
-case 319:
-#line 2214 "Gmsh.y"
+case 320:
+#line 2240 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c))){
vyyerror("Unknown numeric option class '%s'", yyvsp[-3].c);
@@ -5545,8 +5580,8 @@ case 319:
}
;
break;}
-case 320:
-#line 2230 "Gmsh.y"
+case 321:
+#line 2256 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-6].c))){
vyyerror("Unknown numeric option class '%s'", yyvsp[-6].c);
@@ -5562,131 +5597,131 @@ case 320:
}
;
break;}
-case 321:
-#line 2248 "Gmsh.y"
+case 322:
+#line 2274 "Gmsh.y"
{
memcpy(yyval.v, yyvsp[0].v, 5*sizeof(double)) ;
;
break;}
-case 322:
-#line 2252 "Gmsh.y"
+case 323:
+#line 2278 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = -yyvsp[0].v[i] ;
;
break;}
-case 323:
-#line 2256 "Gmsh.y"
+case 324:
+#line 2282 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[0].v[i];
;
break;}
-case 324:
-#line 2260 "Gmsh.y"
+case 325:
+#line 2286 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[-2].v[i] - yyvsp[0].v[i] ;
;
break;}
-case 325:
-#line 2264 "Gmsh.y"
+case 326:
+#line 2290 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[-2].v[i] + yyvsp[0].v[i] ;
;
break;}
-case 326:
-#line 2270 "Gmsh.y"
+case 327:
+#line 2296 "Gmsh.y"
{
yyval.v[0]=yyvsp[-9].d; yyval.v[1]=yyvsp[-7].d; yyval.v[2]=yyvsp[-5].d; yyval.v[3]=yyvsp[-3].d; yyval.v[4]=yyvsp[-1].d;
;
break;}
-case 327:
-#line 2274 "Gmsh.y"
+case 328:
+#line 2300 "Gmsh.y"
{
yyval.v[0]=yyvsp[-7].d; yyval.v[1]=yyvsp[-5].d; yyval.v[2]=yyvsp[-3].d; yyval.v[3]=yyvsp[-1].d; yyval.v[4]=1.0;
;
break;}
-case 328:
-#line 2278 "Gmsh.y"
-{
- yyval.v[0]=yyvsp[-5].d; yyval.v[1]=yyvsp[-3].d; yyval.v[2]=yyvsp[-1].d; yyval.v[3]=0.0; yyval.v[4]=1.0;
- ;
- break;}
case 329:
-#line 2282 "Gmsh.y"
+#line 2304 "Gmsh.y"
{
yyval.v[0]=yyvsp[-5].d; yyval.v[1]=yyvsp[-3].d; yyval.v[2]=yyvsp[-1].d; yyval.v[3]=0.0; yyval.v[4]=1.0;
;
break;}
case 330:
-#line 2289 "Gmsh.y"
+#line 2308 "Gmsh.y"
{
+ yyval.v[0]=yyvsp[-5].d; yyval.v[1]=yyvsp[-3].d; yyval.v[2]=yyvsp[-1].d; yyval.v[3]=0.0; yyval.v[4]=1.0;
;
break;}
case 331:
-#line 2292 "Gmsh.y"
+#line 2315 "Gmsh.y"
{
;
break;}
case 332:
-#line 2298 "Gmsh.y"
+#line 2318 "Gmsh.y"
{
;
break;}
case 333:
-#line 2301 "Gmsh.y"
+#line 2324 "Gmsh.y"
{
;
break;}
case 334:
-#line 2307 "Gmsh.y"
+#line 2327 "Gmsh.y"
{
;
break;}
case 335:
-#line 2310 "Gmsh.y"
+#line 2333 "Gmsh.y"
{
- yyval.l=yyvsp[-1].l;
;
break;}
case 336:
-#line 2314 "Gmsh.y"
+#line 2336 "Gmsh.y"
{
yyval.l=yyvsp[-1].l;
;
break;}
case 337:
-#line 2321 "Gmsh.y"
+#line 2340 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(List_T*)) ;
- List_Add(yyval.l, &(yyvsp[0].l)) ;
+ yyval.l=yyvsp[-1].l;
;
break;}
case 338:
-#line 2326 "Gmsh.y"
+#line 2347 "Gmsh.y"
{
+ yyval.l = List_Create(2,1,sizeof(List_T*)) ;
List_Add(yyval.l, &(yyvsp[0].l)) ;
;
break;}
case 339:
-#line 2334 "Gmsh.y"
+#line 2352 "Gmsh.y"
+{
+ List_Add(yyval.l, &(yyvsp[0].l)) ;
+ ;
+ break;}
+case 340:
+#line 2360 "Gmsh.y"
{
yyval.l = List_Create(2,1,sizeof(double)) ;
List_Add(yyval.l, &(yyvsp[0].d)) ;
;
break;}
-case 340:
-#line 2339 "Gmsh.y"
+case 341:
+#line 2365 "Gmsh.y"
{
yyval.l = yyvsp[0].l ;
;
break;}
-case 341:
-#line 2343 "Gmsh.y"
+case 342:
+#line 2369 "Gmsh.y"
{
yyval.l=yyvsp[-1].l;
;
break;}
-case 342:
-#line 2347 "Gmsh.y"
+case 343:
+#line 2373 "Gmsh.y"
{
yyval.l=yyvsp[-1].l;
for(i=0 ; i<List_Nbr(yyval.l) ; i++){
@@ -5695,16 +5730,16 @@ case 342:
}
;
break;}
-case 343:
-#line 2358 "Gmsh.y"
+case 344:
+#line 2384 "Gmsh.y"
{
yyval.l = List_Create(2,1,sizeof(double)) ;
for(d=yyvsp[-2].d ; (yyvsp[-2].d<yyvsp[0].d)?(d<=yyvsp[0].d):(d>=yyvsp[0].d) ; (yyvsp[-2].d<yyvsp[0].d)?(d+=1.):(d-=1.))
List_Add(yyval.l, &d) ;
;
break;}
-case 344:
-#line 2364 "Gmsh.y"
+case 345:
+#line 2390 "Gmsh.y"
{
yyval.l = List_Create(2,1,sizeof(double)) ;
if(!yyvsp[0].d || (yyvsp[-4].d<yyvsp[-2].d && yyvsp[0].d<0) || (yyvsp[-4].d>yyvsp[-2].d && yyvsp[0].d>0)){
@@ -5716,8 +5751,8 @@ case 344:
List_Add(yyval.l, &d) ;
;
break;}
-case 345:
-#line 2375 "Gmsh.y"
+case 346:
+#line 2401 "Gmsh.y"
{
yyval.l = List_Create(2,1,sizeof(double)) ;
TheSymbol.Name = yyvsp[-2].c ;
@@ -5732,8 +5767,8 @@ case 345:
}
;
break;}
-case 346:
-#line 2389 "Gmsh.y"
+case 347:
+#line 2415 "Gmsh.y"
{
yyval.l = List_Create(2,1,sizeof(double)) ;
TheSymbol.Name = yyvsp[-2].c ;
@@ -5750,8 +5785,8 @@ case 346:
}
;
break;}
-case 347:
-#line 2405 "Gmsh.y"
+case 348:
+#line 2431 "Gmsh.y"
{
yyval.l = List_Create(2,1,sizeof(double)) ;
TheSymbol.Name = yyvsp[-5].c ;
@@ -5772,8 +5807,8 @@ case 347:
List_Delete(yyvsp[-2].l);
;
break;}
-case 348:
-#line 2425 "Gmsh.y"
+case 349:
+#line 2451 "Gmsh.y"
{
yyval.l = List_Create(2,1,sizeof(double)) ;
TheSymbol.Name = yyvsp[-5].c ;
@@ -5796,27 +5831,27 @@ case 348:
List_Delete(yyvsp[-2].l);
;
break;}
-case 349:
-#line 2450 "Gmsh.y"
+case 350:
+#line 2476 "Gmsh.y"
{
yyval.l = List_Create(2,1,sizeof(double)) ;
List_Add(yyval.l, &(yyvsp[0].d)) ;
;
break;}
-case 350:
-#line 2455 "Gmsh.y"
+case 351:
+#line 2481 "Gmsh.y"
{
yyval.l = yyvsp[0].l ;
;
break;}
-case 351:
-#line 2459 "Gmsh.y"
+case 352:
+#line 2485 "Gmsh.y"
{
List_Add(yyval.l, &(yyvsp[0].d)) ;
;
break;}
-case 352:
-#line 2463 "Gmsh.y"
+case 353:
+#line 2489 "Gmsh.y"
{
for(i=0 ; i<List_Nbr(yyvsp[0].l) ; i++){
List_Read(yyvsp[0].l, i, &d) ;
@@ -5825,27 +5860,27 @@ case 352:
List_Delete(yyvsp[0].l);
;
break;}
-case 353:
-#line 2475 "Gmsh.y"
+case 354:
+#line 2501 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-7].d, (int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d);
;
break;}
-case 354:
-#line 2479 "Gmsh.y"
+case 355:
+#line 2505 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d, 255);
;
break;}
-case 355:
-#line 2490 "Gmsh.y"
+case 356:
+#line 2516 "Gmsh.y"
{
yyval.u = Get_ColorForString(ColorString, -1, yyvsp[0].c, &flag);
if(flag) vyyerror("Unknown color '%s'", yyvsp[0].c);
;
break;}
-case 356:
-#line 2495 "Gmsh.y"
+case 357:
+#line 2521 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-4].c))){
vyyerror("Unknown color option class '%s'", yyvsp[-4].c);
@@ -5862,14 +5897,14 @@ case 356:
}
;
break;}
-case 357:
-#line 2514 "Gmsh.y"
+case 358:
+#line 2540 "Gmsh.y"
{
yyval.l = yyvsp[-1].l;
;
break;}
-case 358:
-#line 2518 "Gmsh.y"
+case 359:
+#line 2544 "Gmsh.y"
{
yyval.l = List_Create(256,10,sizeof(unsigned int)) ;
ColorTable *ct = Get_ColorTable((int)yyvsp[-3].d);
@@ -5881,27 +5916,27 @@ case 358:
}
;
break;}
-case 359:
-#line 2532 "Gmsh.y"
+case 360:
+#line 2558 "Gmsh.y"
{
yyval.l = List_Create(256,10,sizeof(unsigned int)) ;
List_Add(yyval.l, &(yyvsp[0].u)) ;
;
break;}
-case 360:
-#line 2537 "Gmsh.y"
+case 361:
+#line 2563 "Gmsh.y"
{
List_Add(yyval.l, &(yyvsp[0].u)) ;
;
break;}
-case 361:
-#line 2544 "Gmsh.y"
+case 362:
+#line 2570 "Gmsh.y"
{
yyval.c = yyvsp[0].c;
;
break;}
-case 362:
-#line 2548 "Gmsh.y"
+case 363:
+#line 2574 "Gmsh.y"
{
yyval.c = (char *)Malloc((strlen(yyvsp[-3].c)+strlen(yyvsp[-1].c)+1)*sizeof(char)) ;
strcpy(yyval.c, yyvsp[-3].c) ;
@@ -5910,8 +5945,8 @@ case 362:
Free(yyvsp[-1].c);
;
break;}
-case 363:
-#line 2556 "Gmsh.y"
+case 364:
+#line 2582 "Gmsh.y"
{
yyval.c = (char *)Malloc((strlen(yyvsp[-1].c)+1)*sizeof(char)) ;
for(i=strlen(yyvsp[-1].c)-1; i>=0; i--){
@@ -5925,14 +5960,14 @@ case 363:
Free(yyvsp[-1].c);
;
break;}
-case 364:
-#line 2569 "Gmsh.y"
+case 365:
+#line 2595 "Gmsh.y"
{
yyval.c = yyvsp[-1].c;
;
break;}
-case 365:
-#line 2573 "Gmsh.y"
+case 366:
+#line 2599 "Gmsh.y"
{
for(i = 0 ; i<List_Nbr(yyvsp[-1].l) ; i++){
if(!i){
@@ -5958,8 +5993,8 @@ case 365:
Free(yyvsp[-3].c);
;
break;}
-case 366:
-#line 2598 "Gmsh.y"
+case 367:
+#line 2624 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-3].c)))
vyyerror("Unknown string option class '%s'", yyvsp[-3].c);
@@ -5974,8 +6009,8 @@ case 366:
}
;
break;}
-case 367:
-#line 2612 "Gmsh.y"
+case 368:
+#line 2638 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-6].c)))
vyyerror("Unknown string option class '%s'", yyvsp[-6].c);
@@ -6212,7 +6247,7 @@ yyerrhandle:
}
return 1;
}
-#line 2627 "Gmsh.y"
+#line 2653 "Gmsh.y"
void InitSymbols(void){
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 4577e5d2c7264e48b53616c9ac79e755bc3669ab..976f6afdd2b666fd40138e5f61560230f1a8a053 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,6 +1,6 @@
%{
-// $Id: Gmsh.y,v 1.100 2001-09-24 06:56:02 geuzaine Exp $
+// $Id: Gmsh.y,v 1.101 2001-09-25 08:21:14 geuzaine Exp $
#include <stdarg.h>
#ifndef _NOPLUGIN
@@ -1847,6 +1847,32 @@ ExtrudeParameter :
List_Delete($5);
List_Delete($7);
}
+ | tLayers '{' ListOfDouble ',' ListOfDouble '}' tEND
+ {
+ double d;
+ int j;
+ extr.mesh.ExtrudeMesh = true;
+ extr.mesh.NbLayer = List_Nbr($3);
+ if(extr.mesh.NbLayer > NB_LAYER_MAX){
+ vyyerror("Too many layers in extrusion");
+ }
+ else if(List_Nbr($3) == List_Nbr($5)){
+ for(int i=0;i<List_Nbr($3);i++){
+ List_Read($3,i,&d);
+ j = (int)d;
+ extr.mesh.NbElmLayer[i] = j;
+ extr.mesh.ZonLayer[i] = 0;
+ List_Read($5,i,&d);
+ extr.mesh.hLayer[i] = d;
+ }
+ }
+ else{
+ vyyerror("Wrong layer definition {%d, %d}",
+ List_Nbr($3), List_Nbr($5));
+ }
+ List_Delete($3);
+ List_Delete($5);
+ }
| tRecombine tEND
{
extr.mesh.Recombine = true;
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 445c482930c80fb1d2f8d14017098e87abedc052..31a6a0715ae1f0d6e64dae9252ff776e3c8e2738 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.114 2001-09-24 06:56:03 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.115 2001-09-25 08:21:14 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -998,7 +998,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.114 2001-09-24 06:56:03 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.115 2001-09-25 08:21:14 geuzaine Exp $
#include <stdio.h>
#include <stdlib.h>
diff --git a/doc/VERSIONS b/doc/VERSIONS
index 2ec077c55a2fffa3b31fa8341e4ab84c76c3d214..a4a7848d63d8d3a2fd0126f67eea9464ebb5078b 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,7 +1,7 @@
-$Id: VERSIONS,v 1.71 2001-09-24 07:11:26 geuzaine Exp $
+$Id: VERSIONS,v 1.72 2001-09-25 08:21:14 geuzaine Exp $
New in 1.27: Added ability to extrude curves with Layers/Recombine
-attributes;
+attributes; New PointSize/LineWidth options;
New in 1.26: Enhanced 2D anisotropic mesh generator (metric
intersections); fixed small bug in 3D initial mesh; added alternative
diff --git a/utils/gmsh_fltk.spec b/utils/gmsh_fltk.spec
index d3bd151f3106ae3c0ff6dabe12f2e05aa69cef89..d761182208c03428e57a66f79fc9193d508c315c 100644
--- a/utils/gmsh_fltk.spec
+++ b/utils/gmsh_fltk.spec
@@ -1,7 +1,7 @@
Summary: A 3D mesh generator with pre- and post-processing facilities
Name: gmsh
-Version: 1.261
-Source: gmsh-1.261.tar.gz
+Version: 1.262
+Source: gmsh-1.262.tar.gz
Release: 1
Copyright: distributable
Group: Applications/Engineering