From 00c3549db2a61ef9e30e399d8fd80248e2692a96 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 8 Dec 2000 10:56:51 +0000
Subject: [PATCH] modifs in ColorTable
---
Box/Box.cpp | 6 +-
{Graphics => Common}/ColorTable.cpp | 35 +-
{Graphics => Common}/ColorTable.h | 5 +-
Common/Context.cpp | 13 +-
Common/Makefile | 14 +-
Common/Views.cpp | 76 +-
Common/Views.h | 5 +-
Graphics/Makefile | 26 +-
Mesh/Makefile | 5 +-
Parser/Gmsh.tab.cpp | 3917 ++++++++++++++-------------
Parser/Gmsh.y | 85 +-
Parser/Gmsh.yy.cpp | 2 +-
Parser/Makefile | 7 +-
Unix/CbColorbar.cpp | 6 +-
Unix/CbFile.cpp | 6 +-
Unix/CbFile.h | 3 +-
Unix/CbPost.cpp | 12 +-
Unix/Geometry.cpp | 7 +-
Unix/Main.cpp | 14 +-
Unix/Makefile | 39 +-
Unix/Register.cpp | 8 +-
Unix/Widgets.cpp | 44 +-
Unix/Widgets.h | 5 +-
23 files changed, 2172 insertions(+), 2168 deletions(-)
rename {Graphics => Common}/ColorTable.cpp (87%)
rename {Graphics => Common}/ColorTable.h (88%)
diff --git a/Box/Box.cpp b/Box/Box.cpp
index b3afac3981..fc0a34dd25 100644
--- a/Box/Box.cpp
+++ b/Box/Box.cpp
@@ -1,4 +1,4 @@
-/* $Id: Box.cpp,v 1.11 2000-12-05 19:38:22 geuzaine Exp $ */
+/* $Id: Box.cpp,v 1.12 2000-12-08 10:56:30 geuzaine Exp $ */
#include <signal.h>
@@ -55,10 +55,6 @@ char gmsh_help[] =
/* dummy defs for link purposes */
-void ColorTable_InitParam (int number, ColorTable * ct, int rgb_flag, int alpha_flag){}
-void ColorTable_Recompute (ColorTable * ct, int rgb_flag, int alpha_flag){}
-void ColorTable_Copy(ColorTable *ct){}
-void ColorTable_Paste(ColorTable *ct){}
void ZeroHighlight(Mesh *){}
void AddViewInUI(int, char *, int){}
void draw_polygon_2d (double, double, double, int, double *, double *, double *){}
diff --git a/Graphics/ColorTable.cpp b/Common/ColorTable.cpp
similarity index 87%
rename from Graphics/ColorTable.cpp
rename to Common/ColorTable.cpp
index f1dcd0fac5..e75d882381 100644
--- a/Graphics/ColorTable.cpp
+++ b/Common/ColorTable.cpp
@@ -1,4 +1,4 @@
-/* $Id: ColorTable.cpp,v 1.3 2000-11-26 15:43:46 geuzaine Exp $ */
+/* $Id: ColorTable.cpp,v 1.1 2000-12-08 10:56:36 geuzaine Exp $ */
#include "Gmsh.h"
#include "ColorTable.h"
@@ -181,43 +181,18 @@ void ColorTable_Paste(ColorTable *ct){
}
-/*
- * File format is ASCII:
- * $COL
- * <table_size>
- * <r> <g> <b> <a> - n lines of rgba values as integers in [0,255]
- * .....
- * <r> <g> <b> <a>
- */
-void ColorTable_Save(FILE *fp, ColorTable *ct){
+void ColorTable_Print(ColorTable *ct, FILE *fp){
int i, r, g, b, a;
- fprintf(fp, "$COL\n");
- fprintf(fp, "%d\n", ct->size);
for (i=0;i<ct->size;i++) {
r = UNPACK_RED( ct->table[i] );
g = UNPACK_GREEN( ct->table[i] );
b = UNPACK_BLUE( ct->table[i] );
a = UNPACK_ALPHA( ct->table[i] );
- fprintf(fp, "%d %d %d %d\n", r, g, b, a );
+ if(!((i+1)%4)) fprintf(fp, "\n ");
+ fprintf(fp, "{%d, %d, %d, %d}", r, g, b, a );
+ if(i!=ct->size-1) fprintf(fp, ", ");
}
}
-void ColorTable_Load(FILE *fp, ColorTable *ct){
- int i, r, g, b, a;
-
- fscanf(fp, "$COL\n");
- fscanf(fp, "%d\n", &ct->size);
-
- if(ct->size>COLORTABLE_NBMAX_COLOR){
- Msg(ERROR, "Too many colors in ColorTable (%d > %d)",
- ct->size, COLORTABLE_NBMAX_COLOR);
- return;
- }
-
- for (i=0;i<ct->size;i++) {
- fscanf(fp, "%d %d %d %d\n", &r, &g, &b, &a);
- ct->table[i] = PACK_COLOR(r, g, b, a);
- }
-}
diff --git a/Graphics/ColorTable.h b/Common/ColorTable.h
similarity index 88%
rename from Graphics/ColorTable.h
rename to Common/ColorTable.h
index f14cb064d0..2104760eae 100644
--- a/Graphics/ColorTable.h
+++ b/Common/ColorTable.h
@@ -1,4 +1,4 @@
-/* $Id: ColorTable.h,v 1.3 2000-11-26 15:43:46 geuzaine Exp $ */
+/* $Id: ColorTable.h,v 1.1 2000-12-08 10:56:36 geuzaine Exp $ */
#ifndef _COLORTABLE_H_
#define _COLORTABLE_H_
@@ -40,7 +40,6 @@ void ColorTable_InitParam (int number, ColorTable * ct, int rgb_flag, int alpha_
void ColorTable_Recompute (ColorTable * ct, int rgb_flag, int alpha_flag);
void ColorTable_Copy(ColorTable *ct);
void ColorTable_Paste(ColorTable *ct);
-void ColorTable_Load(FILE *fp, ColorTable *ct);
-void ColorTable_Save(FILE *fp, ColorTable *ct) ;
+void ColorTable_Print(ColorTable *ct, FILE *fp) ;
#endif
diff --git a/Common/Context.cpp b/Common/Context.cpp
index 3829c22a79..d63a6bb7bb 100644
--- a/Common/Context.cpp
+++ b/Common/Context.cpp
@@ -1,4 +1,4 @@
-/* $Id: Context.cpp,v 1.16 2000-12-07 19:03:56 geuzaine Exp $ */
+/* $Id: Context.cpp,v 1.17 2000-12-08 10:56:36 geuzaine Exp $ */
#include "Gmsh.h"
#include "Const.h"
@@ -364,17 +364,16 @@ void Print_Context(FILE *file){
Print_NumberOptions(PostProcessingOptions_Number, "PostProcessing.", file);
Print_ArrayOptions(PostProcessingOptions_Array, "PostProcessing.", file);
Print_ColorOptions(PostProcessingOptions_Color, "PostProcessing.", file);
- fprintf(file, "\n");
- Print_StringOptions(PrintOptions_String, "Print.", file);
- Print_NumberOptions(PrintOptions_Number, "Print.", file);
- Print_ArrayOptions(PrintOptions_Array, "Print.", file);
- Print_ColorOptions(PrintOptions_Color, "Print.", file);
for(i=0; i<List_Nbr(Post_ViewList) ; i++){
- fprintf(file, "\n");
Print_StringViewOptions(i, file);
Print_NumberViewOptions(i, file);
Print_ArrayViewOptions(i, file);
}
+ fprintf(file, "\n");
+ Print_StringOptions(PrintOptions_String, "Print.", file);
+ Print_NumberOptions(PrintOptions_Number, "Print.", file);
+ Print_ArrayOptions(PrintOptions_Array, "Print.", file);
+ Print_ColorOptions(PrintOptions_Color, "Print.", file);
}
void Context_T::buildRotmatrix(float m[4][4])
diff --git a/Common/Makefile b/Common/Makefile
index 4147f16a89..f256eef01e 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2000-12-07 08:46:09 geuzaine Exp $
+# $Id: Makefile,v 1.6 2000-12-08 10:56:36 geuzaine Exp $
#
# Makefile for "libCommon.a"
#
@@ -21,7 +21,8 @@ INCLUDE = -I../includes -I../Common -I../DataStr -I../Geo -I../Graphics\
CFLAGS = $(C_FLAGS) $(OS_FLAGS) $(INCLUDE) $(GL_INCLUDE)
SRC = Context.cpp\
- Views.cpp
+ Views.cpp\
+ ColorTable.cpp
OBJ = $(SRC:.cpp=.o)
@@ -54,8 +55,11 @@ Context.o: Context.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/Tools.h Const.h ../Geo/Geo.h ../Mesh/Mesh.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Graphics/ColorTable.h \
- Context.h trackball.c trackball.h
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Context.h \
+ trackball.c trackball.h
Views.o: Views.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
- ../DataStr/Tools.h Views.h Const.h ../Graphics/ColorTable.h Context.h
+ ../DataStr/Tools.h Views.h Const.h ColorTable.h Context.h
+ColorTable.o: ColorTable.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
+ ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
+ ../DataStr/Tools.h ColorTable.h Context.h
diff --git a/Common/Views.cpp b/Common/Views.cpp
index 14d41df660..66398acb25 100644
--- a/Common/Views.cpp
+++ b/Common/Views.cpp
@@ -1,4 +1,4 @@
-/* $Id: Views.cpp,v 1.14 2000-12-07 19:03:56 geuzaine Exp $ */
+/* $Id: Views.cpp,v 1.15 2000-12-08 10:56:36 geuzaine Exp $ */
#include "Gmsh.h"
#include "Views.h"
@@ -331,7 +331,7 @@ void CopyViewOptions(Post_View *src, Post_View *dest){
ColorTable_Paste(&dest->CT);
}
-char **Get_StringViewOption(int num, char *str, int *type){
+char *Get_StringViewOption(int num, char *str, int *type){
Post_View *v;
if(num < 0 || num >= List_Nbr(Post_ViewList)){
@@ -341,13 +341,13 @@ char **Get_StringViewOption(int num, char *str, int *type){
v = (Post_View*)List_Pointer(Post_ViewList, num);
if(!strcmp(str, "Format")){
- return (char**)&v->Format ;
+ return v->Format ;
}
else if(!strcmp(str, "FileName")){
- return (char**)&v->FileName ;
+ return v->FileName ;
}
else if(!strcmp(str, "Name")){
- return (char**)&v->Name ;
+ return v->Name ;
}
else{
return NULL ;
@@ -361,9 +361,9 @@ void Print_StringViewOptions(int num, FILE *file){
return ;
v = (Post_View*)List_Pointer(Post_ViewList, num);
- fprintf(file, "Post.View[%d].Format = \"%s\";\n", num, v->Format);
- fprintf(file, "Post.View[%d].FileName = \"%s\";\n", num, v->FileName);
- fprintf(file, "Post.View[%d].Name = \"%s\";\n", num, v->Name);
+ fprintf(file, "PostProcessing.View[%d].Format = \"%s\";\n", num, v->Format);
+ fprintf(file, "PostProcessing.View[%d].FileName = \"%s\";\n", num, v->FileName);
+ fprintf(file, "PostProcessing.View[%d].Name = \"%s\";\n", num, v->Name);
}
void *Get_NumberViewOption(int num, char *str, int *type){
@@ -395,7 +395,7 @@ void *Get_NumberViewOption(int num, char *str, int *type){
*type = GMSH_DOUBLE ;
return (void*)&v->CustomMin ;
}
- else if(!strcmp(str, "CustomMin")){
+ else if(!strcmp(str, "CustomMax")){
*type = GMSH_DOUBLE ;
return (void*)&v->CustomMax ;
}
@@ -425,11 +425,11 @@ void *Get_NumberViewOption(int num, char *str, int *type){
}
else if(!strcmp(str, "ShowTime")){
*type = GMSH_INT ;
- return (void*)&v->ShowElement ;
+ return (void*)&v->ShowTime ;
}
else if(!strcmp(str, "ShowScale")){
*type = GMSH_INT ;
- return (void*)&v->ShowElement ;
+ return (void*)&v->ShowScale ;
}
else if(!strcmp(str, "TransparentScale")){
*type = GMSH_INT ;
@@ -463,25 +463,25 @@ void Print_NumberViewOptions(int num, FILE *file){
return ;
v = (Post_View*)List_Pointer(Post_ViewList, num);
- fprintf(file, "Post.View[%d].NbTimeStep = %d;\n", num, v->NbTimeStep);
- fprintf(file, "Post.View[%d].TimeStep = %d;\n", num, v->TimeStep);
- fprintf(file, "Post.View[%d].Min = %g;\n", num, v->Min);
- fprintf(file, "Post.View[%d].Max = %g;\n", num, v->Max);
- fprintf(file, "Post.View[%d].CustomMin = %g;\n", num, v->CustomMin);
- fprintf(file, "Post.View[%d].CustomMax = %g;\n", num, v->CustomMax);
- fprintf(file, "Post.View[%d].ArrowScale = %g;\n", num, v->ArrowScale);
- fprintf(file, "Post.View[%d].Visible = %d;\n", num, v->Visible);
- fprintf(file, "Post.View[%d].IntervalsType = %d;\n", num, v->IntervalsType);
- fprintf(file, "Post.View[%d].NbIso = %d;\n", num, v->NbIso);
- fprintf(file, "Post.View[%d].Light = %d;\n", num, v->Light);
- fprintf(file, "Post.View[%d].ShowElement = %d;\n", num, v->ShowElement);
- fprintf(file, "Post.View[%d].ShowTime = %d;\n", num, v->ShowTime);
- fprintf(file, "Post.View[%d].ShowScale = %d;\n", num, v->ShowScale);
- fprintf(file, "Post.View[%d].TransparentScale = %d;\n", num, v->TransparentScale);
- fprintf(file, "Post.View[%d].ScaleType = %d;\n", num, v->ScaleType);
- fprintf(file, "Post.View[%d].RangeType = %d;\n", num, v->RangeType);
- fprintf(file, "Post.View[%d].ArrowType = %d;\n", num, v->ArrowType);
- fprintf(file, "Post.View[%d].ArrowLocation = %d;\n", num, v->ArrowLocation);
+ fprintf(file, "PostProcessing.View[%d].NbTimeStep = %d;\n", num, v->NbTimeStep);
+ fprintf(file, "PostProcessing.View[%d].TimeStep = %d;\n", num, v->TimeStep);
+ fprintf(file, "PostProcessing.View[%d].Min = %g;\n", num, v->Min);
+ fprintf(file, "PostProcessing.View[%d].Max = %g;\n", num, v->Max);
+ fprintf(file, "PostProcessing.View[%d].CustomMin = %g;\n", num, v->CustomMin);
+ fprintf(file, "PostProcessing.View[%d].CustomMax = %g;\n", num, v->CustomMax);
+ fprintf(file, "PostProcessing.View[%d].ArrowScale = %g;\n", num, v->ArrowScale);
+ fprintf(file, "PostProcessing.View[%d].Visible = %d;\n", num, v->Visible);
+ fprintf(file, "PostProcessing.View[%d].IntervalsType = %d;\n", num, v->IntervalsType);
+ fprintf(file, "PostProcessing.View[%d].NbIso = %d;\n", num, v->NbIso);
+ fprintf(file, "PostProcessing.View[%d].Light = %d;\n", num, v->Light);
+ fprintf(file, "PostProcessing.View[%d].ShowElement = %d;\n", num, v->ShowElement);
+ fprintf(file, "PostProcessing.View[%d].ShowTime = %d;\n", num, v->ShowTime);
+ fprintf(file, "PostProcessing.View[%d].ShowScale = %d;\n", num, v->ShowScale);
+ fprintf(file, "PostProcessing.View[%d].TransparentScale = %d;\n", num, v->TransparentScale);
+ fprintf(file, "PostProcessing.View[%d].ScaleType = %d;\n", num, v->ScaleType);
+ fprintf(file, "PostProcessing.View[%d].RangeType = %d;\n", num, v->RangeType);
+ fprintf(file, "PostProcessing.View[%d].ArrowType = %d;\n", num, v->ArrowType);
+ fprintf(file, "PostProcessing.View[%d].ArrowLocation = %d;\n", num, v->ArrowLocation);
}
void *Get_ArrayViewOption(int num, char *str, int *type){
@@ -506,6 +506,15 @@ void *Get_ArrayViewOption(int num, char *str, int *type){
}
}
+ColorTable *Get_ColorTableViewOption(int num){
+ Post_View *v;
+
+ if(num < 0 || num >= List_Nbr(Post_ViewList))
+ return NULL ;
+ v = (Post_View*)List_Pointer(Post_ViewList, num);
+ return &v->CT ;
+}
+
void Print_ArrayViewOptions(int num, FILE *file){
Post_View *v;
@@ -513,11 +522,14 @@ void Print_ArrayViewOptions(int num, FILE *file){
return ;
v = (Post_View*)List_Pointer(Post_ViewList, num);
- fprintf(file, "Post.View[%d].Offset = {%g,%g,%g};\n",
+ fprintf(file, "PostProcessing.View[%d].Offset = {%g,%g,%g};\n",
num, v->Offset[0], v->Offset[1], v->Offset[2]);
- fprintf(file, "Post.View[%d].Raise = {%g,%g,%g};\n",
+ fprintf(file, "PostProcessing.View[%d].Raise = {%g,%g,%g};\n",
num, v->Raise[0], v->Raise[1], v->Raise[2]);
+ fprintf(file, "PostProcessing.View[%d].Color = { ", num);
+ ColorTable_Print(&v->CT, file);
+ fprintf(file, " };\n");
}
diff --git a/Common/Views.h b/Common/Views.h
index 7630a040e5..d4e85ccb7d 100644
--- a/Common/Views.h
+++ b/Common/Views.h
@@ -1,4 +1,4 @@
-/* $Id: Views.h,v 1.12 2000-12-07 19:03:56 geuzaine Exp $ */
+/* $Id: Views.h,v 1.13 2000-12-08 10:56:36 geuzaine Exp $ */
#ifndef _VIEWS_H_
#define _VIEWS_H_
@@ -82,9 +82,10 @@ int CreateBGM(Post_View *ErrView, int OptiMethod, double Degree,
double OptiValue, double *ObjFunct, char *OutFile);
double ErrorInView(Post_View * ErrView, int *n);
-char **Get_StringViewOption(int num, char *str, int *type);
+char *Get_StringViewOption(int num, char *str, int *type);
void *Get_NumberViewOption(int num, char *str, int *type);
void *Get_ArrayViewOption(int num, char *str, int *type);
+ColorTable *Get_ColorTableViewOption(int num);
void Print_StringViewOptions(int num, FILE *file);
void Print_NumberViewOptions(int num, FILE *file);
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 8a046f90a9..092eff857c 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2000-11-27 17:13:48 geuzaine Exp $
+# $Id: Makefile,v 1.5 2000-12-08 10:56:42 geuzaine Exp $
#
# Makefile for "libGraphics.a"
#
@@ -34,7 +34,6 @@ SRC = Draw.cpp \
Entity.cpp \
Scale.cpp \
Volume.cpp \
- ColorTable.cpp \
gl2ps.cpp gl2gif.cpp
@@ -69,7 +68,7 @@ Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Graphics/ColorTable.h ../Common/Context.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
../Geo/MinMax.h ../Unix/CbGeneral.h ../Unix/Widgets.h \
../Unix/XContext.h
Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
@@ -77,55 +76,52 @@ Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Graphics/ColorTable.h ../Common/Context.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
../Geo/MinMax.h gl2ps.h ../Geo/Verif.h ../Mesh/Numeric.h
Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Graphics/ColorTable.h ../Common/Context.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
../Geo/Verif.h ../Mesh/Interpolation.h ../Mesh/Numeric.h
Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Graphics/ColorTable.h ../Common/Context.h
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h
PostSimplex.o: PostSimplex.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Graphics/ColorTable.h Iso.h ../Common/Context.h
+ ../Common/Const.h ../Common/ColorTable.h Iso.h ../Common/Context.h
Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/Const.h \
- ../Graphics/ColorTable.h
+ ../Common/ColorTable.h
Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Graphics/ColorTable.h ../Common/Context.h
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h
Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h \
- ../Common/Views.h ../Graphics/ColorTable.h ../Common/Context.h \
- gl2ps.h ../Unix/XContext.h
+ ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h gl2ps.h \
+ ../Unix/XContext.h
Volume.o: Volume.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Graphics/ColorTable.h ../Mesh/Interpolation.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Mesh/Interpolation.h \
../Common/Context.h
-ColorTable.o: ColorTable.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ColorTable.h ../Common/Context.h
gl2ps.o: gl2ps.cpp gl2ps.h
gl2gif.o: gl2gif.cpp gl2gif.h
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 5303e816bf..9f62671c1c 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2000-11-27 17:13:49 geuzaine Exp $
+# $Id: Makefile,v 1.6 2000-12-08 10:56:47 geuzaine Exp $
#
# Makefile for "libMesh.a"
#
@@ -178,8 +178,7 @@ depend:
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h 3D_Mesh.h ../Adapt/Adapt.h \
- ../Common/Views.h ../Common/Const.h ../Graphics/ColorTable.h \
- Numeric.h
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Numeric.h
3D_Extrude.o: 3D_Extrude.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 10c384c891..35c2332e82 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -165,7 +165,7 @@
#define tMINUSMINUS 415
#line 1 "Gmsh.y"
- /* $Id: Gmsh.tab.cpp,v 1.28 2000-12-07 19:03:57 geuzaine Exp $ */
+ /* $Id: Gmsh.tab.cpp,v 1.29 2000-12-08 10:56:49 geuzaine Exp $ */
#include <stdarg.h>
@@ -184,6 +184,7 @@
#include "Parser.h"
#include "Main.h"
#include "FunctionManager.h"
+#include "ColorTable.h"
#ifdef __DECCXX // bug in bison
#include <alloca.h>
@@ -209,10 +210,10 @@ static int i,j,k,flag,RecursionLevel=0,ImbricatedLoop = 0;
static double d;
static ExtrudeParams extr;
static List_T *ListOfDouble_L,*ListOfDouble2_L;
-static List_T *ListOfListOfDouble_L;
+static List_T *ListOfListOfDouble_L, *ListOfColor_L=NULL;
static void *pNumOpt, *pArrOpt;
-static char **pStrOpt;
+static char **pStrOpt, *pStrViewOpt;
static unsigned int *pColOpt;
static StringXString *pStrCat;
static StringXNumber *pNumCat;
@@ -223,7 +224,7 @@ void yyerror (char *s);
void vyyerror (char *fmt, ...);
-#line 60 "Gmsh.y"
+#line 61 "Gmsh.y"
typedef union {
char *c;
int i;
@@ -243,11 +244,11 @@ typedef union {
-#define YYFINAL 1490
+#define YYFINAL 1500
#define YYFLAG -32768
#define YYNTBASE 179
-#define YYTRANSLATE(x) ((unsigned)(x) <= 415 ? yytranslate[x] : 255)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 415 ? yytranslate[x] : 257)
static const short yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -312,22 +313,23 @@ static const short yyprhs[] = { 0,
946, 951, 955, 959, 964, 969, 974, 979, 986, 998,
1005, 1017, 1024, 1036, 1043, 1055, 1062, 1074, 1081, 1093,
1099, 1111, 1117, 1129, 1136, 1148, 1155, 1167, 1174, 1186,
- 1195, 1203, 1212, 1225, 1232, 1238, 1246, 1254, 1267, 1275,
- 1285, 1303, 1311, 1320, 1329, 1337, 1349, 1355, 1364, 1374,
- 1383, 1406, 1427, 1436, 1445, 1451, 1460, 1468, 1477, 1483,
- 1495, 1501, 1511, 1513, 1515, 1517, 1518, 1521, 1526, 1531,
- 1535, 1539, 1542, 1546, 1549, 1553, 1560, 1569, 1571, 1573,
- 1577, 1580, 1589, 1602, 1611, 1624, 1633, 1646, 1658, 1674,
- 1676, 1679, 1689, 1692, 1699, 1709, 1719, 1728, 1737, 1746,
- 1753, 1758, 1761, 1763, 1765, 1767, 1769, 1771, 1773, 1777,
- 1780, 1783, 1786, 1790, 1794, 1798, 1802, 1806, 1810, 1814,
- 1818, 1822, 1826, 1830, 1834, 1838, 1842, 1848, 1853, 1858,
- 1863, 1868, 1873, 1878, 1883, 1888, 1893, 1898, 1905, 1910,
- 1915, 1920, 1925, 1930, 1935, 1942, 1949, 1956, 1958, 1960,
- 1962, 1966, 1975, 1980, 1990, 1995, 2005, 2009, 2015, 2017,
- 2020, 2023, 2027, 2031, 2043, 2053, 2061, 2069, 2073, 2082,
- 2083, 2087, 2089, 2093, 2094, 2098, 2102, 2104, 2108, 2109,
- 2111, 2115, 2117, 2119, 2123, 2127, 2137, 2145, 2151, 2153
+ 1195, 1207, 1215, 1224, 1237, 1244, 1250, 1258, 1266, 1279,
+ 1287, 1297, 1315, 1323, 1332, 1341, 1349, 1361, 1367, 1376,
+ 1386, 1395, 1418, 1439, 1448, 1457, 1463, 1472, 1480, 1489,
+ 1495, 1507, 1513, 1523, 1525, 1527, 1529, 1530, 1533, 1538,
+ 1543, 1547, 1551, 1554, 1558, 1561, 1565, 1572, 1581, 1583,
+ 1585, 1589, 1592, 1601, 1614, 1623, 1636, 1645, 1658, 1670,
+ 1686, 1688, 1691, 1701, 1704, 1711, 1721, 1731, 1740, 1749,
+ 1758, 1765, 1770, 1773, 1775, 1777, 1779, 1781, 1783, 1785,
+ 1789, 1792, 1795, 1798, 1802, 1806, 1810, 1814, 1818, 1822,
+ 1826, 1830, 1834, 1838, 1842, 1846, 1850, 1854, 1860, 1865,
+ 1870, 1875, 1880, 1885, 1890, 1895, 1900, 1905, 1910, 1917,
+ 1922, 1927, 1932, 1937, 1942, 1947, 1954, 1961, 1968, 1970,
+ 1972, 1974, 1978, 1987, 1992, 2002, 2007, 2017, 2021, 2027,
+ 2029, 2032, 2035, 2039, 2043, 2055, 2065, 2073, 2081, 2085,
+ 2094, 2095, 2099, 2101, 2105, 2106, 2110, 2114, 2116, 2120,
+ 2121, 2123, 2127, 2129, 2131, 2135, 2139, 2149, 2157, 2163,
+ 2165, 2171, 2175, 2177
};
static const short yyrhs[] = { 181,
@@ -450,141 +452,144 @@ static const short yyrhs[] = { 181,
176, 4, 152, 246, 6, 0, 4, 176, 4, 153,
246, 6, 0, 4, 176, 63, 177, 243, 178, 176,
4, 153, 246, 6, 0, 4, 176, 84, 176, 4,
- 7, 254, 6, 0, 33, 171, 243, 173, 7, 246,
- 6, 0, 48, 33, 171, 243, 173, 7, 252, 6,
- 0, 64, 33, 252, 7, 174, 243, 172, 243, 172,
- 243, 175, 6, 0, 40, 41, 252, 7, 243, 6,
- 0, 33, 174, 243, 175, 6, 0, 36, 171, 243,
- 173, 7, 252, 6, 0, 38, 171, 243, 173, 7,
- 252, 6, 0, 64, 36, 252, 7, 174, 243, 172,
- 243, 172, 243, 175, 6, 0, 34, 171, 243, 173,
- 7, 252, 6, 0, 34, 171, 243, 173, 7, 252,
- 44, 246, 6, 0, 42, 171, 243, 173, 7, 174,
- 243, 172, 243, 172, 5, 172, 5, 172, 5, 175,
- 6, 0, 35, 171, 243, 173, 7, 252, 6, 0,
- 48, 36, 171, 243, 173, 7, 252, 6, 0, 36,
- 58, 171, 243, 173, 7, 252, 6, 0, 78, 171,
- 243, 173, 7, 252, 6, 0, 79, 171, 243, 173,
- 7, 252, 83, 252, 80, 243, 6, 0, 36, 174,
- 243, 175, 6, 0, 44, 37, 171, 243, 173, 7,
- 252, 6, 0, 136, 37, 171, 243, 173, 7, 243,
- 252, 6, 0, 45, 37, 171, 243, 173, 7, 252,
- 6, 0, 79, 37, 81, 82, 171, 243, 173, 7,
- 250, 83, 174, 252, 172, 252, 175, 80, 174, 243,
- 172, 243, 175, 6, 0, 79, 37, 171, 243, 173,
- 7, 250, 83, 174, 252, 172, 252, 175, 80, 174,
- 243, 172, 243, 175, 6, 0, 48, 37, 171, 243,
- 173, 7, 252, 6, 0, 37, 58, 171, 243, 173,
- 7, 252, 6, 0, 37, 174, 243, 175, 6, 0,
- 47, 39, 171, 243, 173, 7, 252, 6, 0, 39,
- 171, 243, 173, 7, 252, 6, 0, 48, 39, 171,
- 243, 173, 7, 252, 6, 0, 53, 246, 174, 230,
- 175, 0, 52, 174, 246, 172, 246, 172, 243, 175,
- 174, 230, 175, 0, 54, 246, 174, 230, 175, 0,
- 55, 174, 246, 172, 243, 175, 174, 230, 175, 0,
- 232, 0, 231, 0, 229, 0, 0, 231, 228, 0,
- 57, 174, 231, 175, 0, 61, 174, 231, 175, 0,
- 59, 5, 6, 0, 30, 5, 6, 0, 88, 6,
- 0, 89, 5, 6, 0, 31, 6, 0, 32, 243,
- 6, 0, 85, 171, 243, 8, 243, 173, 0, 85,
- 171, 243, 8, 243, 8, 243, 173, 0, 86, 0,
- 90, 0, 91, 4, 6, 0, 92, 4, 0, 56,
- 33, 174, 243, 172, 246, 175, 6, 0, 56, 33,
- 174, 243, 172, 246, 172, 246, 172, 243, 175, 6,
- 0, 56, 36, 174, 243, 172, 246, 175, 6, 0,
- 56, 36, 174, 243, 172, 246, 172, 246, 172, 243,
- 175, 6, 0, 56, 37, 174, 243, 172, 246, 175,
- 6, 0, 56, 37, 174, 243, 172, 246, 172, 246,
+ 7, 254, 6, 0, 4, 176, 63, 177, 243, 178,
+ 176, 84, 7, 255, 6, 0, 33, 171, 243, 173,
+ 7, 246, 6, 0, 48, 33, 171, 243, 173, 7,
+ 252, 6, 0, 64, 33, 252, 7, 174, 243, 172,
+ 243, 172, 243, 175, 6, 0, 40, 41, 252, 7,
+ 243, 6, 0, 33, 174, 243, 175, 6, 0, 36,
+ 171, 243, 173, 7, 252, 6, 0, 38, 171, 243,
+ 173, 7, 252, 6, 0, 64, 36, 252, 7, 174,
+ 243, 172, 243, 172, 243, 175, 6, 0, 34, 171,
+ 243, 173, 7, 252, 6, 0, 34, 171, 243, 173,
+ 7, 252, 44, 246, 6, 0, 42, 171, 243, 173,
+ 7, 174, 243, 172, 243, 172, 5, 172, 5, 172,
+ 5, 175, 6, 0, 35, 171, 243, 173, 7, 252,
+ 6, 0, 48, 36, 171, 243, 173, 7, 252, 6,
+ 0, 36, 58, 171, 243, 173, 7, 252, 6, 0,
+ 78, 171, 243, 173, 7, 252, 6, 0, 79, 171,
+ 243, 173, 7, 252, 83, 252, 80, 243, 6, 0,
+ 36, 174, 243, 175, 6, 0, 44, 37, 171, 243,
+ 173, 7, 252, 6, 0, 136, 37, 171, 243, 173,
+ 7, 243, 252, 6, 0, 45, 37, 171, 243, 173,
+ 7, 252, 6, 0, 79, 37, 81, 82, 171, 243,
+ 173, 7, 250, 83, 174, 252, 172, 252, 175, 80,
+ 174, 243, 172, 243, 175, 6, 0, 79, 37, 171,
+ 243, 173, 7, 250, 83, 174, 252, 172, 252, 175,
+ 80, 174, 243, 172, 243, 175, 6, 0, 48, 37,
+ 171, 243, 173, 7, 252, 6, 0, 37, 58, 171,
+ 243, 173, 7, 252, 6, 0, 37, 174, 243, 175,
+ 6, 0, 47, 39, 171, 243, 173, 7, 252, 6,
+ 0, 39, 171, 243, 173, 7, 252, 6, 0, 48,
+ 39, 171, 243, 173, 7, 252, 6, 0, 53, 246,
+ 174, 230, 175, 0, 52, 174, 246, 172, 246, 172,
+ 243, 175, 174, 230, 175, 0, 54, 246, 174, 230,
+ 175, 0, 55, 174, 246, 172, 243, 175, 174, 230,
+ 175, 0, 232, 0, 231, 0, 229, 0, 0, 231,
+ 228, 0, 57, 174, 231, 175, 0, 61, 174, 231,
+ 175, 0, 59, 5, 6, 0, 30, 5, 6, 0,
+ 88, 6, 0, 89, 5, 6, 0, 31, 6, 0,
+ 32, 243, 6, 0, 85, 171, 243, 8, 243, 173,
+ 0, 85, 171, 243, 8, 243, 8, 243, 173, 0,
+ 86, 0, 90, 0, 91, 4, 6, 0, 92, 4,
+ 0, 56, 33, 174, 243, 172, 246, 175, 6, 0,
+ 56, 33, 174, 243, 172, 246, 172, 246, 172, 243,
+ 175, 6, 0, 56, 36, 174, 243, 172, 246, 175,
+ 6, 0, 56, 36, 174, 243, 172, 246, 172, 246,
172, 243, 175, 6, 0, 56, 37, 174, 243, 172,
- 246, 175, 174, 238, 175, 6, 0, 56, 37, 174,
- 243, 172, 246, 172, 246, 172, 243, 175, 174, 238,
- 175, 6, 0, 239, 0, 238, 239, 0, 65, 174,
- 252, 172, 252, 172, 252, 175, 6, 0, 60, 6,
- 0, 46, 36, 252, 7, 243, 6, 0, 46, 36,
- 252, 7, 243, 49, 51, 243, 6, 0, 46, 36,
- 252, 7, 243, 49, 50, 243, 6, 0, 46, 37,
- 174, 243, 175, 7, 252, 6, 0, 43, 37, 174,
- 243, 175, 7, 252, 6, 0, 46, 39, 174, 243,
- 175, 7, 252, 6, 0, 60, 37, 252, 7, 243,
- 6, 0, 60, 37, 252, 6, 0, 62, 6, 0,
- 96, 0, 97, 0, 98, 0, 99, 0, 100, 0,
- 244, 0, 171, 243, 173, 0, 161, 243, 0, 160,
- 243, 0, 167, 243, 0, 243, 161, 243, 0, 243,
- 160, 243, 0, 243, 162, 243, 0, 243, 163, 243,
- 0, 243, 164, 243, 0, 243, 168, 243, 0, 243,
- 156, 243, 0, 243, 157, 243, 0, 243, 158, 243,
- 0, 243, 159, 243, 0, 243, 150, 243, 0, 243,
- 149, 243, 0, 243, 147, 243, 0, 243, 148, 243,
- 0, 243, 146, 243, 8, 243, 0, 10, 171, 243,
- 173, 0, 11, 171, 243, 173, 0, 12, 171, 243,
- 173, 0, 13, 171, 243, 173, 0, 14, 171, 243,
- 173, 0, 15, 171, 243, 173, 0, 16, 171, 243,
- 173, 0, 17, 171, 243, 173, 0, 18, 171, 243,
- 173, 0, 19, 171, 243, 173, 0, 20, 171, 243,
- 172, 243, 173, 0, 21, 171, 243, 173, 0, 22,
- 171, 243, 173, 0, 23, 171, 243, 173, 0, 24,
- 171, 243, 173, 0, 25, 171, 243, 173, 0, 26,
- 171, 243, 173, 0, 27, 171, 243, 172, 243, 173,
- 0, 28, 171, 243, 172, 243, 173, 0, 29, 171,
- 243, 172, 243, 173, 0, 3, 0, 9, 0, 4,
- 0, 4, 176, 4, 0, 4, 176, 63, 177, 243,
- 178, 176, 4, 0, 4, 176, 4, 169, 0, 4,
- 176, 63, 177, 243, 178, 176, 4, 169, 0, 4,
- 176, 4, 170, 0, 4, 176, 63, 177, 243, 178,
- 176, 4, 170, 0, 243, 8, 243, 0, 243, 8,
- 243, 8, 243, 0, 247, 0, 161, 246, 0, 160,
- 246, 0, 246, 161, 246, 0, 246, 160, 246, 0,
- 174, 243, 172, 243, 172, 243, 172, 243, 172, 243,
- 175, 0, 174, 243, 172, 243, 172, 243, 172, 243,
- 175, 0, 174, 243, 172, 243, 172, 243, 175, 0,
- 171, 243, 172, 243, 172, 243, 173, 0, 4, 176,
- 4, 0, 4, 176, 63, 177, 243, 178, 176, 4,
- 0, 0, 171, 249, 173, 0, 5, 0, 249, 172,
- 5, 0, 0, 174, 251, 175, 0, 171, 251, 173,
- 0, 252, 0, 251, 172, 252, 0, 0, 243, 0,
- 174, 253, 175, 0, 243, 0, 245, 0, 253, 172,
- 243, 0, 253, 172, 245, 0, 174, 243, 172, 243,
- 172, 243, 172, 243, 175, 0, 174, 243, 172, 243,
- 172, 243, 175, 0, 174, 4, 172, 243, 175, 0,
- 4, 0, 4, 176, 84, 176, 4, 0
+ 246, 175, 6, 0, 56, 37, 174, 243, 172, 246,
+ 172, 246, 172, 243, 175, 6, 0, 56, 37, 174,
+ 243, 172, 246, 175, 174, 238, 175, 6, 0, 56,
+ 37, 174, 243, 172, 246, 172, 246, 172, 243, 175,
+ 174, 238, 175, 6, 0, 239, 0, 238, 239, 0,
+ 65, 174, 252, 172, 252, 172, 252, 175, 6, 0,
+ 60, 6, 0, 46, 36, 252, 7, 243, 6, 0,
+ 46, 36, 252, 7, 243, 49, 51, 243, 6, 0,
+ 46, 36, 252, 7, 243, 49, 50, 243, 6, 0,
+ 46, 37, 174, 243, 175, 7, 252, 6, 0, 43,
+ 37, 174, 243, 175, 7, 252, 6, 0, 46, 39,
+ 174, 243, 175, 7, 252, 6, 0, 60, 37, 252,
+ 7, 243, 6, 0, 60, 37, 252, 6, 0, 62,
+ 6, 0, 96, 0, 97, 0, 98, 0, 99, 0,
+ 100, 0, 244, 0, 171, 243, 173, 0, 161, 243,
+ 0, 160, 243, 0, 167, 243, 0, 243, 161, 243,
+ 0, 243, 160, 243, 0, 243, 162, 243, 0, 243,
+ 163, 243, 0, 243, 164, 243, 0, 243, 168, 243,
+ 0, 243, 156, 243, 0, 243, 157, 243, 0, 243,
+ 158, 243, 0, 243, 159, 243, 0, 243, 150, 243,
+ 0, 243, 149, 243, 0, 243, 147, 243, 0, 243,
+ 148, 243, 0, 243, 146, 243, 8, 243, 0, 10,
+ 171, 243, 173, 0, 11, 171, 243, 173, 0, 12,
+ 171, 243, 173, 0, 13, 171, 243, 173, 0, 14,
+ 171, 243, 173, 0, 15, 171, 243, 173, 0, 16,
+ 171, 243, 173, 0, 17, 171, 243, 173, 0, 18,
+ 171, 243, 173, 0, 19, 171, 243, 173, 0, 20,
+ 171, 243, 172, 243, 173, 0, 21, 171, 243, 173,
+ 0, 22, 171, 243, 173, 0, 23, 171, 243, 173,
+ 0, 24, 171, 243, 173, 0, 25, 171, 243, 173,
+ 0, 26, 171, 243, 173, 0, 27, 171, 243, 172,
+ 243, 173, 0, 28, 171, 243, 172, 243, 173, 0,
+ 29, 171, 243, 172, 243, 173, 0, 3, 0, 9,
+ 0, 4, 0, 4, 176, 4, 0, 4, 176, 63,
+ 177, 243, 178, 176, 4, 0, 4, 176, 4, 169,
+ 0, 4, 176, 63, 177, 243, 178, 176, 4, 169,
+ 0, 4, 176, 4, 170, 0, 4, 176, 63, 177,
+ 243, 178, 176, 4, 170, 0, 243, 8, 243, 0,
+ 243, 8, 243, 8, 243, 0, 247, 0, 161, 246,
+ 0, 160, 246, 0, 246, 161, 246, 0, 246, 160,
+ 246, 0, 174, 243, 172, 243, 172, 243, 172, 243,
+ 172, 243, 175, 0, 174, 243, 172, 243, 172, 243,
+ 172, 243, 175, 0, 174, 243, 172, 243, 172, 243,
+ 175, 0, 171, 243, 172, 243, 172, 243, 173, 0,
+ 4, 176, 4, 0, 4, 176, 63, 177, 243, 178,
+ 176, 4, 0, 0, 171, 249, 173, 0, 5, 0,
+ 249, 172, 5, 0, 0, 174, 251, 175, 0, 171,
+ 251, 173, 0, 252, 0, 251, 172, 252, 0, 0,
+ 243, 0, 174, 253, 175, 0, 243, 0, 245, 0,
+ 253, 172, 243, 0, 253, 172, 245, 0, 174, 243,
+ 172, 243, 172, 243, 172, 243, 175, 0, 174, 243,
+ 172, 243, 172, 243, 175, 0, 174, 4, 172, 243,
+ 175, 0, 4, 0, 4, 176, 84, 176, 4, 0,
+ 174, 256, 175, 0, 254, 0, 256, 172, 254, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 140, 142, 143, 150, 158, 172, 184, 186, 189, 191,
- 192, 193, 196, 202, 207, 208, 209, 212, 216, 219,
- 225, 230, 236, 244, 249, 253, 259, 264, 268, 273,
- 277, 280, 285, 289, 293, 297, 302, 306, 309, 313,
- 317, 321, 325, 329, 333, 336, 340, 343, 347, 350,
- 359, 363, 369, 371, 372, 373, 374, 375, 376, 377,
- 378, 379, 380, 381, 383, 384, 387, 398, 403, 409,
- 414, 415, 416, 417, 418, 419, 420, 421, 422, 423,
- 424, 425, 428, 431, 435, 441, 447, 450, 454, 460,
- 466, 469, 473, 479, 485, 488, 492, 500, 506, 509,
- 513, 521, 527, 530, 534, 542, 548, 551, 555, 567,
- 573, 576, 580, 592, 598, 601, 605, 617, 623, 626,
- 630, 643, 649, 652, 656, 669, 675, 678, 682, 695,
- 707, 717, 725, 733, 741, 749, 757, 768, 781, 799,
- 816, 837, 854, 875, 892, 913, 930, 951, 968, 989,
- 1006, 1027, 1044, 1067, 1092, 1121, 1146, 1175, 1200, 1231,
- 1251, 1262, 1268, 1287, 1298, 1306, 1312, 1318, 1337, 1343,
- 1359, 1366, 1372, 1378, 1384, 1390, 1409, 1421, 1427, 1446,
- 1467, 1475, 1481, 1487, 1493, 1505, 1511, 1517, 1529, 1535,
- 1540, 1545, 1552, 1554, 1555, 1558, 1563, 1574, 1592, 1607,
- 1635, 1666, 1670, 1676, 1681, 1695, 1710, 1723, 1742, 1749,
- 1756, 1785, 1791, 1797, 1801, 1805, 1809, 1813, 1818, 1825,
- 1829, 1834, 1852, 1862, 1880, 1897, 1914, 1935, 1955, 1975,
- 1992, 2016, 2029, 2031, 2032, 2033, 2034, 2037, 2039, 2040,
- 2041, 2042, 2043, 2044, 2045, 2046, 2047, 2048, 2049, 2050,
- 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 2060,
- 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070,
- 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2080, 2082, 2083,
- 2092, 2109, 2130, 2147, 2168, 2185, 2207, 2214, 2227, 2232,
- 2236, 2240, 2244, 2249, 2254, 2258, 2262, 2266, 2292, 2324,
- 2328, 2333, 2337, 2342, 2346, 2350, 2356, 2362, 2368, 2372,
- 2378, 2385, 2391, 2400, 2404, 2414, 2419, 2423, 2428, 2433
+ 141, 143, 144, 151, 159, 173, 185, 187, 190, 192,
+ 193, 194, 197, 203, 208, 209, 210, 213, 217, 220,
+ 226, 231, 237, 245, 250, 254, 260, 265, 269, 274,
+ 278, 281, 286, 290, 294, 298, 303, 307, 310, 314,
+ 318, 322, 326, 330, 334, 337, 341, 344, 348, 351,
+ 360, 364, 370, 372, 373, 374, 375, 376, 377, 378,
+ 379, 380, 381, 382, 384, 385, 388, 399, 404, 410,
+ 415, 416, 417, 418, 419, 420, 421, 422, 423, 424,
+ 425, 426, 429, 432, 436, 442, 448, 451, 455, 461,
+ 467, 470, 474, 480, 486, 489, 493, 501, 507, 510,
+ 514, 522, 528, 531, 535, 543, 549, 552, 556, 568,
+ 574, 577, 581, 593, 599, 602, 606, 618, 624, 627,
+ 631, 644, 650, 653, 657, 670, 676, 679, 683, 696,
+ 708, 718, 726, 734, 742, 750, 758, 769, 782, 800,
+ 817, 838, 855, 876, 893, 914, 931, 952, 969, 990,
+ 1007, 1028, 1045, 1068, 1093, 1122, 1147, 1176, 1201, 1232,
+ 1245, 1270, 1281, 1287, 1306, 1317, 1325, 1331, 1337, 1356,
+ 1362, 1378, 1385, 1391, 1397, 1403, 1409, 1428, 1440, 1446,
+ 1465, 1486, 1494, 1500, 1506, 1512, 1524, 1530, 1536, 1548,
+ 1554, 1559, 1564, 1571, 1573, 1574, 1577, 1582, 1593, 1611,
+ 1626, 1654, 1685, 1689, 1695, 1700, 1714, 1729, 1742, 1761,
+ 1768, 1775, 1804, 1810, 1816, 1820, 1824, 1828, 1832, 1837,
+ 1844, 1848, 1853, 1871, 1881, 1899, 1916, 1933, 1954, 1974,
+ 1994, 2011, 2035, 2048, 2050, 2051, 2052, 2053, 2056, 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, 2086, 2087, 2088,
+ 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2099, 2101,
+ 2102, 2111, 2128, 2149, 2166, 2187, 2204, 2226, 2233, 2246,
+ 2251, 2255, 2259, 2263, 2268, 2273, 2277, 2281, 2285, 2311,
+ 2343, 2347, 2352, 2356, 2361, 2365, 2369, 2375, 2381, 2387,
+ 2391, 2397, 2404, 2410, 2419, 2423, 2433, 2438, 2442, 2447,
+ 2452, 2467, 2474, 2483
};
#endif
@@ -630,7 +635,7 @@ static const char * const yytname[] = { "$","error","$undefined.","tDOUBLE",
"Extrude","ExtrudeParameters","ExtrudeParameter","Transfini","Coherence","BoolExpr",
"FExpr","FExpr_Single","FExpr_Range","VExpr","VExpr_Single","ListOfStrings",
"RecursiveListOfStrings","ListOfListOfDouble","RecursiveListOfListOfDouble",
-"ListOfDouble","RecursiveListOfDouble","Color", NULL
+"ListOfDouble","RecursiveListOfDouble","Color","ListOfColor","RecursiveListOfColor", NULL
};
#endif
@@ -651,22 +656,23 @@ static const short yyr1[] = { 0,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 228, 228, 228, 228, 228, 228, 228, 228, 228,
228, 228, 228, 228, 228, 228, 228, 228, 228, 228,
- 228, 228, 228, 228, 228, 228, 228, 228, 228, 228,
- 228, 228, 228, 228, 228, 228, 228, 228, 229, 229,
- 229, 229, 230, 230, 230, 231, 231, 232, 233, 234,
- 235, 235, 235, 235, 235, 236, 236, 236, 236, 236,
- 236, 237, 237, 237, 237, 237, 237, 237, 237, 238,
- 238, 239, 239, 240, 240, 240, 240, 240, 240, 240,
- 240, 241, 242, 242, 242, 242, 242, 243, 243, 243,
+ 228, 228, 228, 228, 228, 228, 228, 228, 228, 229,
+ 229, 229, 229, 230, 230, 230, 231, 231, 232, 233,
+ 234, 235, 235, 235, 235, 235, 236, 236, 236, 236,
+ 236, 236, 237, 237, 237, 237, 237, 237, 237, 237,
+ 238, 238, 239, 239, 240, 240, 240, 240, 240, 240,
+ 240, 240, 241, 242, 242, 242, 242, 242, 243, 243,
243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
- 243, 243, 243, 243, 243, 243, 243, 244, 244, 244,
- 244, 244, 244, 244, 244, 244, 245, 245, 246, 246,
- 246, 246, 246, 247, 247, 247, 247, 247, 247, 248,
- 248, 249, 249, 250, 250, 250, 251, 251, 252, 252,
- 252, 253, 253, 253, 253, 254, 254, 254, 254, 254
+ 243, 243, 243, 243, 243, 243, 243, 243, 244, 244,
+ 244, 244, 244, 244, 244, 244, 244, 245, 245, 246,
+ 246, 246, 246, 246, 247, 247, 247, 247, 247, 247,
+ 248, 248, 249, 249, 250, 250, 250, 251, 251, 252,
+ 252, 252, 253, 253, 253, 253, 254, 254, 254, 254,
+ 254, 255, 256, 256
};
static const short yyr2[] = { 0,
@@ -686,22 +692,23 @@ static const short yyr2[] = { 0,
4, 3, 3, 4, 4, 4, 4, 6, 11, 6,
11, 6, 11, 6, 11, 6, 11, 6, 11, 5,
11, 5, 11, 6, 11, 6, 11, 6, 11, 8,
- 7, 8, 12, 6, 5, 7, 7, 12, 7, 9,
- 17, 7, 8, 8, 7, 11, 5, 8, 9, 8,
- 22, 20, 8, 8, 5, 8, 7, 8, 5, 11,
- 5, 9, 1, 1, 1, 0, 2, 4, 4, 3,
- 3, 2, 3, 2, 3, 6, 8, 1, 1, 3,
- 2, 8, 12, 8, 12, 8, 12, 11, 15, 1,
- 2, 9, 2, 6, 9, 9, 8, 8, 8, 6,
- 4, 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, 1, 1, 1,
- 3, 8, 4, 9, 4, 9, 3, 5, 1, 2,
- 2, 3, 3, 11, 9, 7, 7, 3, 8, 0,
- 3, 1, 3, 0, 3, 3, 1, 3, 0, 1,
- 3, 1, 1, 3, 3, 9, 7, 5, 1, 5
+ 11, 7, 8, 12, 6, 5, 7, 7, 12, 7,
+ 9, 17, 7, 8, 8, 7, 11, 5, 8, 9,
+ 8, 22, 20, 8, 8, 5, 8, 7, 8, 5,
+ 11, 5, 9, 1, 1, 1, 0, 2, 4, 4,
+ 3, 3, 2, 3, 2, 3, 6, 8, 1, 1,
+ 3, 2, 8, 12, 8, 12, 8, 12, 11, 15,
+ 1, 2, 9, 2, 6, 9, 9, 8, 8, 8,
+ 6, 4, 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, 1, 1,
+ 1, 3, 8, 4, 9, 4, 9, 3, 5, 1,
+ 2, 2, 3, 3, 11, 9, 7, 7, 3, 8,
+ 0, 3, 1, 3, 0, 3, 3, 1, 3, 0,
+ 1, 3, 1, 1, 3, 3, 9, 7, 5, 1,
+ 5, 3, 1, 3
};
static const short yydefact[] = { 51,
@@ -710,144 +717,145 @@ static const short yydefact[] = { 51,
10, 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, 208, 0, 0, 209,
+ 0, 0, 0, 0, 0, 0, 209, 0, 0, 210,
0, 0, 0, 52, 54, 53, 55, 56, 57, 58,
- 59, 63, 65, 64, 60, 61, 62, 278, 280, 279,
+ 59, 63, 65, 64, 60, 61, 62, 279, 281, 280,
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, 238, 12, 0, 13, 14,
- 16, 15, 17, 300, 300, 0, 66, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 204, 0, 0,
+ 0, 0, 0, 0, 0, 239, 12, 0, 13, 14,
+ 16, 15, 17, 301, 301, 0, 66, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 205, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 309, 0, 0, 0, 0, 309, 0, 0, 0, 0,
+ 310, 0, 0, 0, 0, 310, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 289, 0, 0, 0, 0, 0, 196, 0, 309, 196,
- 232, 0, 309, 309, 0, 0, 0, 0, 202, 0,
- 0, 211, 0, 0, 0, 0, 0, 0, 0, 0,
+ 290, 0, 0, 0, 0, 0, 197, 0, 310, 197,
+ 233, 0, 310, 310, 0, 0, 0, 0, 203, 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, 241, 240, 242, 0, 0, 0,
+ 0, 0, 0, 0, 242, 241, 243, 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, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 132, 133, 0, 0, 0, 201, 0,
- 205, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 310, 0, 0, 0, 0,
+ 0, 0, 0, 132, 133, 0, 0, 0, 202, 0,
+ 206, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 311, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 291, 290, 0, 0, 0, 0, 196, 196, 0,
- 0, 0, 0, 0, 200, 0, 0, 0, 70, 0,
- 0, 0, 0, 0, 0, 0, 203, 210, 0, 281,
+ 0, 292, 291, 0, 0, 0, 0, 197, 197, 0,
+ 0, 0, 0, 0, 201, 0, 0, 0, 70, 0,
+ 0, 0, 0, 0, 0, 0, 204, 211, 0, 282,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 239, 0, 255, 256, 254, 253, 249, 250, 251,
- 252, 241, 240, 245, 246, 247, 248, 0, 0, 0,
+ 0, 240, 0, 256, 257, 255, 254, 250, 251, 252,
+ 253, 242, 241, 246, 247, 248, 249, 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, 302, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 303, 0,
0, 0, 0, 131, 134, 135, 136, 137, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 244, 243,
+ 0, 0, 0, 0, 0, 0, 0, 0, 245, 244,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 312, 313, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 298, 0,
- 0, 0, 293, 292, 195, 0, 194, 193, 0, 0,
- 0, 0, 0, 198, 197, 231, 0, 199, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 283, 285,
- 0, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 0, 269, 270, 271, 272, 273, 274, 0, 0,
+ 0, 313, 314, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 299, 0,
+ 0, 0, 294, 293, 196, 0, 195, 194, 0, 0,
+ 0, 0, 0, 199, 198, 232, 0, 200, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 284, 286,
+ 0, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 268, 0, 270, 271, 272, 273, 274, 275, 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, 301, 0, 19, 0, 280, 0,
+ 0, 0, 0, 0, 302, 0, 19, 0, 281, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 150, 152, 0, 0, 0, 0, 165, 309, 309,
- 0, 309, 177, 0, 185, 309, 309, 0, 0, 311,
+ 0, 150, 152, 0, 0, 0, 0, 166, 310, 310,
+ 0, 310, 178, 0, 186, 310, 310, 0, 0, 312,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 189, 191, 0,
+ 0, 0, 0, 0, 0, 0, 0, 190, 192, 0,
0, 0, 0, 0, 70, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 71, 72,
73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 0, 0, 309, 0, 0, 309, 0, 0, 0, 0,
- 0, 0, 0, 257, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 309, 309, 0, 0, 0, 0,
- 309, 309, 0, 0, 0, 0, 0, 309, 0, 309,
- 0, 0, 0, 0, 0, 303, 0, 300, 0, 138,
+ 0, 0, 310, 0, 0, 310, 0, 0, 0, 0,
+ 0, 0, 0, 258, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 310, 310, 0, 0, 0, 0,
+ 310, 310, 0, 0, 0, 0, 0, 310, 0, 310,
+ 0, 0, 0, 0, 0, 304, 0, 301, 0, 138,
0, 140, 154, 142, 156, 144, 158, 146, 148, 0,
- 0, 0, 0, 0, 0, 309, 0, 309, 0, 0,
- 287, 314, 315, 164, 0, 309, 309, 309, 224, 0,
- 309, 309, 309, 309, 309, 309, 309, 0, 0, 0,
- 0, 0, 0, 0, 0, 230, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 310, 0, 310, 0, 0,
+ 288, 315, 316, 165, 0, 310, 310, 310, 225, 0,
+ 310, 310, 310, 310, 310, 310, 310, 0, 0, 0,
+ 0, 0, 0, 0, 0, 231, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 68,
- 0, 0, 0, 0, 304, 0, 0, 206, 0, 0,
- 268, 275, 276, 277, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 305, 0, 0, 207, 0, 0,
+ 269, 276, 277, 278, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 233, 234,
- 235, 236, 237, 0, 0, 0, 0, 0, 0, 0,
- 18, 0, 281, 0, 0, 319, 0, 0, 67, 161,
- 169, 0, 172, 0, 166, 0, 167, 187, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 234, 235,
+ 236, 237, 238, 0, 0, 0, 0, 0, 0, 0,
+ 18, 0, 282, 0, 0, 320, 0, 0, 67, 162,
+ 170, 0, 173, 0, 167, 0, 168, 188, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 196, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 197, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 175, 0,
- 309, 309, 0, 309, 0, 309, 0, 0, 0, 0,
- 309, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 309,
- 0, 0, 0, 0, 0, 0, 0, 0, 300, 0,
- 0, 0, 280, 0, 160, 0, 174, 184, 288, 0,
- 228, 178, 180, 0, 0, 227, 229, 186, 162, 173,
- 183, 188, 0, 0, 297, 0, 296, 0, 0, 212,
- 0, 214, 0, 216, 0, 69, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 176, 0,
+ 310, 310, 0, 310, 0, 310, 0, 0, 0, 0,
+ 310, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 310,
+ 0, 0, 0, 0, 0, 0, 0, 0, 301, 0,
+ 0, 0, 0, 281, 0, 160, 0, 175, 185, 289,
+ 0, 229, 179, 181, 0, 0, 228, 230, 187, 163,
+ 174, 184, 189, 0, 0, 298, 0, 297, 0, 0,
+ 213, 0, 215, 0, 217, 0, 69, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 304, 0, 307, 0, 0, 0, 207, 0, 282, 0,
- 0, 0, 0, 21, 0, 30, 0, 34, 0, 28,
- 0, 0, 33, 0, 38, 36, 0, 0, 0, 0,
- 0, 0, 45, 0, 0, 0, 0, 0, 50, 0,
+ 0, 305, 0, 308, 0, 0, 0, 208, 0, 283,
+ 0, 0, 0, 0, 21, 0, 30, 0, 34, 0,
+ 28, 0, 0, 33, 0, 38, 36, 0, 0, 0,
+ 0, 0, 0, 45, 0, 0, 0, 0, 0, 50,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 170, 0, 226, 225, 196, 299, 0, 192,
- 0, 0, 0, 0, 0, 0, 220, 0, 0, 0,
+ 0, 0, 0, 0, 171, 0, 227, 226, 197, 300,
+ 0, 193, 0, 0, 0, 0, 0, 0, 221, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 309, 306, 305, 309, 0, 179, 284, 286,
- 0, 0, 304, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 309, 0, 0, 0, 0,
+ 0, 0, 0, 0, 310, 307, 306, 310, 0, 180,
+ 285, 287, 0, 0, 305, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 310, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 295, 0, 0, 0, 223, 309, 0, 221, 0,
+ 0, 0, 0, 0, 0, 296, 0, 0, 0, 224,
+ 310, 0, 222, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 309, 0,
+ 0, 0, 35, 0, 0, 0, 0, 25, 0, 31,
+ 0, 37, 26, 39, 0, 42, 0, 46, 47, 0,
+ 0, 49, 0, 0, 0, 139, 141, 155, 143, 157,
+ 145, 159, 147, 149, 151, 153, 323, 0, 161, 321,
+ 319, 0, 0, 191, 0, 0, 0, 0, 0, 219,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 308, 0, 0, 0, 35, 0,
- 0, 0, 0, 25, 0, 31, 0, 37, 26, 39,
- 0, 42, 0, 46, 47, 0, 0, 49, 0, 0,
- 0, 139, 141, 155, 143, 157, 145, 159, 147, 149,
- 151, 153, 320, 318, 0, 0, 190, 0, 0, 0,
- 0, 0, 218, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 309, 309, 176,
+ 0, 0, 0, 0, 310, 310, 177, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 282, 0, 0, 294, 213, 215, 217,
- 0, 309, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 85, 89, 93, 163, 168, 0, 0, 0, 0,
- 0, 0, 0, 29, 32, 40, 0, 41, 48, 43,
- 0, 0, 317, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 309, 0,
+ 283, 0, 322, 0, 0, 295, 214, 216, 218, 0,
+ 310, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 85, 89, 93, 164, 169, 0, 0, 0, 0, 0,
+ 0, 0, 29, 32, 40, 0, 41, 48, 43, 0,
+ 324, 0, 318, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 310, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 309, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 310, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 24, 27,
- 0, 0, 316, 0, 219, 0, 0, 0, 0, 0,
+ 0, 0, 317, 0, 220, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 83, 0, 87, 0,
- 91, 0, 0, 0, 0, 309, 0, 0, 0, 0,
+ 91, 0, 0, 0, 0, 310, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 44, 20, 171, 222, 0, 0, 0, 0, 0, 0,
+ 44, 20, 172, 223, 0, 0, 0, 0, 0, 0,
0, 0, 0, 84, 86, 88, 90, 92, 94, 0,
- 0, 0, 0, 309, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 310, 0, 0, 0, 0, 0, 0,
97, 101, 105, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
- 309, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 182, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 95, 0, 99, 0, 103, 0, 309, 0,
+ 310, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 183, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 95, 0, 99, 0, 103, 0, 310, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 181, 0, 22, 0, 0, 0, 0, 0,
- 0, 96, 98, 100, 102, 104, 106, 309, 0, 0,
+ 0, 0, 182, 0, 22, 0, 0, 0, 0, 0,
+ 0, 96, 98, 100, 102, 104, 106, 310, 0, 0,
0, 109, 113, 117, 0, 0, 0, 0, 0, 0,
- 0, 309, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 310, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 107, 0, 111, 0, 115, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 108, 110, 112, 114, 116, 118, 0, 121,
@@ -856,1216 +864,1244 @@ static const short yydefact[] = { 51,
0, 120, 122, 124, 126, 128, 130, 0, 0, 0
};
-static const short yydefgoto[] = { 1488,
+static const short yydefgoto[] = { 1498,
4, 5, 18, 19, 20, 21, 6, 64, 65, 66,
- 470, 1266, 609, 1216, 1268, 610, 1217, 1270, 611, 1218,
- 1372, 612, 1345, 1374, 613, 1346, 1376, 614, 1347, 1433,
- 615, 1419, 1435, 616, 1420, 1437, 617, 1421, 1470, 618,
- 1464, 1472, 619, 1465, 1474, 620, 1466, 67, 465, 455,
- 456, 457, 458, 71, 72, 73, 74, 75, 996, 997,
+ 470, 1276, 609, 1226, 1278, 610, 1227, 1280, 611, 1228,
+ 1382, 612, 1355, 1384, 613, 1356, 1386, 614, 1357, 1443,
+ 615, 1429, 1445, 616, 1430, 1447, 617, 1431, 1480, 618,
+ 1474, 1482, 619, 1475, 1484, 620, 1476, 67, 465, 455,
+ 456, 457, 458, 71, 72, 73, 74, 75, 998, 999,
76, 77, 774, 286, 106, 433, 302, 161, 256, 400,
- 843, 932, 933, 434, 788
+ 843, 933, 934, 434, 788, 1059, 1128
};
-static const short yypact[] = { 350,
--32768,-32768, -36,-32768, 426, 2200, 1195, 135, 94, 137,
- 144, 156, 163, 169, -144, 50, 78,-32768,-32768,-32768,
--32768, 289, 99, 30, 303, 1195, -100, 145, 150, -35,
- -40, 183, 193, 332, 237, 347, 377, 384, 319, 393,
- 27, 267, 3, 3, 272, 83, 299, 437, 442, 309,
- 478, 486, 227, 326, -29, 327,-32768, 496, 498,-32768,
- 500, 504, 472,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 357,-32768,
- 375, 378, 379, 380, 381, 389, 392, 403, 404, 405,
- 408, 413, 414, 415, 417, 418, 419, 420, 421, 422,
- 1195, 1195, 1195, 1195, 1482,-32768,-32768, 2236,-32768,-32768,
--32768,-32768,-32768, 423, 423, 548,-32768, 1195, 1195, 1195,
- 1195, 1195, 558, 574, 20, 590, 594,-32768, 627, 1195,
- 1195, 1195, 1195, 430, 1195, 1195, 431, 1195, 1195, 1195,
- 730, 1195, 429, 447, 449, 730, 439, 445, 450, 451,
- 453, 455, 461, 3, 458, 3, 3, 1195, 1195, -92,
--32768, -81, 3, 462, 463, 470,-32768, 619, 730,-32768,
--32768, -1, 730, 730, 1195, -68, 1195, 1195,-32768, 629,
- 639,-32768, 475, 12, 1195, 1195, 1195, 1195, 1195, 1195,
- 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
- 1195, 1195, 1195, 1195, 479, 479, 479, 2857, 1195, 1195,
- 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
- 1195, 1195, 1195, 1482, 477, 487, 488, 489, 494, 497,
- 499, 501, 503, 506, 507, 508, 510, 512, 513, 514,
- 515, 516, 518, 528, 529, 535, 536, 537, 538, 539,
- 552, 553, 554, 555, 659, 495, 532, 556, 676, 973,
- 1295, 1366, 1390,-32768,-32768, 103, 550, 559,-32768, 557,
--32768, 1195, 1195, 2885, 2355, 2913, 2941, 1195, 2969, 2378,
- 1195, 2401, 2997, 3025, 1195, 7529, 664, 3053, 1195, 1195,
- 1195, 668, 1195, 1195, 1195, 1195, 1195, 1195, 1195, -23,
- 18,-32768,-32768, 4621, 4648, 3, 3, 382, 382, -5,
- 1195, 1195, 1195, 2130,-32768, 84, 2148, 3,-32768, 724,
- 729, 3081, 655, 1195, 3109, 1029,-32768,-32768, 1195, 124,
- 583, 3137, 3165, 3193, 3221, 3249, 3277, 3305, 3333, 3361,
- 3389, 4675, 3417, 3445, 3473, 3501, 3529, 3557, 4702, 4729,
- 4756,-32768, 1943, 448, 448, 534, 534, 256, 256, 256,
- 256, -28, -20, 479, 479, 479, 479, 4783, 756, 757,
- 758, 759, 761, 762, 763, 764, 765, 766, 767, 773,
- 774, 776, 788, 789, 791, 794, 795, 796, 797, 798,
- 799, 677, 800, 802, 804, 806, 810, 809,-32768, -55,
- 811, 812, 814,-32768,-32768,-32768,-32768,-32768, 315, 927,
- 927, 1195, 1195, 815, 821, 1195, 813, 1195, 117, 117,
- 808, 822, 835, 838, 3585, 839, 823, 3613, 841, 842,
- 843, 1966,-32768, 95, 1195, 844, 2424, 3641, 3669, 1195,
- 2447, 2470, 3697, 3725, 3753, 3781, 3809, 3,-32768, 643,
- 1195, 1195,-32768,-32768,-32768, 673, 1011,-32768, 679, 1195,
- 4806, 4833, 4860,-32768,-32768,-32768, 1195,-32768, -75, -30,
- 678, 681, 849, 686, 3837, 851, 1195, 3865,-32768,-32768,
- 1195,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 1195,-32768,-32768,-32768,-32768,-32768,-32768, 1195, 1195,
- 1195, 1195, 716, 691, 692, 693, 694, 696, 697, 698,
- 700, 702, 703, 704, 705, 706, 707, 708, 709, 710,
- 712, 713, 714, 715, 717, 720, 721, 722, 723, 726,
- 728, 731, 733, 883,-32768, 734,-32768, 736, 746, 890,
- 927, 927, 1195, 1416, -2, 1459, 0, 1549, 5, 1575,
- 1598,-32768,-32768, 2150, 895, 3893, 3,-32768, 730, 730,
- 899, 730,-32768, 902,-32768, 730, 730, 1195, 1195,-32768,
- 1627, 749, 917, 918, 919, 409, 920, 921, 922, 925,
- 928, 950, 951, 151, 1195, 4887, 4914,-32768,-32768, 2493,
- 3, 3, 3, 1650,-32768, 790, 805, 807, 816, 817,
- 818, 819, 820, 824, 825, 826, 827, 953,-32768,-32768,
+static const short yypact[] = { 880,
+-32768,-32768, -116,-32768, 454, 2236, 1143, 54, 55, 66,
+ 72, 84, 111, 113, -31, -25, -8,-32768,-32768,-32768,
+-32768, 167, 99, 30, 220, 1143, -72, 47, 92, -44,
+ -40, 124, 132, 229, 145, 222, 284, 312, 10, 317,
+ 274, 149, 1, 1, 177, 265, 188, 378, 357, 234,
+ 413, 432, 85, 285, -30, 294,-32768, 440, 458,-32768,
+ 460, 462, 430,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 295,-32768,
+ 297, 298, 301, 302, 306, 309, 310, 313, 316, 319,
+ 320, 325, 326, 327, 328, 329, 335, 336, 337, 338,
+ 1143, 1143, 1143, 1143, 1524,-32768,-32768, 2258,-32768,-32768,
+-32768,-32768,-32768, 349, 349, 474,-32768, 1143, 1143, 1143,
+ 1143, 1143, 477, 482, 16, 515, 517,-32768, 688, 1143,
+ 1143, 1143, 1143, 353, 1143, 1143, 354, 1143, 1143, 1143,
+ 640, 1143, 359, 356, 358, 640, 372, 374, 379, 380,
+ 382, 385, 386, 1, 376, 1, 1, 1143, 1143, -122,
+-32768, -106, 1, 384, 389, 390,-32768, 553, 640,-32768,
+-32768, 0, 640, 640, 1143, -68, 1143, 1143,-32768, 554,
+ 567,-32768, 403, 11, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1143, 407, 407, 407, 2932, 1143, 1143,
+ 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1524, 405, 406, 408, 409, 416, 417,
+ 418, 441, 442, 445, 447, 448, 449, 450, 451, 452,
+ 453, 455, 456, 457, 461, 463, 464, 465, 466, 468,
+ 469, 470, 475, 476, 606, 473, 497, 499, 729, 892,
+ 973, 1038, 1328,-32768,-32768, 103, 471, 496,-32768, 501,
+-32768, 1143, 1143, 2960, 2430, 2988, 3016, 1143, 3044, 2453,
+ 1143, 2476, 3072, 3100, 1143, 7577, 618, 3128, 1143, 1143,
+ 1143, 667, 1143, 1143, 1143, 1143, 1143, 1143, 1143, -56,
+ 12,-32768,-32768, 2186, 4696, 1, 1, 293, 293, -52,
+ 1143, 1143, 1143, 2090,-32768, 308, 2166, 1,-32768, 668,
+ 670, 3156, 596, 1143, 3184, 1930,-32768,-32768, 1143, 272,
+ 502, 3212, 3240, 3268, 3296, 3324, 3352, 3380, 3408, 3436,
+ 3464, 4723, 3492, 3520, 3548, 3576, 3604, 3632, 4750, 4777,
+ 4804,-32768, 1953, 381, 381, -76, -76, 254, 254, 254,
+ 254, -105, -101, 407, 407, 407, 407, 4831, 675, 676,
+ 678, 679, 680, 681, 682, 684, 685, 686, 687, 690,
+ 691, 692, 693, 694, 695, 697, 700, 701, 702, 703,
+ 704, 564, 705, 718, 719, 720, 723, 722,-32768, 276,
+ 724, 725, 728,-32768,-32768,-32768,-32768,-32768, 315, 1087,
+ 1087, 1143, 1143, 730, 731, 1143, 735, 1143, 117, 117,
+ 721, 734, 727, 736, 3660, 737, 739, 3688, 740, 742,
+ 743, 2003,-32768, -16, 1143, 744, 2499, 3716, 3744, 1143,
+ 2522, 2545, 3772, 3800, 3828, 3856, 3884, 1,-32768, 570,
+ 1143, 1143,-32768,-32768,-32768, 578, 1186,-32768, 579, 1143,
+ 4854, 4881, 4908,-32768,-32768,-32768, 1143,-32768, -103, 749,
+ 582, 583, 751, 588, 3912, 753, 1143, 3940,-32768,-32768,
+ 1143,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 1143,-32768,-32768,-32768,-32768,-32768,-32768, 1143, 1143,
+ 1143, 1143, 619, 589, 591, 592, 594, 595, 597, 598,
+ 599, 600, 607, 609, 621, 622, 624, 630, 631, 632,
+ 633, 634, 637, 641, 655, 656, 657, 660, 661, 683,
+ 696, 698, 710, 763,-32768, 605,-32768, 732, 623, 833,
+ 1087, 1087, 1143, 1435, 4, 1458, 6, 1488, 39, 1580,
+ 1603,-32768,-32768, 2248, 835, 3968, 1,-32768, 640, 640,
+ 847, 640,-32768, 850,-32768, 640, 640, 1143, 1143,-32768,
+ 1626, 666, 851, 852, 856, 627, 857, 858, 859, 862,
+ 865, 867, 887, -18, 1143, 4935, 4962,-32768,-32768, 2568,
+ 1, 1, 1, 1651,-32768, 738, 752, 754, 755, 756,
+ 757, 758, 759, 760, 761, 762, 764, 889,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 1195, 1195, 730, 1195, 955, 730, 493, 966, 2226, 3921,
- 3949, 3977, 4005, 7529, 853, 931, 1195, 1195, 3, 957,
- 974, 831, 977, 978, 730, 730, 979, 3, 980, 991,
- 730, 730, 996, 997, 998, 999, 1002, 730, 351, 730,
- 1003, 1004, 1006, 1005, 1009,-32768, 1001, 423, 21,-32768,
- 2829,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 846,
- 24, 1012, 59, 23, 1017, 730, 1018, 730, 1019, 1020,
- 1994, 1966,-32768,-32768, 1195, 730, 730, 730,-32768, 264,
- 730, 730, 730, 730, 730, 730, 730, 1195, 2249, 1195,
- 1195, 854, -99, -83, 138,-32768, -18, 1195, 1195, 1195,
- 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,-32768,
- 4941, 4968, 1023, 4033, 178, 932, 1195,-32768, 1195, 855,
--32768,-32768,-32768,-32768, 1195, 845, 4995, 5022, -73, 858,
- 860, 862, 863, 866, 867, 869, 870, -52, 871, 879,
- 884, 888, 889, 904, 906, 907, 910, 911,-32768,-32768,
--32768,-32768,-32768, 913, 914, 923, 924, 930, 934, 936,
--32768, 937, 124, 885, 1035, 915, 1234, 1077,-32768,-32768,
--32768, 3,-32768, 1086,-32768, 1087,-32768,-32768, 1195, 5049,
- 1091, 1097, 1098, 1195, 1195, 1104, 1105, 1107, 1109, 1110,
- 1111, 1118, 2516, 949, 4061, 1518, 382, 3, 1120, 3,
- 1121, 3, 25, 1122, 5076, 5103, 5130, 5157, 5184, 5211,
- 5238, 5265, 5292, 5319, 5346, 5373, 1195, 1195,-32768, 1131,
- 730, 730, 1056, 730, 4089, 219, 1139, 1482, 1142, 1195,
- 730, 1140, 1145, 1143, 992, 1147, 351, 1156, 1160, 1195,
- 1158, 1162, 1174, 1175, 1180, 351, 1195, 1195, 1195, 730,
- 1178, 1191, 351, 1195, 1193, 1197, 1196, 1195, 423, 1195,
- 243, 1117, -146, 5400,-32768, 64,-32768,-32768, 7529, 1195,
--32768,-32768,-32768, 1678, 1709,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, 1066, 1199,-32768, 1195,-32768, 1067, 185,-32768,
- 187,-32768, 200,-32768, 199,-32768, 1195, 1195, 1195, 1195,
- 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 5427, 5454,
- 178, 190,-32768, 213, 1090, 1161,-32768, 1259, 261, 1482,
- 1095, 5481, 1099,-32768, 1100,-32768, 1101,-32768, 1096,-32768,
- 1112, 4117,-32768, 1114,-32768,-32768, 1115, 1116, 4145, 5508,
- 4173, 1123,-32768, 1119, 1124, 5535, 1127, 1129,-32768, 5562,
- 1132, 2272, 502, 927, 927, 1195, 1195, 1195, 1195, 1094,
- 1195, 1195,-32768, 5589,-32768,-32768, 382,-32768, 2295,-32768,
- 1195, 1195, 1195, 1284, 1133, -48,-32768, 5616, 5643, 5670,
- 5697, 5724, 5751, 5778, 5805, 5832, 5859, 5886, 5913, 1195,
- 1195, 1210, 730,-32768,-32768, 730, 1195,-32768,-32768,-32768,
- 2546, 1288, 178, 351, 1293, 1195, 1297, 351, 1300, 1305,
- 1303, 1304, 1306, 1195, 1309, 730, 1310, 1311, 1195, 1308,
- 1319, 1195, 1321, 1151, 1322, 1734, 66, 1757, 101, 1786,
- 116, 1809, 1837, 1868, 1893, 1325, 2569, 5940, 1326, 1155,
- 1195,-32768, 2592, 2615, 2638,-32768, 730, 1327,-32768, 1195,
- 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
- 1195, 2661, 2684, 1163,-32768, 1164, 1916, 1195,-32768, 1166,
- 1167, 1168, 5967,-32768, 1159,-32768, 1169,-32768,-32768,-32768,
- 4201,-32768, 1171,-32768,-32768, 4229, 1172,-32768, 4257, 1185,
- 1330,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768, 1195, 1186,-32768, 2707, 1329, 1338,
- 26, 1187,-32768, 5994, 6021, 6048, 6075, 6102, 6129, 6156,
- 6183, 6210, 4285, 4313, 4341, 1354, 1355, 730, 730,-32768,
- 1482, 351, 351, 351, 351, 1357, 1358, 1359, 351, 1361,
- 1362, 1363, 1365, 261, 2325, 1368,-32768,-32768,-32768,-32768,
- 199, 730, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
- 1195,-32768,-32768,-32768,-32768,-32768, 1209, 1208, 1482, 1213,
- 1214, 1198, 1215,-32768,-32768,-32768, 1217,-32768,-32768,-32768,
- 1218, 1195,-32768, 1219, -45, 1220, 6237, 6264, 6291, 6318,
- 6345, 6372, 6399, 6426, 6453, 1223, 1224, 1225, 730, 1307,
- 2737, 351, 351, 1387, 1394, 351, 1401, 2760, 1402, 1403,
- 730, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
- 1195, 1195, 1195, 1233, 1236, 1195, 1239, 1240,-32768,-32768,
- 1241, 1242,-32768, 1238,-32768, 1248, 6480, 6507, 6534, 6561,
- 6588, 6615, 6642, 6669, 6696, 217, 7529, 235, 7529, 250,
- 7529, 1344, 1195, 1482, 351, 730, 1419, 1420, 1421, 1422,
- 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
- 1423, 1195, 1424, 1195, 1425, 1258, 6723, 1482, 1265, 1267,
--32768,-32768,-32768,-32768, 6750, 6777, 6804, 6831, 6858, 6885,
- 4369, 4397, 4425, 7529,-32768, 7529,-32768, 7529,-32768, 1195,
- 1195, 7506, 351, 730, 1195, 1195, 1195, 1195, 1195, 1195,
--32768,-32768,-32768, 6912, 2783, 1301, 1275, 1276, 6939, 6966,
- 6993, 7020, 7047, 7074, 1290, 1292, 1294, 1195, 1443,-32768,
- 730, 351, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195,
- 1195, 2806,-32768, 1278, 1299, 7101, 7128, 7155, 7182, 7209,
- 7236, 268, 7529, 280, 7529, 282, 7529, 1468, 730, 1469,
- 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1470, 1195, 1471,
- 1195, 1472,-32768, 1312,-32768, 7263, 7290, 7317, 4453, 4481,
- 4509, 7529,-32768, 7529,-32768, 7529,-32768, 730, 1195, 1195,
- 1195,-32768,-32768,-32768, 1315, 7344, 7371, 7398, 1314, 1343,
- 1345, 730, 1195, 1195, 1195, 1195, 1195, 1195, 1317, 7425,
- 7452, 7479, 284, 7529, 297, 7529, 305, 7529, 351, 1195,
- 1195, 1195, 1195, 1473, 1195, 1474, 1195, 1475, 1347, 4537,
- 4565, 4593, 7529,-32768, 7529,-32768, 7529,-32768, 1476,-32768,
--32768,-32768,-32768, 1367, 1369, 1370, 1195, 1195, 1195, 306,
- 7529, 324, 7529, 373, 7529, 1195, 1477, 1195, 1512, 1195,
- 1525, 7529,-32768, 7529,-32768, 7529,-32768, 1532, 1533,-32768
+ 1143, 1143, 640, 1143, 894, 640, 355, 895, 2271, 3996,
+ 4024, 4052, 4080, 7577, 766, 893, 1143, 1143, 1, 896,
+ 900, 745, 903, 905, 640, 640, 907, 1, 945, 946,
+ 640, 640, 948, 949, 950, 951, 953, 640, 273, 640,
+ 954, 955, 956, 959, 960,-32768, 952, 349, 13,-32768,
+ 2904,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 783,
+ 2, 968, 64, 17, 969, 640, 974, 640, 975, 978,
+ 2027, 2003,-32768,-32768, 1143, 640, 640, 640,-32768, 401,
+ 640, 640, 640, 640, 640, 640, 640, 1143, 2294, 1143,
+ 1143, 811, -132, -124, -119,-32768, 870, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,-32768,
+ 4989, 5016, 983, 4108, 93, 916, 1143,-32768, 1143, 814,
+-32768,-32768,-32768,-32768, 1143, 828, 5043, 5070, -129, 829,
+ 830, 832, 834, 836, 837, 839, 841, -96, 842, 843,
+ 846, 853, 854, 855, 860, 861, 863, 849,-32768,-32768,
+-32768,-32768,-32768, 864, 871, 874, 875, 885, 886, 890,
+-32768, 891, 272, 825, 7, 848, 1551, 1003,-32768,-32768,
+-32768, 1,-32768, 1009,-32768, 1017,-32768,-32768, 1143, 5097,
+ 1022, 1024, 1025, 1143, 1143, 1055, 1058, 1059, 1060, 1073,
+ 1074, 1075, 2591, 906, 4136, 2340, 293, 1, 1077, 1,
+ 1078, 1, 3, 1080, 5124, 5151, 5178, 5205, 5232, 5259,
+ 5286, 5313, 5340, 5367, 5394, 5421, 1143, 1143,-32768, 1081,
+ 640, 640, 1004, 640, 4164, 218, 1085, 1524, 1089, 1143,
+ 640, 1088, 1090, 1111, 933, 1112, 273, 1118, 1123, 1143,
+ 1121, 1125, 1132, 1133, 1137, 273, 1143, 1143, 1143, 640,
+ 1136, 1140, 273, 1143, 1141, 1142, 1144, 1143, 349, 1143,
+ 243, 1166, 1064, -83, 5448,-32768, 101,-32768,-32768, 7577,
+ 1143,-32768,-32768,-32768, 1692, 1715,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 1000, 1145,-32768, 1143,-32768, 1014, -12,
+-32768, -3,-32768, 88,-32768, 90,-32768, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 5475,
+ 5502, 93, 286,-32768, 137, 1016, 1113,-32768, 1197, 292,
+ 1524, 1019, 5529, 1032,-32768, 1035,-32768, 1036,-32768, 1037,
+-32768, 1039, 4192,-32768, 1040,-32768,-32768, 1041, 1042, 4220,
+ 5556, 4248, 1044,-32768, 1045, 1054, 5583, 1057, 1079,-32768,
+ 5610, 1083, 2317, 581, 1087, 1087, 1143, 1143, 1143, 1143,
+ 1043, 1033, 1143, 1143,-32768, 5637,-32768,-32768, 293,-32768,
+ 2370,-32768, 1143, 1143, 1143, 1207, 1082, -39,-32768, 5664,
+ 5691, 5718, 5745, 5772, 5799, 5826, 5853, 5880, 5907, 5934,
+ 5961, 1143, 1143, 1149, 640,-32768,-32768, 640, 1143,-32768,
+-32768,-32768, 2621, 1245, 93, 273, 1250, 1143, 1251, 273,
+ 1253, 1257, 1256, 1260, 1261, 1143, 1262, 640, 1263, 1264,
+ 1143, 1268, 1266, 1143, 1258, 1097, 1269, 1739, 116, 1762,
+ 133, 1785, 139, 1810, 1837, 1860, 1884, 2, 1272, 1270,
+ 2644, 5988, 1274, 1105, 1143,-32768, 2667, 2690, 2713,-32768,
+ 640, 1275,-32768, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1143, 1143, 2736, 2759, 1108,-32768, 1122,
+ 1907, 1143,-32768, 1124, 1126, 1127, 6015,-32768, 1110,-32768,
+ 1129,-32768,-32768,-32768, 4276,-32768, 1128,-32768,-32768, 4304,
+ 1134,-32768, 4332, 1139, 1301,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768, 185,-32768,-32768,
+-32768, 1143, 1146,-32768, 2782, 1300, 1302, 24, 1147,-32768,
+ 6042, 6069, 6096, 6123, 6150, 6177, 6204, 6231, 6258, 4360,
+ 4388, 4416, 1303, 1306, 640, 640,-32768, 1524, 273, 273,
+ 273, 273, 1307, 1309, 1310, 273, 1311, 1314, 1315, 1320,
+ 292, 2,-32768, 2400, 1321,-32768,-32768,-32768,-32768, 90,
+ 640, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+-32768,-32768,-32768,-32768,-32768, 1155, 1160, 1524, 1164, 1165,
+ 1167, 1168,-32768,-32768,-32768, 1170,-32768,-32768,-32768, 1171,
+-32768, 1143,-32768, 1172, -38, 1173, 6285, 6312, 6339, 6366,
+ 6393, 6420, 6447, 6474, 6501, 1174, 1175, 1176, 640, 1259,
+ 2812, 273, 273, 1332, 1340, 273, 1342, 2835, 1347, 1348,
+ 640, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1178, 1181, 1143, 1193, 1194,-32768,-32768,
+ 1199, 1200,-32768, 1192,-32768, 1195, 6528, 6555, 6582, 6609,
+ 6636, 6663, 6690, 6717, 6744, 186, 7577, 212, 7577, 216,
+ 7577, 1294, 1143, 1524, 273, 640, 1371, 1372, 1373, 1374,
+ 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1375, 1143, 1376, 1143, 1377, 1217, 6771, 1524, 1221, 1223,
+-32768,-32768,-32768,-32768, 6798, 6825, 6852, 6879, 6906, 6933,
+ 4444, 4472, 4500, 7577,-32768, 7577,-32768, 7577,-32768, 1143,
+ 1143, 7554, 273, 640, 1143, 1143, 1143, 1143, 1143, 1143,
+-32768,-32768,-32768, 6960, 2858, 1252, 1224, 1226, 6987, 7014,
+ 7041, 7068, 7095, 7122, 1225, 1227, 1228, 1143, 1394,-32768,
+ 640, 273, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 2881,-32768, 1231, 1232, 7149, 7176, 7203, 7230, 7257,
+ 7284, 235, 7577, 248, 7577, 249, 7577, 1398, 640, 1400,
+ 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1401, 1143, 1402,
+ 1143, 1403,-32768, 1238,-32768, 7311, 7338, 7365, 4528, 4556,
+ 4584, 7577,-32768, 7577,-32768, 7577,-32768, 640, 1143, 1143,
+ 1143,-32768,-32768,-32768, 1239, 7392, 7419, 7446, 1241, 1242,
+ 1243, 640, 1143, 1143, 1143, 1143, 1143, 1143, 1246, 7473,
+ 7500, 7527, 255, 7577, 259, 7577, 260, 7577, 273, 1143,
+ 1143, 1143, 1143, 1413, 1143, 1414, 1143, 1415, 1249, 4612,
+ 4640, 4668, 7577,-32768, 7577,-32768, 7577,-32768, 1417,-32768,
+-32768,-32768,-32768, 1265, 1273, 1277, 1143, 1143, 1143, 264,
+ 7577, 268, 7577, 275, 7577, 1143, 1418, 1143, 1419, 1143,
+ 1427, 7577,-32768, 7577,-32768, 7577,-32768, 1434, 1436,-32768
};
static const short yypgoto[] = {-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 940,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ 845,-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,-32768, 1536, 1539,
- -307, 224, 1550,-32768,-32768,-32768,-32768,-32768, 386, -987,
--32768,-32768, -852, -7,-32768, 990, -10,-32768, -114,-32768,
- -921, 718, 454,-32768,-32768
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1431, 1432,
+ -307, 223, 1443,-32768,-32768,-32768,-32768,-32768, 262, -995,
+-32768,-32768, -807, -7,-32768, 883, -10,-32768, -114,-32768,
+ -924, 611, 809,-32768, -1034,-32768,-32768
};
-#define YYLAST 7697
+#define YYLAST 7745
static const short yytable[] = { 105,
- 257, 459, 318, 673, 949, 675, 155, 176, 1069, 1012,
- 677, 994, 323, 958, 994, 330, 995, 137, 129, 995,
- 965, 449, 134, 266, 783, 981, 114, 786, 791, 184,
- 914, 1170, 160, 162, 126, 596, 597, 598, 599, 600,
- 601, 602, 603, 604, 605, 606, 607, 596, 597, 598,
- 599, 600, 601, 602, 603, 604, 605, 606, 607, 150,
- 306, 307, 151, 152, 790, 153, 792, 306, 307, 983,
- 130, 1114, 818, 131, 331, 819, 306, 307, 306, 307,
- 450, 308, 267, 784, 306, 307, 306, 307, 820, 466,
- 467, 821, 309, 205, 206, 207, 208, 224, 595, 852,
- 108, 1090, 324, 268, 7, 118, 1116, 306, 307, 409,
- 259, 260, 261, 262, 263, 164, 534, 535, 165, 166,
- 861, 1118, 274, 275, 276, 277, 1068, 279, 280, 1230,
- 282, 283, 284, 138, 288, 135, 306, 307, 136, 223,
- 107, 177, 109, 300, 608, -244, 303, 223, 448, 110,
- 304, 305, 310, -243, 306, 307, 824, 306, 307, 306,
- 307, 111, 156, 157, 306, 307, 460, 322, 112, 325,
- 326, 1091, 319, 158, 113, 1095, 159, 332, 333, 334,
+ 257, 459, 1073, 318, 155, 786, 176, 1014, 915, 673,
+ 881, 675, 323, 134, 330, 449, 783, 137, 129, 266,
+ 996, 996, 791, 1127, 7, 997, 997, 306, 307, 1179,
+ 306, 307, 160, 162, 126, 306, 307, 306, 307, 818,
+ 306, 307, 819, 852, 677, 146, 147, 820, 148, 950,
+ 821, 308, 822, 306, 307, 823, 306, 307, 959, 107,
+ 792, 108, 223, 306, 307, 966, 223, 309, -245, 790,
+ 595, 109, -244, 331, 450, 784, 861, 110, 267, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 983, 111,
+ 882, 223, 184, 205, 206, 207, 208, 224, 130, 268,
+ 1094, 131, 324, 306, 307, 118, 985, 306, 307, 409,
+ 259, 260, 261, 262, 263, 448, 112, 173, 113, 460,
+ 174, 1118, 274, 275, 276, 277, 135, 279, 280, 136,
+ 282, 283, 284, 138, 288, 1072, 1240, 1211, 1120, 114,
+ 177, 306, 307, 300, 1122, 115, 303, 306, 307, 996,
+ 304, 305, 310, 708, 997, 569, 306, 307, 570, 993,
+ 156, 157, 116, 306, 307, 306, 307, 322, 994, 325,
+ 326, 158, 117, 319, 159, 787, 916, 332, 333, 334,
335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 350, 351, 787, 915, 1171,
+ 345, 346, 347, 348, 349, 350, 351, 1180, 306, 307,
127, 353, 354, 355, 356, 357, 358, 359, 360, 361,
- 362, 363, 364, 365, 366, 367, 368, 1069, 306, 307,
- 115, 78, 79, 306, 307, 306, 307, 80, 81, 82,
- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 95, 96, 97, 98, 99, 100, 116, 973,
- 119, 120, 121, 122, 410, 411, 412, 413, 994, 173,
- 306, 307, 174, 995, 419, 420, 569, 123, 124, 570,
+ 362, 363, 364, 365, 366, 367, 368, 132, 1095, 1073,
+ 78, 79, 1099, 306, 307, 128, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 306, 307, 974,
+ 119, 120, 121, 122, 410, 411, 412, 413, 143, 995,
+ 306, 307, 133, 841, 419, 420, 842, 123, 124, 141,
425, 414, 415, 428, 125, 306, 307, 432, 220, 221,
222, 437, 438, 439, 223, 441, 442, 443, 444, 445,
- 446, 447, 479, 480, 117, 453, 454, 306, 307, 1190,
- 1191, 1192, 1193, 461, 462, 463, 1197, 469, 128, 822,
- 306, 307, 823, 804, 805, 132, 475, 78, 539, 540,
- 133, 478, 708, 80, 81, 82, 83, 84, 85, 86,
+ 446, 447, 306, 307, 139, 453, 454, 164, 306, 307,
+ 165, 166, 140, 461, 462, 463, 150, 469, 1015, 151,
+ 152, 1017, 153, 466, 467, 142, 475, 78, 539, 540,
+ 144, 478, 154, 80, 81, 82, 83, 84, 85, 86,
87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 306, 307, 306, 307, 841, -7,
- -7, 842, -7, 139, 146, 147, 991, 148, 992, 306,
- 307, 1013, 1014, 140, 209, 210, 211, 212, 213, 1247,
- 1248, 993, 141, 1251, 214, 215, 216, 217, 218, 219,
- 220, 221, 222, 143, 1013, 103, 223, 1015, 1290, 104,
- 314, 1291, 285, 317, 974, 975, 976, 977, 545, 547,
- 549, 544, 546, 548, 550, 551, 1292, 142, 554, 1293,
- 556, 978, 979, 144, 699, 272, 273, 220, 221, 222,
- 145, 1294, 1299, 223, 1295, -1, 8, 571, 9, 1019,
- 1020, 149, 576, 42, 43, 44, 45, 584, 47, 1387,
- 154, 168, 1388, 586, 587, 163, 769, 770, 771, 772,
- 773, 1389, 590, 1391, 1390, 1443, 1392, 700, 1444, 594,
- -7, -7, -7, -7, -7, -7, -7, -7, 1445, 627,
- 1337, 1446, 167, 629, 541, 542, 1447, 1476, 169, 1448,
- 1477, 103, 170, 171, 630, 543, 1, 2, 159, 3,
- 172, 631, 632, 633, 634, 1478, 175, 178, 1479, 1365,
- 737, 179, 180, 181, 78, 539, 1045, 182, 183, 908,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 303, 184, 205, 206, 671, 10, 11, 12, 13,
- 14, 15, 16, 17, 1480, 185, 683, 1481, 186, 187,
- 188, 189, 258, 782, 209, 210, 211, 212, 213, 190,
- 691, 692, 191, 264, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 192, 193, 194, 223, 709, 195, 265,
- 713, 714, 715, 196, 197, 198, 1449, 199, 200, 201,
- 202, 203, 204, 255, 287, 269, 212, 213, 270, 292,
- 278, 281, 289, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 293, 731, 732, 223, 734, 290, 294, 291,
- 295, 296, 316, 297, 315, 298, 320, 321, 749, 747,
- 748, 299, 271, 301, 327, 311, 312, 758, 209, 210,
- 211, 212, 213, 313, 328, 329, 223, 369, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 370, 371, 372,
- 223, 541, 542, 399, 373, 738, 401, 374, 103, 375,
- 435, 376, 543, 377, 440, 159, 378, 379, 380, 1060,
- 381, 404, 382, 383, 384, 385, 386, 800, 387, 214,
- 215, 216, 217, 272, 273, 220, 221, 222, 388, 389,
- 813, 223, 815, 816, 402, 390, 391, 392, 393, 394,
- 825, 826, 827, 828, 829, 830, 831, 832, 833, 834,
- 835, 836, 395, 396, 397, 398, 416, 403, 418, 845,
- 471, 846, 78, 79, 417, 472, 474, 848, 80, 81,
+ 97, 98, 99, 100, 42, 43, 44, 45, 145, 47,
+ 163, 1199, 1200, 1201, 1202, 149, 1172, 1300, 1206, 1173,
+ 1301, 167, 737, 209, 210, 211, 212, 213, 769, 770,
+ 771, 772, 773, 214, 215, 216, 217, 218, 219, 220,
+ 221, 222, 168, 1302, 103, 223, 1303, 1304, 104, 314,
+ 1305, 285, 317, 169, 975, 976, 977, 978, 545, 547,
+ 549, 544, 546, 548, 550, 551, 1397, 170, 554, 1398,
+ 556, 979, 980, 272, 273, 220, 221, 222, 171, 1399,
+ 1401, 223, 1400, 1402, 1257, 1258, 1453, 571, 1261, 1454,
+ 1455, 1457, 576, 1456, 1458, 1486, 172, 584, 1487, 1488,
+ 479, 480, 1489, 586, 587, 179, 1490, 534, 535, 1491,
+ 804, 805, 590, -1, 8, 175, 9, 1015, 1016, 594,
+ 1021, 1022, 180, 181, 178, 182, 183, 185, 186, 627,
+ 184, 187, 188, 629, 541, 542, 189, 1309, 258, 190,
+ 191, 103, 264, 192, 630, 543, 193, 265, 159, 194,
+ 195, 631, 632, 633, 634, 196, 197, 198, 199, 200,
+ 209, 210, 211, 212, 213, 201, 202, 203, 204, 909,
+ 214, 215, 216, 217, 272, 273, 220, 221, 222, 255,
+ 269, 270, 223, 278, 281, 1347, 290, 738, 291, 212,
+ 213, 303, 289, 205, 206, 671, 214, 215, 216, 217,
+ 272, 273, 220, 221, 222, 293, 683, 294, 223, 295,
+ 296, 301, 297, 782, 1375, 298, 299, 311, 315, 327,
+ 691, 692, 312, 313, 10, 11, 12, 13, 14, 15,
+ 16, 17, 328, 329, 223, 369, 370, 709, 371, 372,
+ 713, 714, 715, 78, 539, 1047, 373, 374, 375, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 399, 376, 377, 731, 732, 378, 734, 379, 380, 381,
+ 382, 383, 384, 385, 435, 386, 387, 388, 749, 747,
+ 748, 389, 699, 390, 391, 392, 393, 758, 394, 395,
+ 396, 1459, 78, 79, 401, 397, 398, 416, 80, 81,
82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 481,
- 504, 505, 506, 507, 971, 508, 509, 510, 511, 512,
- 513, 514, 209, 210, 211, 212, 213, 515, 516, 884,
- 517, 886, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 889, 518, 519, 223, 520, 894, 895, 521, 522,
- 523, 524, 525, 526, 528, 527, 529, 909, 530, 911,
- 531, 913, 532, 533, 557, 536, 555, 537, 538, 585,
- 552, 209, 210, 211, 212, 213, 553, 558, 563, 929,
- 930, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 940, 559, 942, 223, 560, 562, 565, 588, 566, 567,
- 572, 621, 952, 589, 622, 623, 624, 626, 635, 959,
- 960, 961, 636, 637, 638, 639, 966, 640, 641, 642,
- 970, 643, 972, 644, 645, 646, 647, 648, 649, 650,
- 651, 652, 984, 653, 654, 655, 656, 666, 657, 101,
- 102, 658, 659, 660, 661, 670, 103, 662, 989, 663,
- 104, 681, 664, 285, 665, 686, 667, 668, 688, 998,
- 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008,
- 1009, 669, 695, 696, 697, 698, 701, 702, 703, 78,
- 539, 704, 1021, 746, 705, 80, 81, 82, 83, 84,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 402,
+ 403, 417, 418, 440, 471, 700, 472, 474, 481, 504,
+ 505, 1064, 506, 507, 508, 509, 510, 800, 511, 512,
+ 513, 514, 527, 271, 515, 516, 517, 518, 519, 520,
+ 813, 521, 815, 816, 522, 523, 524, 525, 526, 528,
+ 825, 826, 827, 828, 829, 830, 831, 832, 833, 834,
+ 835, 836, 529, 530, 531, 532, 533, 557, 536, 845,
+ 537, 846, 538, 559, 404, 552, 553, 848, 555, 558,
+ 541, 542, 560, 562, 563, 565, 585, 103, 566, 567,
+ 572, 543, 588, 589, 159, 621, 622, 623, 624, 626,
+ 636, 635, 637, 638, 972, 639, 640, 666, 641, 642,
+ 643, 644, 209, 210, 211, 212, 213, 667, 645, 885,
+ 646, 887, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 890, 647, 648, 223, 649, 895, 896, 669, 101,
+ 102, 650, 651, 652, 653, 654, 103, 910, 655, 912,
+ 104, 914, 656, 285, 596, 597, 598, 599, 600, 601,
+ 602, 603, 604, 605, 606, 607, 657, 658, 659, 930,
+ 931, 660, 661, 209, 210, 211, 212, 213, 670, 695,
+ 941, 681, 943, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 953, 686, 662, 223, 688, 696, 697, 960,
+ 961, 962, 698, 701, 702, 703, 967, 663, 704, 664,
+ 971, 705, 973, 706, 209, 210, 211, 212, 213, -7,
+ -7, 665, -7, 986, 214, 215, 216, 217, 272, 273,
+ 220, 221, 222, 707, 730, 746, 223, 405, 750, 991,
+ 735, 739, 751, 668, 745, 753, 752, 754, 718, 757,
+ 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009,
+ 1010, 1011, 719, 608, 720, 721, 722, 723, 724, 725,
+ 726, 727, 728, 1023, 729, 596, 597, 598, 599, 600,
+ 601, 602, 603, 604, 605, 606, 607, 759, 760, 287,
+ 763, 764, 765, 766, 292, 767, 776, 781, 785, 777,
+ 778, 779, 780, 1049, 1051, 1053, 1048, 1050, 1052, 1054,
+ 1055, 1056, 1057, 789, 793, 1061, 1062, 316, 406, 795,
+ 797, 320, 321, 798, 817, 1067, 1068, 1069, 839, 847,
+ -7, -7, -7, -7, -7, -7, -7, -7, 844, 849,
+ 853, 880, 854, 855, 1086, 1087, 856, 857, 886, 858,
+ 859, 1091, 860, 862, 888, 863, 1, 2, 864, 3,
+ 1097, 871, 889, 883, 865, 866, 867, 892, 1105, 893,
+ 894, 868, 869, 1110, 870, 872, 1113, 209, 210, 211,
+ 212, 213, 873, 407, 824, 874, 875, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 876, 1135, 877, 223,
+ 897, 878, 879, 898, 899, 900, 1141, 1142, 1143, 1144,
+ 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 901, 902,
+ 903, 905, 911, 913, 1158, 917, 936, 932, 940, 78,
+ 539, 942, 946, 945, 948, 80, 81, 82, 83, 84,
85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 706, 707, 730, 750,
- 718, 735, 1047, 1049, 1051, 1046, 1048, 1050, 1052, 1053,
- 1054, 1055, 739, 1057, 1058, 719, 751, 720, 405, 753,
- 754, 757, 759, 1063, 1064, 1065, 721, 722, 723, 724,
- 725, 745, 752, 760, 726, 727, 728, 729, 763, 764,
- 765, 766, 1082, 1083, 767, 776, 781, 779, 777, 1087,
- 778, 780, 684, 685, 844, 687, 849, 789, 1093, 689,
- 690, 785, 793, 795, 797, 798, 1101, 817, 839, 853,
- 847, 1106, 854, 855, 1109, 856, 477, 857, 881, 858,
- 859, 860, 862, 27, 28, 29, 30, 31, 32, 33,
- 34, 863, 35, 1128, 37, 38, 864, 40, 41, 865,
- 866, 880, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141,
- 1142, 1143, 1144, 1145, 53, 867, 733, 868, 869, 736,
- 1151, 870, 885, 871, 872, 873, 541, 542, 54, 55,
- 882, 887, 888, 103, 874, 875, 891, 543, 755, 756,
- 159, 876, 892, 893, 761, 762, 877, 878, 879, 896,
- 897, 768, 898, 775, 899, 900, 901, 1165, 209, 210,
- 211, 212, 213, 902, 904, 910, 912, 916, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 931, 935, 794,
- 223, 796, 939, 1189, 941, 944, 63, 945, 946, 801,
- 802, 803, 948, 947, 806, 807, 808, 809, 810, 811,
- 812, 950, 951, 953, 954, 1207, 1208, 1209, 1210, 1211,
- 1212, 1213, 1214, 1215, 209, 210, 211, 212, 213, 955,
- 956, 1221, 957, 963, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 964, 1228, 967, 223, 78, 79, 968,
- 980, 969, 988, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 1257, 1258, 1259, 1260, 1261, 1262,
- 1263, 1264, 1265, 1267, 1269, 1271, 78, 883, 1274, 987,
- 1017, 990, 80, 81, 82, 83, 84, 85, 86, 87,
+ 95, 96, 97, 98, 99, 100, 947, 949, 209, 210,
+ 211, 212, 213, 951, 1174, 952, 954, 955, 214, 215,
+ 216, 217, 272, 273, 220, 221, 222, 956, 957, 958,
+ 223, 964, 965, 968, 969, 78, 79, 982, 990, 970,
+ 1198, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
+ 99, 100, 981, 989, 1217, 1218, 1219, 1220, 1221, 1222,
+ 1223, 1224, 1225, 209, 210, 211, 212, 213, 992, 1018,
+ 1231, 1024, 1019, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 1020, 1026, 1238, 223, 1027, 1028, 1060, 1029,
+ 1030, 1032, 1070, 1033, 1034, 1038, 1058, 1039, 27, 28,
+ 29, 30, 31, 32, 33, 34, 1040, 35, 1042, 37,
+ 38, 1088, 40, 41, 1267, 1268, 1269, 1270, 1271, 1272,
+ 1273, 1274, 1275, 1277, 1279, 1281, 541, 542, 1284, 53,
+ 1093, 1043, 1096, 103, 1045, 1071, 1098, 543, 1100, 1101,
+ 159, 1102, 1114, 54, 55, 1103, 1104, 1106, 1108, 1109,
+ 1111, 1112, 1115, 1130, 1116, 1307, 1308, 1129, 1133, 1134,
+ 1140, 1155, 1163, 1315, 1316, 1317, 1318, 1319, 1320, 1321,
+ 1322, 1323, 1324, 1156, 1326, 1159, 1328, 1160, 1161, 1166,
+ 1332, 1164, 101, 102, 1171, 1177, 1168, 1178, 1194, 103,
+ 1170, 1195, 1203, 104, 1204, 1205, 1207, 1175, 1181, 1208,
+ 1209, 63, 1344, 1345, 1210, 1214, 1229, 1349, 1350, 1351,
+ 1352, 1353, 1354, 408, 1230, 1232, 1233, 1259, 1255, 1234,
+ 1235, 1236, 1237, 1239, 1241, 1260, 1262, 1251, 1252, 1253,
+ 1372, 1264, 1282, 1265, 1283, 1376, 1377, 1378, 1379, 1380,
+ 1381, 1383, 1385, 1387, 1285, 1286, 1289, 684, 685, 1290,
+ 687, 1287, 1288, 1306, 689, 690, 1311, 1312, 1313, 1314,
+ 1325, 1327, 1329, 1406, 1407, 1408, 1409, 1410, 1411, 1412,
+ 1330, 1414, 1333, 1416, 1334, 1361, 1360, 1362, 1369, 1373,
+ 1370, 1371, 1389, 1403, 1390, 1405, 1413, 1415, 1417, 1418,
+ 1432, 1426, 1427, 1428, 1436, 1437, 1438, 1449, 1464, 1466,
+ 1468, 1469, 1473, 1493, 1495, 1440, 1441, 1442, 1444, 1446,
+ 1448, 733, 1497, 1499, 736, 1500, 68, 69, 1477, 717,
+ 672, 1215, 1460, 1461, 1462, 1463, 1478, 1465, 70, 1467,
+ 1479, 693, 935, 755, 756, 0, 0, 0, 0, 761,
+ 762, 0, 0, 674, 0, 0, 768, 0, 775, 1481,
+ 1483, 1485, 0, 209, 210, 211, 212, 213, 1492, 0,
+ 1494, 0, 1496, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 676, 794, 223, 796, 0, 0, 0,
+ 0, 0, 0, 0, 801, 802, 803, 0, 0, 806,
+ 807, 808, 809, 810, 811, 812, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 78, 79, 0, 0,
+ 0, 0, 80, 81, 82, 83, 84, 85, 86, 87,
88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 1016, 1018, 1297, 1298, 1022, 1027, 1056,
- 1024, 1025, 1026, 1305, 1306, 1307, 1308, 1309, 1310, 1311,
- 1312, 1313, 1314, 1028, 1316, 1030, 1318, 1031, 1032, 1066,
- 1322, 1037, 1084, 1089, 1036, 1092, 1038, 936, 1040, 938,
- 406, 1041, 1094, 1043, 943, 1096, 1067, 1097, 1098, 1099,
- 1107, 1100, 1334, 1335, 1102, 1104, 1105, 1339, 1340, 1341,
- 1342, 1343, 1344, 962, 1108, 1110, 1111, 1112, 1123, 1127,
- 1126, 1156, 1133, 1164, 1168, 1149, 1148, 1152, 1153, 1154,
- 1362, 1157, 1159, 1169, 1161, 1366, 1367, 1368, 1369, 1370,
- 1371, 1373, 1375, 1377, 101, 102, 1163, 1166, 1172, 1185,
- 1186, 103, 1194, 1195, 1196, 104, 1198, 1199, 1200, 1201,
- 1224, 407, 1204, 1396, 1397, 1398, 1399, 1400, 1401, 1402,
- 1219, 1404, 1220, 1406, 1222, 1223, 1245, 1225, 1226, 1227,
- 1229, 1231, 1249, 101, 102, 408, 1241, 1242, 1243, 1250,
- 103, 1416, 1417, 1418, 104, 1252, 1254, 1272, 1255, 1273,
- 1275, 1276, 1279, 1277, 1278, 1430, 1431, 1432, 1434, 1436,
- 1438, 672, 1280, 1296, 1301, 1302, 1303, 1304, 1315, 1317,
- 1319, 1320, 1450, 1451, 1452, 1453, 1323, 1455, 1324, 1457,
- 209, 210, 211, 212, 213, 1350, 1351, 1352, 1363, 1379,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 1471,
- 1473, 1475, 223, 1359, 674, 1360, 1085, 1361, 1482, 1086,
- 1484, 1380, 1486, 1393, 1395, 1403, 1405, 1407, 1454, 1456,
- 1458, 1463, 1483, 1408, 78, 79, 1422, 1426, 1439, 1103,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 209, 210, 211, 212, 213, 1427, 1485, 1428, 1459,
- 1132, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 1487, 1489, 1490, 223, 717, 209, 210, 211, 212, 213,
- 1467, 68, 1468, 1469, 69, 214, 215, 216, 217, 272,
- 273, 220, 221, 222, 676, 70, 1205, 223, 693, 934,
- 0, 209, 210, 211, 212, 213, 0, 0, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 678, 0, 0, 223, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1187, 1188, 679, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 1206, 223, 209, 210, 211,
- 212, 213, 694, 0, 0, 0, 0, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 0, 0, 103, 223,
- 0, 0, 104, 0, 0, 716, 0, 0, 0, 0,
- 0, 0, 0, 209, 210, 211, 212, 213, 0, 0,
- 0, 0, 1244, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 985, 1256, 223, 0, 0, 0, 906,
- 0, 0, 907, 0, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 986, 0, 223, 0, 0, 0,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 1300,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 1113,
- 0, 0, 223, 209, 210, 211, 212, 213, 0, 0,
+ 98, 99, 100, 78, 884, 0, 0, 0, 0, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 209, 210, 211, 212, 213, 678, 0, 0, 0, 0,
+ 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
+ 0, 0, 223, 209, 210, 211, 212, 213, 679, 0,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 1115, 0, 0, 223, 0, 0, 0, 0,
- 0, 0, 209, 210, 211, 212, 213, 1338, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 1117, 0, 0, 223, 209, 210, 211, 212, 213,
- 0, 0, 0, 0, 1364, 214, 215, 216, 217, 272,
- 273, 220, 221, 222, 1119, 0, 0, 223, 0, 0,
- 0, 0, 0, 209, 210, 211, 212, 213, 0, 0,
- 0, 0, 1394, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 1120, 0, 0, 223, 0, 0, 0, 0,
- 0, 0, 0, 0, 209, 210, 211, 212, 213, 0,
- 0, 1415, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 1121, 0, 1429, 223, 0, 0, 209,
- 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
- 215, 216, 217, 272, 273, 220, 221, 222, 1122, 0,
- 0, 223, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 1150, 0, 0, 223, 0, 0, 0, 0, 0,
- 0, 209, 210, 211, 212, 213, 0, 0, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 502, 0, 0, 223, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 568, 0, 0, 223, 0, 0, 0,
- 0, 0, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 799, 0, 0, 223, 0, 0, 0, 0, 0,
- 0, 0, 0, 209, 210, 211, 212, 213, 0, 0,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 0, 694, 0, 209, 210, 211, 212, 213, 0, 0,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 209, 210,
+ 221, 222, 937, 0, 939, 223, 716, 0, 0, 944,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 963, 214,
+ 215, 216, 217, 218, 219, 220, 221, 222, 0, 0,
+ 103, 223, 0, 0, 104, 0, 0, 987, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 101, 102, 0, 0, 0, 0, 0, 103, 0, 0,
+ 988, 104, 0, 0, 0, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 1117, 0, 0, 223, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
+ 216, 217, 272, 273, 220, 221, 222, 1119, 0, 0,
223, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 0, 209, 210,
+ 1121, 0, 0, 223, 0, 0, 209, 210, 211, 212,
+ 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
+ 272, 273, 220, 221, 222, 1123, 0, 0, 223, 0,
+ 0, 0, 0, 1089, 0, 0, 1090, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 209, 210, 211,
+ 212, 213, 1124, 0, 0, 0, 1107, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 209, 210, 211, 212, 213, 1125, 0, 0, 0, 0,
+ 214, 215, 216, 217, 272, 273, 220, 221, 222, 1139,
+ 0, 0, 223, 0, 209, 210, 211, 212, 213, 1126,
+ 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
+ 220, 221, 222, 0, 0, 0, 223, 209, 210, 211,
+ 212, 213, 1157, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 209, 210, 211, 212, 213, 0, 0, 477, 0, 0,
+ 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
+ 0, 0, 223, 0, 0, 209, 210, 211, 212, 213,
+ 502, 0, 0, 1196, 1197, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 209, 210, 211, 212, 213, 0, 0, 1216,
+ 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 0, 0, 0, 223, 209, 210, 211, 212, 213,
+ 568, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 209,
+ 210, 211, 212, 213, 799, 0, 0, 1254, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 1266,
+ 0, 223, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 0, 0, 0, 223, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 1310, 0, 0, 223, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 209, 210, 211, 212, 213, 0, 0, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 0, 0, 209,
- 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
- 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 27, 28, 29, 30, 31, 32, 33, 34,
+ 223, 0, 27, 28, 29, 30, 31, 32, 33, 34,
0, 35, 0, 37, 38, 0, 40, 41, 0, 0,
- 27, 28, 29, 30, 31, 32, 33, 34, 0, 35,
- 0, 37, 38, 53, 40, 41, 0, 0, 0, -3,
- 22, 0, 0, 23, 0, 0, 0, 54, 55, 0,
- 0, 53, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 54, 55, 0, 0, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 0, 35, 36, 37, 38, 39, 40, 41, 0, 0,
- 0, 42, 43, 44, 45, 46, 47, 0, 48, 49,
- 50, 51, 52, 53, 0, 63, 0, 0, 0, 0,
- 0, 225, 0, 0, 0, 0, 0, 54, 55, 0,
- 0, 0, 0, 63, 56, 57, 0, 58, 59, 60,
- 61, 62, 0, 0, 0, 209, 210, 211, 212, 213,
- 0, 0, 0, 0, 464, 214, 215, 216, 217, 272,
+ 0, 0, 1348, 0, 0, 0, 0, 0, 209, 210,
+ 211, 212, 213, 53, 0, 0, 0, 0, 214, 215,
+ 216, 217, 272, 273, 220, 221, 222, 54, 55, 1374,
+ 223, 0, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 0, 0, 0, 223, 0, 0, 1404, 27, 28,
+ 29, 30, 31, 32, 33, 34, 0, 35, 0, 37,
+ 38, 0, 40, 41, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 63, 1425, 0, 0, 53,
+ 0, 0, 0, 0, 0, -3, 22, 0, 0, 23,
+ 1439, 0, 0, 54, 55, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 464, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 0, 35, 36, 37,
+ 38, 39, 40, 41, 0, 0, 0, 42, 43, 44,
+ 45, 46, 47, 225, 48, 49, 50, 51, 52, 53,
+ 0, 63, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 54, 55, 0, 0, 0, 0, 0,
+ 56, 57, 0, 58, 59, 60, 61, 62, 0, 0,
+ 0, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 468, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 226, 227, 228, 223, 0, 0, 0, 451, 229, 230,
+ 231, 232, 233, 234, 235, 236, 237, 238, 0, 0,
+ 0, 63, 0, 0, 0, 0, 239, 240, 241, 242,
+ 243, 244, 245, 246, 247, 248, 0, 249, 250, 251,
+ 252, 253, 254, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 209, 210, 211, 212,
+ 213, 0, 0, 0, 0, 680, 214, 215, 216, 217,
+ 272, 273, 220, 221, 222, 0, 0, 0, 223, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 740, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 814, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 0, 0, 0, 223, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 1046, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 907, 0, 0, 908, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 1065, 0, 0, 1066, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 0, 468, 0, 0, 0, 0, 680, 226, 227,
- 228, 0, 0, 0, 0, 63, 229, 230, 231, 232,
- 233, 234, 235, 236, 237, 238, 0, 0, 0, 0,
- 0, 0, 0, 0, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 0, 249, 250, 251, 252, 253,
- 254, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 1212, 0, 0, 1213, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 209, 210,
+ 211, 212, 213, 0, 422, 0, 0, 0, 214, 215,
+ 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
+ 223, 209, 210, 211, 212, 213, 0, 427, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
0, 0, 0, 223, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 740, 214, 215, 216, 217, 272, 273,
+ 429, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 209, 210, 211,
- 212, 213, 0, 0, 0, 0, 814, 214, 215, 216,
+ 212, 213, 0, 573, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 1044,
+ 209, 210, 211, 212, 213, 0, 577, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1061, 0, 0, 1062,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1202, 0, 0, 1203,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 209, 210, 211, 212, 213, 0, 422,
+ 0, 0, 223, 209, 210, 211, 212, 213, 0, 578,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
221, 222, 0, 0, 0, 223, 209, 210, 211, 212,
- 213, 0, 427, 0, 0, 0, 214, 215, 216, 217,
+ 213, 0, 712, 0, 0, 0, 214, 215, 216, 217,
+ 272, 273, 220, 221, 222, 0, 0, 0, 223, 1092,
+ 0, 0, 0, 0, 0, 904, 209, 210, 211, 212,
+ 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 209,
- 210, 211, 212, 213, 0, 429, 0, 0, 0, 214,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 209, 210, 211, 212, 213, 0, 573, 0,
+ 0, 223, 209, 210, 211, 212, 213, 0, 1131, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
222, 0, 0, 0, 223, 209, 210, 211, 212, 213,
- 0, 577, 0, 0, 0, 214, 215, 216, 217, 272,
+ 0, 1136, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 209, 210,
- 211, 212, 213, 0, 578, 0, 0, 0, 214, 215,
+ 211, 212, 213, 0, 1137, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 209, 210, 211, 212, 213, 0, 712, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 1088, 0, 0, 0, 0, 0,
- 903, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 223, 209, 210, 211, 212, 213, 0, 1138, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
0, 0, 0, 223, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
+ 1153, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 209, 210, 211,
- 212, 213, 0, 1124, 0, 0, 0, 214, 215, 216,
+ 212, 213, 0, 1154, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 209, 210, 211, 212, 213, 0, 1129, 0, 0, 0,
+ 1256, 0, 0, 0, 0, 0, 1176, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 209, 210, 211, 212, 213, 0, 1130,
+ 0, 0, 223, 209, 210, 211, 212, 213, 0, 1263,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
221, 222, 0, 0, 0, 223, 209, 210, 211, 212,
- 213, 0, 1131, 0, 0, 0, 214, 215, 216, 217,
+ 213, 0, 1359, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 209,
- 210, 211, 212, 213, 0, 1146, 0, 0, 0, 214,
+ 210, 211, 212, 213, 0, 1388, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 209, 210, 211, 212, 213, 0, 1147, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 1246, 0, 0, 0, 0,
- 0, 1167, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 209, 210, 211, 212, 213,
+ 0, 223, 0, 0, 0, 451, 352, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 352, 209, 210, 211, 212, 213,
0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
- 273, 220, 221, 222, 0, 0, 0, 223, 209, 210,
- 211, 212, 213, 0, 1253, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 209, 210, 211, 212, 213, 0, 1349, 0, 0,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 421, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 423, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 209, 210, 211, 212, 213, 0,
- 1378, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 451, 352, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 352,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 421, 209, 210,
+ 0, 0, 0, 223, 0, 0, 0, 0, 424, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 426, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 430, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 431, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 436, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 473, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 476, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 482, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 483, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 484, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 485, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 486, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 487, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 488, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 489, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 490, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 491, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 493, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 494, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 495, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 496, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 497, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 498, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 561, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 564, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 574, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 575, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 579, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 580, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 581, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 582, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 583, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 625, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 628, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 682, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 741, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 742, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 743, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 744, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 840, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 906, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 938, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 1031, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 1035, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 1037, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 1165, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 1167, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 1169, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 1191, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 1192, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 1193, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 1341, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 1342, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 1343, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 1422, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 0, 1423, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 0, 1424, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 0, 1470, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 0, 1471, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 0,
+ 1472, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 452, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 423, 209, 210, 211, 212,
+ 223, 0, 0, 0, 492, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 499, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 0, 0, 0, 223, 0, 0, 0, 500, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 503, 0, 0, 501, 209, 210, 211, 212,
+ 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
+ 272, 273, 220, 221, 222, 0, 0, 0, 223, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 591, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 424, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 426, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 430,
+ 0, 0, 592, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 593,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 431, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 436, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 473, 209, 210, 211, 212, 213, 0,
+ 0, 0, 223, 0, 0, 0, 710, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 711, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 476, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 482,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 483, 209, 210,
+ 837, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 838, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 484, 209, 210, 211, 212,
+ 223, 0, 0, 0, 850, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 851, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 0, 0, 0, 223, 0, 0, 0, 891, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 918, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 485, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 486, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 487,
+ 0, 0, 919, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 920,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 488, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 489, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 490, 209, 210, 211, 212, 213, 0,
+ 0, 0, 223, 0, 0, 0, 921, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 922, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 491, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 493,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 494, 209, 210,
+ 923, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 924, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 495, 209, 210, 211, 212,
+ 223, 0, 0, 0, 925, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 926, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 0, 0, 0, 223, 0, 0, 0, 927, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 928, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 496, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 497, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 498,
+ 0, 0, 929, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 984,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 561, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 564, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 574, 209, 210, 211, 212, 213, 0,
+ 0, 0, 223, 0, 0, 0, 1012, 209, 210, 211,
+ 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
+ 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
+ 0, 0, 0, 1013, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 575, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 579,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 580, 209, 210,
+ 1025, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
+ 0, 0, 0, 223, 0, 0, 0, 1036, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 581, 209, 210, 211, 212,
+ 223, 0, 0, 0, 1041, 209, 210, 211, 212, 213,
+ 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
+ 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
+ 0, 1044, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
+ 222, 0, 0, 0, 223, 0, 0, 0, 1063, 209,
+ 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
+ 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
+ 0, 223, 0, 0, 0, 1074, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 582, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 583, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 625,
+ 0, 0, 1075, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 1076,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 628, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 682, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 741, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 742, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 743,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 744, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 840, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 905, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 937, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 1029,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 1033, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 1035, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 1158, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 1160, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 1162,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 1182, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 1183, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 1184, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 1331, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 1332,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 1333, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 1412, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 0, 1413, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 0, 1414, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 0, 1460,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 0, 1461, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 0, 1462, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 451, 209, 210, 211, 212, 213, 0, 0,
- 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 452,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 492, 209, 210, 211,
- 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
- 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 499, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 500, 209, 210, 211, 212, 213, 0, 0, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 503, 0, 0, 501, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 209, 210, 211, 212, 213, 0, 0, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 591, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 592, 209, 210, 211, 212, 213,
- 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
- 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 593, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 710, 209,
- 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
- 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 711, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 837, 209, 210, 211, 212, 213, 0, 0,
- 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 838,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 850, 209, 210, 211,
+ 0, 0, 223, 0, 0, 0, 1077, 209, 210, 211,
212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 851, 209, 210, 211, 212, 213, 0,
+ 0, 0, 0, 1078, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 890, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 1079, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 917, 209, 210,
+ 0, 0, 0, 223, 0, 0, 0, 1080, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 918, 209, 210, 211, 212, 213,
+ 223, 0, 0, 0, 1081, 209, 210, 211, 212, 213,
0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 919, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 1082, 209, 210, 211, 212, 213, 0, 0, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 920, 209,
+ 222, 0, 0, 0, 223, 0, 0, 0, 1083, 209,
210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 921, 209, 210, 211, 212,
+ 0, 223, 0, 0, 0, 1084, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 922, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 1085, 209, 210, 211, 212, 213, 0, 0,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 923,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 1132,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 924, 209, 210, 211,
+ 0, 0, 223, 0, 0, 0, 1162, 209, 210, 211,
212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 925, 209, 210, 211, 212, 213, 0,
+ 0, 0, 0, 1182, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 926, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 1183, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 927, 209, 210,
+ 0, 0, 0, 223, 0, 0, 0, 1184, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 928, 209, 210, 211, 212, 213,
+ 223, 0, 0, 0, 1185, 209, 210, 211, 212, 213,
0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 982, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 1186, 209, 210, 211, 212, 213, 0, 0, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 1010, 209,
+ 222, 0, 0, 0, 223, 0, 0, 0, 1187, 209,
210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 1011, 209, 210, 211, 212,
+ 0, 223, 0, 0, 0, 1188, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 1023, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 1189, 209, 210, 211, 212, 213, 0, 0,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 1034,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 1190,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1039, 209, 210, 211,
+ 0, 0, 223, 0, 0, 0, 1242, 209, 210, 211,
212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 1042, 209, 210, 211, 212, 213, 0,
+ 0, 0, 0, 1243, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 1059, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 1244, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 1070, 209, 210,
+ 0, 0, 0, 223, 0, 0, 0, 1245, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 1071, 209, 210, 211, 212, 213,
+ 223, 0, 0, 0, 1246, 209, 210, 211, 212, 213,
0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 1072, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 1247, 209, 210, 211, 212, 213, 0, 0, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 1073, 209,
+ 222, 0, 0, 0, 223, 0, 0, 0, 1248, 209,
210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 1074, 209, 210, 211, 212,
+ 0, 223, 0, 0, 0, 1249, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 1075, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 1250, 209, 210, 211, 212, 213, 0, 0,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 1076,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 1291,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1077, 209, 210, 211,
+ 0, 0, 223, 0, 0, 0, 1292, 209, 210, 211,
212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 1078, 209, 210, 211, 212, 213, 0,
+ 0, 0, 0, 1293, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 1079, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 1294, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 1080, 209, 210,
+ 0, 0, 0, 223, 0, 0, 0, 1295, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 1081, 209, 210, 211, 212, 213,
+ 223, 0, 0, 0, 1296, 209, 210, 211, 212, 213,
0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 1125, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 1297, 209, 210, 211, 212, 213, 0, 0, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 1155, 209,
+ 222, 0, 0, 0, 223, 0, 0, 0, 1298, 209,
210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 1173, 209, 210, 211, 212,
+ 0, 223, 0, 0, 0, 1299, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 1174, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 1331, 209, 210, 211, 212, 213, 0, 0,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 1175,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 1335,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1176, 209, 210, 211,
+ 0, 0, 223, 0, 0, 0, 1336, 209, 210, 211,
212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 1177, 209, 210, 211, 212, 213, 0,
+ 0, 0, 0, 1337, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 1178, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 1338, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 1179, 209, 210,
+ 0, 0, 0, 223, 0, 0, 0, 1339, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 1180, 209, 210, 211, 212, 213,
+ 223, 0, 0, 0, 1340, 209, 210, 211, 212, 213,
0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 1181, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 1358, 209, 210, 211, 212, 213, 0, 0, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 1232, 209,
+ 222, 0, 0, 0, 223, 0, 0, 0, 1363, 209,
210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 1233, 209, 210, 211, 212,
+ 0, 223, 0, 0, 0, 1364, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 1234, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 1365, 209, 210, 211, 212, 213, 0, 0,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 1235,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 1366,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1236, 209, 210, 211,
+ 0, 0, 223, 0, 0, 0, 1367, 209, 210, 211,
212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 1237, 209, 210, 211, 212, 213, 0,
+ 0, 0, 0, 1368, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 1238, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 1391, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 1239, 209, 210,
+ 0, 0, 0, 223, 0, 0, 0, 1392, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 1240, 209, 210, 211, 212, 213,
+ 223, 0, 0, 0, 1393, 209, 210, 211, 212, 213,
0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 1281, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 1394, 209, 210, 211, 212, 213, 0, 0, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 1282, 209,
+ 222, 0, 0, 0, 223, 0, 0, 0, 1395, 209,
210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 1283, 209, 210, 211, 212,
+ 0, 223, 0, 0, 0, 1396, 209, 210, 211, 212,
213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 1284, 209, 210, 211, 212, 213, 0, 0,
+ 0, 0, 1419, 209, 210, 211, 212, 213, 0, 0,
0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 1285,
+ 221, 222, 0, 0, 0, 223, 0, 0, 0, 1420,
209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1286, 209, 210, 211,
+ 0, 0, 223, 0, 0, 0, 1421, 209, 210, 211,
212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 1287, 209, 210, 211, 212, 213, 0,
+ 0, 0, 0, 1433, 209, 210, 211, 212, 213, 0,
0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 1288, 209, 210, 211, 212, 213, 0, 0, 0, 0,
+ 1434, 209, 210, 211, 212, 213, 0, 0, 0, 0,
0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 1289, 209, 210,
+ 0, 0, 0, 223, 0, 0, 0, 1435, 209, 210,
211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 1321, 209, 210, 211, 212, 213,
+ 223, 0, 0, 0, 1450, 209, 210, 211, 212, 213,
0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 1325, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 1451, 209, 210, 211, 212, 213, 0, 0, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 1326, 209,
+ 222, 0, 0, 0, 223, 0, 0, 1346, 1452, 209,
210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 1327, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 1328, 209, 210, 211, 212, 213, 0, 0,
- 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 1329,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1330, 209, 210, 211,
- 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
- 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 1348, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 1353, 209, 210, 211, 212, 213, 0, 0, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 1354, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 1355, 209, 210, 211, 212, 213,
- 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
- 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 1356, 209, 210, 211, 212, 213, 0, 0, 0,
- 0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 1357, 209,
- 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
- 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 1358, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 1381, 209, 210, 211, 212, 213, 0, 0,
- 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 1382,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1383, 209, 210, 211,
- 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
- 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 1384, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 0,
- 1385, 209, 210, 211, 212, 213, 0, 0, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 0, 0, 0, 1386, 209, 210,
- 211, 212, 213, 0, 0, 0, 0, 0, 214, 215,
- 216, 217, 272, 273, 220, 221, 222, 0, 0, 0,
- 223, 0, 0, 0, 1409, 209, 210, 211, 212, 213,
- 0, 0, 0, 0, 0, 214, 215, 216, 217, 272,
- 273, 220, 221, 222, 0, 0, 0, 223, 0, 0,
- 0, 1410, 209, 210, 211, 212, 213, 0, 0, 0,
+ 0, 223, 209, 210, 211, 212, 213, 0, 0, 0,
0, 0, 214, 215, 216, 217, 272, 273, 220, 221,
- 222, 0, 0, 0, 223, 0, 0, 0, 1411, 209,
- 210, 211, 212, 213, 0, 0, 0, 0, 0, 214,
- 215, 216, 217, 272, 273, 220, 221, 222, 0, 0,
- 0, 223, 0, 0, 0, 1423, 209, 210, 211, 212,
- 213, 0, 0, 0, 0, 0, 214, 215, 216, 217,
- 272, 273, 220, 221, 222, 0, 0, 0, 223, 0,
- 0, 0, 1424, 209, 210, 211, 212, 213, 0, 0,
- 0, 0, 0, 214, 215, 216, 217, 272, 273, 220,
- 221, 222, 0, 0, 0, 223, 0, 0, 0, 1425,
- 209, 210, 211, 212, 213, 0, 0, 0, 0, 0,
- 214, 215, 216, 217, 272, 273, 220, 221, 222, 0,
- 0, 0, 223, 0, 0, 0, 1440, 209, 210, 211,
- 212, 213, 0, 0, 0, 0, 0, 214, 215, 216,
- 217, 272, 273, 220, 221, 222, 0, 0, 0, 223,
- 0, 0, 0, 1441, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223, 0, 0, 1336,
- 1442, 209, 210, 211, 212, 213, 0, 0, 0, 0,
- 0, 214, 215, 216, 217, 272, 273, 220, 221, 222,
- 0, 0, 0, 223, 209, 210, 211, 212, 213, 0,
- 0, 0, 0, 0, 214, 215, 216, 217, 272, 273,
- 220, 221, 222, 0, 0, 0, 223
+ 222, 0, 0, 0, 223
};
static const short yycheck[] = { 7,
- 115, 309, 4, 6, 857, 6, 4, 37, 996, 931,
- 6, 60, 81, 866, 60, 4, 65, 58, 26, 65,
- 873, 4, 58, 4, 4, 172, 171, 4, 6, 176,
- 6, 6, 43, 44, 5, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 33,
- 160, 161, 36, 37, 6, 39, 44, 160, 161, 6,
- 171, 6, 172, 174, 63, 175, 160, 161, 160, 161,
- 63, 174, 63, 63, 160, 161, 160, 161, 172, 6,
- 7, 175, 174, 101, 102, 103, 104, 105, 174, 173,
- 7, 1023, 171, 84, 141, 7, 6, 160, 161, 7,
- 118, 119, 120, 121, 122, 33, 172, 173, 36, 37,
- 173, 6, 130, 131, 132, 133, 175, 135, 136, 175,
- 138, 139, 140, 174, 142, 171, 160, 161, 174, 168,
- 6, 171, 6, 154, 175, 174, 157, 168, 172, 6,
- 158, 159, 163, 174, 160, 161, 175, 160, 161, 160,
- 161, 6, 160, 161, 160, 161, 172, 175, 6, 177,
- 178, 1024, 174, 171, 6, 1028, 174, 185, 186, 187,
+ 115, 309, 998, 4, 4, 4, 37, 932, 6, 6,
+ 4, 6, 81, 58, 4, 4, 4, 58, 26, 4,
+ 60, 60, 6, 1058, 141, 65, 65, 160, 161, 6,
+ 160, 161, 43, 44, 5, 160, 161, 160, 161, 172,
+ 160, 161, 175, 173, 6, 36, 37, 172, 39, 857,
+ 175, 174, 172, 160, 161, 175, 160, 161, 866, 6,
+ 44, 7, 168, 160, 161, 873, 168, 174, 174, 6,
+ 174, 6, 174, 63, 63, 63, 173, 6, 63, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, 172, 6,
+ 84, 168, 176, 101, 102, 103, 104, 105, 171, 84,
+ 1025, 174, 171, 160, 161, 7, 6, 160, 161, 7,
+ 118, 119, 120, 121, 122, 172, 6, 33, 6, 172,
+ 36, 6, 130, 131, 132, 133, 171, 135, 136, 174,
+ 138, 139, 140, 174, 142, 175, 175, 1172, 6, 171,
+ 171, 160, 161, 154, 6, 171, 157, 160, 161, 60,
+ 158, 159, 163, 172, 65, 172, 160, 161, 175, 172,
+ 160, 161, 171, 160, 161, 160, 161, 175, 172, 177,
+ 178, 171, 6, 174, 174, 174, 174, 185, 186, 187,
188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
- 198, 199, 200, 201, 202, 203, 204, 174, 174, 174,
+ 198, 199, 200, 201, 202, 203, 204, 174, 160, 161,
171, 209, 210, 211, 212, 213, 214, 215, 216, 217,
- 218, 219, 220, 221, 222, 223, 224, 1205, 160, 161,
- 171, 3, 4, 160, 161, 160, 161, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 171, 7,
- 152, 153, 154, 155, 152, 153, 154, 155, 60, 33,
- 160, 161, 36, 65, 272, 273, 172, 169, 170, 175,
+ 218, 219, 220, 221, 222, 223, 224, 171, 1026, 1215,
+ 3, 4, 1030, 160, 161, 6, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 160, 161, 7,
+ 152, 153, 154, 155, 152, 153, 154, 155, 37, 172,
+ 160, 161, 171, 171, 272, 273, 174, 169, 170, 41,
278, 169, 170, 281, 176, 160, 161, 285, 162, 163,
164, 289, 290, 291, 168, 293, 294, 295, 296, 297,
- 298, 299, 169, 170, 6, 306, 307, 160, 161, 1152,
- 1153, 1154, 1155, 311, 312, 313, 1159, 318, 6, 172,
- 160, 161, 175, 50, 51, 171, 324, 3, 4, 5,
- 171, 329, 172, 9, 10, 11, 12, 13, 14, 15,
+ 298, 299, 160, 161, 171, 306, 307, 33, 160, 161,
+ 36, 37, 171, 311, 312, 313, 33, 318, 172, 36,
+ 37, 175, 39, 6, 7, 171, 324, 3, 4, 5,
+ 37, 329, 174, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 160, 161, 160, 161, 171, 0,
- 1, 174, 3, 171, 36, 37, 172, 39, 172, 160,
- 161, 172, 173, 171, 146, 147, 148, 149, 150, 1222,
- 1223, 172, 41, 1226, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 37, 172, 167, 168, 175, 172, 171,
- 167, 175, 174, 170, 152, 153, 154, 155, 409, 410,
- 411, 409, 410, 411, 412, 413, 172, 171, 416, 175,
- 418, 169, 170, 37, 6, 160, 161, 162, 163, 164,
- 37, 172, 1275, 168, 175, 0, 1, 435, 3, 169,
- 170, 39, 440, 52, 53, 54, 55, 448, 57, 172,
- 174, 5, 175, 451, 452, 174, 96, 97, 98, 99,
- 100, 172, 460, 172, 175, 172, 175, 49, 175, 467,
- 111, 112, 113, 114, 115, 116, 117, 118, 172, 477,
- 1323, 175, 174, 481, 160, 161, 172, 172, 37, 175,
- 175, 167, 174, 6, 492, 171, 137, 138, 174, 140,
- 5, 499, 500, 501, 502, 172, 171, 171, 175, 1352,
- 8, 6, 5, 4, 3, 4, 5, 4, 37, 817,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 542, 176, 541, 542, 543, 111, 112, 113, 114,
- 115, 116, 117, 118, 172, 171, 557, 175, 171, 171,
- 171, 171, 5, 668, 146, 147, 148, 149, 150, 171,
- 568, 569, 171, 6, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 171, 171, 171, 168, 585, 171, 6,
- 591, 592, 593, 171, 171, 171, 1439, 171, 171, 171,
- 171, 171, 171, 171, 141, 6, 149, 150, 5, 146,
- 171, 171, 174, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 174, 621, 622, 168, 624, 171, 174, 171,
- 171, 171, 169, 171, 6, 171, 173, 174, 639, 637,
- 638, 171, 6, 176, 6, 174, 174, 648, 146, 147,
- 148, 149, 150, 174, 6, 171, 168, 171, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, 171, 171, 171,
- 168, 160, 161, 5, 171, 173, 172, 171, 167, 171,
- 7, 171, 171, 171, 7, 174, 171, 171, 171, 987,
- 171, 6, 171, 171, 171, 171, 171, 695, 171, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 171, 171,
- 708, 168, 710, 711, 173, 171, 171, 171, 171, 171,
- 718, 719, 720, 721, 722, 723, 724, 725, 726, 727,
- 728, 729, 171, 171, 171, 171, 177, 172, 172, 737,
- 7, 739, 3, 4, 176, 7, 82, 745, 9, 10,
+ 26, 27, 28, 29, 52, 53, 54, 55, 37, 57,
+ 174, 1159, 1160, 1161, 1162, 39, 172, 172, 1166, 175,
+ 175, 174, 8, 146, 147, 148, 149, 150, 96, 97,
+ 98, 99, 100, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 5, 172, 167, 168, 175, 172, 171, 167,
+ 175, 174, 170, 37, 152, 153, 154, 155, 409, 410,
+ 411, 409, 410, 411, 412, 413, 172, 174, 416, 175,
+ 418, 169, 170, 160, 161, 162, 163, 164, 6, 172,
+ 172, 168, 175, 175, 1232, 1233, 172, 435, 1236, 175,
+ 172, 172, 440, 175, 175, 172, 5, 448, 175, 172,
+ 169, 170, 175, 451, 452, 6, 172, 172, 173, 175,
+ 50, 51, 460, 0, 1, 171, 3, 172, 173, 467,
+ 169, 170, 5, 4, 171, 4, 37, 171, 171, 477,
+ 176, 171, 171, 481, 160, 161, 171, 1285, 5, 171,
+ 171, 167, 6, 171, 492, 171, 171, 6, 174, 171,
+ 171, 499, 500, 501, 502, 171, 171, 171, 171, 171,
+ 146, 147, 148, 149, 150, 171, 171, 171, 171, 817,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 171,
+ 6, 5, 168, 171, 171, 1333, 171, 173, 171, 149,
+ 150, 542, 174, 541, 542, 543, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 174, 557, 174, 168, 171,
+ 171, 176, 171, 668, 1362, 171, 171, 174, 6, 6,
+ 568, 569, 174, 174, 111, 112, 113, 114, 115, 116,
+ 117, 118, 6, 171, 168, 171, 171, 585, 171, 171,
+ 591, 592, 593, 3, 4, 5, 171, 171, 171, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 5, 171, 171, 621, 622, 171, 624, 171, 171, 171,
+ 171, 171, 171, 171, 7, 171, 171, 171, 639, 637,
+ 638, 171, 6, 171, 171, 171, 171, 648, 171, 171,
+ 171, 1449, 3, 4, 172, 171, 171, 177, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 177,
- 5, 5, 5, 5, 879, 5, 5, 5, 5, 5,
- 5, 5, 146, 147, 148, 149, 150, 5, 5, 787,
- 5, 792, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 799, 5, 5, 168, 5, 804, 805, 5, 5,
- 5, 5, 5, 5, 5, 129, 5, 818, 5, 820,
- 5, 822, 3, 5, 7, 5, 4, 6, 5, 177,
- 6, 146, 147, 148, 149, 150, 6, 6, 6, 837,
- 838, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 848, 7, 850, 168, 7, 7, 6, 175, 7, 7,
- 7, 174, 860, 175, 174, 7, 171, 7, 143, 867,
- 868, 869, 172, 172, 172, 172, 874, 172, 172, 172,
- 878, 172, 880, 172, 172, 172, 172, 172, 172, 172,
- 172, 172, 890, 172, 172, 172, 172, 5, 172, 160,
- 161, 172, 172, 172, 172, 6, 167, 172, 906, 172,
- 171, 7, 172, 174, 172, 7, 173, 172, 7, 917,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 173,
+ 172, 176, 172, 7, 7, 49, 7, 82, 177, 5,
+ 5, 989, 5, 5, 5, 5, 5, 695, 5, 5,
+ 5, 5, 129, 6, 5, 5, 5, 5, 5, 5,
+ 708, 5, 710, 711, 5, 5, 5, 5, 5, 5,
+ 718, 719, 720, 721, 722, 723, 724, 725, 726, 727,
+ 728, 729, 5, 5, 5, 3, 5, 7, 5, 737,
+ 6, 739, 5, 7, 6, 6, 6, 745, 4, 6,
+ 160, 161, 7, 7, 6, 6, 177, 167, 7, 7,
+ 7, 171, 175, 175, 174, 174, 174, 7, 171, 7,
+ 172, 143, 172, 172, 879, 172, 172, 5, 172, 172,
+ 172, 172, 146, 147, 148, 149, 150, 173, 172, 787,
+ 172, 792, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 799, 172, 172, 168, 172, 804, 805, 176, 160,
+ 161, 172, 172, 172, 172, 172, 167, 818, 172, 820,
+ 171, 822, 172, 174, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 172, 172, 172, 837,
+ 838, 172, 172, 146, 147, 148, 149, 150, 6, 174,
+ 848, 7, 850, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 860, 7, 172, 168, 7, 7, 7, 867,
+ 868, 869, 7, 7, 7, 7, 874, 172, 7, 172,
+ 878, 7, 880, 7, 146, 147, 148, 149, 150, 0,
+ 1, 172, 3, 891, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 7, 6, 3, 168, 6, 3, 907,
+ 7, 7, 3, 172, 139, 3, 162, 3, 171, 3,
918, 919, 920, 921, 922, 923, 924, 925, 926, 927,
- 928, 176, 174, 7, 7, 7, 7, 7, 7, 3,
- 4, 7, 940, 3, 7, 9, 10, 11, 12, 13,
+ 928, 929, 171, 175, 171, 171, 171, 171, 171, 171,
+ 171, 171, 171, 941, 171, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 3, 3, 141,
+ 3, 3, 3, 3, 146, 3, 3, 6, 176, 5,
+ 5, 3, 3, 974, 975, 976, 974, 975, 976, 977,
+ 978, 979, 980, 6, 6, 983, 984, 169, 6, 6,
+ 6, 173, 174, 6, 174, 993, 994, 995, 6, 176,
+ 111, 112, 113, 114, 115, 116, 117, 118, 83, 172,
+ 172, 177, 173, 172, 1012, 1013, 173, 172, 6, 173,
+ 172, 1019, 172, 172, 6, 173, 137, 138, 173, 140,
+ 1028, 173, 6, 176, 172, 172, 172, 6, 1036, 6,
+ 6, 172, 172, 1041, 172, 172, 1044, 146, 147, 148,
+ 149, 150, 172, 6, 175, 172, 172, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, 172, 1065, 173, 168,
+ 6, 172, 172, 6, 6, 6, 1074, 1075, 1076, 1077,
+ 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 6, 6,
+ 6, 176, 6, 6, 1092, 6, 83, 7, 4, 3,
+ 4, 3, 3, 6, 162, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 7, 7, 6, 3,
- 171, 7, 973, 974, 975, 973, 974, 975, 976, 977,
- 978, 979, 7, 981, 982, 171, 3, 171, 6, 3,
- 3, 3, 3, 991, 992, 993, 171, 171, 171, 171,
- 171, 139, 162, 3, 171, 171, 171, 171, 3, 3,
- 3, 3, 1010, 1011, 3, 3, 6, 3, 5, 1017,
- 5, 3, 559, 560, 83, 562, 172, 6, 1026, 566,
- 567, 176, 6, 6, 6, 6, 1034, 174, 6, 172,
- 176, 1039, 173, 172, 1042, 173, 8, 172, 4, 173,
- 172, 172, 172, 33, 34, 35, 36, 37, 38, 39,
- 40, 173, 42, 1061, 44, 45, 173, 47, 48, 172,
- 172, 177, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077,
- 1078, 1079, 1080, 1081, 64, 172, 623, 172, 172, 626,
- 1088, 172, 6, 173, 172, 172, 160, 161, 78, 79,
- 176, 6, 6, 167, 172, 172, 6, 171, 645, 646,
- 174, 172, 6, 6, 651, 652, 173, 172, 172, 6,
- 6, 658, 6, 660, 6, 6, 6, 1125, 146, 147,
- 148, 149, 150, 6, 176, 6, 6, 6, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, 7, 83, 686,
- 168, 688, 4, 1151, 3, 6, 136, 3, 6, 696,
- 697, 698, 6, 162, 701, 702, 703, 704, 705, 706,
- 707, 6, 3, 6, 3, 1173, 1174, 1175, 1176, 1177,
- 1178, 1179, 1180, 1181, 146, 147, 148, 149, 150, 6,
- 6, 1189, 3, 6, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 3, 1202, 3, 168, 3, 4, 3,
- 84, 6, 4, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 1232, 1233, 1234, 1235, 1236, 1237,
- 1238, 1239, 1240, 1241, 1242, 1243, 3, 4, 1246, 174,
- 80, 175, 9, 10, 11, 12, 13, 14, 15, 16,
+ 24, 25, 26, 27, 28, 29, 6, 6, 146, 147,
+ 148, 149, 150, 6, 1132, 3, 6, 3, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 6, 6, 3,
+ 168, 6, 3, 3, 3, 3, 4, 84, 4, 6,
+ 1158, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 7, 174, 1182, 1183, 1184, 1185, 1186, 1187,
+ 1188, 1189, 1190, 146, 147, 148, 149, 150, 175, 174,
+ 1198, 173, 80, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 6, 172, 1212, 168, 172, 172, 176, 173,
+ 172, 172, 6, 173, 173, 172, 174, 173, 33, 34,
+ 35, 36, 37, 38, 39, 40, 173, 42, 172, 44,
+ 45, 83, 47, 48, 1242, 1243, 1244, 1245, 1246, 1247,
+ 1248, 1249, 1250, 1251, 1252, 1253, 160, 161, 1256, 64,
+ 6, 173, 3, 167, 172, 174, 6, 171, 6, 3,
+ 174, 6, 5, 78, 79, 6, 6, 6, 6, 6,
+ 3, 6, 176, 4, 6, 1283, 1284, 6, 5, 175,
+ 6, 174, 173, 1291, 1292, 1293, 1294, 1295, 1296, 1297,
+ 1298, 1299, 1300, 172, 1302, 172, 1304, 172, 172, 172,
+ 1308, 173, 160, 161, 4, 6, 173, 6, 6, 167,
+ 172, 6, 6, 171, 6, 6, 6, 172, 172, 6,
+ 6, 136, 1330, 1331, 5, 5, 172, 1335, 1336, 1337,
+ 1338, 1339, 1340, 6, 175, 172, 172, 6, 80, 173,
+ 173, 172, 172, 172, 172, 6, 5, 174, 174, 174,
+ 1358, 5, 175, 6, 174, 1363, 1364, 1365, 1366, 1367,
+ 1368, 1369, 1370, 1371, 172, 172, 175, 559, 560, 175,
+ 562, 173, 173, 80, 566, 567, 6, 6, 6, 6,
+ 6, 6, 6, 1391, 1392, 1393, 1394, 1395, 1396, 1397,
+ 174, 1399, 172, 1401, 172, 172, 145, 172, 174, 6,
+ 174, 174, 172, 6, 173, 6, 6, 6, 6, 172,
+ 172, 1419, 1420, 1421, 174, 174, 174, 172, 6, 6,
+ 6, 173, 6, 6, 6, 1433, 1434, 1435, 1436, 1437,
+ 1438, 623, 6, 0, 626, 0, 6, 6, 174, 595,
+ 6, 1180, 1450, 1451, 1452, 1453, 174, 1455, 6, 1457,
+ 174, 569, 842, 645, 646, -1, -1, -1, -1, 651,
+ 652, -1, -1, 6, -1, -1, 658, -1, 660, 1477,
+ 1478, 1479, -1, 146, 147, 148, 149, 150, 1486, -1,
+ 1488, -1, 1490, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, 6, 686, 168, 688, -1, -1, -1,
+ -1, -1, -1, -1, 696, 697, 698, -1, -1, 701,
+ 702, 703, 704, 705, 706, 707, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 3, 4, -1, -1,
+ -1, -1, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 174, 6, 1273, 1274, 173, 173, 176,
- 172, 172, 172, 1281, 1282, 1283, 1284, 1285, 1286, 1287,
- 1288, 1289, 1290, 172, 1292, 172, 1294, 173, 173, 6,
- 1298, 173, 83, 6, 172, 3, 173, 844, 172, 846,
- 6, 173, 6, 172, 851, 6, 174, 3, 6, 6,
- 3, 6, 1320, 1321, 6, 6, 6, 1325, 1326, 1327,
- 1328, 1329, 1330, 870, 6, 5, 176, 6, 4, 175,
- 5, 173, 6, 4, 6, 172, 174, 172, 172, 172,
- 1348, 173, 172, 6, 173, 1353, 1354, 1355, 1356, 1357,
- 1358, 1359, 1360, 1361, 160, 161, 172, 172, 172, 6,
- 6, 167, 6, 6, 6, 171, 6, 6, 6, 5,
- 173, 6, 5, 1381, 1382, 1383, 1384, 1385, 1386, 1387,
- 172, 1389, 175, 1391, 172, 172, 80, 173, 172, 172,
- 172, 172, 6, 160, 161, 6, 174, 174, 174, 6,
- 167, 1409, 1410, 1411, 171, 5, 5, 175, 6, 174,
- 172, 172, 175, 173, 173, 1423, 1424, 1425, 1426, 1427,
- 1428, 6, 175, 80, 6, 6, 6, 6, 6, 6,
- 6, 174, 1440, 1441, 1442, 1443, 172, 1445, 172, 1447,
- 146, 147, 148, 149, 150, 145, 172, 172, 6, 172,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, 1467,
- 1468, 1469, 168, 174, 6, 174, 1013, 174, 1476, 1016,
- 1478, 173, 1480, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 172, 3, 4, 172, 174, 172, 1036,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 146, 147, 148, 149, 150, 174, 6, 174, 173,
- 1067, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 6, 0, 0, 168, 595, 146, 147, 148, 149, 150,
- 174, 6, 174, 174, 6, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 6, 6, 1171, 168, 569, 842,
- -1, 146, 147, 148, 149, 150, -1, -1, -1, -1,
- -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 6, -1, -1, 168, -1, -1, -1, -1, -1, -1,
+ 27, 28, 29, 3, 4, -1, -1, -1, -1, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 146, 147, 148, 149, 150, 6, -1, -1, -1, -1,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
+ -1, -1, 168, 146, 147, 148, 149, 150, 6, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ -1, 6, -1, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 844, -1, 846, 168, 6, -1, -1, 851,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, 870, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ 167, 168, -1, -1, 171, -1, -1, 6, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 1148, 1149, 6, 146, 147, 148, 149, 150, -1,
+ 160, 161, -1, -1, -1, -1, -1, 167, -1, -1,
+ 6, 171, -1, -1, -1, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, 6, -1, -1, 168, 146, 147,
+ 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 6, -1, -1,
+ 168, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ 6, -1, -1, 168, -1, -1, 146, 147, 148, 149,
+ 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 6, -1, -1, 168, -1,
+ -1, -1, -1, 1015, -1, -1, 1018, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 146, 147, 148,
+ 149, 150, 6, -1, -1, -1, 1038, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ 146, 147, 148, 149, 150, 6, -1, -1, -1, -1,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 1071,
+ -1, -1, 168, -1, 146, 147, 148, 149, 150, 6,
-1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, 1172, 168, 146, 147, 148,
+ 162, 163, 164, -1, -1, -1, 168, 146, 147, 148,
149, 150, 6, -1, -1, -1, -1, 156, 157, 158,
- 159, 160, 161, 162, 163, 164, -1, -1, 167, 168,
- -1, -1, 171, -1, -1, 6, -1, -1, -1, -1,
- -1, -1, -1, 146, 147, 148, 149, 150, -1, -1,
- -1, -1, 1219, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, -1, 6, 1231, 168, -1, -1, -1, 172,
- -1, -1, 175, -1, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, 6, -1, 168, -1, -1, -1,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, 1276,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, 6,
- -1, -1, 168, 146, 147, 148, 149, 150, -1, -1,
- -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 6, -1, -1, 168, -1, -1, -1, -1,
- -1, -1, 146, 147, 148, 149, 150, 1324, -1, -1,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ 146, 147, 148, 149, 150, -1, -1, 8, -1, -1,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
+ -1, -1, 168, -1, -1, 146, 147, 148, 149, 150,
+ 8, -1, -1, 1155, 1156, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 146, 147, 148, 149, 150, -1, -1, 1181,
-1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 6, -1, -1, 168, 146, 147, 148, 149, 150,
- -1, -1, -1, -1, 1351, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 6, -1, -1, 168, -1, -1,
- -1, -1, -1, 146, 147, 148, 149, 150, -1, -1,
- -1, -1, 1379, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 6, -1, -1, 168, -1, -1, -1, -1,
- -1, -1, -1, -1, 146, 147, 148, 149, 150, -1,
- -1, 1408, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 6, -1, 1422, 168, -1, -1, 146,
- 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 6, -1,
+ 164, -1, -1, -1, 168, 146, 147, 148, 149, 150,
+ 8, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, 146,
+ 147, 148, 149, 150, 8, -1, -1, 1229, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, 1241,
-1, 168, 146, 147, 148, 149, 150, -1, -1, -1,
-1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 6, -1, -1, 168, -1, -1, -1, -1, -1,
- -1, 146, 147, 148, 149, 150, -1, -1, -1, -1,
- -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 8, -1, -1, 168, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 8, -1, -1, 168, -1, -1, -1,
- -1, -1, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 8, -1, -1, 168, -1, -1, -1, -1, -1,
- -1, -1, -1, 146, 147, 148, 149, 150, -1, -1,
- -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, -1, -1, -1, 168, -1, -1, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, 146, 147, 148, 149, 150, -1, -1, -1, -1,
- -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- -1, -1, -1, 168, -1, -1, -1, -1, 146, 147,
+ 164, -1, -1, -1, 168, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, 1286, -1, -1, 168, 146, 147,
148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, 146, 147, 148, 149, 150, -1, -1, -1, -1,
- -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- -1, -1, -1, 168, -1, -1, -1, -1, -1, 146,
- 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
- -1, 168, 33, 34, 35, 36, 37, 38, 39, 40,
+ 168, -1, 33, 34, 35, 36, 37, 38, 39, 40,
-1, 42, -1, 44, 45, -1, 47, 48, -1, -1,
- 33, 34, 35, 36, 37, 38, 39, 40, -1, 42,
- -1, 44, 45, 64, 47, 48, -1, -1, -1, 0,
- 1, -1, -1, 4, -1, -1, -1, 78, 79, -1,
- -1, 64, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 78, 79, -1, -1, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- -1, 42, 43, 44, 45, 46, 47, 48, -1, -1,
- -1, 52, 53, 54, 55, 56, 57, -1, 59, 60,
- 61, 62, 63, 64, -1, 136, -1, -1, -1, -1,
- -1, 36, -1, -1, -1, -1, -1, 78, 79, -1,
- -1, -1, -1, 136, 85, 86, -1, 88, 89, 90,
- 91, 92, -1, -1, -1, 146, 147, 148, 149, 150,
- -1, -1, -1, -1, 175, 156, 157, 158, 159, 160,
+ -1, -1, 1334, -1, -1, -1, -1, -1, 146, 147,
+ 148, 149, 150, 64, -1, -1, -1, -1, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 78, 79, 1361,
+ 168, -1, 146, 147, 148, 149, 150, -1, -1, -1,
+ -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, -1, -1, -1, 168, -1, -1, 1389, 33, 34,
+ 35, 36, 37, 38, 39, 40, -1, 42, -1, 44,
+ 45, -1, 47, 48, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 136, 1418, -1, -1, 64,
+ -1, -1, -1, -1, -1, 0, 1, -1, -1, 4,
+ 1432, -1, -1, 78, 79, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 175, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, -1, 42, 43, 44,
+ 45, 46, 47, 48, -1, -1, -1, 52, 53, 54,
+ 55, 56, 57, 36, 59, 60, 61, 62, 63, 64,
+ -1, 136, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 78, 79, -1, -1, -1, -1, -1,
+ 85, 86, -1, 88, 89, 90, 91, 92, -1, -1,
+ -1, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ 175, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ 93, 94, 95, 168, -1, -1, -1, 172, 101, 102,
+ 103, 104, 105, 106, 107, 108, 109, 110, -1, -1,
+ -1, 136, -1, -1, -1, -1, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, -1, 130, 131, 132,
+ 133, 134, 135, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, 146, 147, 148, 149,
+ 150, -1, -1, -1, -1, 178, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, -1, -1, -1, 168, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, 178, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, 146, 147, 148, 149, 150, -1, -1, -1,
+ -1, 178, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, -1, -1, -1, 168, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, 178, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, 172, -1, -1, 175, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
- -1, -1, 175, -1, -1, -1, -1, 178, 93, 94,
- 95, -1, -1, -1, -1, 136, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, -1, -1, -1, -1,
- -1, -1, -1, -1, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, -1, 130, 131, 132, 133, 134,
- 135, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 172, -1, -1, 175, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, 172, -1, -1, 175, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, 146, 147,
+ 148, 149, 150, -1, 175, -1, -1, -1, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
+ 168, 146, 147, 148, 149, 150, -1, 175, -1, -1,
-1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-1, -1, -1, 168, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, 178, 156, 157, 158, 159, 160, 161,
+ 175, -1, -1, -1, 156, 157, 158, 159, 160, 161,
162, 163, 164, -1, -1, -1, 168, 146, 147, 148,
- 149, 150, -1, -1, -1, -1, 178, 156, 157, 158,
+ 149, 150, -1, 175, -1, -1, -1, 156, 157, 158,
159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, 178,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, 172, -1, -1, 175,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, 172, -1, -1, 175,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
+ 146, 147, 148, 149, 150, -1, 175, -1, -1, -1,
156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
-1, -1, 168, 146, 147, 148, 149, 150, -1, 175,
-1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
163, 164, -1, -1, -1, 168, 146, 147, 148, 149,
150, -1, 175, -1, -1, -1, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, -1, -1, -1, 168, 139,
+ -1, -1, -1, -1, -1, 175, 146, 147, 148, 149,
+ 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
160, 161, 162, 163, 164, -1, -1, -1, 168, 146,
- 147, 148, 149, 150, -1, 175, -1, -1, -1, 156,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
-1, 168, 146, 147, 148, 149, 150, -1, 175, -1,
-1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
@@ -2075,16 +2111,16 @@ static const short yycheck[] = { 7,
148, 149, 150, -1, 175, -1, -1, -1, 156, 157,
158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
168, 146, 147, 148, 149, 150, -1, 175, -1, -1,
- -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- -1, -1, -1, 168, 139, -1, -1, -1, -1, -1,
- 175, 146, 147, 148, 149, 150, -1, -1, -1, -1,
-1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-1, -1, -1, 168, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
+ 175, -1, -1, -1, 156, 157, 158, 159, 160, 161,
162, 163, 164, -1, -1, -1, 168, 146, 147, 148,
149, 150, -1, 175, -1, -1, -1, 156, 157, 158,
159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
- 146, 147, 148, 149, 150, -1, 175, -1, -1, -1,
+ 139, -1, -1, -1, -1, -1, 175, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
-1, -1, 168, 146, 147, 148, 149, 150, -1, 175,
-1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
@@ -2093,217 +2129,184 @@ static const short yycheck[] = { 7,
160, 161, 162, 163, 164, -1, -1, -1, 168, 146,
147, 148, 149, 150, -1, 175, -1, -1, -1, 156,
157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
- -1, 168, 146, 147, 148, 149, 150, -1, 175, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, 139, -1, -1, -1, -1,
- -1, 175, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, 146, 147, 148, 149, 150,
+ -1, 168, -1, -1, -1, 172, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
-1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, -1, -1, -1, 168, 146, 147,
- 148, 149, 150, -1, 175, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, 146, 147, 148, 149, 150, -1, 175, -1, -1,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
-1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- -1, -1, -1, 168, 146, 147, 148, 149, 150, -1,
- 175, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- 172, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, -1, 173, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- -1, 173, 146, 147, 148, 149, 150, -1, -1, -1,
- -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, -1, -1, -1, 168, -1, -1, -1, -1, 173,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, -1, 173, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, -1, -1, -1, -1, 173, 146, 147, 148, 149,
- 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, -1, -1, -1, 168, -1,
- -1, -1, 172, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
-1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, -1, -1, -1, 168, -1, -1, -1, 172,
- 146, 147, 148, 149, 150, -1, -1, -1, -1, -1,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, -1,
- -1, -1, 168, -1, -1, -1, 172, 146, 147, 148,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
- -1, -1, -1, 172, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
- 172, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
-1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- -1, -1, -1, 168, 142, -1, -1, 172, 146, 147,
- 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
- 168, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
+ -1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ -1, -1, -1, 168, -1, -1, -1, -1, 173, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, -1, -1, -1, -1, 173, 146, 147, 148,
+ 149, 150, -1, -1, -1, -1, -1, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
+ -1, -1, -1, -1, 173, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, -1, 173, 146, 147, 148, 149, 150, -1, -1,
+ -1, -1, -1, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, -1, -1, -1, 168, -1, -1, -1, -1,
+ 173, 146, 147, 148, 149, 150, -1, -1, -1, -1,
-1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-1, -1, -1, 168, -1, -1, -1, 172, 146, 147,
148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
@@ -2315,6 +2318,11 @@ static const short yycheck[] = { 7,
-1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
164, -1, -1, -1, 168, -1, -1, -1, 172, 146,
147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, 142, -1, -1, 172, 146, 147, 148, 149,
+ 150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, -1, -1, -1, 168, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
-1, 168, -1, -1, -1, 172, 146, 147, 148, 149,
150, -1, -1, -1, -1, -1, 156, 157, 158, 159,
@@ -2572,12 +2580,23 @@ static const short yycheck[] = { 7,
159, 160, 161, 162, 163, 164, -1, -1, -1, 168,
-1, -1, -1, 172, 146, 147, 148, 149, 150, -1,
-1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168, -1, -1, 144,
+ 162, 163, 164, -1, -1, -1, 168, -1, -1, -1,
172, 146, 147, 148, 149, 150, -1, -1, -1, -1,
-1, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- -1, -1, -1, 168, 146, 147, 148, 149, 150, -1,
- -1, -1, -1, -1, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, -1, -1, -1, 168
+ -1, -1, -1, 168, -1, -1, -1, 172, 146, 147,
+ 148, 149, 150, -1, -1, -1, -1, -1, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, -1, -1, -1,
+ 168, -1, -1, -1, 172, 146, 147, 148, 149, 150,
+ -1, -1, -1, -1, -1, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, -1, -1, -1, 168, -1, -1,
+ -1, 172, 146, 147, 148, 149, 150, -1, -1, -1,
+ -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, -1, -1, -1, 168, -1, -1, 144, 172, 146,
+ 147, 148, 149, 150, -1, -1, -1, -1, -1, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, -1, -1,
+ -1, 168, 146, 147, 148, 149, 150, -1, -1, -1,
+ -1, -1, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, -1, -1, -1, 168
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/local/share/bison.simple"
@@ -3078,7 +3097,7 @@ yyreduce:
switch (yyn) {
case 4:
-#line 152 "Gmsh.y"
+#line 153 "Gmsh.y"
{
Msg(PARSER_INFO,"STL File Format");
STL_Surf = Create_Surface(1,MSH_SURF_STL,1);
@@ -3087,7 +3106,7 @@ case 4:
;
break;}
case 5:
-#line 166 "Gmsh.y"
+#line 167 "Gmsh.y"
{
STL_Surf->STL->Add_Facet( yyvsp[-12].d, yyvsp[-11].d, yyvsp[-10].d,
yyvsp[-8].d, yyvsp[-7].d, yyvsp[-6].d,
@@ -3096,7 +3115,7 @@ case 5:
;
break;}
case 6:
-#line 173 "Gmsh.y"
+#line 174 "Gmsh.y"
{
Msg(PARSER_INFO,"STL File Format Read");
Tree_Add(THEM->Surfaces, &STL_Surf);
@@ -3104,83 +3123,83 @@ case 6:
;
break;}
case 9:
-#line 190 "Gmsh.y"
+#line 191 "Gmsh.y"
{ return 1; ;
break;}
case 10:
-#line 191 "Gmsh.y"
+#line 192 "Gmsh.y"
{ return 1; ;
break;}
case 11:
-#line 192 "Gmsh.y"
+#line 193 "Gmsh.y"
{ return 1; ;
break;}
case 12:
-#line 193 "Gmsh.y"
+#line 194 "Gmsh.y"
{ yyerrok ; return 1; ;
break;}
case 13:
-#line 198 "Gmsh.y"
+#line 199 "Gmsh.y"
{
Msg(PARSER_INFO,"Step Iso-10303-21 File Format");
Create_Step_Solid_BRep();
;
break;}
case 14:
-#line 203 "Gmsh.y"
+#line 204 "Gmsh.y"
{
Msg(PARSER_INFO,"Step Iso-10303-21 File Format Read");
Resolve_BREP ();
;
break;}
case 18:
-#line 214 "Gmsh.y"
+#line 215 "Gmsh.y"
{
;
break;}
case 19:
-#line 217 "Gmsh.y"
+#line 218 "Gmsh.y"
{
;
break;}
case 20:
-#line 221 "Gmsh.y"
+#line 222 "Gmsh.y"
{
;
break;}
case 21:
-#line 227 "Gmsh.y"
+#line 228 "Gmsh.y"
{
Add_Cartesian_Point((int)yyvsp[-8].d,yyvsp[-4].c,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2]);
;
break;}
case 22:
-#line 233 "Gmsh.y"
+#line 234 "Gmsh.y"
{
Add_BSpline_Curve_With_Knots ((int)yyvsp[-22].d, yyvsp[-18].c, (int) yyvsp[-16].d, yyvsp[-14].l, yyvsp[-6].l, yyvsp[-4].l, 0., 1.);
;
break;}
case 23:
-#line 240 "Gmsh.y"
+#line 241 "Gmsh.y"
{
Add_BSpline_Surface_With_Knots ((int)yyvsp[-30].d, yyvsp[-26].c, (int) yyvsp[-24].d, (int) yyvsp[-22].d, yyvsp[-20].l, yyvsp[-10].l,
yyvsp[-8].l, yyvsp[-6].l, yyvsp[-4].l, 0., 1., 0., 1. );
;
break;}
case 24:
-#line 246 "Gmsh.y"
+#line 247 "Gmsh.y"
{
Add_Edge_Curve ((int)yyvsp[-14].d, yyvsp[-10].c , (int)yyvsp[-8].d , (int)yyvsp[-6].d, (int)yyvsp[-4].d);
;
break;}
case 25:
-#line 250 "Gmsh.y"
+#line 251 "Gmsh.y"
{
Add_Face_Outer_Bound((int)yyvsp[-10].d,yyvsp[-6].c,(int)yyvsp[-4].d,yyvsp[-2].i,1);
;
break;}
case 26:
-#line 254 "Gmsh.y"
+#line 255 "Gmsh.y"
{
/* La je dois voir la norme ! Face_Bound : trou externe a la surface ! */
Msg(PARSER_INFO,"Found a Face Bound");
@@ -3188,304 +3207,304 @@ case 26:
;
break;}
case 27:
-#line 261 "Gmsh.y"
+#line 262 "Gmsh.y"
{
Add_Oriented_Edge((int)yyvsp[-14].d,yyvsp[-10].c,(int)yyvsp[-4].d,yyvsp[-2].i);
;
break;}
case 28:
-#line 265 "Gmsh.y"
+#line 266 "Gmsh.y"
{
Add_Edge_Loop((int)yyvsp[-8].d,yyvsp[-4].c,yyvsp[-2].l);
;
break;}
case 29:
-#line 270 "Gmsh.y"
+#line 271 "Gmsh.y"
{
Add_Advanced_Face((int)yyvsp[-12].d,yyvsp[-8].c,yyvsp[-6].l,(int)yyvsp[-4].d,yyvsp[-2].i);
;
break;}
case 30:
-#line 274 "Gmsh.y"
+#line 275 "Gmsh.y"
{
Add_Vertex_Point((int)yyvsp[-8].d,yyvsp[-4].c,(int)yyvsp[-2].d);
;
break;}
case 31:
-#line 278 "Gmsh.y"
+#line 279 "Gmsh.y"
{
;
break;}
case 32:
-#line 282 "Gmsh.y"
+#line 283 "Gmsh.y"
{
Add_Axis2_Placement3D ( (int)yyvsp[-12].d, (int)yyvsp[-4].d, (int)yyvsp[-2].d, (int)yyvsp[-6].d);
;
break;}
case 33:
-#line 286 "Gmsh.y"
+#line 287 "Gmsh.y"
{
Add_Direction((int)yyvsp[-8].d , yyvsp[-4].c, yyvsp[-2].v[0], yyvsp[-2].v[1], yyvsp[-2].v[2]);
;
break;}
case 34:
-#line 290 "Gmsh.y"
+#line 291 "Gmsh.y"
{
Add_Plane((int)yyvsp[-8].d,yyvsp[-4].c,(int)yyvsp[-2].d);
;
break;}
case 35:
-#line 294 "Gmsh.y"
+#line 295 "Gmsh.y"
{
Add_Line ((int)yyvsp[-10].d, yyvsp[-6].c , (int) yyvsp[-4].d, (int)yyvsp[-2].d);
;
break;}
case 36:
-#line 298 "Gmsh.y"
+#line 299 "Gmsh.y"
{
Msg(PARSER_INFO,"Found a Closed shell");
Add_Closed_Shell((int)yyvsp[-8].d, yyvsp[-4].c , yyvsp[-2].l);
;
break;}
case 37:
-#line 304 "Gmsh.y"
+#line 305 "Gmsh.y"
{
;
break;}
case 38:
-#line 307 "Gmsh.y"
+#line 308 "Gmsh.y"
{
;
break;}
case 39:
-#line 310 "Gmsh.y"
+#line 311 "Gmsh.y"
{
Add_Cylinder ((int)yyvsp[-10].d, yyvsp[-6].c , (int)yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 40:
-#line 314 "Gmsh.y"
+#line 315 "Gmsh.y"
{
Add_Cone ((int)yyvsp[-12].d, yyvsp[-8].c , (int)yyvsp[-6].d, yyvsp[-4].d,yyvsp[-2].d);
;
break;}
case 41:
-#line 318 "Gmsh.y"
+#line 319 "Gmsh.y"
{
Add_Torus ((int)yyvsp[-12].d, yyvsp[-8].c , (int)yyvsp[-6].d, yyvsp[-4].d,yyvsp[-2].d);
;
break;}
case 42:
-#line 322 "Gmsh.y"
+#line 323 "Gmsh.y"
{
Add_Circle((int) yyvsp[-10].d, yyvsp[-6].c, (int) yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 43:
-#line 326 "Gmsh.y"
+#line 327 "Gmsh.y"
{
Add_Ellipsis((int) yyvsp[-12].d, yyvsp[-8].c, (int) yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 44:
-#line 331 "Gmsh.y"
+#line 332 "Gmsh.y"
{
;
break;}
case 45:
-#line 334 "Gmsh.y"
+#line 335 "Gmsh.y"
{
;
break;}
case 46:
-#line 338 "Gmsh.y"
+#line 339 "Gmsh.y"
{
;
break;}
case 47:
-#line 341 "Gmsh.y"
+#line 342 "Gmsh.y"
{
;
break;}
case 48:
-#line 345 "Gmsh.y"
+#line 346 "Gmsh.y"
{
;
break;}
case 49:
-#line 348 "Gmsh.y"
+#line 349 "Gmsh.y"
{
;
break;}
case 50:
-#line 351 "Gmsh.y"
+#line 352 "Gmsh.y"
{
;
break;}
case 51:
-#line 361 "Gmsh.y"
+#line 362 "Gmsh.y"
{
;
break;}
case 52:
-#line 364 "Gmsh.y"
+#line 365 "Gmsh.y"
{
Msg(PARSER_INFO,"Gmsh File Format Read");
;
break;}
case 53:
-#line 370 "Gmsh.y"
+#line 371 "Gmsh.y"
{ return 1; ;
break;}
case 54:
-#line 371 "Gmsh.y"
+#line 372 "Gmsh.y"
{ return 1; ;
break;}
case 55:
-#line 372 "Gmsh.y"
+#line 373 "Gmsh.y"
{ return 1; ;
break;}
case 56:
-#line 373 "Gmsh.y"
+#line 374 "Gmsh.y"
{ return 1; ;
break;}
case 57:
-#line 374 "Gmsh.y"
+#line 375 "Gmsh.y"
{ return 1; ;
break;}
case 58:
-#line 375 "Gmsh.y"
+#line 376 "Gmsh.y"
{ return 1; ;
break;}
case 59:
-#line 376 "Gmsh.y"
+#line 377 "Gmsh.y"
{ return 1; ;
break;}
case 60:
-#line 377 "Gmsh.y"
+#line 378 "Gmsh.y"
{ return 1; ;
break;}
case 61:
-#line 378 "Gmsh.y"
+#line 379 "Gmsh.y"
{ return 1; ;
break;}
case 62:
-#line 379 "Gmsh.y"
+#line 380 "Gmsh.y"
{ return 1; ;
break;}
case 63:
-#line 380 "Gmsh.y"
+#line 381 "Gmsh.y"
{ return 1; ;
break;}
case 64:
-#line 381 "Gmsh.y"
+#line 382 "Gmsh.y"
{return 1;;
break;}
case 65:
-#line 383 "Gmsh.y"
+#line 384 "Gmsh.y"
{ return 1; ;
break;}
case 66:
-#line 384 "Gmsh.y"
+#line 385 "Gmsh.y"
{ yyerrok; return 1;;
break;}
case 67:
-#line 389 "Gmsh.y"
+#line 390 "Gmsh.y"
{
Msg(PARSER_INFO, yyvsp[-4].c, yyvsp[-2].d);
;
break;}
case 68:
-#line 400 "Gmsh.y"
+#line 401 "Gmsh.y"
{
EndView(1, Force_ViewNumber,yyname,yyvsp[-4].c,0.,0.,0.);
;
break;}
case 69:
-#line 404 "Gmsh.y"
+#line 405 "Gmsh.y"
{
EndView(1, Force_ViewNumber,yyname,yyvsp[-6].c,yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2]);
;
break;}
case 70:
-#line 411 "Gmsh.y"
+#line 412 "Gmsh.y"
{
BeginView(1);
;
break;}
case 83:
-#line 430 "Gmsh.y"
+#line 431 "Gmsh.y"
{ List_Add(ActualView->SP, &yyvsp[0].d) ; ;
break;}
case 84:
-#line 432 "Gmsh.y"
+#line 433 "Gmsh.y"
{ List_Add(ActualView->SP, &yyvsp[0].d) ; ;
break;}
case 85:
-#line 437 "Gmsh.y"
+#line 438 "Gmsh.y"
{
List_Add(ActualView->SP, &yyvsp[-5].d); List_Add(ActualView->SP, &yyvsp[-3].d);
List_Add(ActualView->SP, &yyvsp[-1].d);
;
break;}
case 86:
-#line 442 "Gmsh.y"
+#line 443 "Gmsh.y"
{
ActualView->NbSP++ ;
;
break;}
case 87:
-#line 449 "Gmsh.y"
+#line 450 "Gmsh.y"
{ List_Add(ActualView->VP, &yyvsp[0].d) ; ;
break;}
case 88:
-#line 451 "Gmsh.y"
+#line 452 "Gmsh.y"
{ List_Add(ActualView->VP, &yyvsp[0].d) ; ;
break;}
case 89:
-#line 456 "Gmsh.y"
+#line 457 "Gmsh.y"
{
List_Add(ActualView->VP, &yyvsp[-5].d); List_Add(ActualView->VP, &yyvsp[-3].d);
List_Add(ActualView->VP, &yyvsp[-1].d);
;
break;}
case 90:
-#line 461 "Gmsh.y"
+#line 462 "Gmsh.y"
{
ActualView->NbVP++ ;
;
break;}
case 91:
-#line 468 "Gmsh.y"
+#line 469 "Gmsh.y"
{ List_Add(ActualView->TP, &yyvsp[0].d) ; ;
break;}
case 92:
-#line 470 "Gmsh.y"
+#line 471 "Gmsh.y"
{ List_Add(ActualView->TP, &yyvsp[0].d) ; ;
break;}
case 93:
-#line 475 "Gmsh.y"
+#line 476 "Gmsh.y"
{
List_Add(ActualView->TP, &yyvsp[-5].d); List_Add(ActualView->TP, &yyvsp[-3].d);
List_Add(ActualView->TP, &yyvsp[-1].d);
;
break;}
case 94:
-#line 480 "Gmsh.y"
+#line 481 "Gmsh.y"
{
ActualView->NbTP++ ;
;
break;}
case 95:
-#line 487 "Gmsh.y"
+#line 488 "Gmsh.y"
{ List_Add(ActualView->SL, &yyvsp[0].d) ; ;
break;}
case 96:
-#line 489 "Gmsh.y"
+#line 490 "Gmsh.y"
{ List_Add(ActualView->SL, &yyvsp[0].d) ; ;
break;}
case 97:
-#line 495 "Gmsh.y"
+#line 496 "Gmsh.y"
{
List_Add(ActualView->SL, &yyvsp[-11].d); List_Add(ActualView->SL, &yyvsp[-5].d);
List_Add(ActualView->SL, &yyvsp[-9].d); List_Add(ActualView->SL, &yyvsp[-3].d);
@@ -3493,21 +3512,21 @@ case 97:
;
break;}
case 98:
-#line 501 "Gmsh.y"
+#line 502 "Gmsh.y"
{
ActualView->NbSL++ ;
;
break;}
case 99:
-#line 508 "Gmsh.y"
+#line 509 "Gmsh.y"
{ List_Add(ActualView->VL, &yyvsp[0].d) ; ;
break;}
case 100:
-#line 510 "Gmsh.y"
+#line 511 "Gmsh.y"
{ List_Add(ActualView->VL, &yyvsp[0].d) ; ;
break;}
case 101:
-#line 516 "Gmsh.y"
+#line 517 "Gmsh.y"
{
List_Add(ActualView->SL, &yyvsp[-11].d); List_Add(ActualView->SL, &yyvsp[-5].d);
List_Add(ActualView->SL, &yyvsp[-9].d); List_Add(ActualView->SL, &yyvsp[-3].d);
@@ -3515,21 +3534,21 @@ case 101:
;
break;}
case 102:
-#line 522 "Gmsh.y"
+#line 523 "Gmsh.y"
{
ActualView->NbVL++ ;
;
break;}
case 103:
-#line 529 "Gmsh.y"
+#line 530 "Gmsh.y"
{ List_Add(ActualView->TL, &yyvsp[0].d) ; ;
break;}
case 104:
-#line 531 "Gmsh.y"
+#line 532 "Gmsh.y"
{ List_Add(ActualView->TL, &yyvsp[0].d) ; ;
break;}
case 105:
-#line 537 "Gmsh.y"
+#line 538 "Gmsh.y"
{
List_Add(ActualView->SL, &yyvsp[-11].d); List_Add(ActualView->SL, &yyvsp[-5].d);
List_Add(ActualView->SL, &yyvsp[-9].d); List_Add(ActualView->SL, &yyvsp[-3].d);
@@ -3537,21 +3556,21 @@ case 105:
;
break;}
case 106:
-#line 543 "Gmsh.y"
+#line 544 "Gmsh.y"
{
ActualView->NbTL++ ;
;
break;}
case 107:
-#line 550 "Gmsh.y"
+#line 551 "Gmsh.y"
{ List_Add(ActualView->ST, &yyvsp[0].d) ; ;
break;}
case 108:
-#line 552 "Gmsh.y"
+#line 553 "Gmsh.y"
{ List_Add(ActualView->ST, &yyvsp[0].d) ; ;
break;}
case 109:
-#line 559 "Gmsh.y"
+#line 560 "Gmsh.y"
{
List_Add(ActualView->ST, &yyvsp[-17].d); List_Add(ActualView->ST, &yyvsp[-11].d);
List_Add(ActualView->ST, &yyvsp[-5].d);
@@ -3562,21 +3581,21 @@ case 109:
;
break;}
case 110:
-#line 568 "Gmsh.y"
+#line 569 "Gmsh.y"
{
ActualView->NbST++ ;
;
break;}
case 111:
-#line 575 "Gmsh.y"
+#line 576 "Gmsh.y"
{ List_Add(ActualView->VT, &yyvsp[0].d) ; ;
break;}
case 112:
-#line 577 "Gmsh.y"
+#line 578 "Gmsh.y"
{ List_Add(ActualView->VT, &yyvsp[0].d) ; ;
break;}
case 113:
-#line 584 "Gmsh.y"
+#line 585 "Gmsh.y"
{
List_Add(ActualView->VT, &yyvsp[-17].d); List_Add(ActualView->VT, &yyvsp[-11].d);
List_Add(ActualView->VT, &yyvsp[-5].d);
@@ -3587,21 +3606,21 @@ case 113:
;
break;}
case 114:
-#line 593 "Gmsh.y"
+#line 594 "Gmsh.y"
{
ActualView->NbVT++ ;
;
break;}
case 115:
-#line 600 "Gmsh.y"
+#line 601 "Gmsh.y"
{ List_Add(ActualView->TT, &yyvsp[0].d) ; ;
break;}
case 116:
-#line 602 "Gmsh.y"
+#line 603 "Gmsh.y"
{ List_Add(ActualView->TT, &yyvsp[0].d) ; ;
break;}
case 117:
-#line 609 "Gmsh.y"
+#line 610 "Gmsh.y"
{
List_Add(ActualView->TT, &yyvsp[-17].d); List_Add(ActualView->TT, &yyvsp[-11].d);
List_Add(ActualView->TT, &yyvsp[-5].d);
@@ -3612,21 +3631,21 @@ case 117:
;
break;}
case 118:
-#line 618 "Gmsh.y"
+#line 619 "Gmsh.y"
{
ActualView->NbTT++ ;
;
break;}
case 119:
-#line 625 "Gmsh.y"
+#line 626 "Gmsh.y"
{ List_Add(ActualView->SS, &yyvsp[0].d) ; ;
break;}
case 120:
-#line 627 "Gmsh.y"
+#line 628 "Gmsh.y"
{ List_Add(ActualView->SS, &yyvsp[0].d) ; ;
break;}
case 121:
-#line 635 "Gmsh.y"
+#line 636 "Gmsh.y"
{
List_Add(ActualView->SS, &yyvsp[-23].d); List_Add(ActualView->SS, &yyvsp[-17].d);
List_Add(ActualView->SS, &yyvsp[-11].d); List_Add(ActualView->SS, &yyvsp[-5].d);
@@ -3637,21 +3656,21 @@ case 121:
;
break;}
case 122:
-#line 644 "Gmsh.y"
+#line 645 "Gmsh.y"
{
ActualView->NbSS++ ;
;
break;}
case 123:
-#line 651 "Gmsh.y"
+#line 652 "Gmsh.y"
{ List_Add(ActualView->VS, &yyvsp[0].d) ; ;
break;}
case 124:
-#line 653 "Gmsh.y"
+#line 654 "Gmsh.y"
{ List_Add(ActualView->VS, &yyvsp[0].d) ; ;
break;}
case 125:
-#line 661 "Gmsh.y"
+#line 662 "Gmsh.y"
{
List_Add(ActualView->VS, &yyvsp[-23].d); List_Add(ActualView->VS, &yyvsp[-17].d);
List_Add(ActualView->VS, &yyvsp[-11].d); List_Add(ActualView->VS, &yyvsp[-5].d);
@@ -3662,21 +3681,21 @@ case 125:
;
break;}
case 126:
-#line 670 "Gmsh.y"
+#line 671 "Gmsh.y"
{
ActualView->NbVS++ ;
;
break;}
case 127:
-#line 677 "Gmsh.y"
+#line 678 "Gmsh.y"
{ List_Add(ActualView->TS, &yyvsp[0].d) ; ;
break;}
case 128:
-#line 679 "Gmsh.y"
+#line 680 "Gmsh.y"
{ List_Add(ActualView->TS, &yyvsp[0].d) ; ;
break;}
case 129:
-#line 687 "Gmsh.y"
+#line 688 "Gmsh.y"
{
List_Add(ActualView->TS, &yyvsp[-23].d); List_Add(ActualView->TS, &yyvsp[-17].d);
List_Add(ActualView->TS, &yyvsp[-11].d); List_Add(ActualView->TS, &yyvsp[-5].d);
@@ -3687,13 +3706,13 @@ case 129:
;
break;}
case 130:
-#line 696 "Gmsh.y"
+#line 697 "Gmsh.y"
{
ActualView->NbTS++ ;
;
break;}
case 131:
-#line 712 "Gmsh.y"
+#line 713 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c;
TheSymbol.val = yyvsp[-1].d;
@@ -3701,7 +3720,7 @@ case 131:
;
break;}
case 132:
-#line 718 "Gmsh.y"
+#line 719 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3711,7 +3730,7 @@ case 132:
;
break;}
case 133:
-#line 726 "Gmsh.y"
+#line 727 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3721,7 +3740,7 @@ case 133:
;
break;}
case 134:
-#line 734 "Gmsh.y"
+#line 735 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3731,7 +3750,7 @@ case 134:
;
break;}
case 135:
-#line 742 "Gmsh.y"
+#line 743 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3741,7 +3760,7 @@ case 135:
;
break;}
case 136:
-#line 750 "Gmsh.y"
+#line 751 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3751,7 +3770,7 @@ case 136:
;
break;}
case 137:
-#line 758 "Gmsh.y"
+#line 759 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3761,7 +3780,7 @@ case 137:
;
break;}
case 138:
-#line 769 "Gmsh.y"
+#line 770 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown String Option Class '%s'", yyvsp[-5].c);
@@ -3775,24 +3794,24 @@ case 138:
;
break;}
case 139:
-#line 782 "Gmsh.y"
+#line 783 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
- if(!(pStrOpt = Get_StringViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
+ if(!(pStrViewOpt = Get_StringViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
if(i < 0) vyyerror("PostProcessing View %d does not Exist", (int)yyvsp[-6].d);
else vyyerror("Unknown String Option '%s.View[%d].%s'",
yyvsp[-10].c, (int)yyvsp[-6].d, yyvsp[-3].c);
}
else{
- *pStrOpt = yyvsp[-1].c ;
+ strcpy(pStrViewOpt, yyvsp[-1].c) ;
}
}
;
break;}
case 140:
-#line 800 "Gmsh.y"
+#line 801 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3811,9 +3830,9 @@ case 140:
;
break;}
case 141:
-#line 817 "Gmsh.y"
+#line 818 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -3833,7 +3852,7 @@ case 141:
;
break;}
case 142:
-#line 838 "Gmsh.y"
+#line 839 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3852,9 +3871,9 @@ case 142:
;
break;}
case 143:
-#line 855 "Gmsh.y"
+#line 856 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -3874,7 +3893,7 @@ case 143:
;
break;}
case 144:
-#line 876 "Gmsh.y"
+#line 877 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3893,9 +3912,9 @@ case 144:
;
break;}
case 145:
-#line 893 "Gmsh.y"
+#line 894 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -3915,7 +3934,7 @@ case 145:
;
break;}
case 146:
-#line 914 "Gmsh.y"
+#line 915 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3934,9 +3953,9 @@ case 146:
;
break;}
case 147:
-#line 931 "Gmsh.y"
+#line 932 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -3956,7 +3975,7 @@ case 147:
;
break;}
case 148:
-#line 952 "Gmsh.y"
+#line 953 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3975,9 +3994,9 @@ case 148:
;
break;}
case 149:
-#line 969 "Gmsh.y"
+#line 970 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -3997,7 +4016,7 @@ case 149:
;
break;}
case 150:
-#line 990 "Gmsh.y"
+#line 991 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-4].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-4].c);
@@ -4016,9 +4035,9 @@ case 150:
;
break;}
case 151:
-#line 1007 "Gmsh.y"
+#line 1008 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -4038,7 +4057,7 @@ case 151:
;
break;}
case 152:
-#line 1028 "Gmsh.y"
+#line 1029 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-4].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-4].c);
@@ -4057,9 +4076,9 @@ case 152:
;
break;}
case 153:
-#line 1045 "Gmsh.y"
+#line 1046 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -4079,7 +4098,7 @@ case 153:
;
break;}
case 154:
-#line 1068 "Gmsh.y"
+#line 1069 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Array Option Class '%s'", yyvsp[-5].c);
@@ -4106,9 +4125,9 @@ case 154:
;
break;}
case 155:
-#line 1093 "Gmsh.y"
+#line 1094 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pArrOpt = Get_ArrayViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -4136,7 +4155,7 @@ case 155:
;
break;}
case 156:
-#line 1122 "Gmsh.y"
+#line 1123 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Array Option Class '%s'", yyvsp[-5].c);
@@ -4163,9 +4182,9 @@ case 156:
;
break;}
case 157:
-#line 1147 "Gmsh.y"
+#line 1148 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pArrOpt = Get_ArrayViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -4193,7 +4212,7 @@ case 157:
;
break;}
case 158:
-#line 1176 "Gmsh.y"
+#line 1177 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Array Option Class '%s'", yyvsp[-5].c);
@@ -4220,9 +4239,9 @@ case 158:
;
break;}
case 159:
-#line 1201 "Gmsh.y"
+#line 1202 "Gmsh.y"
{
- if(strcmp(yyvsp[-10].c, "Post"))
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
else{
if(!(pArrOpt = Get_ArrayViewOption((int)yyvsp[-6].d, yyvsp[-3].c, &i))){
@@ -4250,7 +4269,7 @@ case 159:
;
break;}
case 160:
-#line 1232 "Gmsh.y"
+#line 1233 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-7].c)))
vyyerror("Unknown Color Option Class '%s'", yyvsp[-7].c);
@@ -4264,23 +4283,43 @@ case 160:
;
break;}
case 161:
-#line 1256 "Gmsh.y"
+#line 1246 "Gmsh.y"
+{
+ if(strcmp(yyvsp[-10].c, "PostProcessing"))
+ vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
+ else{
+ ColorTable *ct = Get_ColorTableViewOption((int)yyvsp[-6].d);
+ if(!ct)
+ vyyerror("PostProcessing View %d does not Exist", (int)yyvsp[-6].d);
+ else{
+ ct->size = List_Nbr(yyvsp[-1].l);
+ if(ct->size > COLORTABLE_NBMAX_COLOR)
+ vyyerror("Too Many (%d>%d) Colors in Post.View[%d].Color",
+ ct->size, COLORTABLE_NBMAX_COLOR, (int)yyvsp[-6].d);
+ else
+ for(i=0 ; i<ct->size ; i++) List_Read(yyvsp[-1].l, i, &ct->table[i]);
+ }
+ }
+ ;
+ break;}
+case 162:
+#line 1275 "Gmsh.y"
{
Cdbpts101((int)yyvsp[-4].d,yyvsp[-1].v[0],yyvsp[-1].v[1],yyvsp[-1].v[2],yyvsp[-1].v[3],yyvsp[-1].v[4]);
yyval.s.Type = MSH_POINT;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 162:
-#line 1263 "Gmsh.y"
+case 163:
+#line 1282 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_POINT,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_PHYSICAL_POINT;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 163:
-#line 1269 "Gmsh.y"
+case 164:
+#line 1288 "Gmsh.y"
{
Vertex *v;
Attractor *a;
@@ -4300,8 +4339,8 @@ case 163:
}
;
break;}
-case 164:
-#line 1288 "Gmsh.y"
+case 165:
+#line 1307 "Gmsh.y"
{
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
List_Read(yyvsp[-3].l,i,&d);
@@ -4313,31 +4352,31 @@ case 164:
}
;
break;}
-case 165:
-#line 1299 "Gmsh.y"
+case 166:
+#line 1318 "Gmsh.y"
{
yyval.s.Type = MSH_POINT;
yyval.s.Num = (int)yyvsp[-2].d;
;
break;}
-case 166:
-#line 1307 "Gmsh.y"
+case 167:
+#line 1326 "Gmsh.y"
{
Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_LINE,1,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
yyval.s.Type = MSH_SEGM_LINE;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 167:
-#line 1313 "Gmsh.y"
+case 168:
+#line 1332 "Gmsh.y"
{
Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_SPLN,3,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
yyval.s.Type = MSH_SEGM_SPLN;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 168:
-#line 1319 "Gmsh.y"
+case 169:
+#line 1338 "Gmsh.y"
{
Curve *c;
Attractor *a;
@@ -4357,16 +4396,16 @@ case 168:
}
;
break;}
-case 169:
-#line 1338 "Gmsh.y"
+case 170:
+#line 1357 "Gmsh.y"
{
Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_CIRC,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
yyval.s.Type = MSH_SEGM_CIRC ;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 170:
-#line 1344 "Gmsh.y"
+case 171:
+#line 1363 "Gmsh.y"
{
List_T *temp;
int i,j;
@@ -4383,48 +4422,48 @@ case 170:
yyval.s.Num = (int)yyvsp[-6].d;
;
break;}
-case 171:
-#line 1361 "Gmsh.y"
+case 172:
+#line 1380 "Gmsh.y"
{
Cdbseg101((int)yyvsp[-14].d,MSH_SEGM_PARAMETRIC,2,NULL,NULL,-1,-1,yyvsp[-10].d,yyvsp[-8].d,yyvsp[-6].c,yyvsp[-4].c,yyvsp[-2].c);
yyval.s.Type = MSH_SEGM_PARAMETRIC ;
yyval.s.Num = (int)yyvsp[-14].d;
;
break;}
-case 172:
-#line 1367 "Gmsh.y"
+case 173:
+#line 1386 "Gmsh.y"
{
Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_ELLI,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
yyval.s.Type = MSH_SEGM_ELLI ;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 173:
-#line 1373 "Gmsh.y"
+case 174:
+#line 1392 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_LINE,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_PHYSICAL_LINE;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 174:
-#line 1379 "Gmsh.y"
+case 175:
+#line 1398 "Gmsh.y"
{
yyval.s.Type = MSH_SEGM_LOOP;
Cdbz101((int)yyvsp[-4].d,yyval.s.Type,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 175:
-#line 1385 "Gmsh.y"
+case 176:
+#line 1404 "Gmsh.y"
{
Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_BSPLN,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
yyval.s.Type = MSH_SEGM_BSPLN;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 176:
-#line 1391 "Gmsh.y"
+case 177:
+#line 1410 "Gmsh.y"
{
List_T *Temp;
int i;
@@ -4444,8 +4483,8 @@ case 176:
List_Delete(Temp);
;
break;}
-case 177:
-#line 1410 "Gmsh.y"
+case 178:
+#line 1429 "Gmsh.y"
{
yyval.s.Num = (int)yyvsp[-2].d;
Curve *c = FindCurve(yyval.s.Num,THEM);
@@ -4455,16 +4494,16 @@ case 177:
yyval.s.Type = c->Typ;
;
break;}
-case 178:
-#line 1422 "Gmsh.y"
+case 179:
+#line 1441 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_SURF_PLAN,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_SURF_PLAN;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 179:
-#line 1428 "Gmsh.y"
+case 180:
+#line 1447 "Gmsh.y"
{
Surface *s,*support;
support = FindSurface((int)yyvsp[-2].d,THEM);
@@ -4484,8 +4523,8 @@ case 179:
}
;
break;}
-case 180:
-#line 1447 "Gmsh.y"
+case 181:
+#line 1466 "Gmsh.y"
{
List_Read(yyvsp[-1].l,0,&d);
i = (int)d;
@@ -4507,38 +4546,38 @@ case 180:
}
;
break;}
-case 181:
-#line 1470 "Gmsh.y"
+case 182:
+#line 1489 "Gmsh.y"
{
CreateNurbsSurface ( (int) yyvsp[-16].d , (int)yyvsp[-4].d , (int)yyvsp[-2].d , yyvsp[-13].l, yyvsp[-10].l, yyvsp[-8].l);
yyval.s.Type = MSH_SURF_NURBS;
yyval.s.Num = (int)yyvsp[-16].d;
;
break;}
-case 182:
-#line 1478 "Gmsh.y"
+case 183:
+#line 1497 "Gmsh.y"
{
CreateNurbsSurfaceSupport ((int)yyvsp[-16].d, (int) yyvsp[-4].d , (int) yyvsp[-2].d , yyvsp[-13].l, yyvsp[-10].l, yyvsp[-8].l);
;
break;}
-case 183:
-#line 1482 "Gmsh.y"
+case 184:
+#line 1501 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_SURFACE,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_PHYSICAL_SURFACE;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 184:
-#line 1488 "Gmsh.y"
+case 185:
+#line 1507 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_SURF_LOOP,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_SURF_LOOP;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 185:
-#line 1494 "Gmsh.y"
+case 186:
+#line 1513 "Gmsh.y"
{
yyval.s.Num = (int)yyvsp[-2].d;
Surface *s = FindSurface(yyval.s.Num,THEM);
@@ -4548,85 +4587,85 @@ case 185:
yyval.s.Type = s->Typ;
;
break;}
-case 186:
-#line 1506 "Gmsh.y"
+case 187:
+#line 1525 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_VOLUME;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 187:
-#line 1512 "Gmsh.y"
+case 188:
+#line 1531 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_VOLUME;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 188:
-#line 1518 "Gmsh.y"
+case 189:
+#line 1537 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_PHYSICAL_VOLUME;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
-case 189:
-#line 1531 "Gmsh.y"
+case 190:
+#line 1550 "Gmsh.y"
{
TranslateShapes (yyvsp[-3].v[0],yyvsp[-3].v[1],yyvsp[-3].v[2],yyvsp[-1].l,1);
yyval.l = yyvsp[-1].l;
;
break;}
-case 190:
-#line 1536 "Gmsh.y"
+case 191:
+#line 1555 "Gmsh.y"
{
RotateShapes(yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].d,yyvsp[-1].l);
yyval.l = yyvsp[-1].l;
;
break;}
-case 191:
-#line 1541 "Gmsh.y"
+case 192:
+#line 1560 "Gmsh.y"
{
SymmetryShapes(yyvsp[-3].v[0],yyvsp[-3].v[1],yyvsp[-3].v[2],yyvsp[-3].v[3],yyvsp[-1].l,1);
yyval.l = yyvsp[-1].l;
;
break;}
-case 192:
-#line 1546 "Gmsh.y"
+case 193:
+#line 1565 "Gmsh.y"
{
DilatShapes(yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].d,yyvsp[-1].l,1);
yyval.l = yyvsp[-1].l;
;
break;}
-case 193:
-#line 1553 "Gmsh.y"
-{ yyval.l = yyvsp[0].l; ;
- break;}
case 194:
-#line 1554 "Gmsh.y"
+#line 1572 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 195:
-#line 1555 "Gmsh.y"
+#line 1573 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 196:
-#line 1560 "Gmsh.y"
+#line 1574 "Gmsh.y"
+{ yyval.l = yyvsp[0].l; ;
+ break;}
+case 197:
+#line 1579 "Gmsh.y"
{
yyval.l = List_Create(3,3,sizeof(Shape));
;
break;}
-case 197:
-#line 1564 "Gmsh.y"
+case 198:
+#line 1583 "Gmsh.y"
{
List_Add(yyval.l,&yyvsp[0].s);
yyval.l = yyvsp[-1].l;
;
break;}
-case 198:
-#line 1576 "Gmsh.y"
+case 199:
+#line 1595 "Gmsh.y"
{
yyval.l = List_Create(3,3,sizeof(Shape));
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
@@ -4637,8 +4676,8 @@ case 198:
}
;
break;}
-case 199:
-#line 1594 "Gmsh.y"
+case 200:
+#line 1613 "Gmsh.y"
{
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
List_Read (yyvsp[-1].l,i,&TheShape);
@@ -4646,8 +4685,8 @@ case 199:
}
;
break;}
-case 200:
-#line 1609 "Gmsh.y"
+case 201:
+#line 1628 "Gmsh.y"
{
yyinTab[RecursionLevel++] = yyin;
strcpy(tmpstring, ThePathForIncludes);
@@ -4670,8 +4709,8 @@ case 200:
}
;
break;}
-case 201:
-#line 1637 "Gmsh.y"
+case 202:
+#line 1656 "Gmsh.y"
{
char ext[6];
strcpy(ext,yyvsp[-1].c+(strlen(yyvsp[-1].c)-4));
@@ -4702,29 +4741,29 @@ case 201:
}
;
break;}
-case 202:
-#line 1667 "Gmsh.y"
+case 203:
+#line 1686 "Gmsh.y"
{
exit(0);
;
break;}
-case 203:
-#line 1671 "Gmsh.y"
+case 204:
+#line 1690 "Gmsh.y"
{
FILE *ff = yyin;
MergeProblem(yyvsp[-1].c);
yyin = ff;
;
break;}
-case 204:
-#line 1677 "Gmsh.y"
+case 205:
+#line 1696 "Gmsh.y"
{
Init();
Draw();
;
break;}
-case 205:
-#line 1682 "Gmsh.y"
+case 206:
+#line 1701 "Gmsh.y"
{
extern long Get_AnimTime();
long sleep_time = Get_AnimTime();
@@ -4733,8 +4772,8 @@ case 205:
}
;
break;}
-case 206:
-#line 1698 "Gmsh.y"
+case 207:
+#line 1717 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4748,8 +4787,8 @@ case 206:
fgetpos( ff, &yyposImbricatedLoopsTab[ImbricatedLoop++]);
;
break;}
-case 207:
-#line 1711 "Gmsh.y"
+case 208:
+#line 1730 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4763,8 +4802,8 @@ case 207:
fgetpos( ff, &yyposImbricatedLoopsTab[ImbricatedLoop++]);
;
break;}
-case 208:
-#line 1724 "Gmsh.y"
+case 209:
+#line 1743 "Gmsh.y"
{
if(LoopControlVariablesTab[ImbricatedLoop-1][1] >
LoopControlVariablesTab[ImbricatedLoop-1][0])
@@ -4784,8 +4823,8 @@ case 208:
}
;
break;}
-case 209:
-#line 1743 "Gmsh.y"
+case 210:
+#line 1762 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction(&yyin,yylineno))
{
@@ -4793,8 +4832,8 @@ case 209:
}
;
break;}
-case 210:
-#line 1750 "Gmsh.y"
+case 211:
+#line 1769 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction(yyvsp[-1].c,&yyin,yylineno))
{
@@ -4802,8 +4841,8 @@ case 210:
}
;
break;}
-case 211:
-#line 1757 "Gmsh.y"
+case 212:
+#line 1776 "Gmsh.y"
{
// skip everything until return is found
if(!FunctionManager::Instance()->createFunction(yyvsp[0].c,yyin,yylineno))
@@ -4814,71 +4853,71 @@ case 211:
skip_until("Return");
;
break;}
-case 212:
-#line 1787 "Gmsh.y"
+case 213:
+#line 1806 "Gmsh.y"
{
Curve *pc, *prc;
Extrude_ProtudePoint(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,&pc,&prc,NULL);
;
break;}
-case 213:
-#line 1792 "Gmsh.y"
+case 214:
+#line 1811 "Gmsh.y"
{
Curve *pc, *prc;
Extrude_ProtudePoint(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,
&pc,&prc,NULL);
;
break;}
-case 214:
-#line 1798 "Gmsh.y"
+case 215:
+#line 1817 "Gmsh.y"
{
Extrude_ProtudeCurve(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,NULL);
;
break;}
-case 215:
-#line 1802 "Gmsh.y"
+case 216:
+#line 1821 "Gmsh.y"
{
Extrude_ProtudeCurve(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,NULL);
;
break;}
-case 216:
-#line 1806 "Gmsh.y"
+case 217:
+#line 1825 "Gmsh.y"
{
Extrude_ProtudeSurface(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,0,NULL);
;
break;}
-case 217:
-#line 1810 "Gmsh.y"
+case 218:
+#line 1829 "Gmsh.y"
{
Extrude_ProtudeSurface(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,0,NULL);
;
break;}
-case 218:
-#line 1814 "Gmsh.y"
+case 219:
+#line 1833 "Gmsh.y"
{
int vol = NEWREG();
Extrude_ProtudeSurface(1,(int)yyvsp[-7].d,yyvsp[-5].v[0],yyvsp[-5].v[1],yyvsp[-5].v[2],0.,0.,0.,0.,vol,&extr);
;
break;}
-case 219:
-#line 1819 "Gmsh.y"
+case 220:
+#line 1838 "Gmsh.y"
{
int vol = NEWREG();
Extrude_ProtudeSurface(0,(int)yyvsp[-11].d,yyvsp[-9].v[0],yyvsp[-9].v[1],yyvsp[-9].v[2],yyvsp[-7].v[0],yyvsp[-7].v[1],yyvsp[-7].v[2],yyvsp[-5].d,vol,&extr);
;
break;}
-case 220:
-#line 1827 "Gmsh.y"
+case 221:
+#line 1846 "Gmsh.y"
{
;
break;}
-case 221:
-#line 1830 "Gmsh.y"
+case 222:
+#line 1849 "Gmsh.y"
{
;
break;}
-case 222:
-#line 1836 "Gmsh.y"
+case 223:
+#line 1855 "Gmsh.y"
{
double d;
int j;
@@ -4896,14 +4935,14 @@ case 222:
}
;
break;}
-case 223:
-#line 1853 "Gmsh.y"
+case 224:
+#line 1872 "Gmsh.y"
{
extr.mesh.Recombine = true;
;
break;}
-case 224:
-#line 1864 "Gmsh.y"
+case 225:
+#line 1883 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -4921,8 +4960,8 @@ case 224:
}
;
break;}
-case 225:
-#line 1881 "Gmsh.y"
+case 226:
+#line 1900 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -4940,8 +4979,8 @@ case 225:
}
;
break;}
-case 226:
-#line 1898 "Gmsh.y"
+case 227:
+#line 1917 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -4959,8 +4998,8 @@ case 226:
}
;
break;}
-case 227:
-#line 1915 "Gmsh.y"
+case 228:
+#line 1934 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -4982,8 +5021,8 @@ case 227:
}
;
break;}
-case 228:
-#line 1936 "Gmsh.y"
+case 229:
+#line 1955 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5004,8 +5043,8 @@ case 228:
}
;
break;}
-case 229:
-#line 1956 "Gmsh.y"
+case 230:
+#line 1975 "Gmsh.y"
{
Volume *v = FindVolume((int)yyvsp[-4].d,THEM);
if(!v)
@@ -5026,8 +5065,8 @@ case 229:
}
;
break;}
-case 230:
-#line 1976 "Gmsh.y"
+case 231:
+#line 1995 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -5045,8 +5084,8 @@ case 230:
}
;
break;}
-case 231:
-#line 1993 "Gmsh.y"
+case 232:
+#line 2012 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
@@ -5064,202 +5103,202 @@ case 231:
}
;
break;}
-case 232:
-#line 2018 "Gmsh.y"
+case 233:
+#line 2037 "Gmsh.y"
{
Coherence_PS();
;
break;}
-case 233:
-#line 2030 "Gmsh.y"
-{yyval.i = 1;;
- break;}
case 234:
-#line 2031 "Gmsh.y"
-{yyval.i = 0;;
+#line 2049 "Gmsh.y"
+{yyval.i = 1;;
break;}
case 235:
-#line 2032 "Gmsh.y"
-{yyval.i = -1;;
+#line 2050 "Gmsh.y"
+{yyval.i = 0;;
break;}
case 236:
-#line 2033 "Gmsh.y"
+#line 2051 "Gmsh.y"
{yyval.i = -1;;
break;}
case 237:
-#line 2034 "Gmsh.y"
+#line 2052 "Gmsh.y"
{yyval.i = -1;;
break;}
case 238:
-#line 2038 "Gmsh.y"
-{ yyval.d = yyvsp[0].d; ;
+#line 2053 "Gmsh.y"
+{yyval.i = -1;;
break;}
case 239:
-#line 2039 "Gmsh.y"
-{ yyval.d = yyvsp[-1].d ; ;
+#line 2057 "Gmsh.y"
+{ yyval.d = yyvsp[0].d; ;
break;}
case 240:
-#line 2040 "Gmsh.y"
-{ yyval.d = -yyvsp[0].d ; ;
+#line 2058 "Gmsh.y"
+{ yyval.d = yyvsp[-1].d ; ;
break;}
case 241:
-#line 2041 "Gmsh.y"
-{ yyval.d = yyvsp[0].d; ;
+#line 2059 "Gmsh.y"
+{ yyval.d = -yyvsp[0].d ; ;
break;}
case 242:
-#line 2042 "Gmsh.y"
-{ yyval.d = !yyvsp[0].d ; ;
+#line 2060 "Gmsh.y"
+{ yyval.d = yyvsp[0].d; ;
break;}
case 243:
-#line 2043 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d - yyvsp[0].d ; ;
+#line 2061 "Gmsh.y"
+{ yyval.d = !yyvsp[0].d ; ;
break;}
case 244:
-#line 2044 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d + yyvsp[0].d ; ;
+#line 2062 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d - yyvsp[0].d ; ;
break;}
case 245:
-#line 2045 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d * yyvsp[0].d ; ;
+#line 2063 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d + yyvsp[0].d ; ;
break;}
case 246:
-#line 2046 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d / yyvsp[0].d ; ;
+#line 2064 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d * yyvsp[0].d ; ;
break;}
case 247:
-#line 2047 "Gmsh.y"
-{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d ; ;
+#line 2065 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d / yyvsp[0].d ; ;
break;}
case 248:
-#line 2048 "Gmsh.y"
-{ yyval.d = pow(yyvsp[-2].d,yyvsp[0].d) ; ;
+#line 2066 "Gmsh.y"
+{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d ; ;
break;}
case 249:
-#line 2049 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d < yyvsp[0].d ; ;
+#line 2067 "Gmsh.y"
+{ yyval.d = pow(yyvsp[-2].d,yyvsp[0].d) ; ;
break;}
case 250:
-#line 2050 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d > yyvsp[0].d ; ;
+#line 2068 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d < yyvsp[0].d ; ;
break;}
case 251:
-#line 2051 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d <= yyvsp[0].d ; ;
+#line 2069 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d > yyvsp[0].d ; ;
break;}
case 252:
-#line 2052 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d >= yyvsp[0].d ; ;
+#line 2070 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d <= yyvsp[0].d ; ;
break;}
case 253:
-#line 2053 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d == yyvsp[0].d ; ;
+#line 2071 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d >= yyvsp[0].d ; ;
break;}
case 254:
-#line 2054 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d != yyvsp[0].d ; ;
+#line 2072 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d == yyvsp[0].d ; ;
break;}
case 255:
-#line 2055 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d && yyvsp[0].d ; ;
+#line 2073 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d != yyvsp[0].d ; ;
break;}
case 256:
-#line 2056 "Gmsh.y"
-{ yyval.d = yyvsp[-2].d || yyvsp[0].d ; ;
+#line 2074 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d && yyvsp[0].d ; ;
break;}
case 257:
-#line 2057 "Gmsh.y"
-{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d ; ;
+#line 2075 "Gmsh.y"
+{ yyval.d = yyvsp[-2].d || yyvsp[0].d ; ;
break;}
case 258:
-#line 2058 "Gmsh.y"
-{ yyval.d = exp(yyvsp[-1].d); ;
+#line 2076 "Gmsh.y"
+{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d ; ;
break;}
case 259:
-#line 2059 "Gmsh.y"
-{ yyval.d = log(yyvsp[-1].d); ;
+#line 2077 "Gmsh.y"
+{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 260:
-#line 2060 "Gmsh.y"
-{ yyval.d = log10(yyvsp[-1].d); ;
+#line 2078 "Gmsh.y"
+{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 261:
-#line 2061 "Gmsh.y"
-{ yyval.d = sqrt(yyvsp[-1].d); ;
+#line 2079 "Gmsh.y"
+{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 262:
-#line 2062 "Gmsh.y"
-{ yyval.d = sin(yyvsp[-1].d); ;
+#line 2080 "Gmsh.y"
+{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 263:
-#line 2063 "Gmsh.y"
-{ yyval.d = asin(yyvsp[-1].d); ;
+#line 2081 "Gmsh.y"
+{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 264:
-#line 2064 "Gmsh.y"
-{ yyval.d = cos(yyvsp[-1].d); ;
+#line 2082 "Gmsh.y"
+{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 265:
-#line 2065 "Gmsh.y"
-{ yyval.d = acos(yyvsp[-1].d); ;
+#line 2083 "Gmsh.y"
+{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 266:
-#line 2066 "Gmsh.y"
-{ yyval.d = tan(yyvsp[-1].d); ;
+#line 2084 "Gmsh.y"
+{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 267:
-#line 2067 "Gmsh.y"
-{ yyval.d = atan(yyvsp[-1].d); ;
+#line 2085 "Gmsh.y"
+{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 268:
-#line 2068 "Gmsh.y"
-{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2086 "Gmsh.y"
+{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 269:
-#line 2069 "Gmsh.y"
-{ yyval.d = sinh(yyvsp[-1].d); ;
+#line 2087 "Gmsh.y"
+{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 270:
-#line 2070 "Gmsh.y"
-{ yyval.d = cosh(yyvsp[-1].d); ;
+#line 2088 "Gmsh.y"
+{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 271:
-#line 2071 "Gmsh.y"
-{ yyval.d = tanh(yyvsp[-1].d); ;
+#line 2089 "Gmsh.y"
+{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 272:
-#line 2072 "Gmsh.y"
-{ yyval.d = fabs(yyvsp[-1].d); ;
+#line 2090 "Gmsh.y"
+{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 273:
-#line 2073 "Gmsh.y"
-{ yyval.d = floor(yyvsp[-1].d); ;
+#line 2091 "Gmsh.y"
+{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 274:
-#line 2074 "Gmsh.y"
-{ yyval.d = ceil(yyvsp[-1].d); ;
+#line 2092 "Gmsh.y"
+{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 275:
-#line 2075 "Gmsh.y"
-{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2093 "Gmsh.y"
+{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 276:
-#line 2076 "Gmsh.y"
+#line 2094 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 277:
-#line 2077 "Gmsh.y"
-{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
+#line 2095 "Gmsh.y"
+{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 278:
-#line 2081 "Gmsh.y"
-{ yyval.d = yyvsp[0].d; ;
+#line 2096 "Gmsh.y"
+{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 279:
-#line 2082 "Gmsh.y"
-{ yyval.d = 3.141592653589793; ;
+#line 2100 "Gmsh.y"
+{ yyval.d = yyvsp[0].d; ;
break;}
case 280:
-#line 2084 "Gmsh.y"
+#line 2101 "Gmsh.y"
+{ yyval.d = 3.141592653589793; ;
+ break;}
+case 281:
+#line 2103 "Gmsh.y"
{
TheSymbol.Name = yyvsp[0].c ;
if (!List_Query(Symbol_L, &TheSymbol, CompareSymbols)) {
@@ -5269,8 +5308,8 @@ case 280:
Free(yyvsp[0].c);
;
break;}
-case 281:
-#line 2093 "Gmsh.y"
+case 282:
+#line 2112 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-2].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-2].c);
@@ -5288,10 +5327,10 @@ case 281:
}
;
break;}
-case 282:
-#line 2110 "Gmsh.y"
+case 283:
+#line 2129 "Gmsh.y"
{
- if(strcmp(yyvsp[-7].c, "Post"))
+ if(strcmp(yyvsp[-7].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-7].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-3].d, yyvsp[0].c, &i))){
@@ -5310,8 +5349,8 @@ case 282:
}
;
break;}
-case 283:
-#line 2131 "Gmsh.y"
+case 284:
+#line 2150 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-3].c);
@@ -5329,10 +5368,10 @@ case 283:
}
;
break;}
-case 284:
-#line 2148 "Gmsh.y"
+case 285:
+#line 2167 "Gmsh.y"
{
- if(strcmp(yyvsp[-8].c, "Post"))
+ if(strcmp(yyvsp[-8].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-8].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-4].d, yyvsp[-1].c, &i))){
@@ -5351,8 +5390,8 @@ case 284:
}
;
break;}
-case 285:
-#line 2169 "Gmsh.y"
+case 286:
+#line 2188 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-3].c);
@@ -5370,10 +5409,10 @@ case 285:
}
;
break;}
-case 286:
-#line 2186 "Gmsh.y"
+case 287:
+#line 2205 "Gmsh.y"
{
- if(strcmp(yyvsp[-8].c, "Post"))
+ if(strcmp(yyvsp[-8].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-8].c);
else{
if(!(pNumOpt = Get_NumberViewOption((int)yyvsp[-4].d, yyvsp[-1].c, &i))){
@@ -5392,16 +5431,16 @@ case 286:
}
;
break;}
-case 287:
-#line 2209 "Gmsh.y"
+case 288:
+#line 2228 "Gmsh.y"
{
ListOfDouble2_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(ListOfDouble2_L, &d) ;
;
break;}
-case 288:
-#line 2215 "Gmsh.y"
+case 289:
+#line 2234 "Gmsh.y"
{
ListOfDouble2_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)){
@@ -5413,62 +5452,62 @@ case 288:
List_Add(ListOfDouble2_L, &d) ;
;
break;}
-case 289:
-#line 2229 "Gmsh.y"
+case 290:
+#line 2248 "Gmsh.y"
{
yyval.v = yyvsp[0].v;
;
break;}
-case 290:
-#line 2233 "Gmsh.y"
+case 291:
+#line 2252 "Gmsh.y"
{
for(i=0 ; i<6 ; i++) yyval.v[i] = -yyvsp[0].v[i] ;
;
break;}
-case 291:
-#line 2237 "Gmsh.y"
+case 292:
+#line 2256 "Gmsh.y"
{
yyval.v = yyvsp[0].v;
;
break;}
-case 292:
-#line 2241 "Gmsh.y"
+case 293:
+#line 2260 "Gmsh.y"
{
for(i=0 ; i<6 ; i++) yyval.v[i] = yyvsp[-2].v[i] - yyvsp[0].v[i] ;
;
break;}
-case 293:
-#line 2245 "Gmsh.y"
+case 294:
+#line 2264 "Gmsh.y"
{
for(i=0 ; i<6 ; i++) yyval.v[i] = yyvsp[-2].v[i] + yyvsp[0].v[i] ;
;
break;}
-case 294:
-#line 2251 "Gmsh.y"
+case 295:
+#line 2270 "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 295:
-#line 2255 "Gmsh.y"
+case 296:
+#line 2274 "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 296:
-#line 2259 "Gmsh.y"
+case 297:
+#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 297:
-#line 2263 "Gmsh.y"
+case 298:
+#line 2282 "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 298:
-#line 2267 "Gmsh.y"
+case 299:
+#line 2286 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-2].c)))
vyyerror("Unknown Array Option Class '%s'", yyvsp[-2].c);
@@ -5495,10 +5534,10 @@ case 298:
}
;
break;}
-case 299:
-#line 2293 "Gmsh.y"
+case 300:
+#line 2312 "Gmsh.y"
{
- if(strcmp(yyvsp[-7].c, "Post"))
+ if(strcmp(yyvsp[-7].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-7].c);
else{
if(!(pArrOpt = Get_ArrayViewOption((int)yyvsp[-3].d, yyvsp[0].c, &i))){
@@ -5527,84 +5566,84 @@ case 299:
}
;
break;}
-case 300:
-#line 2326 "Gmsh.y"
-{
- ;
- break;}
case 301:
-#line 2329 "Gmsh.y"
+#line 2345 "Gmsh.y"
{
;
break;}
case 302:
-#line 2335 "Gmsh.y"
+#line 2348 "Gmsh.y"
{
;
break;}
case 303:
-#line 2338 "Gmsh.y"
+#line 2354 "Gmsh.y"
{
;
break;}
case 304:
-#line 2344 "Gmsh.y"
+#line 2357 "Gmsh.y"
{
;
break;}
case 305:
-#line 2347 "Gmsh.y"
+#line 2363 "Gmsh.y"
{
- yyval.l=ListOfListOfDouble_L;
;
break;}
case 306:
-#line 2351 "Gmsh.y"
+#line 2366 "Gmsh.y"
{
yyval.l=ListOfListOfDouble_L;
;
break;}
case 307:
-#line 2358 "Gmsh.y"
+#line 2370 "Gmsh.y"
{
- ListOfListOfDouble_L = List_Create(2,1,sizeof(List_T*)) ;
- List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
+ yyval.l=ListOfListOfDouble_L;
;
break;}
case 308:
-#line 2363 "Gmsh.y"
+#line 2377 "Gmsh.y"
{
+ ListOfListOfDouble_L = List_Create(2,1,sizeof(List_T*)) ;
List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
;
break;}
case 309:
-#line 2370 "Gmsh.y"
+#line 2382 "Gmsh.y"
{
+ List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
;
break;}
case 310:
-#line 2373 "Gmsh.y"
+#line 2389 "Gmsh.y"
+{
+ ;
+ break;}
+case 311:
+#line 2392 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
yyval.l=ListOfDouble_L;
;
break;}
-case 311:
-#line 2379 "Gmsh.y"
+case 312:
+#line 2398 "Gmsh.y"
{
yyval.l=ListOfDouble_L;
;
break;}
-case 312:
-#line 2387 "Gmsh.y"
+case 313:
+#line 2406 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
;
break;}
-case 313:
-#line 2392 "Gmsh.y"
+case 314:
+#line 2411 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){
@@ -5614,14 +5653,14 @@ case 313:
List_Delete(ListOfDouble2_L);
;
break;}
-case 314:
-#line 2401 "Gmsh.y"
+case 315:
+#line 2420 "Gmsh.y"
{
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
;
break;}
-case 315:
-#line 2405 "Gmsh.y"
+case 316:
+#line 2424 "Gmsh.y"
{
for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){
List_Read(ListOfDouble2_L, i, &d) ;
@@ -5630,34 +5669,34 @@ case 315:
List_Delete(ListOfDouble2_L);
;
break;}
-case 316:
-#line 2416 "Gmsh.y"
+case 317:
+#line 2435 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-7].d, (int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d);
;
break;}
-case 317:
-#line 2420 "Gmsh.y"
+case 318:
+#line 2439 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d, 255);
;
break;}
-case 318:
-#line 2424 "Gmsh.y"
+case 319:
+#line 2443 "Gmsh.y"
{
yyval.u = Get_ColorForString(ColorString, (int)yyvsp[-1].d, yyvsp[-3].c, &flag);
if(flag) vyyerror("Unknown Color '%s'", yyvsp[-3].c);
;
break;}
-case 319:
-#line 2429 "Gmsh.y"
+case 320:
+#line 2448 "Gmsh.y"
{
yyval.u = Get_ColorForString(ColorString, -1, yyvsp[0].c, &flag);
if(flag) vyyerror("Unknown Color '%s'", yyvsp[0].c);
;
break;}
-case 320:
-#line 2434 "Gmsh.y"
+case 321:
+#line 2453 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-4].c)))
vyyerror("Unknown Color Option Class '%s'", yyvsp[-4].c);
@@ -5670,6 +5709,28 @@ case 320:
}
;
break;}
+case 322:
+#line 2469 "Gmsh.y"
+{
+ yyval.l = ListOfColor_L;
+ ;
+ break;}
+case 323:
+#line 2476 "Gmsh.y"
+{
+ if(!ListOfColor_L)
+ ListOfColor_L = List_Create(256,10,sizeof(unsigned int)) ;
+ else
+ List_Reset(ListOfColor_L) ;
+ List_Add(ListOfColor_L, &(yyvsp[0].u)) ;
+ ;
+ break;}
+case 324:
+#line 2484 "Gmsh.y"
+{
+ List_Add(ListOfColor_L, &(yyvsp[0].u)) ;
+ ;
+ break;}
}
/* the action file gets copied in in place of this dollarsign */
#line 498 "/usr/local/share/bison.simple"
@@ -5868,7 +5929,7 @@ yyerrhandle:
yystate = yyn;
goto yynewstate;
}
-#line 2447 "Gmsh.y"
+#line 2490 "Gmsh.y"
void InitSymbols(void){
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index cdffecc205..26e9f07d51 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,4 +1,4 @@
-%{ /* $Id: Gmsh.y,v 1.27 2000-12-07 16:24:58 remacle Exp $ */
+%{ /* $Id: Gmsh.y,v 1.28 2000-12-08 10:56:49 geuzaine Exp $ */
#include <stdarg.h>
@@ -17,6 +17,7 @@
#include "Parser.h"
#include "Main.h"
#include "FunctionManager.h"
+#include "ColorTable.h"
#ifdef __DECCXX // bug in bison
#include <alloca.h>
@@ -42,10 +43,10 @@ static int i,j,k,flag,RecursionLevel=0,ImbricatedLoop = 0;
static double d;
static ExtrudeParams extr;
static List_T *ListOfDouble_L,*ListOfDouble2_L;
-static List_T *ListOfListOfDouble_L;
+static List_T *ListOfListOfDouble_L, *ListOfColor_L=NULL;
static void *pNumOpt, *pArrOpt;
-static char **pStrOpt;
+static char **pStrOpt, *pStrViewOpt;
static unsigned int *pColOpt;
static StringXString *pStrCat;
static StringXNumber *pNumCat;
@@ -106,7 +107,7 @@ void vyyerror (char *fmt, ...);
%type <d> FExpr FExpr_Single
%type <v> VExpr VExpr_Single
%type <l> ListOfShapes Duplicata Transform MultipleShape
-%type <l> ListOfStrings ListOfDouble ListOfListOfDouble
+%type <l> ListOfStrings ListOfDouble ListOfListOfDouble ListOfColor
%type <s> Shape
%type <i> BoolExpr
%type <u> Color
@@ -780,16 +781,16 @@ Affectation :
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECT tBIGSTR tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
- if(!(pStrOpt = Get_StringViewOption((int)$5, $8, &i))){
+ if(!(pStrViewOpt = Get_StringViewOption((int)$5, $8, &i))){
if(i < 0) vyyerror("PostProcessing View %d does not Exist", (int)$5);
else vyyerror("Unknown String Option '%s.View[%d].%s'",
$1, (int)$5, $8);
}
else{
- *pStrOpt = $10 ;
+ strcpy(pStrViewOpt, $10) ;
}
}
}
@@ -815,7 +816,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECT FExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -853,7 +854,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECTPLUS FExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -891,7 +892,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECTMINUS FExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -929,7 +930,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECTTIMES FExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -967,7 +968,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECTDIVIDE FExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -1005,7 +1006,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tPLUSPLUS FExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -1043,7 +1044,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tMINUSMINUS FExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -1091,7 +1092,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECT VExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pArrOpt = Get_ArrayViewOption((int)$5, $8, &i))){
@@ -1145,7 +1146,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECTPLUS VExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pArrOpt = Get_ArrayViewOption((int)$5, $8, &i))){
@@ -1199,7 +1200,7 @@ Affectation :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tAFFECTMINUS VExpr tEND
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pArrOpt = Get_ArrayViewOption((int)$5, $8, &i))){
@@ -1241,6 +1242,24 @@ Affectation :
}
}
+ | tSTRING '.' tView '[' FExpr ']' '.' tColor tAFFECT ListOfColor tEND
+ {
+ if(strcmp($1, "PostProcessing"))
+ vyyerror("Unknown View Option Class '%s'", $1);
+ else{
+ ColorTable *ct = Get_ColorTableViewOption((int)$5);
+ if(!ct)
+ vyyerror("PostProcessing View %d does not Exist", (int)$5);
+ else{
+ ct->size = List_Nbr($10);
+ if(ct->size > COLORTABLE_NBMAX_COLOR)
+ vyyerror("Too Many (%d>%d) Colors in Post.View[%d].Color",
+ ct->size, COLORTABLE_NBMAX_COLOR, (int)$5);
+ else
+ for(i=0 ; i<ct->size ; i++) List_Read($10, i, &ct->table[i]);
+ }
+ }
+ }
;
@@ -2108,7 +2127,7 @@ FExpr_Single :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -2146,7 +2165,7 @@ FExpr_Single :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tPLUSPLUS
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -2184,7 +2203,7 @@ FExpr_Single :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING tMINUSMINUS
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pNumOpt = Get_NumberViewOption((int)$5, $8, &i))){
@@ -2291,7 +2310,7 @@ VExpr_Single :
}
| tSTRING '.' tView '[' FExpr ']' '.' tSTRING
{
- if(strcmp($1, "Post"))
+ if(strcmp($1, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", $1);
else{
if(!(pArrOpt = Get_ArrayViewOption((int)$5, $8, &i))){
@@ -2444,6 +2463,30 @@ Color :
}
;
+
+ListOfColor :
+ '{' RecursiveListOfColor '}'
+ {
+ $$ = ListOfColor_L;
+ }
+;
+
+RecursiveListOfColor :
+ Color
+ {
+ if(!ListOfColor_L)
+ ListOfColor_L = List_Create(256,10,sizeof(unsigned int)) ;
+ else
+ List_Reset(ListOfColor_L) ;
+ List_Add(ListOfColor_L, &($1)) ;
+ }
+ | RecursiveListOfColor ',' Color
+ {
+ List_Add(ListOfColor_L, &($3)) ;
+ }
+;
+
+
%%
void InitSymbols(void){
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 935e6c3df3..00362698e5 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.28 2000-12-07 19:03:57 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.29 2000-12-08 10:56:49 geuzaine Exp $
*/
#define FLEX_SCANNER
diff --git a/Parser/Makefile b/Parser/Makefile
index eb22ecb908..4e6e4386da 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 2000-12-07 16:03:44 remacle Exp $
+# $Id: Makefile,v 1.8 2000-12-08 10:56:49 geuzaine Exp $
#
# Makefile for "libParser.a"
#
@@ -67,6 +67,7 @@ Gmsh.tab.o: Gmsh.tab.cpp ../Common/Gmsh.h ../Common/Message.h \
../Common/Context.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Geo/DataBase.h \
- ../Mesh/Create.h ../Common/Views.h ../Graphics/ColorTable.h \
+ ../Mesh/Create.h ../Common/Views.h ../Common/ColorTable.h \
../Geo/StepGeomDatabase.h ../Common/Options.h ../Graphics/Draw.h \
- ../Common/Colors.h Parser.h ../Unix/Main.h
+ ../Common/Colors.h Parser.h ../Unix/Main.h FunctionManager.h
+FunctionManager.o: FunctionManager.cpp FunctionManager.h
diff --git a/Unix/CbColorbar.cpp b/Unix/CbColorbar.cpp
index 8cc38ae898..6a4296b037 100644
--- a/Unix/CbColorbar.cpp
+++ b/Unix/CbColorbar.cpp
@@ -1,4 +1,4 @@
-/* $Id: CbColorbar.cpp,v 1.3 2000-11-26 15:43:47 geuzaine Exp $ */
+/* $Id: CbColorbar.cpp,v 1.4 2000-12-08 10:56:51 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -129,7 +129,7 @@ static void redraw_range(ColorBar *cb, int a, int b){
"h show this message",
"1 -> 6 choose predefined colormap",
"m switch color mode",
- "s/l/c/p/r save/load/copy/paste/reset",
+ "c/p/r copy/paste/reset",
"mouse draw color or alpha",
"left/right move or rotate",
"up/down color or alpha curvature",
@@ -424,8 +424,6 @@ void ColorBarInputCb (Widget w, XtPointer client_data,
case XK_c : case XK_C : ColorTable_Copy(TheCB->ct); break;
case XK_p : case XK_P : ColorTable_Paste(TheCB->ct); ColorBarRedraw(); break;
- case XK_s : case XK_S : ManageCb(NULL, (XtPointer)WID.FD.saveDialog, NULL); break;
- case XK_l : case XK_L : ManageCb(NULL, (XtPointer)WID.FD.mergeDialog, NULL); return ;
case XK_h : case XK_H : TheCB->helpflag = !TheCB->helpflag; ColorBarRedraw(); break;
case XK_r :
diff --git a/Unix/CbFile.cpp b/Unix/CbFile.cpp
index 19168be0ff..ba6b75f68f 100644
--- a/Unix/CbFile.cpp
+++ b/Unix/CbFile.cpp
@@ -1,4 +1,4 @@
-/* $Id: CbFile.cpp,v 1.8 2000-12-06 18:28:30 remacle Exp $ */
+/* $Id: CbFile.cpp,v 1.9 2000-12-08 10:56:51 geuzaine Exp $ */
#include <unistd.h>
@@ -9,7 +9,6 @@
#include "Draw.h"
#include "Widgets.h"
#include "Context.h"
-#include "ColorTable.h"
#include "XContext.h"
#include "CbFile.h"
@@ -131,8 +130,6 @@ void CreateImage (FILE *fp) {
/* file */
/* ------------------------------------------------------------------------ */
-void SaveColorTable(FILE *fp);
-
void FileCb(Widget w, XtPointer client_data, XtPointer call_data){
char *c;
XmString xms;
@@ -150,7 +147,6 @@ void FileCb(Widget w, XtPointer client_data, XtPointer call_data){
case FILE_LOAD_GEOM : OpenProblem(c); Init(); Draw(); break;
case FILE_LOAD_POST : MergeProblem(c); ColorBarRedraw(); Init(); Draw(); break;
case FILE_SAVE_MESH_AS : Print_Mesh(&M, c, CTX.mesh.format); break;
- case FILE_SAVE_COLORTABLE_AS : SaveToDisk(c, WID.ED.saveDialog, SaveColorTable); break;
case FILE_CANCEL : WARNING_OVERRIDE = 0; break;
case FILE_PRINT :
if(CTX.print.format == FORMAT_GEO)
diff --git a/Unix/CbFile.h b/Unix/CbFile.h
index be019706f2..4a79c28fb4 100644
--- a/Unix/CbFile.h
+++ b/Unix/CbFile.h
@@ -1,4 +1,4 @@
-/* $Id: CbFile.h,v 1.3 2000-11-24 12:50:06 geuzaine Exp $ */
+/* $Id: CbFile.h,v 1.4 2000-12-08 10:56:51 geuzaine Exp $ */
#ifndef _CB_FILE_H_
#define _CB_FILE_H_
@@ -6,7 +6,6 @@
#define FILE_LOAD_POST 302
#define FILE_SAVE_MESH 304
#define FILE_SAVE_MESH_AS 305
-#define FILE_SAVE_COLORTABLE_AS 306
#define FILE_PRINT 307
#define FILE_CANCEL 308
diff --git a/Unix/CbPost.cpp b/Unix/CbPost.cpp
index d47d25739f..07cc45d855 100644
--- a/Unix/CbPost.cpp
+++ b/Unix/CbPost.cpp
@@ -1,4 +1,4 @@
-/* $Id: CbPost.cpp,v 1.8 2000-11-27 14:23:21 geuzaine Exp $ */
+/* $Id: CbPost.cpp,v 1.9 2000-12-08 10:56:51 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -190,16 +190,6 @@ void ReloadAllViewsCb(Widget w, XtPointer client_data, XtPointer call_data){
Draw();
}
-
-void SaveColorTable(FILE *fp){
- if(!CurrentView){
- Msg(WARNING, "No View to get Color Information From");
- }
- else{
- ColorTable_Save(fp, &CurrentView->CT);
- }
-}
-
/* ------------------------------------------------------------------------
create a post dialog
------------------------------------------------------------------------ */
diff --git a/Unix/Geometry.cpp b/Unix/Geometry.cpp
index c6bc892d7c..7e4e70e77e 100644
--- a/Unix/Geometry.cpp
+++ b/Unix/Geometry.cpp
@@ -1,4 +1,4 @@
-/* $Id: Geometry.cpp,v 1.3 2000-11-26 15:43:48 geuzaine Exp $ */
+/* $Id: Geometry.cpp,v 1.4 2000-12-08 10:56:51 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -261,11 +261,6 @@ void ForceGeometry_FD (Widgets_T *w){
XmNmarginWidth, DIALOG_W,
NULL);
- XtVaSetValues(w->FD.saveDialog,
- XmNmarginHeight, DIALOG_H,
- XmNmarginWidth, DIALOG_W,
- NULL);
-
XtVaSetValues(w->FD.saveAsDialog,
XmNmarginHeight, DIALOG_H,
XmNmarginWidth, DIALOG_W,
diff --git a/Unix/Main.cpp b/Unix/Main.cpp
index 89c07f25ed..ca86c02928 100644
--- a/Unix/Main.cpp
+++ b/Unix/Main.cpp
@@ -1,4 +1,4 @@
-/* $Id: Main.cpp,v 1.21 2000-12-06 18:28:30 remacle Exp $ */
+/* $Id: Main.cpp,v 1.22 2000-12-08 10:56:51 geuzaine Exp $ */
#include <signal.h>
@@ -90,7 +90,6 @@ extern List_T *Post_ViewList;
void ParseFile(char *f){
char String[256];
- Post_View *v;
strncpy(yyname,f,NAME_STR_L);
yyerrorstate=0;
@@ -106,7 +105,7 @@ void ParseFile(char *f){
fgets(String, sizeof(String), yyin) ;
fsetpos(yyin, &position);
- printf("String :: %s",String);
+ //printf("String :: %s",String);
if(!strncmp(String, "$PTS", 4) ||
!strncmp(String, "$NO", 3) ||
@@ -114,15 +113,6 @@ void ParseFile(char *f){
if(THEM->status < 0) mai3d(THEM, 0);
Read_Mesh(THEM, yyin, FORMAT_MSH);
}
- else if(!strncmp(String, "$COL", 4)){
- if(List_Nbr(Post_ViewList)){
- v = (Post_View*)List_Pointer(Post_ViewList, List_Nbr(Post_ViewList)-1);
- ColorTable_Load(yyin, &v->CT);
- }
- else{
- Msg(WARNING, "No Post-Processing View Available to set Colors From");
- }
- }
else if(!strncmp(String, "$PostFormat", 11) ||
!strncmp(String, "$View", 5)){
Read_View(yyin, yyname);
diff --git a/Unix/Makefile b/Unix/Makefile
index 0b7ccaa2b6..6a965c2454 100644
--- a/Unix/Makefile
+++ b/Unix/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2000-11-27 17:13:50 geuzaine Exp $
+# $Id: Makefile,v 1.5 2000-12-08 10:56:51 geuzaine Exp $
#
# Makefile for "libUnix.a"
#
@@ -77,7 +77,7 @@ Main.o: Main.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
- ../Graphics/ColorTable.h ../Common/Context.h ../Parser/Parser.h \
+ ../Common/ColorTable.h ../Common/Context.h ../Parser/Parser.h \
../Geo/MinMax.h Widgets.h Pixmaps.h XColors.h XContext.h \
XRessources.h CbContext.h CbGeom.h Register.h Geometry.h \
../Common/Static.h XStatic.h ../Common/Version.h
@@ -113,35 +113,34 @@ CbContext.o: CbContext.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Graphics/ColorTable.h \
- Widgets.h ../Common/Context.h XContext.h CbContext.h CbGeom.h \
- CbMesh.h
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h XContext.h CbContext.h CbGeom.h CbMesh.h
CbPost.o: CbPost.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Graphics/ColorTable.h \
- Widgets.h ../Common/Context.h XContext.h Main.h CbPost.h CbGeom.h \
- CbMesh.h CbColorbar.h
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h XContext.h Main.h CbPost.h CbGeom.h CbMesh.h \
+ CbColorbar.h
CbColorbar.o: CbColorbar.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
../Common/Const.h XColors.h Widgets.h Register.h ../Common/Context.h \
- XContext.h ../Graphics/ColorTable.h CbColorbar.h
+ XContext.h ../Common/ColorTable.h CbColorbar.h
CbGeom.o: CbGeom.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Graphics/ColorTable.h \
- Widgets.h ../Common/Context.h ../Geo/Verif.h Main.h CbGeom.h
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h ../Geo/Verif.h Main.h CbGeom.h
CbMesh.o: CbMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Graphics/ColorTable.h CbMesh.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h CbMesh.h \
../Common/Context.h Widgets.h
CbOptions.o: CbOptions.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
@@ -149,7 +148,7 @@ CbOptions.o: CbOptions.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
- ../Graphics/ColorTable.h Widgets.h Pixmaps.h ../Common/Context.h \
+ ../Common/ColorTable.h Widgets.h Pixmaps.h ../Common/Context.h \
XContext.h Register.h CbGeneral.h CbOptions.h CbGeom.h CbMesh.h \
CbPost.h
CbFile.o: CbFile.cpp ../Common/Gmsh.h ../Common/Message.h \
@@ -157,21 +156,21 @@ CbFile.o: CbFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h Main.h \
../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
- ../Graphics/Draw.h ../Common/Views.h ../Graphics/ColorTable.h \
- Widgets.h ../Common/Context.h XContext.h CbFile.h CbColorbar.h \
- XDump.h ../Graphics/gl2ps.h ../Graphics/gl2gif.h
+ ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h XContext.h CbFile.h CbColorbar.h XDump.h \
+ ../Graphics/gl2ps.h ../Graphics/gl2gif.h
CbInput.o: CbInput.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Graphics/ColorTable.h \
- Widgets.h ../Common/Context.h XContext.h Register.h CbContext.h \
- CbGeneral.h CbGeom.h CbPost.h CbMesh.h
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h XContext.h Register.h CbContext.h CbGeneral.h \
+ CbGeom.h CbPost.h CbMesh.h
CbGeneral.o: CbGeneral.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Graphics/ColorTable.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
../Common/Context.h XContext.h Widgets.h
diff --git a/Unix/Register.cpp b/Unix/Register.cpp
index c44e41bd0f..02ce88ff7b 100644
--- a/Unix/Register.cpp
+++ b/Unix/Register.cpp
@@ -1,4 +1,4 @@
-/* $Id: Register.cpp,v 1.10 2000-12-05 19:03:21 geuzaine Exp $ */
+/* $Id: Register.cpp,v 1.11 2000-12-08 10:56:51 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -124,9 +124,6 @@ void RegisterCallbacks_ED(Widgets_T *w){
register_ok_cb (w->ED.printDialog, FileCb, FILE_PRINT);
register_cancel_cb (w->ED.printDialog, FileCb, FILE_CANCEL);
- register_ok_cb (w->ED.saveDialog, FileCb, FILE_SAVE_COLORTABLE_AS);
- register_cancel_cb (w->ED.saveDialog, FileCb, FILE_CANCEL);
-
}
@@ -138,9 +135,6 @@ void RegisterCallbacks_FD(Widgets_T *w){
register_ok_cb (w->FD.mergeDialog, FileCb, FILE_LOAD_POST);
register_cancel_cb (w->FD.mergeDialog, ManageCb, w->FD.mergeDialog);
- register_ok_cb (w->FD.saveDialog, FileCb, FILE_SAVE_COLORTABLE_AS);
- register_cancel_cb (w->FD.saveDialog, ManageCb, w->FD.saveDialog);
-
register_ok_cb (w->FD.saveAsDialog, FileCb, FILE_SAVE_MESH_AS);
register_cancel_cb (w->FD.saveAsDialog, ManageCb, w->FD.saveAsDialog);
register_activate_cb (w->FD.saveAsButt[0], OptionsCb, OPTIONS_MESH_FORMAT_MSH);
diff --git a/Unix/Widgets.cpp b/Unix/Widgets.cpp
index ac9014d920..6762d0f245 100644
--- a/Unix/Widgets.cpp
+++ b/Unix/Widgets.cpp
@@ -1,4 +1,4 @@
-/* $Id: Widgets.cpp,v 1.15 2000-12-05 18:54:11 geuzaine Exp $ */
+/* $Id: Widgets.cpp,v 1.16 2000-12-08 10:56:51 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -561,15 +561,8 @@ void CreateWidgets_ED(Widgets_T *w){
XtSetArg(arg[i], XmNmessageString, XmStringCreateSimple("File exists")); i++;
w->ED.printDialog = XmCreateWarningDialog(w->M.shell, "EDprintDialog", arg, i);
- i=0 ;
- XtSetArg(arg[i], XmNdialogTitle, XmStringCreateSimple("Warning")); i++;
- XtSetArg(arg[i], XmNmessageString, XmStringCreateSimple("File exists")); i++;
- w->ED.saveDialog = XmCreateWarningDialog(w->M.shell, "EDsaveDialog", arg, i);
-
tmp = XmMessageBoxGetChild(w->ED.printDialog, XmDIALOG_HELP_BUTTON);
XtUnmanageChild(tmp);
- tmp = XmMessageBoxGetChild(w->ED.saveDialog, XmDIALOG_HELP_BUTTON);
- XtUnmanageChild(tmp);
}
@@ -601,15 +594,6 @@ void CreateWidgets_FD(Widgets_T *w){
w->FD.mergeDialog = XmCreateFileSelectionDialog(w->M.shell, "FDmergeDialog", arg, i);
XtUnmanageChild(w->FD.mergeDialog);
- /* save */
- i=0 ;
- XtSetArg(arg[i], XmNdialogTitle, XmStringCreateSimple("Save")); i++;
- XtSetArg(arg[i], XmNnoMatchString, XmStringCreateSimple("[ NONE ]")); i++;
- XtSetArg(arg[i], XmNdirMask, XmStringCreateSimple("*")); i++;
- XtSetArg(arg[i], XmNautoUnmanage, True); i++;
- w->FD.saveDialog = XmCreateFileSelectionDialog(w->M.shell, "FDsaveDialog", arg, i);
- XtUnmanageChild(w->FD.saveDialog);
-
/* save as */
i=0 ;
XtSetArg(arg[i], XmNdialogTitle, XmStringCreateSimple("Save")); i++;
@@ -711,36 +695,10 @@ void CreateWidgets_FD(Widgets_T *w){
w->FD.printMenu[0] = XmCreateOptionMenu(w->FD.printRowCol, "FDprintMenu0", arg, i);
XtManageChild(w->FD.printMenu[0]);
- /* print - format options
- i=0;
- w->FD.printPane[1] = XmCreatePulldownMenu(w->FD.printRowCol, "FDprintPane1", arg, i);
-
- i=0;
- XtSetArg(arg[i], XmNlabelString, XmStringCreateSimple("xpm")); i++;
- w->FD.printButt[6] = XmCreatePushButton(w->FD.printPane[1], "MprintButt6", arg, i);
- XtManageChild(w->FD.printButt[6]);
- i=0;
- XtSetArg(arg[i], XmNlabelString, XmStringCreateSimple("ps")); i++;
- w->FD.printButt[7] = XmCreatePushButton(w->FD.printPane[1], "MprintButt7", arg, i);
- XtManageChild(w->FD.printButt[7]);
- i=0;
- XtSetArg(arg[i], XmNlabelString, XmStringCreateSimple("eps")); i++;
- w->FD.printButt[8] = XmCreatePushButton(w->FD.printPane[1], "MprintButt8", arg, i);
- XtManageChild(w->FD.printButt[8]);
-
- i=0;
- XtSetArg(arg[i], XmNsubMenuId, w->FD.printPane[1]); i++;
- XtSetArg(arg[i], XmNspacing, 0); i++;
- w->FD.printMenu[1] = XmCreateOptionMenu(w->FD.printRowCol, "FDprintMenu1", arg, i);
- XtManageChild(w->FD.printMenu[1]);
- */
-
tmp = XmFileSelectionBoxGetChild(w->FD.openDialog, XmDIALOG_HELP_BUTTON);
XtUnmanageChild(tmp);
tmp = XmFileSelectionBoxGetChild(w->FD.mergeDialog, XmDIALOG_HELP_BUTTON);
XtUnmanageChild(tmp);
- tmp = XmFileSelectionBoxGetChild(w->FD.saveDialog, XmDIALOG_HELP_BUTTON);
- XtUnmanageChild(tmp);
tmp = XmFileSelectionBoxGetChild(w->FD.saveAsDialog, XmDIALOG_HELP_BUTTON);
XtUnmanageChild(tmp);
tmp = XmFileSelectionBoxGetChild(w->FD.printDialog, XmDIALOG_HELP_BUTTON);
diff --git a/Unix/Widgets.h b/Unix/Widgets.h
index eefcd0d330..0dc9514668 100644
--- a/Unix/Widgets.h
+++ b/Unix/Widgets.h
@@ -1,4 +1,4 @@
-/* $Id: Widgets.h,v 1.6 2000-12-05 18:45:13 geuzaine Exp $ */
+/* $Id: Widgets.h,v 1.7 2000-12-08 10:56:51 geuzaine Exp $ */
#ifndef _WIDGETS_H_
#define _WIDGETS_H_
@@ -67,7 +67,7 @@ typedef struct {
/* error dialogs */
struct {
- Widget printDialog, saveDialog ;
+ Widget printDialog ;
} ED;
/* file dialogs */
@@ -75,7 +75,6 @@ typedef struct {
struct {
Widget openDialog ;
Widget mergeDialog ;
- Widget saveDialog ;
Widget saveAsDialog ;
Widget saveAsFrame[2], saveAsRowCol ;
Widget saveAsPane, saveAsButt[3], saveAsMenu ;
--
GitLab