diff --git a/Common/Context.cpp b/Common/Context.cpp
index e653fa3a4df6f554c715affafdae5c559e8fa946..ee823cc8c04dedea799120aac54bcec6da32a8ea 100644
--- a/Common/Context.cpp
+++ b/Common/Context.cpp
@@ -1,4 +1,4 @@
-// $Id: Context.cpp,v 1.27 2001-01-09 19:40:56 remacle Exp $
+// $Id: Context.cpp,v 1.28 2001-01-10 10:06:15 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -177,7 +177,6 @@ int Get_ColorForString(StringX4Int SX4I[], int alpha,
void Init_Colors(int num){
if(num < 0 || num > 2){
- Msg(GERROR, "Unknown Default Color Scheme");
return;
}
CTX.color.id = num ;
diff --git a/Fltk/Colorbar_Window.cpp b/Fltk/Colorbar_Window.cpp
index 281d4952e8014a263f9eaadd062c1e44f7ea4e64..6849711301bc321dbfb82d8399eb6c8c645b50d3 100644
--- a/Fltk/Colorbar_Window.cpp
+++ b/Fltk/Colorbar_Window.cpp
@@ -1,4 +1,4 @@
-// $Id: Colorbar_Window.cpp,v 1.1 2001-01-10 09:08:59 geuzaine Exp $
+// $Id: Colorbar_Window.cpp,v 1.2 2001-01-10 10:06:16 geuzaine Exp $
#if 0
@@ -8,6 +8,8 @@
#include "ColorTable.h"
#include "Colorbar.h"
+// This file defines the Colorbar_Window class (subclass of Fl_Window)
+
extern XContext_T XCTX ;
extern Widgets_T WID;
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 9aa4e7048f3ac9d2c49340640de09871f7071f16..4be7fac97f9e957985686f84a0458df6a5edfca0 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -77,7 +77,7 @@ Context_Item menu_geometry[] =
{ NULL }
};
Context_Item menu_geometry_elementary[] =
- { { "0", NULL } ,
+ { { "0Elementary", NULL } ,
{ "Add", (Fl_Callback *)geometry_elementary_add_cb } ,
{ "Translate", (Fl_Callback *)geometry_elementary_translate_cb } ,
{ "Rotate", (Fl_Callback *)geometry_elementary_rotate_cb } ,
@@ -88,16 +88,16 @@ Context_Item menu_geometry[] =
{ NULL }
};
Context_Item menu_geometry_elementary_add[] =
- { { "0", NULL } ,
+ { { "0Elementary Add", NULL } ,
{ "New", (Fl_Callback *)geometry_elementary_add_new_cb } ,
{ "Translate", (Fl_Callback *)geometry_elementary_add_translate_cb } ,
{ "Rotate", (Fl_Callback *)geometry_elementary_add_rotate_cb } ,
- { "Scale", (Fl_Callback *)geometry_elementary_add_scale_cb } ,
+ { "Scale", (Fl_Callback *)geometry_elementary_add_scale_cb } ,
{ "Symmetry", (Fl_Callback *)geometry_elementary_add_symmetry_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_add_new[] =
- { { "0", NULL } ,
+ { { "0Elementary Add New", NULL } ,
{ "Parameter", (Fl_Callback *)geometry_elementary_add_new_parameter_cb } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_new_point_cb } ,
{ "Line", (Fl_Callback *)geometry_elementary_add_new_line_cb } ,
@@ -110,96 +110,96 @@ Context_Item menu_geometry[] =
{ NULL }
};
Context_Item menu_geometry_elementary_add_translate[] =
- { { "0", NULL } ,
+ { { "0Elementary Add Translate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_translate_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_add_translate_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_add_translate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_add_rotate[] =
- { { "0", NULL } ,
+ { { "0Elementary Add Rotate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_rotate_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_add_rotate_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_add_rotate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_add_scale[] =
- { { "0", NULL } ,
+ { { "0Elementary Add Scale", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_scale_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_add_scale_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_add_scale_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_add_symmetry[] =
- { { "0", NULL } ,
+ { { "0Elementary Add Symmetry", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_symmetry_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_add_symmetry_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_add_symmetry_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_translate[] =
- { { "0", NULL } ,
+ { { "0Elementary Translate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_translate_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_translate_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_translate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_rotate[] =
- { { "0", NULL } ,
+ { { "0Elementary Rotate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_rotate_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_rotate_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_rotate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_scale[] =
- { { "0", NULL } ,
+ { { "0Elementary Scale", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_scale_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_scale_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_scale_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_symmetry[] =
- { { "0", NULL } ,
+ { { "0Elementary Symmetry", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_symmetry_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_symmetry_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_symmetry_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_extrude[] =
- { { "0", NULL } ,
+ { { "0Elementary Extrude", NULL } ,
{ "Translate", (Fl_Callback *)geometry_elementary_extrude_translate_cb } ,
{ "Rotate", (Fl_Callback *)geometry_elementary_extrude_rotate_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_extrude_translate[] =
- { { "0", NULL } ,
+ { { "0Elementary Extrude Translate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_extrude_translate_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_extrude_translate_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_extrude_translate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_extrude_rotate[] =
- { { "0", NULL } ,
+ { { "0Elementary Extrude Rotate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_extrude_rotate_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_extrude_rotate_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_extrude_rotate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_delete[] =
- { { "0", NULL } ,
+ { { "0Elementary Delete", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_delete_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_elementary_delete_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_delete_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_physical[] =
- { { "0", NULL } ,
+ { { "0Physical", NULL } ,
{ "Add", (Fl_Callback *)geometry_physical_add_cb } ,
{ "Delete", (Fl_Callback *)geometry_physical_delete_cb } ,
{ NULL }
};
Context_Item menu_geometry_physical_add[] =
- { { "0", NULL } ,
+ { { "0Physical Add", NULL } ,
{ "Point", (Fl_Callback *)geometry_physical_add_point_cb } ,
{ "Curve", (Fl_Callback *)geometry_physical_add_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_physical_add_surface_cb } ,
@@ -207,7 +207,7 @@ Context_Item menu_geometry[] =
{ NULL }
};
Context_Item menu_geometry_physical_delete[] =
- { { "0", NULL } ,
+ { { "0Physical Delete", NULL } ,
{ "Point", (Fl_Callback *)geometry_physical_delete_point_cb } ,
{ "Line", (Fl_Callback *)geometry_physical_delete_curve_cb } ,
{ "Surface", (Fl_Callback *)geometry_physical_delete_surface_cb } ,
@@ -224,14 +224,14 @@ Context_Item menu_mesh[] =
{ NULL }
};
Context_Item menu_mesh_define[] =
- { { "1", NULL } ,
+ { { "1Mesh Define", NULL } ,
{ "Length", (Fl_Callback *)mesh_define_length_cb } ,
{ "Recombine", (Fl_Callback *)mesh_define_recombine_cb } ,
{ "Transfinite", (Fl_Callback *)mesh_define_transfinite_cb } ,
{ NULL }
};
Context_Item menu_mesh_define_transfinite[] =
- { { "1", NULL } ,
+ { { "1Mesh Define Transfinite", NULL } ,
{ "Line", (Fl_Callback *)mesh_define_transfinite_line_cb } ,
{ "Surface", (Fl_Callback *)mesh_define_transfinite_surface_cb } ,
{ "Volume", (Fl_Callback *)mesh_define_transfinite_volume_cb } ,
@@ -575,8 +575,14 @@ void GUI::set_context(Context_Item *menu_asked, int flag){
}
int nb = 0;
-
- m_module_butt->value(atoi(menu[0].label));
+
+ if(menu[0].label[0] == '0') m_module_butt->value(0);
+ else if(menu[0].label[0] == '1') m_module_butt->value(1);
+ else if(menu[0].label[0] == '2') m_module_butt->value(2);
+ else {
+ Msg(WARNING, "Something Wrong in your Context Definition");
+ return;
+ }
if(m_module_butt->value() == 2){ // post-processing contexts
for(i = 0 ; i < List_Nbr(Post_ViewList) ; i++) {
@@ -598,6 +604,7 @@ void GUI::set_context(Context_Item *menu_asked, int flag){
}
}
else{ // geometry and mesh contexts
+ Msg(INFO, menu[0].label+1);
for(i=0 ; i < NB_BUTT_MAX ; i++){
m_toggle_butt[i]->hide();
m_popup_butt[i]->hide();
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 83dd6cd7b095102f107278c3aa8d0542e338bf7d..404358ed3dc1d7681d43576ddda717164cc155fa 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2001-01-10 09:08:59 geuzaine Exp $
+# $Id: Makefile,v 1.4 2001-01-10 10:06:16 geuzaine Exp $
#
# Makefile for "libFltk.a"
#
@@ -29,6 +29,7 @@ SRC = Main.cpp \
Message.cpp \
GUI.cpp\
Callbacks.cpp\
+ Opengl.cpp\
Opengl_Window.cpp\
Colorbar_Window.cpp
@@ -66,12 +67,13 @@ Main.o: Main.cpp ../Common/Gmsh.h ../Common/Message.h \
../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
../Common/ColorTable.h ../Common/Context.h ../Parser/Parser.h \
- ../Common/Static.h ../Common/Version.h GUI.h ../Parser/OpenFile.h \
- ../Common/GetOptions.h
+ ../Common/Static.h ../Common/Version.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h ../Parser/OpenFile.h ../Common/GetOptions.h
Message.o: Message.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/Version.h ../Common/Context.h ../Common/Const.h GUI.h
+ ../Common/Version.h ../Common/Context.h ../Common/Const.h GUI.h \
+ Opengl_Window.h Colorbar_Window.h ../Common/ColorTable.h
GUI.o: GUI.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 \
@@ -79,20 +81,31 @@ GUI.o: GUI.cpp ../Common/Gmsh.h ../Common/Message.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
../Common/Views.h ../Common/ColorTable.h ../Common/Version.h GUI.h \
- Callbacks.h ../Common/Bitmaps.h ../Common/GetOptions.h \
- ../Common/Help.h
+ Opengl_Window.h Colorbar_Window.h Callbacks.h ../Common/Bitmaps.h \
+ ../Common/GetOptions.h ../Common/Help.h
+Callbacks.o: Callbacks.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 ../Common/ColorTable.h \
+ ../Common/Timer.h ../Geo/Visibility.h ../Graphics/CreateFile.h \
+ ../Parser/OpenFile.h ../Common/Context.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h Callbacks.h
Opengl.o: Opengl.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/Context.h ../Common/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/ColorTable.h GUI.h
-Callbacks.o: Callbacks.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 \
+ ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h ../Graphics/gl2ps.h
+Opengl_Window.o: Opengl_Window.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/Context.h ../Common/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 ../Common/ColorTable.h \
- ../Common/Timer.h ../Geo/Visibility.h ../Graphics/CreateFile.h \
- ../Parser/OpenFile.h ../Common/Context.h GUI.h Callbacks.h
+ ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h
+Colorbar_Window.o: Colorbar_Window.cpp
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5895cdef30109e9b6b5d43084b30dba8807bcadc
--- /dev/null
+++ b/Fltk/Opengl.cpp
@@ -0,0 +1,123 @@
+// $Id: Opengl.cpp,v 1.6 2001-01-10 10:06:38 geuzaine Exp $
+
+#include "Gmsh.h"
+#include "GmshUI.h"
+#include "Context.h"
+#include "Const.h"
+#include "Geo.h"
+#include "Mesh.h"
+#include "Draw.h"
+#include "GUI.h"
+#include "gl2ps.h"
+
+extern GUI *WID;
+extern Mesh M;
+extern Context_T CTX;
+
+void Process_SelectionBuffer(int x, int y, int *n, GLuint *ii, GLuint *jj);
+void Filter_SelectionBuffer(int n, GLuint *typ, GLuint *ient, Vertex **thev,
+ Curve **thec, Surface **thes, Mesh *m);
+void myZoom(GLdouble X1, GLdouble X2, GLdouble Y1, GLdouble Y2,
+ GLdouble Xc1, GLdouble Xc2, GLdouble Yc1, GLdouble Yc2);
+
+/* ------------------------------------------------------------------------ */
+/* Init/Draw */
+/* ------------------------------------------------------------------------ */
+
+void Init(void){
+ WID->make_gl_current();
+}
+
+void InitOverlay(void){
+}
+
+void Draw(void){
+ WID->draw_gl();
+}
+
+void DrawOverlay(void){
+ WID->draw_gl_overlay();
+}
+
+void DrawUI(void){
+ WID->check();
+}
+
+void Draw_String(char *s){
+
+ if(CTX.stream == TO_FILE){
+ if(!CTX.print.gl_fonts && CTX.print.eps_quality > 0){
+ gl2psText(s,CTX.print.font,CTX.print.font_size);
+ return ;
+ }
+ }
+
+ glListBase(CTX.font_base);
+ glCallLists(strlen(s), GL_UNSIGNED_BYTE, (GLubyte *)s);
+}
+
+/* ------------------------------------------------------------------------
+ set_XXX
+ ------------------------------------------------------------------------ */
+
+void set_r(int i, double val){
+ if(!CTX.useTrackball){
+ if(!CTX.rlock[i]){
+ CTX.r[i] = val;
+ }
+ }
+}
+
+void set_t(int i, double val){
+ if(!CTX.tlock[i]){
+ CTX.t[i] = val;
+ }
+}
+
+void set_s(int i, double val){
+ if(!CTX.slock[i]){
+ CTX.s[i] = val;
+ }
+}
+
+
+/* ------------------------------------------------------------------------ */
+/* SelectEntity */
+/* ------------------------------------------------------------------------ */
+
+int check_type(int type, Vertex *v, Curve *c, Surface *s){
+ return ( (type==ENT_POINT && v) ||
+ (type==ENT_LINE && c) ||
+ (type==ENT_SURFACE && s) ) ;
+}
+
+int SelectEntity(int type, Vertex **v, Curve **c, Surface **s){
+ int hits;
+ GLuint ii[SELECTION_BUFFER_SIZE],jj[SELECTION_BUFFER_SIZE];
+ int event;
+
+ *v = NULL; *c = NULL; *s = NULL;
+
+ printf("select entity...\n");
+
+ while(1){
+ Fl::check();
+ if((event = Fl::event_key())){
+ if(event == 'q') return(0);
+ if(event == 'e') return(-1);
+ }
+ if(Fl::event_is_click()){
+ Process_SelectionBuffer(Fl::event_x(), Fl::event_y(), &hits, ii, jj);
+ Filter_SelectionBuffer(hits,ii,jj,v,c,s,&M);
+ if(check_type(type,*v,*c,*s)){
+ BeginHighlight();
+ HighlightEntity(*v,*c,*s,1);
+ EndHighlight(1);
+ return(Fl::event_button());
+ }
+ }
+ }
+
+}
+
+
diff --git a/Fltk/Opengl_Window.cpp b/Fltk/Opengl_Window.cpp
index d5e3f1cb2233b3d27bc499b72d0d4e18163409ad..21b8aee1579fb0b9a92122860e60ce428182f480 100644
--- a/Fltk/Opengl_Window.cpp
+++ b/Fltk/Opengl_Window.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl_Window.cpp,v 1.1 2001-01-10 09:08:59 geuzaine Exp $
+// $Id: Opengl_Window.cpp,v 1.2 2001-01-10 10:06:16 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -10,6 +10,8 @@
#include "GUI.h"
#include "Opengl_Window.h"
+// This file defines the Opengl_Window class (subclass of Fl_GL_Window)
+
extern GUI *WID;
extern Mesh M;
extern Context_T CTX;
@@ -20,99 +22,6 @@ void Filter_SelectionBuffer(int n, GLuint *typ, GLuint *ient, Vertex **thev,
void myZoom(GLdouble X1, GLdouble X2, GLdouble Y1, GLdouble Y2,
GLdouble Xc1, GLdouble Xc2, GLdouble Yc1, GLdouble Yc2);
-/* ------------------------------------------------------------------------ */
-/* Init/Draw */
-/* ------------------------------------------------------------------------ */
-
-void Init(void){
- WID->make_gl_current();
-}
-
-void InitOverlay(void){
-}
-
-void Draw(void){
- WID->draw_gl();
-}
-
-void DrawOverlay(void){
- WID->draw_gl_overlay();
-}
-
-void DrawUI(void){
- WID->check();
-}
-
-
-/* ------------------------------------------------------------------------
- set_XXX
- ------------------------------------------------------------------------ */
-
-void set_r(int i, double val){
- if(!CTX.useTrackball){
- if(!CTX.rlock[i]){
- CTX.r[i] = val;
- }
- }
-}
-
-void set_t(int i, double val){
- if(!CTX.tlock[i]){
- CTX.t[i] = val;
- }
-}
-
-void set_s(int i, double val){
- if(!CTX.slock[i]){
- CTX.s[i] = val;
- }
-}
-
-
-/* ------------------------------------------------------------------------ */
-/* SelectEntity */
-/* ------------------------------------------------------------------------ */
-
-int check_type(int type, Vertex *v, Curve *c, Surface *s){
- return ( (type==ENT_POINT && v) ||
- (type==ENT_LINE && c) ||
- (type==ENT_SURFACE && s) ) ;
-}
-
-int SelectEntity(int type, Vertex **v, Curve **c, Surface **s){
- int hits;
- GLuint ii[SELECTION_BUFFER_SIZE],jj[SELECTION_BUFFER_SIZE];
- int event;
-
- *v = NULL; *c = NULL; *s = NULL;
-
- printf("select entity...\n");
-
- while(1){
- Fl::check();
- if((event = Fl::event_key())){
- if(event == 'q') return(0);
- if(event == 'e') return(-1);
- }
- if(Fl::event_is_click()){
- Process_SelectionBuffer(Fl::event_x(), Fl::event_y(), &hits, ii, jj);
- Filter_SelectionBuffer(hits,ii,jj,v,c,s,&M);
- if(check_type(type,*v,*c,*s)){
- BeginHighlight();
- HighlightEntity(*v,*c,*s,1);
- EndHighlight(1);
- return(Fl::event_button());
- }
- }
- }
-
-}
-
-
-/* ------------------------------------------------------------------------ */
-/* The OpenGL Widget */
-/* ------------------------------------------------------------------------ */
-
void Opengl_Window::draw() {
if (!valid()) {
valid(1);
diff --git a/Graphics/CreateFile.cpp b/Graphics/CreateFile.cpp
index a12c55c8399e94d6876beb9fd7ac0246b036d233..15a39e2f1fdb19a434b9fa9abc6dcdc6868631d2 100644
--- a/Graphics/CreateFile.cpp
+++ b/Graphics/CreateFile.cpp
@@ -1,4 +1,4 @@
-// $Id: CreateFile.cpp,v 1.5 2001-01-10 08:50:30 geuzaine Exp $
+// $Id: CreateFile.cpp,v 1.6 2001-01-10 10:06:17 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -88,7 +88,6 @@ void CreateFile (char *name, int format) {
break;
#ifdef _XMOTIF
-
case FORMAT_XPM :
if(!(fp = fopen(name,"wb"))) {
Msg(WARNING, "Unable to Open File '%s'", name);
@@ -99,8 +98,8 @@ void CreateFile (char *name, int format) {
Msg (INFO, "Wrote File '%s'", name);
fclose(fp);
break;
-
#endif
+
#ifndef WIN32
case FORMAT_JPEG :
if(!(fp = fopen(name,"wb"))) {
@@ -116,6 +115,7 @@ void CreateFile (char *name, int format) {
fclose(fp);
break;
#endif
+
case FORMAT_GIF :
if(!(fp = fopen(name,"wb"))) {
Msg(WARNING, "Unable to Open File '%s'", name);
diff --git a/Graphics/Draw.cpp b/Graphics/Draw.cpp
index 0ec6f3ec0b7580ff6a73e4b6f41c13d13fa6be51..3af9710a5671e6ad5e2b7cd2b2f18d9dd4fdb2fb 100644
--- a/Graphics/Draw.cpp
+++ b/Graphics/Draw.cpp
@@ -1,4 +1,4 @@
-// $Id: Draw.cpp,v 1.15 2001-01-08 08:05:43 geuzaine Exp $
+// $Id: Draw.cpp,v 1.16 2001-01-10 10:06:17 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -7,7 +7,6 @@
#include "Draw.h"
#include "Context.h"
#include "MinMax.h"
-#include "CbGeneral.h"
extern Context_T CTX ;
extern Mesh M;
diff --git a/Graphics/Draw.h b/Graphics/Draw.h
index 2daf890c1ec00bf8003f4adc02ae57fc8b6b1b80..0a46ce60bde1ea2f0865e12f16a322c33944d9e1 100644
--- a/Graphics/Draw.h
+++ b/Graphics/Draw.h
@@ -17,6 +17,10 @@ void InitNoShading(void);
void InitPosition(void);
void Orthogonalize(int x, int y);
+void set_r(int i, double val);
+void set_t(int i, double val);
+void set_s(int i, double val);
+
void Replot(void);
void RaiseFill (int i, double Val, double ValMin, double Raise[3][5]);
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 93e549a2aba3e285dc0ad4159256e3be7e8bbbb5..663ebfa125730204e64fb5c029935eb903ec512c 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 2001-01-09 14:24:09 geuzaine Exp $
+# $Id: Makefile,v 1.13 2001-01-10 10:06:17 geuzaine Exp $
#
# Makefile for "libGraphics.a"
#
@@ -74,7 +74,7 @@ Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.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 ../Common/ColorTable.h ../Common/Context.h \
- ../Geo/MinMax.h ../Motif/CbGeneral.h
+ ../Geo/MinMax.h
Mesh.o: Mesh.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 \
@@ -120,7 +120,7 @@ Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.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 ../Common/ColorTable.h ../Common/Context.h gl2ps.h \
+ ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h \
../Motif/XContext.h
Axes.o: Axes.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
diff --git a/Graphics/Scale.cpp b/Graphics/Scale.cpp
index 4fa1d822afe94bce86e1021127db00df96eed233..b2e556d6305c863312740a39443172e14a893f66 100644
--- a/Graphics/Scale.cpp
+++ b/Graphics/Scale.cpp
@@ -1,4 +1,4 @@
-// $Id: Scale.cpp,v 1.13 2001-01-09 14:24:09 geuzaine Exp $
+// $Id: Scale.cpp,v 1.14 2001-01-10 10:06:17 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -7,51 +7,31 @@
#include "Draw.h"
#include "Context.h"
#include "Views.h"
-#include "gl2ps.h"
extern Context_T CTX;
#ifdef _XMOTIF
+
#include "XContext.h"
extern XContext_T XCTX;
-#define FONTHEIGHT XCTX.xfont.helve_h
-#define FONTASCENT XCTX.xfont.helve_a
-#else
-#define FONTHEIGHT 21
-#define FONTASCENT 21
-#endif
-
-/* Even if all computations in these routines are made in window
- coordinates, double precision is used to work at subpixel accuracy */
-
-/* ------------------------------------------------------------------------ */
-/* D r a w _ S t r i n g */
-/* ------------------------------------------------------------------------ */
-
-void Draw_String(char *s){
-
- if(CTX.stream == TO_FILE){
- if(!CTX.print.gl_fonts && CTX.print.eps_quality > 0){
- gl2psText(s,CTX.print.font,CTX.print.font_size);
- return ;
- }
- }
-
- glListBase(CTX.font_base);
- glCallLists(strlen(s), GL_UNSIGNED_BYTE, (GLubyte *)s);
-}
-
-
-#ifdef _XMOTIF
static int dir,ascent, descent;
static XCharStruct overall;
#define CHECK_W \
XTextExtents(XCTX.xfont.helve, label, strlen(label), &dir,&ascent,&descent,&overall); \
if(overall.width > cv_w) cv_w=overall.width
+#define FONTHEIGHT XCTX.xfont.helve_h
+#define FONTASCENT XCTX.xfont.helve_a
+
#else
+
#define CHECK_W cv_w=200
+#define FONTHEIGHT 21
+#define FONTASCENT 21
+
#endif
+/* Even if all computations in these routines are made in window
+ coordinates, double precision is used to work at subpixel accuracy */
/* ------------------------------------------------------------------------ */
/* D r a w _ S c a l e */
@@ -70,6 +50,14 @@ void draw_scale(Post_View *v, double xmin, double ymin, double *width, double he
char label[128] ;
double Val, ValMin, ValMax;
+#ifdef _XMOTIF
+ font_h = FONTHEIGHT ; /* hauteur totale de la fonte */
+ font_a = FONTASCENT ; /* hauteur de la fonte au dessus de pt de ref */
+#else
+ font_h = 21 ;
+ font_a = 21 ;
+#endif
+
font_h = FONTHEIGHT ; /* hauteur totale de la fonte */
font_a = FONTASCENT ; /* hauteur de la fonte au dessus de pt de ref */
label_h = 1.8*font_h ; /* hauteur du label */
diff --git a/Motif/CbGeneral.h b/Motif/CbGeneral.h
deleted file mode 100644
index d9854cb8778c0403ccc2a36b88849f260360f503..0000000000000000000000000000000000000000
--- a/Motif/CbGeneral.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _CB_GENERAL_H_
-#define _CB_GENERAL_H_
-
-void set_r(int i, double val);
-void set_t(int i, double val);
-void set_s(int i, double val);
-
-#endif
diff --git a/Motif/CbInput.cpp b/Motif/CbInput.cpp
index f165a76cc63dc6d5db219c492e8c9e4612eaacf3..8dc640bd89bc925659fee2dd27c41fb694976fdf 100644
--- a/Motif/CbInput.cpp
+++ b/Motif/CbInput.cpp
@@ -1,4 +1,4 @@
-// $Id: CbInput.cpp,v 1.1 2001-01-08 08:20:10 geuzaine Exp $
+// $Id: CbInput.cpp,v 1.2 2001-01-10 10:06:18 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -10,7 +10,6 @@
#include "Register.h"
#include "CbContext.h"
-#include "CbGeneral.h"
#include "CbGeom.h"
#include "CbPost.h"
#include "CbMesh.h"
diff --git a/Motif/CbOptions.cpp b/Motif/CbOptions.cpp
index 9c990715324e91eccd23649c0eed355189b00b03..eee29453d2708323a98a1b8812d3d858a3add663 100644
--- a/Motif/CbOptions.cpp
+++ b/Motif/CbOptions.cpp
@@ -1,4 +1,4 @@
-// $Id: CbOptions.cpp,v 1.2 2001-01-09 14:24:11 geuzaine Exp $
+// $Id: CbOptions.cpp,v 1.3 2001-01-10 10:06:18 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -14,7 +14,6 @@
#include "Timer.h"
#include "Visibility.h"
-#include "CbGeneral.h"
#include "CbOptions.h"
#include "CbGeom.h"
#include "CbMesh.h"
diff --git a/Motif/Makefile b/Motif/Makefile
index 1e49f859ec4361b266356782a0782820e4e1446e..a7122b618bc47332bcb4e747995b25d60d5f6a1b 100644
--- a/Motif/Makefile
+++ b/Motif/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2001-01-09 14:24:11 geuzaine Exp $
+# $Id: Makefile,v 1.3 2001-01-10 10:06:18 geuzaine Exp $
#
# Makefile for "libMotif.a"
#
@@ -107,7 +107,8 @@ Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.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 ../Common/ColorTable.h \
- ../Common/Context.h ../Geo/MinMax.h Widgets.h XContext.h
+ ../Common/Context.h ../Geo/MinMax.h Widgets.h XContext.h \
+ ../Graphics/gl2ps.h
XColors.o: XColors.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 XContext.h
@@ -157,7 +158,7 @@ CbOptions.o: CbOptions.cpp ../Common/Gmsh.h ../Common/Message.h \
../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
../Common/ColorTable.h Widgets.h Pixmaps.h ../Common/Context.h \
XContext.h Register.h ../Common/Timer.h ../Geo/Visibility.h \
- CbGeneral.h CbOptions.h CbGeom.h CbMesh.h CbPost.h
+ CbOptions.h CbGeom.h CbMesh.h CbPost.h
CbFile.o: CbFile.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 \
@@ -172,8 +173,8 @@ CbInput.o: CbInput.cpp ../Common/Gmsh.h ../Common/Message.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 ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h XContext.h Register.h CbContext.h CbGeneral.h \
- CbGeom.h CbPost.h CbMesh.h
+ ../Common/Context.h XContext.h Register.h CbContext.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 \
diff --git a/Motif/Message.cpp b/Motif/Message.cpp
index 66263d52b20982e2dfeb949ff9755599f8b1f509..6a775b81b7377efba1d3a4cc4592ad7d6f222ab3 100644
--- a/Motif/Message.cpp
+++ b/Motif/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.1 2001-01-08 08:20:11 geuzaine Exp $
+// $Id: Message.cpp,v 1.2 2001-01-10 10:06:18 geuzaine Exp $
#include <signal.h>
#include <sys/resource.h>
@@ -60,7 +60,7 @@ void Msg(int level, char *fmt, ...){
Arg arg[2];
int nb, nbvis;
- if(level != FATAL && level != ERROR && level != PARSER_ERROR &&
+ if(level != FATAL && level != GERROR && level != PARSER_ERROR &&
CTX.interactive && !CTX.verbosity)
return ;
@@ -73,7 +73,7 @@ void Msg(int level, char *fmt, ...){
fprintf(stderr, "\n");
abort = 1;
break;
- case ERROR :
+ case GERROR :
if(CTX.interactive || !CTX.command_win){
fprintf(stderr, ERROR_STR);
vfprintf(stderr, fmt, args);
diff --git a/Motif/Opengl.cpp b/Motif/Opengl.cpp
index 0adf331944195efd83dd6bd937f952b78bc1bd54..6ac815daa0d96b640a95cdd2f869e25b1f761805 100644
--- a/Motif/Opengl.cpp
+++ b/Motif/Opengl.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.1 2001-01-08 08:20:11 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.2 2001-01-10 10:06:18 geuzaine Exp $
#include <X11/IntrinsicP.h>
@@ -11,6 +11,7 @@
#include "MinMax.h"
#include "Widgets.h"
#include "XContext.h"
+#include "gl2ps.h"
extern XContext_T XCTX ;
extern Widgets_T WID ;
@@ -69,6 +70,19 @@ void DrawOverlay(void){
void DrawUI(void){
}
+void Draw_String(char *s){
+
+ if(CTX.stream == TO_FILE){
+ if(!CTX.print.gl_fonts && CTX.print.eps_quality > 0){
+ gl2psText(s,CTX.print.font,CTX.print.font_size);
+ return ;
+ }
+ }
+
+ glListBase(CTX.font_base);
+ glCallLists(strlen(s), GL_UNSIGNED_BYTE, (GLubyte *)s);
+}
+
/* ------------------------------------------------------------------------ */
/* SelectEntity */
/* ------------------------------------------------------------------------ */
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index d6999925e3071f9ac49ad8e0abbc0b0f18d4f856..38062597e8beb9608d2b2a5841936f17c9b9a3a2 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -1,175 +1,176 @@
/* A Bison parser, made from Gmsh.y
- by GNU Bison version 1.28 */
+ by GNU Bison version 1.25
+ */
#define YYBISON 1 /* Identify Bison output. */
-#define tDOUBLE 257
-#define tSTRING 258
-#define tBIGSTR 259
-#define tEND 260
-#define tAFFECT 261
-#define tDOTS 262
-#define tPi 263
-#define tExp 264
-#define tLog 265
-#define tLog10 266
-#define tSqrt 267
-#define tSin 268
-#define tAsin 269
-#define tCos 270
-#define tAcos 271
-#define tTan 272
-#define tRand 273
-#define tAtan 274
-#define tAtan2 275
-#define tSinh 276
-#define tCosh 277
-#define tTanh 278
-#define tFabs 279
-#define tFloor 280
-#define tCeil 281
-#define tFmod 282
-#define tModulo 283
-#define tHypot 284
-#define tPrintf 285
-#define tSprintf 286
-#define tDraw 287
-#define tPoint 288
-#define tCircle 289
-#define tEllipsis 290
-#define tLine 291
-#define tSurface 292
-#define tSpline 293
-#define tVolume 294
-#define tCharacteristic 295
-#define tLength 296
-#define tParametric 297
-#define tElliptic 298
-#define tPlane 299
-#define tRuled 300
-#define tTransfinite 301
-#define tComplex 302
-#define tPhysical 303
-#define tUsing 304
-#define tBump 305
-#define tProgression 306
-#define tRotate 307
-#define tTranslate 308
-#define tSymmetry 309
-#define tDilate 310
-#define tExtrude 311
-#define tDuplicata 312
-#define tLoop 313
-#define tRecombine 314
-#define tDelete 315
-#define tCoherence 316
-#define tIntersect 317
-#define tView 318
-#define tAttractor 319
-#define tLayers 320
-#define tScalarTetrahedron 321
-#define tVectorTetrahedron 322
-#define tTensorTetrahedron 323
-#define tScalarTriangle 324
-#define tVectorTriangle 325
-#define tTensorTriangle 326
-#define tScalarLine 327
-#define tVectorLine 328
-#define tTensorLine 329
-#define tScalarPoint 330
-#define tVectorPoint 331
-#define tTensorPoint 332
-#define tBSpline 333
-#define tNurbs 334
-#define tOrder 335
-#define tWith 336
-#define tBounds 337
-#define tKnots 338
-#define tColor 339
-#define tFor 340
-#define tIn 341
-#define tEndFor 342
-#define tIf 343
-#define tEndIf 344
-#define tExit 345
-#define tReturn 346
-#define tCall 347
-#define tFunction 348
-#define tMesh 349
-#define tB_SPLINE_SURFACE_WITH_KNOTS 350
-#define tB_SPLINE_CURVE_WITH_KNOTS 351
-#define tCARTESIAN_POINT 352
-#define tTRUE 353
-#define tFALSE 354
-#define tUNSPECIFIED 355
-#define tU 356
-#define tV 357
-#define tEDGE_CURVE 358
-#define tVERTEX_POINT 359
-#define tORIENTED_EDGE 360
-#define tPLANE 361
-#define tFACE_OUTER_BOUND 362
-#define tEDGE_LOOP 363
-#define tADVANCED_FACE 364
-#define tVECTOR 365
-#define tDIRECTION 366
-#define tAXIS2_PLACEMENT_3D 367
-#define tISO 368
-#define tENDISO 369
-#define tENDSEC 370
-#define tDATA 371
-#define tHEADER 372
-#define tFILE_DESCRIPTION 373
-#define tFILE_SCHEMA 374
-#define tFILE_NAME 375
-#define tMANIFOLD_SOLID_BREP 376
-#define tCLOSED_SHELL 377
-#define tADVANCED_BREP_SHAPE_REPRESENTATION 378
-#define tFACE_BOUND 379
-#define tCYLINDRICAL_SURFACE 380
-#define tCONICAL_SURFACE 381
-#define tCIRCLE 382
-#define tTRIMMED_CURVE 383
-#define tGEOMETRIC_SET 384
-#define tCOMPOSITE_CURVE_SEGMENT 385
-#define tCONTINUOUS 386
-#define tCOMPOSITE_CURVE 387
-#define tTOROIDAL_SURFACE 388
-#define tPRODUCT_DEFINITION 389
-#define tPRODUCT_DEFINITION_SHAPE 390
-#define tSHAPE_DEFINITION_REPRESENTATION 391
-#define tELLIPSE 392
-#define tTrimmed 393
-#define tSolid 394
-#define tEndSolid 395
-#define tVertex 396
-#define tFacet 397
-#define tNormal 398
-#define tOuter 399
-#define tLoopSTL 400
-#define tEndLoop 401
-#define tEndFacet 402
-#define tAFFECTPLUS 403
-#define tAFFECTMINUS 404
-#define tAFFECTTIMES 405
-#define tAFFECTDIVIDE 406
-#define tOR 407
-#define tAND 408
-#define tEQUAL 409
-#define tNOTEQUAL 410
-#define tAPPROXEQUAL 411
-#define tLESSOREQUAL 412
-#define tGREATEROREQUAL 413
-#define tCROSSPRODUCT 414
-#define tPLUSPLUS 415
-#define tMINUSMINUS 416
-#define UNARYPREC 417
+#define tDOUBLE 258
+#define tSTRING 259
+#define tBIGSTR 260
+#define tEND 261
+#define tAFFECT 262
+#define tDOTS 263
+#define tPi 264
+#define tExp 265
+#define tLog 266
+#define tLog10 267
+#define tSqrt 268
+#define tSin 269
+#define tAsin 270
+#define tCos 271
+#define tAcos 272
+#define tTan 273
+#define tRand 274
+#define tAtan 275
+#define tAtan2 276
+#define tSinh 277
+#define tCosh 278
+#define tTanh 279
+#define tFabs 280
+#define tFloor 281
+#define tCeil 282
+#define tFmod 283
+#define tModulo 284
+#define tHypot 285
+#define tPrintf 286
+#define tSprintf 287
+#define tDraw 288
+#define tPoint 289
+#define tCircle 290
+#define tEllipsis 291
+#define tLine 292
+#define tSurface 293
+#define tSpline 294
+#define tVolume 295
+#define tCharacteristic 296
+#define tLength 297
+#define tParametric 298
+#define tElliptic 299
+#define tPlane 300
+#define tRuled 301
+#define tTransfinite 302
+#define tComplex 303
+#define tPhysical 304
+#define tUsing 305
+#define tBump 306
+#define tProgression 307
+#define tRotate 308
+#define tTranslate 309
+#define tSymmetry 310
+#define tDilate 311
+#define tExtrude 312
+#define tDuplicata 313
+#define tLoop 314
+#define tRecombine 315
+#define tDelete 316
+#define tCoherence 317
+#define tIntersect 318
+#define tView 319
+#define tAttractor 320
+#define tLayers 321
+#define tScalarTetrahedron 322
+#define tVectorTetrahedron 323
+#define tTensorTetrahedron 324
+#define tScalarTriangle 325
+#define tVectorTriangle 326
+#define tTensorTriangle 327
+#define tScalarLine 328
+#define tVectorLine 329
+#define tTensorLine 330
+#define tScalarPoint 331
+#define tVectorPoint 332
+#define tTensorPoint 333
+#define tBSpline 334
+#define tNurbs 335
+#define tOrder 336
+#define tWith 337
+#define tBounds 338
+#define tKnots 339
+#define tColor 340
+#define tFor 341
+#define tIn 342
+#define tEndFor 343
+#define tIf 344
+#define tEndIf 345
+#define tExit 346
+#define tReturn 347
+#define tCall 348
+#define tFunction 349
+#define tMesh 350
+#define tB_SPLINE_SURFACE_WITH_KNOTS 351
+#define tB_SPLINE_CURVE_WITH_KNOTS 352
+#define tCARTESIAN_POINT 353
+#define tTRUE 354
+#define tFALSE 355
+#define tUNSPECIFIED 356
+#define tU 357
+#define tV 358
+#define tEDGE_CURVE 359
+#define tVERTEX_POINT 360
+#define tORIENTED_EDGE 361
+#define tPLANE 362
+#define tFACE_OUTER_BOUND 363
+#define tEDGE_LOOP 364
+#define tADVANCED_FACE 365
+#define tVECTOR 366
+#define tDIRECTION 367
+#define tAXIS2_PLACEMENT_3D 368
+#define tISO 369
+#define tENDISO 370
+#define tENDSEC 371
+#define tDATA 372
+#define tHEADER 373
+#define tFILE_DESCRIPTION 374
+#define tFILE_SCHEMA 375
+#define tFILE_NAME 376
+#define tMANIFOLD_SOLID_BREP 377
+#define tCLOSED_SHELL 378
+#define tADVANCED_BREP_SHAPE_REPRESENTATION 379
+#define tFACE_BOUND 380
+#define tCYLINDRICAL_SURFACE 381
+#define tCONICAL_SURFACE 382
+#define tCIRCLE 383
+#define tTRIMMED_CURVE 384
+#define tGEOMETRIC_SET 385
+#define tCOMPOSITE_CURVE_SEGMENT 386
+#define tCONTINUOUS 387
+#define tCOMPOSITE_CURVE 388
+#define tTOROIDAL_SURFACE 389
+#define tPRODUCT_DEFINITION 390
+#define tPRODUCT_DEFINITION_SHAPE 391
+#define tSHAPE_DEFINITION_REPRESENTATION 392
+#define tELLIPSE 393
+#define tTrimmed 394
+#define tSolid 395
+#define tEndSolid 396
+#define tVertex 397
+#define tFacet 398
+#define tNormal 399
+#define tOuter 400
+#define tLoopSTL 401
+#define tEndLoop 402
+#define tEndFacet 403
+#define tAFFECTPLUS 404
+#define tAFFECTMINUS 405
+#define tAFFECTTIMES 406
+#define tAFFECTDIVIDE 407
+#define tOR 408
+#define tAND 409
+#define tEQUAL 410
+#define tNOTEQUAL 411
+#define tAPPROXEQUAL 412
+#define tLESSOREQUAL 413
+#define tGREATEROREQUAL 414
+#define tCROSSPRODUCT 415
+#define tPLUSPLUS 416
+#define tMINUSMINUS 417
+#define UNARYPREC 418
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.58 2001-01-09 19:40:56 remacle Exp $
+// $Id: Gmsh.tab.cpp,v 1.59 2001-01-10 10:06:19 geuzaine Exp $
#include <stdarg.h>
@@ -190,6 +191,7 @@
#include "FunctionManager.h"
#include "ColorTable.h"
#include "Timer.h"
+#include "CreateFile.h"
#ifdef __DECCXX // bug in bison
#include <alloca.h>
@@ -227,14 +229,12 @@ static StringXString *pStrCat;
static StringXNumber *pNumCat;
static StringXColor *pColCat;
-void CreateFile (char *name, int format){}
-
char *strsave(char *ptr);
void yyerror (char *s);
void vyyerror (char *fmt, ...);
void skip_until (char *skip, char *until);
-#line 69 "Gmsh.y"
+#line 68 "Gmsh.y"
typedef union {
char *c;
int i;
@@ -258,7 +258,7 @@ typedef union {
#define YYFLAG -32768
#define YYNTBASE 182
-#define YYTRANSLATE(x) ((unsigned)(x) <= 417 ? yytranslate[x] : 261)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 418 ? yytranslate[x] : 261)
static const short yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -286,23 +286,23 @@ static const short yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 154, 155, 156, 157,
- 158, 160, 162, 168, 170, 171, 172
+ 2, 2, 2, 2, 2, 1, 2, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 154, 155, 156,
+ 157, 158, 160, 162, 168, 170, 171, 172
};
#if YYDEBUG != 0
@@ -579,41 +579,41 @@ static const short yyrhs[] = { 184,
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 148, 150, 151, 152, 159, 167, 181, 193, 195, 198,
- 200, 201, 204, 210, 215, 216, 217, 220, 224, 227,
- 233, 238, 244, 252, 257, 261, 267, 272, 276, 281,
- 285, 288, 293, 297, 301, 305, 310, 314, 317, 321,
- 325, 329, 333, 337, 341, 344, 348, 351, 355, 358,
- 367, 371, 377, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 392, 398, 427, 432, 438, 443,
- 444, 445, 446, 447, 448, 449, 450, 451, 452, 453,
- 454, 457, 460, 464, 470, 476, 479, 483, 489, 495,
- 498, 502, 508, 514, 517, 521, 529, 535, 538, 542,
- 550, 556, 559, 563, 571, 577, 580, 584, 596, 602,
- 605, 609, 621, 627, 630, 634, 646, 652, 655, 659,
- 672, 678, 681, 685, 698, 704, 707, 711, 724, 736,
- 752, 764, 773, 785, 793, 805, 813, 825, 833, 845,
- 853, 865, 877, 896, 909, 927, 944, 965, 982, 1003,
- 1020, 1041, 1058, 1079, 1100, 1126, 1143, 1164, 1181, 1204,
- 1217, 1242, 1253, 1259, 1278, 1289, 1297, 1303, 1309, 1328,
- 1334, 1350, 1357, 1363, 1369, 1375, 1381, 1400, 1412, 1418,
- 1437, 1458, 1466, 1472, 1478, 1484, 1496, 1502, 1508, 1520,
- 1526, 1531, 1536, 1543, 1545, 1546, 1549, 1554, 1565, 1583,
- 1591, 1595, 1606, 1658, 1677, 1681, 1702, 1718, 1732, 1757,
- 1782, 1808, 1814, 1819, 1824, 1828, 1838, 1844, 1850, 1854,
- 1858, 1862, 1866, 1871, 1878, 1882, 1887, 1905, 1915, 1933,
- 1950, 1967, 1988, 2008, 2028, 2045, 2069, 2074, 2085, 2087,
- 2090, 2092, 2093, 2094, 2095, 2098, 2100, 2101, 2102, 2103,
- 2104, 2105, 2106, 2107, 2114, 2115, 2116, 2117, 2118, 2119,
- 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129,
- 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139,
- 2140, 2141, 2142, 2143, 2144, 2145, 2150, 2155, 2159, 2171,
- 2189, 2201, 2219, 2231, 2251, 2272, 2296, 2317, 2341, 2362,
- 2387, 2394, 2407, 2414, 2418, 2422, 2426, 2431, 2436, 2440,
- 2444, 2450, 2454, 2459, 2463, 2468, 2472, 2476, 2482, 2488,
- 2494, 2498, 2504, 2519, 2526, 2532, 2541, 2553, 2557, 2565,
- 2578, 2583, 2587, 2592, 2597, 2615, 2620, 2641, 2650, 2656,
- 2661, 2665
+ 147, 149, 150, 151, 158, 166, 180, 192, 194, 197,
+ 199, 200, 203, 209, 214, 215, 216, 219, 223, 226,
+ 232, 237, 243, 251, 256, 260, 266, 271, 275, 280,
+ 284, 287, 292, 296, 300, 304, 309, 313, 316, 320,
+ 324, 328, 332, 336, 340, 343, 347, 350, 354, 357,
+ 366, 370, 376, 378, 379, 380, 381, 382, 383, 384,
+ 385, 386, 387, 388, 391, 397, 426, 431, 437, 442,
+ 443, 444, 445, 446, 447, 448, 449, 450, 451, 452,
+ 453, 456, 459, 463, 469, 475, 478, 482, 488, 494,
+ 497, 501, 507, 513, 516, 520, 528, 534, 537, 541,
+ 549, 555, 558, 562, 570, 576, 579, 583, 595, 601,
+ 604, 608, 620, 626, 629, 633, 645, 651, 654, 658,
+ 671, 677, 680, 684, 697, 703, 706, 710, 723, 735,
+ 751, 763, 772, 784, 792, 804, 812, 824, 832, 844,
+ 852, 864, 876, 895, 908, 926, 943, 964, 981, 1002,
+ 1019, 1040, 1057, 1078, 1099, 1125, 1142, 1163, 1180, 1203,
+ 1216, 1241, 1252, 1258, 1277, 1288, 1296, 1302, 1308, 1327,
+ 1333, 1349, 1356, 1362, 1368, 1374, 1380, 1399, 1411, 1417,
+ 1436, 1457, 1465, 1471, 1477, 1483, 1495, 1501, 1507, 1519,
+ 1525, 1530, 1535, 1542, 1544, 1545, 1548, 1553, 1564, 1582,
+ 1590, 1594, 1605, 1657, 1676, 1680, 1701, 1717, 1731, 1756,
+ 1781, 1807, 1813, 1818, 1823, 1827, 1837, 1843, 1849, 1853,
+ 1857, 1861, 1865, 1870, 1877, 1881, 1886, 1904, 1914, 1932,
+ 1949, 1966, 1987, 2007, 2027, 2044, 2068, 2073, 2084, 2086,
+ 2089, 2091, 2092, 2093, 2094, 2097, 2099, 2100, 2101, 2102,
+ 2103, 2104, 2105, 2106, 2113, 2114, 2115, 2116, 2117, 2118,
+ 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128,
+ 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138,
+ 2139, 2140, 2141, 2142, 2143, 2144, 2149, 2154, 2158, 2170,
+ 2188, 2200, 2218, 2230, 2250, 2271, 2295, 2316, 2340, 2361,
+ 2386, 2393, 2406, 2413, 2417, 2421, 2425, 2430, 2435, 2439,
+ 2443, 2449, 2453, 2458, 2462, 2467, 2471, 2475, 2481, 2487,
+ 2493, 2497, 2503, 2518, 2525, 2531, 2540, 2552, 2556, 2564,
+ 2577, 2582, 2586, 2591, 2596, 2614, 2619, 2640, 2649, 2655,
+ 2660, 2664
};
#endif
@@ -2500,8 +2500,7 @@ static const short yycheck[] = { 23,
166, 167, -1, -1, -1, -1, -1, 173, -1, 175
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/lib/bison.simple"
-/* This file comes from bison-1.28. */
+#line 3 "/usr/local/share/bison.simple"
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -2518,66 +2517,46 @@ static const short yycheck[] = { 23,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
-/* This is the parser code that is written into each bison parser
- when the %semantic_parser declaration is not specified in the grammar.
- It was written by Richard Stallman by simplifying the hairy parser
- used when %semantic_parser is specified. */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
+#ifndef alloca
#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
#define alloca __builtin_alloca
#else /* not GNU C. */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
#include <alloca.h>
#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C. */
-/* This used to test MSDOS, but that is a bad idea
- since that symbol is in the user namespace. */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
- instead, just don't use alloca. */
+#if defined (MSDOS) && !defined (__TURBOC__)
#include <malloc.h>
-#endif
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
- So I turned it off. rms, 2 May 1997. */
-/* #include <malloc.h> */
+#include <malloc.h>
#pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
- and on HPUX 10. Eventually we can turn this on. */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
+#else /* not MSDOS, __TURBOC__, or _AIX */
+#ifdef __hpux
+#ifdef __cplusplus
+extern "C" {
+void *alloca (unsigned int);
+};
+#else /* not __cplusplus */
+void *alloca ();
+#endif /* not __cplusplus */
#endif /* __hpux */
-#endif
#endif /* not _AIX */
#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
+#endif /* not sparc. */
+#endif /* not GNU C. */
+#endif /* alloca not defined. */
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
+/* This is the parser code that is written into each bison parser
+ when the %semantic_parser declaration is not specified in the grammar.
+ It was written by Richard Stallman by simplifying the hairy parser
+ used when %semantic_parser is specified. */
/* Note: there must be only one dollar sign in this file.
It is replaced by the list of actions, each action
@@ -2587,8 +2566,8 @@ static const short yycheck[] = { 23,
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY -2
#define YYEOF 0
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
+#define YYACCEPT return(0)
+#define YYABORT return(1)
#define YYERROR goto yyerrlab1
/* Like YYERROR except do call yyerror.
This remains here temporarily to ease the
@@ -2669,12 +2648,12 @@ int yydebug; /* nonzero means print parse trace */
#ifndef YYMAXDEPTH
#define YYMAXDEPTH 10000
#endif
-
-/* Define __yy_memcpy. Note that the size argument
- should be passed with type unsigned int, because that is what the non-GCC
- definitions require. With GCC, __builtin_memcpy takes an arg
- of type size_t, but it can handle unsigned int. */
+/* Prevent warning if -Wstrict-prototypes. */
+#ifdef __GNUC__
+int yyparse (void);
+#endif
+
#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
#else /* not GNU C or C++ */
@@ -2686,7 +2665,7 @@ static void
__yy_memcpy (to, from, count)
char *to;
char *from;
- unsigned int count;
+ int count;
{
register char *f = from;
register char *t = to;
@@ -2701,10 +2680,10 @@ __yy_memcpy (to, from, count)
/* This is the most reliable way to avoid incompatibilities
in available built-in functions on various systems. */
static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+__yy_memcpy (char *to, char *from, int count)
{
- register char *t = to;
register char *f = from;
+ register char *t = to;
register int i = count;
while (i-- > 0)
@@ -2714,7 +2693,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#endif
#endif
-#line 217 "/usr/lib/bison.simple"
+#line 196 "/usr/local/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -2735,15 +2714,6 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#define YYPARSE_PARAM_DECL
#endif /* not YYPARSE_PARAM */
-/* Prevent warning if -Wstrict-prototypes. */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
-int yyparse (void);
-#endif
-#endif
-
int
yyparse(YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
@@ -2772,7 +2742,6 @@ yyparse(YYPARSE_PARAM_ARG)
#endif
int yystacksize = YYINITDEPTH;
- int yyfree_stacks = 0;
#ifdef YYPURE
int yychar;
@@ -2857,32 +2826,18 @@ yynewstate:
if (yystacksize >= YYMAXDEPTH)
{
yyerror("parser stack overflow");
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
-#endif
- }
return 2;
}
yystacksize *= 2;
if (yystacksize > YYMAXDEPTH)
yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
- yyfree_stacks = 1;
-#endif
- yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
- __yy_memcpy ((char *)yyss, (char *)yyss1,
- size * (unsigned int) sizeof (*yyssp));
- yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
- __yy_memcpy ((char *)yyvs, (char *)yyvs1,
- size * (unsigned int) sizeof (*yyvsp));
+ yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
+ __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
+ yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
+ __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
#ifdef YYLSP_NEEDED
- yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
- __yy_memcpy ((char *)yyls, (char *)yyls1,
- size * (unsigned int) sizeof (*yylsp));
+ yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
+ __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
#endif
#endif /* no yyoverflow */
@@ -3043,11 +2998,11 @@ yyreduce:
switch (yyn) {
case 4:
-#line 152 "Gmsh.y"
+#line 151 "Gmsh.y"
{ yyerrok ; return 1; ;
break;}
case 5:
-#line 161 "Gmsh.y"
+#line 160 "Gmsh.y"
{
Msg(PARSER_INFO,"STL File Format");
STL_Surf = Create_Surface(1,MSH_SURF_STL,1);
@@ -3056,7 +3011,7 @@ case 5:
;
break;}
case 6:
-#line 175 "Gmsh.y"
+#line 174 "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,
@@ -3065,7 +3020,7 @@ case 6:
;
break;}
case 7:
-#line 182 "Gmsh.y"
+#line 181 "Gmsh.y"
{
Msg(PARSER_INFO,"STL File Format Read");
Tree_Add(THEM->Surfaces, &STL_Surf);
@@ -3073,79 +3028,79 @@ case 7:
;
break;}
case 10:
-#line 199 "Gmsh.y"
+#line 198 "Gmsh.y"
{ return 1; ;
break;}
case 11:
-#line 200 "Gmsh.y"
+#line 199 "Gmsh.y"
{ return 1; ;
break;}
case 12:
-#line 201 "Gmsh.y"
+#line 200 "Gmsh.y"
{ return 1; ;
break;}
case 13:
-#line 206 "Gmsh.y"
+#line 205 "Gmsh.y"
{
Msg(PARSER_INFO,"Step Iso-10303-21 File Format");
Create_Step_Solid_BRep();
;
break;}
case 14:
-#line 211 "Gmsh.y"
+#line 210 "Gmsh.y"
{
Msg(PARSER_INFO,"Step Iso-10303-21 File Format Read");
Resolve_BREP ();
;
break;}
case 18:
-#line 222 "Gmsh.y"
+#line 221 "Gmsh.y"
{
;
break;}
case 19:
-#line 225 "Gmsh.y"
+#line 224 "Gmsh.y"
{
;
break;}
case 20:
-#line 229 "Gmsh.y"
+#line 228 "Gmsh.y"
{
;
break;}
case 21:
-#line 235 "Gmsh.y"
+#line 234 "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 241 "Gmsh.y"
+#line 240 "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 248 "Gmsh.y"
+#line 247 "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 254 "Gmsh.y"
+#line 253 "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 258 "Gmsh.y"
+#line 257 "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 262 "Gmsh.y"
+#line 261 "Gmsh.y"
{
/* La je dois voir la norme ! Face_Bound : trou externe a la surface ! */
Msg(PARSER_INFO,"Found a Face Bound");
@@ -3153,208 +3108,208 @@ case 26:
;
break;}
case 27:
-#line 269 "Gmsh.y"
+#line 268 "Gmsh.y"
{
Add_Oriented_Edge((int)yyvsp[-14].d,yyvsp[-10].c,(int)yyvsp[-4].d,yyvsp[-2].i);
;
break;}
case 28:
-#line 273 "Gmsh.y"
+#line 272 "Gmsh.y"
{
Add_Edge_Loop((int)yyvsp[-8].d,yyvsp[-4].c,yyvsp[-2].l);
;
break;}
case 29:
-#line 278 "Gmsh.y"
+#line 277 "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 282 "Gmsh.y"
+#line 281 "Gmsh.y"
{
Add_Vertex_Point((int)yyvsp[-8].d,yyvsp[-4].c,(int)yyvsp[-2].d);
;
break;}
case 31:
-#line 286 "Gmsh.y"
+#line 285 "Gmsh.y"
{
;
break;}
case 32:
-#line 290 "Gmsh.y"
+#line 289 "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 294 "Gmsh.y"
+#line 293 "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 298 "Gmsh.y"
+#line 297 "Gmsh.y"
{
Add_Plane((int)yyvsp[-8].d,yyvsp[-4].c,(int)yyvsp[-2].d);
;
break;}
case 35:
-#line 302 "Gmsh.y"
+#line 301 "Gmsh.y"
{
Add_Line ((int)yyvsp[-10].d, yyvsp[-6].c , (int) yyvsp[-4].d, (int)yyvsp[-2].d);
;
break;}
case 36:
-#line 306 "Gmsh.y"
+#line 305 "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 312 "Gmsh.y"
+#line 311 "Gmsh.y"
{
;
break;}
case 38:
-#line 315 "Gmsh.y"
+#line 314 "Gmsh.y"
{
;
break;}
case 39:
-#line 318 "Gmsh.y"
+#line 317 "Gmsh.y"
{
Add_Cylinder ((int)yyvsp[-10].d, yyvsp[-6].c , (int)yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 40:
-#line 322 "Gmsh.y"
+#line 321 "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 326 "Gmsh.y"
+#line 325 "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 330 "Gmsh.y"
+#line 329 "Gmsh.y"
{
Add_Circle((int) yyvsp[-10].d, yyvsp[-6].c, (int) yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 43:
-#line 334 "Gmsh.y"
+#line 333 "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 339 "Gmsh.y"
+#line 338 "Gmsh.y"
{
;
break;}
case 45:
-#line 342 "Gmsh.y"
+#line 341 "Gmsh.y"
{
;
break;}
case 46:
-#line 346 "Gmsh.y"
+#line 345 "Gmsh.y"
{
;
break;}
case 47:
-#line 349 "Gmsh.y"
+#line 348 "Gmsh.y"
{
;
break;}
case 48:
-#line 353 "Gmsh.y"
+#line 352 "Gmsh.y"
{
;
break;}
case 49:
-#line 356 "Gmsh.y"
+#line 355 "Gmsh.y"
{
;
break;}
case 50:
-#line 359 "Gmsh.y"
+#line 358 "Gmsh.y"
{
;
break;}
case 51:
-#line 369 "Gmsh.y"
+#line 368 "Gmsh.y"
{
;
break;}
case 52:
-#line 372 "Gmsh.y"
+#line 371 "Gmsh.y"
{
Msg(PARSER_INFO,"Gmsh File Format Read");
;
break;}
case 53:
-#line 378 "Gmsh.y"
+#line 377 "Gmsh.y"
{ return 1; ;
break;}
case 54:
-#line 379 "Gmsh.y"
+#line 378 "Gmsh.y"
{ return 1; ;
break;}
case 55:
-#line 380 "Gmsh.y"
+#line 379 "Gmsh.y"
{ return 1; ;
break;}
case 56:
-#line 381 "Gmsh.y"
+#line 380 "Gmsh.y"
{ return 1; ;
break;}
case 57:
-#line 382 "Gmsh.y"
+#line 381 "Gmsh.y"
{ return 1; ;
break;}
case 58:
-#line 383 "Gmsh.y"
+#line 382 "Gmsh.y"
{ return 1; ;
break;}
case 59:
-#line 384 "Gmsh.y"
+#line 383 "Gmsh.y"
{ return 1; ;
break;}
case 60:
-#line 385 "Gmsh.y"
+#line 384 "Gmsh.y"
{ return 1; ;
break;}
case 61:
-#line 386 "Gmsh.y"
+#line 385 "Gmsh.y"
{ return 1; ;
break;}
case 62:
-#line 387 "Gmsh.y"
+#line 386 "Gmsh.y"
{ return 1; ;
break;}
case 63:
-#line 388 "Gmsh.y"
+#line 387 "Gmsh.y"
{ return 1; ;
break;}
case 64:
-#line 389 "Gmsh.y"
+#line 388 "Gmsh.y"
{ return 1; ;
break;}
case 65:
-#line 394 "Gmsh.y"
+#line 393 "Gmsh.y"
{
fprintf(stderr, yyvsp[-2].c);
fprintf(stderr, "\n");
;
break;}
case 66:
-#line 399 "Gmsh.y"
+#line 398 "Gmsh.y"
{
for(i = 0 ; i<List_Nbr(ListOfDouble_L) ; i++){
if(!i){
@@ -3379,96 +3334,96 @@ case 66:
;
break;}
case 67:
-#line 429 "Gmsh.y"
+#line 428 "Gmsh.y"
{
EndView(1, Force_ViewNumber,yyname,yyvsp[-4].c,0.,0.,0.);
;
break;}
case 68:
-#line 433 "Gmsh.y"
+#line 432 "Gmsh.y"
{
EndView(1, Force_ViewNumber,yyname,yyvsp[-6].c,yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2]);
;
break;}
case 69:
-#line 440 "Gmsh.y"
+#line 439 "Gmsh.y"
{
BeginView(1);
;
break;}
case 82:
-#line 459 "Gmsh.y"
+#line 458 "Gmsh.y"
{ List_Add(ActualView->SP, &yyvsp[0].d) ; ;
break;}
case 83:
-#line 461 "Gmsh.y"
+#line 460 "Gmsh.y"
{ List_Add(ActualView->SP, &yyvsp[0].d) ; ;
break;}
case 84:
-#line 466 "Gmsh.y"
+#line 465 "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 85:
-#line 471 "Gmsh.y"
+#line 470 "Gmsh.y"
{
ActualView->NbSP++ ;
;
break;}
case 86:
-#line 478 "Gmsh.y"
+#line 477 "Gmsh.y"
{ List_Add(ActualView->VP, &yyvsp[0].d) ; ;
break;}
case 87:
-#line 480 "Gmsh.y"
+#line 479 "Gmsh.y"
{ List_Add(ActualView->VP, &yyvsp[0].d) ; ;
break;}
case 88:
-#line 485 "Gmsh.y"
+#line 484 "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 89:
-#line 490 "Gmsh.y"
+#line 489 "Gmsh.y"
{
ActualView->NbVP++ ;
;
break;}
case 90:
-#line 497 "Gmsh.y"
+#line 496 "Gmsh.y"
{ List_Add(ActualView->TP, &yyvsp[0].d) ; ;
break;}
case 91:
-#line 499 "Gmsh.y"
+#line 498 "Gmsh.y"
{ List_Add(ActualView->TP, &yyvsp[0].d) ; ;
break;}
case 92:
-#line 504 "Gmsh.y"
+#line 503 "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 93:
-#line 509 "Gmsh.y"
+#line 508 "Gmsh.y"
{
ActualView->NbTP++ ;
;
break;}
case 94:
-#line 516 "Gmsh.y"
+#line 515 "Gmsh.y"
{ List_Add(ActualView->SL, &yyvsp[0].d) ; ;
break;}
case 95:
-#line 518 "Gmsh.y"
+#line 517 "Gmsh.y"
{ List_Add(ActualView->SL, &yyvsp[0].d) ; ;
break;}
case 96:
-#line 524 "Gmsh.y"
+#line 523 "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);
@@ -3476,21 +3431,21 @@ case 96:
;
break;}
case 97:
-#line 530 "Gmsh.y"
+#line 529 "Gmsh.y"
{
ActualView->NbSL++ ;
;
break;}
case 98:
-#line 537 "Gmsh.y"
+#line 536 "Gmsh.y"
{ List_Add(ActualView->VL, &yyvsp[0].d) ; ;
break;}
case 99:
-#line 539 "Gmsh.y"
+#line 538 "Gmsh.y"
{ List_Add(ActualView->VL, &yyvsp[0].d) ; ;
break;}
case 100:
-#line 545 "Gmsh.y"
+#line 544 "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);
@@ -3498,21 +3453,21 @@ case 100:
;
break;}
case 101:
-#line 551 "Gmsh.y"
+#line 550 "Gmsh.y"
{
ActualView->NbVL++ ;
;
break;}
case 102:
-#line 558 "Gmsh.y"
+#line 557 "Gmsh.y"
{ List_Add(ActualView->TL, &yyvsp[0].d) ; ;
break;}
case 103:
-#line 560 "Gmsh.y"
+#line 559 "Gmsh.y"
{ List_Add(ActualView->TL, &yyvsp[0].d) ; ;
break;}
case 104:
-#line 566 "Gmsh.y"
+#line 565 "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);
@@ -3520,21 +3475,21 @@ case 104:
;
break;}
case 105:
-#line 572 "Gmsh.y"
+#line 571 "Gmsh.y"
{
ActualView->NbTL++ ;
;
break;}
case 106:
-#line 579 "Gmsh.y"
+#line 578 "Gmsh.y"
{ List_Add(ActualView->ST, &yyvsp[0].d) ; ;
break;}
case 107:
-#line 581 "Gmsh.y"
+#line 580 "Gmsh.y"
{ List_Add(ActualView->ST, &yyvsp[0].d) ; ;
break;}
case 108:
-#line 588 "Gmsh.y"
+#line 587 "Gmsh.y"
{
List_Add(ActualView->ST, &yyvsp[-17].d); List_Add(ActualView->ST, &yyvsp[-11].d);
List_Add(ActualView->ST, &yyvsp[-5].d);
@@ -3545,21 +3500,21 @@ case 108:
;
break;}
case 109:
-#line 597 "Gmsh.y"
+#line 596 "Gmsh.y"
{
ActualView->NbST++ ;
;
break;}
case 110:
-#line 604 "Gmsh.y"
+#line 603 "Gmsh.y"
{ List_Add(ActualView->VT, &yyvsp[0].d) ; ;
break;}
case 111:
-#line 606 "Gmsh.y"
+#line 605 "Gmsh.y"
{ List_Add(ActualView->VT, &yyvsp[0].d) ; ;
break;}
case 112:
-#line 613 "Gmsh.y"
+#line 612 "Gmsh.y"
{
List_Add(ActualView->VT, &yyvsp[-17].d); List_Add(ActualView->VT, &yyvsp[-11].d);
List_Add(ActualView->VT, &yyvsp[-5].d);
@@ -3570,21 +3525,21 @@ case 112:
;
break;}
case 113:
-#line 622 "Gmsh.y"
+#line 621 "Gmsh.y"
{
ActualView->NbVT++ ;
;
break;}
case 114:
-#line 629 "Gmsh.y"
+#line 628 "Gmsh.y"
{ List_Add(ActualView->TT, &yyvsp[0].d) ; ;
break;}
case 115:
-#line 631 "Gmsh.y"
+#line 630 "Gmsh.y"
{ List_Add(ActualView->TT, &yyvsp[0].d) ; ;
break;}
case 116:
-#line 638 "Gmsh.y"
+#line 637 "Gmsh.y"
{
List_Add(ActualView->TT, &yyvsp[-17].d); List_Add(ActualView->TT, &yyvsp[-11].d);
List_Add(ActualView->TT, &yyvsp[-5].d);
@@ -3595,21 +3550,21 @@ case 116:
;
break;}
case 117:
-#line 647 "Gmsh.y"
+#line 646 "Gmsh.y"
{
ActualView->NbTT++ ;
;
break;}
case 118:
-#line 654 "Gmsh.y"
+#line 653 "Gmsh.y"
{ List_Add(ActualView->SS, &yyvsp[0].d) ; ;
break;}
case 119:
-#line 656 "Gmsh.y"
+#line 655 "Gmsh.y"
{ List_Add(ActualView->SS, &yyvsp[0].d) ; ;
break;}
case 120:
-#line 664 "Gmsh.y"
+#line 663 "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);
@@ -3620,21 +3575,21 @@ case 120:
;
break;}
case 121:
-#line 673 "Gmsh.y"
+#line 672 "Gmsh.y"
{
ActualView->NbSS++ ;
;
break;}
case 122:
-#line 680 "Gmsh.y"
+#line 679 "Gmsh.y"
{ List_Add(ActualView->VS, &yyvsp[0].d) ; ;
break;}
case 123:
-#line 682 "Gmsh.y"
+#line 681 "Gmsh.y"
{ List_Add(ActualView->VS, &yyvsp[0].d) ; ;
break;}
case 124:
-#line 690 "Gmsh.y"
+#line 689 "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);
@@ -3645,21 +3600,21 @@ case 124:
;
break;}
case 125:
-#line 699 "Gmsh.y"
+#line 698 "Gmsh.y"
{
ActualView->NbVS++ ;
;
break;}
case 126:
-#line 706 "Gmsh.y"
+#line 705 "Gmsh.y"
{ List_Add(ActualView->TS, &yyvsp[0].d) ; ;
break;}
case 127:
-#line 708 "Gmsh.y"
+#line 707 "Gmsh.y"
{ List_Add(ActualView->TS, &yyvsp[0].d) ; ;
break;}
case 128:
-#line 716 "Gmsh.y"
+#line 715 "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);
@@ -3670,13 +3625,13 @@ case 128:
;
break;}
case 129:
-#line 725 "Gmsh.y"
+#line 724 "Gmsh.y"
{
ActualView->NbTS++ ;
;
break;}
case 130:
-#line 741 "Gmsh.y"
+#line 740 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))){
@@ -3690,7 +3645,7 @@ case 130:
;
break;}
case 131:
-#line 753 "Gmsh.y"
+#line 752 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))){
@@ -3704,7 +3659,7 @@ case 131:
;
break;}
case 132:
-#line 765 "Gmsh.y"
+#line 764 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3715,7 +3670,7 @@ case 132:
;
break;}
case 133:
-#line 774 "Gmsh.y"
+#line 773 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-5].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3729,7 +3684,7 @@ case 133:
;
break;}
case 134:
-#line 786 "Gmsh.y"
+#line 785 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3739,7 +3694,7 @@ case 134:
;
break;}
case 135:
-#line 794 "Gmsh.y"
+#line 793 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-5].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3753,7 +3708,7 @@ case 135:
;
break;}
case 136:
-#line 806 "Gmsh.y"
+#line 805 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3763,7 +3718,7 @@ case 136:
;
break;}
case 137:
-#line 814 "Gmsh.y"
+#line 813 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3777,7 +3732,7 @@ case 137:
;
break;}
case 138:
-#line 826 "Gmsh.y"
+#line 825 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3787,7 +3742,7 @@ case 138:
;
break;}
case 139:
-#line 834 "Gmsh.y"
+#line 833 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3801,7 +3756,7 @@ case 139:
;
break;}
case 140:
-#line 846 "Gmsh.y"
+#line 845 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3811,7 +3766,7 @@ case 140:
;
break;}
case 141:
-#line 854 "Gmsh.y"
+#line 853 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3825,7 +3780,7 @@ case 141:
;
break;}
case 142:
-#line 866 "Gmsh.y"
+#line 865 "Gmsh.y"
{
if(!yyvsp[-1].d)
vyyerror("Division by Zero in '%s /= %g'", yyvsp[-3].c, yyvsp[-1].d);
@@ -3839,7 +3794,7 @@ case 142:
;
break;}
case 143:
-#line 878 "Gmsh.y"
+#line 877 "Gmsh.y"
{
if(!yyvsp[-1].d)
vyyerror("Division by Zero in '%s[%d] /= %g'", yyvsp[-6].c, (int)yyvsp[-4].d, yyvsp[-1].d);
@@ -3857,7 +3812,7 @@ case 143:
;
break;}
case 144:
-#line 897 "Gmsh.y"
+#line 896 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown String Option Class '%s'", yyvsp[-5].c);
@@ -3871,7 +3826,7 @@ case 144:
;
break;}
case 145:
-#line 910 "Gmsh.y"
+#line 909 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -3888,7 +3843,7 @@ case 145:
;
break;}
case 146:
-#line 928 "Gmsh.y"
+#line 927 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3907,7 +3862,7 @@ case 146:
;
break;}
case 147:
-#line 945 "Gmsh.y"
+#line 944 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -3929,7 +3884,7 @@ case 147:
;
break;}
case 148:
-#line 966 "Gmsh.y"
+#line 965 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3948,7 +3903,7 @@ case 148:
;
break;}
case 149:
-#line 983 "Gmsh.y"
+#line 982 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -3970,7 +3925,7 @@ case 149:
;
break;}
case 150:
-#line 1004 "Gmsh.y"
+#line 1003 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3989,7 +3944,7 @@ case 150:
;
break;}
case 151:
-#line 1021 "Gmsh.y"
+#line 1020 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4011,7 +3966,7 @@ case 151:
;
break;}
case 152:
-#line 1042 "Gmsh.y"
+#line 1041 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -4030,7 +3985,7 @@ case 152:
;
break;}
case 153:
-#line 1059 "Gmsh.y"
+#line 1058 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4052,7 +4007,7 @@ case 153:
;
break;}
case 154:
-#line 1080 "Gmsh.y"
+#line 1079 "Gmsh.y"
{
if(!yyvsp[-1].d)
vyyerror("Division by Zero in '%s.%s /= %g'", yyvsp[-5].c, yyvsp[-3].c, yyvsp[-1].d);
@@ -4075,7 +4030,7 @@ case 154:
;
break;}
case 155:
-#line 1101 "Gmsh.y"
+#line 1100 "Gmsh.y"
{
if(!yyvsp[-1].d)
vyyerror("Division by Zero in '%s.View[%d].%s /= %g'",
@@ -4102,7 +4057,7 @@ case 155:
;
break;}
case 156:
-#line 1127 "Gmsh.y"
+#line 1126 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-4].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-4].c);
@@ -4121,7 +4076,7 @@ case 156:
;
break;}
case 157:
-#line 1144 "Gmsh.y"
+#line 1143 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4143,7 +4098,7 @@ case 157:
;
break;}
case 158:
-#line 1165 "Gmsh.y"
+#line 1164 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-4].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-4].c);
@@ -4162,7 +4117,7 @@ case 158:
;
break;}
case 159:
-#line 1182 "Gmsh.y"
+#line 1181 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4184,7 +4139,7 @@ case 159:
;
break;}
case 160:
-#line 1205 "Gmsh.y"
+#line 1204 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-7].c)))
vyyerror("Unknown Color Option Class '%s'", yyvsp[-7].c);
@@ -4198,7 +4153,7 @@ case 160:
;
break;}
case 161:
-#line 1218 "Gmsh.y"
+#line 1217 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4218,7 +4173,7 @@ case 161:
;
break;}
case 162:
-#line 1247 "Gmsh.y"
+#line 1246 "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;
@@ -4226,7 +4181,7 @@ case 162:
;
break;}
case 163:
-#line 1254 "Gmsh.y"
+#line 1253 "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;
@@ -4234,7 +4189,7 @@ case 163:
;
break;}
case 164:
-#line 1260 "Gmsh.y"
+#line 1259 "Gmsh.y"
{
Vertex *v;
Attractor *a;
@@ -4255,7 +4210,7 @@ case 164:
;
break;}
case 165:
-#line 1279 "Gmsh.y"
+#line 1278 "Gmsh.y"
{
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
List_Read(yyvsp[-3].l,i,&d);
@@ -4268,14 +4223,14 @@ case 165:
;
break;}
case 166:
-#line 1290 "Gmsh.y"
+#line 1289 "Gmsh.y"
{
yyval.s.Type = MSH_POINT;
yyval.s.Num = (int)yyvsp[-2].d;
;
break;}
case 167:
-#line 1298 "Gmsh.y"
+#line 1297 "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;
@@ -4283,7 +4238,7 @@ case 167:
;
break;}
case 168:
-#line 1304 "Gmsh.y"
+#line 1303 "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;
@@ -4291,7 +4246,7 @@ case 168:
;
break;}
case 169:
-#line 1310 "Gmsh.y"
+#line 1309 "Gmsh.y"
{
Curve *c;
Attractor *a;
@@ -4312,7 +4267,7 @@ case 169:
;
break;}
case 170:
-#line 1329 "Gmsh.y"
+#line 1328 "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 ;
@@ -4320,7 +4275,7 @@ case 170:
;
break;}
case 171:
-#line 1335 "Gmsh.y"
+#line 1334 "Gmsh.y"
{
List_T *temp;
int i,j;
@@ -4338,7 +4293,7 @@ case 171:
;
break;}
case 172:
-#line 1352 "Gmsh.y"
+#line 1351 "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 ;
@@ -4346,7 +4301,7 @@ case 172:
;
break;}
case 173:
-#line 1358 "Gmsh.y"
+#line 1357 "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 ;
@@ -4354,7 +4309,7 @@ case 173:
;
break;}
case 174:
-#line 1364 "Gmsh.y"
+#line 1363 "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;
@@ -4362,7 +4317,7 @@ case 174:
;
break;}
case 175:
-#line 1370 "Gmsh.y"
+#line 1369 "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);
@@ -4370,7 +4325,7 @@ case 175:
;
break;}
case 176:
-#line 1376 "Gmsh.y"
+#line 1375 "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;
@@ -4378,7 +4333,7 @@ case 176:
;
break;}
case 177:
-#line 1382 "Gmsh.y"
+#line 1381 "Gmsh.y"
{
List_T *Temp;
int i;
@@ -4399,7 +4354,7 @@ case 177:
;
break;}
case 178:
-#line 1401 "Gmsh.y"
+#line 1400 "Gmsh.y"
{
yyval.s.Num = (int)yyvsp[-2].d;
Curve *c = FindCurve(yyval.s.Num,THEM);
@@ -4410,7 +4365,7 @@ case 178:
;
break;}
case 179:
-#line 1413 "Gmsh.y"
+#line 1412 "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;
@@ -4418,7 +4373,7 @@ case 179:
;
break;}
case 180:
-#line 1419 "Gmsh.y"
+#line 1418 "Gmsh.y"
{
Surface *s,*support;
support = FindSurface((int)yyvsp[-4].d,THEM);
@@ -4439,7 +4394,7 @@ case 180:
;
break;}
case 181:
-#line 1438 "Gmsh.y"
+#line 1437 "Gmsh.y"
{
List_Read(yyvsp[-1].l,0,&d);
i = (int)d;
@@ -4462,7 +4417,7 @@ case 181:
;
break;}
case 182:
-#line 1461 "Gmsh.y"
+#line 1460 "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;
@@ -4470,13 +4425,13 @@ case 182:
;
break;}
case 183:
-#line 1469 "Gmsh.y"
+#line 1468 "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 184:
-#line 1473 "Gmsh.y"
+#line 1472 "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;
@@ -4484,7 +4439,7 @@ case 184:
;
break;}
case 185:
-#line 1479 "Gmsh.y"
+#line 1478 "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;
@@ -4492,7 +4447,7 @@ case 185:
;
break;}
case 186:
-#line 1485 "Gmsh.y"
+#line 1484 "Gmsh.y"
{
yyval.s.Num = (int)yyvsp[-2].d;
Surface *s = FindSurface(yyval.s.Num,THEM);
@@ -4503,7 +4458,7 @@ case 186:
;
break;}
case 187:
-#line 1497 "Gmsh.y"
+#line 1496 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_VOLUME;
@@ -4511,7 +4466,7 @@ case 187:
;
break;}
case 188:
-#line 1503 "Gmsh.y"
+#line 1502 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_VOLUME;
@@ -4519,7 +4474,7 @@ case 188:
;
break;}
case 189:
-#line 1509 "Gmsh.y"
+#line 1508 "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;
@@ -4527,60 +4482,60 @@ case 189:
;
break;}
case 190:
-#line 1522 "Gmsh.y"
+#line 1521 "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 191:
-#line 1527 "Gmsh.y"
+#line 1526 "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 192:
-#line 1532 "Gmsh.y"
+#line 1531 "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 193:
-#line 1537 "Gmsh.y"
+#line 1536 "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 194:
-#line 1544 "Gmsh.y"
+#line 1543 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 195:
-#line 1545 "Gmsh.y"
+#line 1544 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 196:
-#line 1546 "Gmsh.y"
+#line 1545 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 197:
-#line 1551 "Gmsh.y"
+#line 1550 "Gmsh.y"
{
yyval.l = List_Create(3,3,sizeof(Shape));
;
break;}
case 198:
-#line 1555 "Gmsh.y"
+#line 1554 "Gmsh.y"
{
List_Add(yyval.l,&yyvsp[0].s);
yyval.l = yyvsp[-1].l;
;
break;}
case 199:
-#line 1567 "Gmsh.y"
+#line 1566 "Gmsh.y"
{
yyval.l = List_Create(3,3,sizeof(Shape));
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
@@ -4592,7 +4547,7 @@ case 199:
;
break;}
case 200:
-#line 1585 "Gmsh.y"
+#line 1584 "Gmsh.y"
{
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
List_Read (yyvsp[-1].l,i,&TheShape);
@@ -4601,19 +4556,19 @@ case 200:
;
break;}
case 201:
-#line 1592 "Gmsh.y"
+#line 1591 "Gmsh.y"
{
FreeView((int)yyvsp[-2].d);
;
break;}
case 202:
-#line 1596 "Gmsh.y"
+#line 1595 "Gmsh.y"
{
Init_Mesh(THEM, 1);
;
break;}
case 203:
-#line 1608 "Gmsh.y"
+#line 1607 "Gmsh.y"
{
if(!strcmp(yyvsp[-2].c, "Include")){
@@ -4666,7 +4621,7 @@ case 203:
;
break;}
case 204:
-#line 1659 "Gmsh.y"
+#line 1658 "Gmsh.y"
{
if(!strcmp(yyvsp[-2].c, "Sleep")){
@@ -4687,13 +4642,13 @@ case 204:
;
break;}
case 205:
-#line 1678 "Gmsh.y"
+#line 1677 "Gmsh.y"
{
exit(0);
;
break;}
case 206:
-#line 1682 "Gmsh.y"
+#line 1681 "Gmsh.y"
{
if(!CTX.interactive){ // we're in interactive mode
if(Tree_Nbr(THEM->Points) != Last_NumberOfPoints){
@@ -4710,7 +4665,7 @@ case 206:
;
break;}
case 207:
-#line 1705 "Gmsh.y"
+#line 1704 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4726,7 +4681,7 @@ case 207:
;
break;}
case 208:
-#line 1719 "Gmsh.y"
+#line 1718 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4742,7 +4697,7 @@ case 208:
;
break;}
case 209:
-#line 1733 "Gmsh.y"
+#line 1732 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4769,7 +4724,7 @@ case 209:
;
break;}
case 210:
-#line 1758 "Gmsh.y"
+#line 1757 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4796,7 +4751,7 @@ case 210:
;
break;}
case 211:
-#line 1783 "Gmsh.y"
+#line 1782 "Gmsh.y"
{
if(LoopControlVariablesTab[ImbricatedLoop-1][1] >
LoopControlVariablesTab[ImbricatedLoop-1][0]){
@@ -4824,7 +4779,7 @@ case 211:
;
break;}
case 212:
-#line 1809 "Gmsh.y"
+#line 1808 "Gmsh.y"
{
if(!FunctionManager::Instance()->createFunction(yyvsp[0].c,yyin,yylineno))
vyyerror("Redefinition of function %s",yyvsp[0].c);
@@ -4832,39 +4787,39 @@ case 212:
;
break;}
case 213:
-#line 1815 "Gmsh.y"
+#line 1814 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction(&yyin,yylineno))
vyyerror("Error while exiting function");
;
break;}
case 214:
-#line 1820 "Gmsh.y"
+#line 1819 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction(yyvsp[-1].c,&yyin,yylineno))
vyyerror("Unknown Function %s",yyvsp[-1].c);
;
break;}
case 215:
-#line 1825 "Gmsh.y"
+#line 1824 "Gmsh.y"
{
if(!yyvsp[-1].d) skip_until("If", "EndIf");
;
break;}
case 216:
-#line 1829 "Gmsh.y"
+#line 1828 "Gmsh.y"
{
;
break;}
case 217:
-#line 1840 "Gmsh.y"
+#line 1839 "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 218:
-#line 1845 "Gmsh.y"
+#line 1844 "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,
@@ -4872,55 +4827,55 @@ case 218:
;
break;}
case 219:
-#line 1851 "Gmsh.y"
+#line 1850 "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 220:
-#line 1855 "Gmsh.y"
+#line 1854 "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 221:
-#line 1859 "Gmsh.y"
+#line 1858 "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 222:
-#line 1863 "Gmsh.y"
+#line 1862 "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 223:
-#line 1867 "Gmsh.y"
+#line 1866 "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 224:
-#line 1872 "Gmsh.y"
+#line 1871 "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 225:
-#line 1880 "Gmsh.y"
+#line 1879 "Gmsh.y"
{
;
break;}
case 226:
-#line 1883 "Gmsh.y"
+#line 1882 "Gmsh.y"
{
;
break;}
case 227:
-#line 1889 "Gmsh.y"
+#line 1888 "Gmsh.y"
{
double d;
int j;
@@ -4939,13 +4894,13 @@ case 227:
;
break;}
case 228:
-#line 1906 "Gmsh.y"
+#line 1905 "Gmsh.y"
{
extr.mesh.Recombine = true;
;
break;}
case 229:
-#line 1917 "Gmsh.y"
+#line 1916 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -4964,7 +4919,7 @@ case 229:
;
break;}
case 230:
-#line 1934 "Gmsh.y"
+#line 1933 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -4983,7 +4938,7 @@ case 230:
;
break;}
case 231:
-#line 1951 "Gmsh.y"
+#line 1950 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -5002,7 +4957,7 @@ case 231:
;
break;}
case 232:
-#line 1968 "Gmsh.y"
+#line 1967 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5025,7 +4980,7 @@ case 232:
;
break;}
case 233:
-#line 1989 "Gmsh.y"
+#line 1988 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5047,7 +5002,7 @@ case 233:
;
break;}
case 234:
-#line 2009 "Gmsh.y"
+#line 2008 "Gmsh.y"
{
Volume *v = FindVolume((int)yyvsp[-4].d,THEM);
if(!v)
@@ -5069,7 +5024,7 @@ case 234:
;
break;}
case 235:
-#line 2029 "Gmsh.y"
+#line 2028 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -5088,7 +5043,7 @@ case 235:
;
break;}
case 236:
-#line 2046 "Gmsh.y"
+#line 2045 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
@@ -5107,79 +5062,79 @@ case 236:
;
break;}
case 237:
-#line 2071 "Gmsh.y"
+#line 2070 "Gmsh.y"
{
Coherence_PS();
;
break;}
case 238:
-#line 2075 "Gmsh.y"
+#line 2074 "Gmsh.y"
{
IntersectAllSegmentsTogether();
;
break;}
case 239:
-#line 2086 "Gmsh.y"
+#line 2085 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 240:
-#line 2087 "Gmsh.y"
+#line 2086 "Gmsh.y"
{ yyval.d = -yyvsp[0].d; ;
break;}
case 241:
-#line 2091 "Gmsh.y"
+#line 2090 "Gmsh.y"
{yyval.i = 1;;
break;}
case 242:
-#line 2092 "Gmsh.y"
+#line 2091 "Gmsh.y"
{yyval.i = 0;;
break;}
case 243:
-#line 2093 "Gmsh.y"
+#line 2092 "Gmsh.y"
{yyval.i = -1;;
break;}
case 244:
-#line 2094 "Gmsh.y"
+#line 2093 "Gmsh.y"
{yyval.i = -1;;
break;}
case 245:
-#line 2095 "Gmsh.y"
+#line 2094 "Gmsh.y"
{yyval.i = -1;;
break;}
case 246:
-#line 2099 "Gmsh.y"
+#line 2098 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 247:
-#line 2100 "Gmsh.y"
+#line 2099 "Gmsh.y"
{ yyval.d = yyvsp[-1].d ; ;
break;}
case 248:
-#line 2101 "Gmsh.y"
+#line 2100 "Gmsh.y"
{ yyval.d = -yyvsp[0].d ; ;
break;}
case 249:
-#line 2102 "Gmsh.y"
+#line 2101 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 250:
-#line 2103 "Gmsh.y"
+#line 2102 "Gmsh.y"
{ yyval.d = !yyvsp[0].d ; ;
break;}
case 251:
-#line 2104 "Gmsh.y"
+#line 2103 "Gmsh.y"
{ yyval.d = yyvsp[-2].d - yyvsp[0].d ; ;
break;}
case 252:
-#line 2105 "Gmsh.y"
+#line 2104 "Gmsh.y"
{ yyval.d = yyvsp[-2].d + yyvsp[0].d ; ;
break;}
case 253:
-#line 2106 "Gmsh.y"
+#line 2105 "Gmsh.y"
{ yyval.d = yyvsp[-2].d * yyvsp[0].d ; ;
break;}
case 254:
-#line 2108 "Gmsh.y"
+#line 2107 "Gmsh.y"
{
if(!yyvsp[0].d)
vyyerror("Division by Zero in '%g / %g'", yyvsp[-2].d, yyvsp[0].d);
@@ -5188,143 +5143,143 @@ case 254:
;
break;}
case 255:
-#line 2114 "Gmsh.y"
+#line 2113 "Gmsh.y"
{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d ; ;
break;}
case 256:
-#line 2115 "Gmsh.y"
+#line 2114 "Gmsh.y"
{ yyval.d = pow(yyvsp[-2].d,yyvsp[0].d) ; ;
break;}
case 257:
-#line 2116 "Gmsh.y"
+#line 2115 "Gmsh.y"
{ yyval.d = yyvsp[-2].d < yyvsp[0].d ; ;
break;}
case 258:
-#line 2117 "Gmsh.y"
+#line 2116 "Gmsh.y"
{ yyval.d = yyvsp[-2].d > yyvsp[0].d ; ;
break;}
case 259:
-#line 2118 "Gmsh.y"
+#line 2117 "Gmsh.y"
{ yyval.d = yyvsp[-2].d <= yyvsp[0].d ; ;
break;}
case 260:
-#line 2119 "Gmsh.y"
+#line 2118 "Gmsh.y"
{ yyval.d = yyvsp[-2].d >= yyvsp[0].d ; ;
break;}
case 261:
-#line 2120 "Gmsh.y"
+#line 2119 "Gmsh.y"
{ yyval.d = yyvsp[-2].d == yyvsp[0].d ; ;
break;}
case 262:
-#line 2121 "Gmsh.y"
+#line 2120 "Gmsh.y"
{ yyval.d = yyvsp[-2].d != yyvsp[0].d ; ;
break;}
case 263:
-#line 2122 "Gmsh.y"
+#line 2121 "Gmsh.y"
{ yyval.d = yyvsp[-2].d && yyvsp[0].d ; ;
break;}
case 264:
-#line 2123 "Gmsh.y"
+#line 2122 "Gmsh.y"
{ yyval.d = yyvsp[-2].d || yyvsp[0].d ; ;
break;}
case 265:
-#line 2124 "Gmsh.y"
+#line 2123 "Gmsh.y"
{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d ; ;
break;}
case 266:
-#line 2125 "Gmsh.y"
+#line 2124 "Gmsh.y"
{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 267:
-#line 2126 "Gmsh.y"
+#line 2125 "Gmsh.y"
{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 268:
-#line 2127 "Gmsh.y"
+#line 2126 "Gmsh.y"
{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 269:
-#line 2128 "Gmsh.y"
+#line 2127 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 270:
-#line 2129 "Gmsh.y"
+#line 2128 "Gmsh.y"
{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 271:
-#line 2130 "Gmsh.y"
+#line 2129 "Gmsh.y"
{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 272:
-#line 2131 "Gmsh.y"
+#line 2130 "Gmsh.y"
{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 273:
-#line 2132 "Gmsh.y"
+#line 2131 "Gmsh.y"
{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 274:
-#line 2133 "Gmsh.y"
+#line 2132 "Gmsh.y"
{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 275:
-#line 2134 "Gmsh.y"
+#line 2133 "Gmsh.y"
{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 276:
-#line 2135 "Gmsh.y"
+#line 2134 "Gmsh.y"
{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 277:
-#line 2136 "Gmsh.y"
+#line 2135 "Gmsh.y"
{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 278:
-#line 2137 "Gmsh.y"
+#line 2136 "Gmsh.y"
{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 279:
-#line 2138 "Gmsh.y"
+#line 2137 "Gmsh.y"
{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 280:
-#line 2139 "Gmsh.y"
+#line 2138 "Gmsh.y"
{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 281:
-#line 2140 "Gmsh.y"
+#line 2139 "Gmsh.y"
{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 282:
-#line 2141 "Gmsh.y"
+#line 2140 "Gmsh.y"
{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 283:
-#line 2142 "Gmsh.y"
+#line 2141 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 284:
-#line 2143 "Gmsh.y"
+#line 2142 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 285:
-#line 2144 "Gmsh.y"
+#line 2143 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 286:
-#line 2145 "Gmsh.y"
+#line 2144 "Gmsh.y"
{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 287:
-#line 2154 "Gmsh.y"
+#line 2153 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 288:
-#line 2155 "Gmsh.y"
+#line 2154 "Gmsh.y"
{ yyval.d = 3.141592653589793; ;
break;}
case 289:
-#line 2160 "Gmsh.y"
+#line 2159 "Gmsh.y"
{
TheSymbol.Name = yyvsp[0].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5338,7 +5293,7 @@ case 289:
;
break;}
case 290:
-#line 2172 "Gmsh.y"
+#line 2171 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5357,7 +5312,7 @@ case 290:
;
break;}
case 291:
-#line 2190 "Gmsh.y"
+#line 2189 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-1].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5371,7 +5326,7 @@ case 291:
;
break;}
case 292:
-#line 2202 "Gmsh.y"
+#line 2201 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-4].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5390,7 +5345,7 @@ case 292:
;
break;}
case 293:
-#line 2220 "Gmsh.y"
+#line 2219 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-1].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5404,7 +5359,7 @@ case 293:
;
break;}
case 294:
-#line 2232 "Gmsh.y"
+#line 2231 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-4].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5423,7 +5378,7 @@ case 294:
;
break;}
case 295:
-#line 2252 "Gmsh.y"
+#line 2251 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-2].c))){
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-2].c);
@@ -5446,7 +5401,7 @@ case 295:
;
break;}
case 296:
-#line 2273 "Gmsh.y"
+#line 2272 "Gmsh.y"
{
if(strcmp(yyvsp[-7].c, "PostProcessing")){
vyyerror("Unknown View Option Class '%s'", yyvsp[-7].c);
@@ -5471,7 +5426,7 @@ case 296:
;
break;}
case 297:
-#line 2297 "Gmsh.y"
+#line 2296 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c))){
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-3].c);
@@ -5494,7 +5449,7 @@ case 297:
;
break;}
case 298:
-#line 2318 "Gmsh.y"
+#line 2317 "Gmsh.y"
{
if(strcmp(yyvsp[-8].c, "PostProcessing")){
vyyerror("Unknown View Option Class '%s'", yyvsp[-8].c);
@@ -5519,7 +5474,7 @@ case 298:
;
break;}
case 299:
-#line 2342 "Gmsh.y"
+#line 2341 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c))){
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-3].c);
@@ -5542,7 +5497,7 @@ case 299:
;
break;}
case 300:
-#line 2363 "Gmsh.y"
+#line 2362 "Gmsh.y"
{
if(strcmp(yyvsp[-8].c, "PostProcessing")){
vyyerror("Unknown View Option Class '%s'", yyvsp[-8].c);
@@ -5567,7 +5522,7 @@ case 300:
;
break;}
case 301:
-#line 2389 "Gmsh.y"
+#line 2388 "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.))
@@ -5575,7 +5530,7 @@ case 301:
;
break;}
case 302:
-#line 2395 "Gmsh.y"
+#line 2394 "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)){
@@ -5588,7 +5543,7 @@ case 302:
;
break;}
case 303:
-#line 2409 "Gmsh.y"
+#line 2408 "Gmsh.y"
{
memcpy(yyval.v, yyvsp[0].v, 5*sizeof(double)) ;
//??? Avec ce qui suit, bison se plante sur DEC
@@ -5596,110 +5551,110 @@ case 303:
;
break;}
case 304:
-#line 2415 "Gmsh.y"
+#line 2414 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = -yyvsp[0].v[i] ;
;
break;}
case 305:
-#line 2419 "Gmsh.y"
+#line 2418 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[0].v[i];
;
break;}
case 306:
-#line 2423 "Gmsh.y"
+#line 2422 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[-2].v[i] - yyvsp[0].v[i] ;
;
break;}
case 307:
-#line 2427 "Gmsh.y"
+#line 2426 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[-2].v[i] + yyvsp[0].v[i] ;
;
break;}
case 308:
-#line 2433 "Gmsh.y"
+#line 2432 "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 309:
-#line 2437 "Gmsh.y"
+#line 2436 "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 310:
-#line 2441 "Gmsh.y"
+#line 2440 "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 311:
-#line 2445 "Gmsh.y"
+#line 2444 "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 312:
-#line 2452 "Gmsh.y"
+#line 2451 "Gmsh.y"
{
;
break;}
case 313:
-#line 2455 "Gmsh.y"
+#line 2454 "Gmsh.y"
{
;
break;}
case 314:
-#line 2461 "Gmsh.y"
+#line 2460 "Gmsh.y"
{
;
break;}
case 315:
-#line 2464 "Gmsh.y"
+#line 2463 "Gmsh.y"
{
;
break;}
case 316:
-#line 2470 "Gmsh.y"
+#line 2469 "Gmsh.y"
{
;
break;}
case 317:
-#line 2473 "Gmsh.y"
+#line 2472 "Gmsh.y"
{
yyval.l=ListOfListOfDouble_L;
;
break;}
case 318:
-#line 2477 "Gmsh.y"
+#line 2476 "Gmsh.y"
{
yyval.l=ListOfListOfDouble_L;
;
break;}
case 319:
-#line 2484 "Gmsh.y"
+#line 2483 "Gmsh.y"
{
ListOfListOfDouble_L = List_Create(2,1,sizeof(List_T*)) ;
List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
;
break;}
case 320:
-#line 2489 "Gmsh.y"
+#line 2488 "Gmsh.y"
{
List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
;
break;}
case 321:
-#line 2496 "Gmsh.y"
+#line 2495 "Gmsh.y"
{
;
break;}
case 322:
-#line 2499 "Gmsh.y"
+#line 2498 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
@@ -5707,7 +5662,7 @@ case 322:
;
break;}
case 323:
-#line 2505 "Gmsh.y"
+#line 2504 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
TheSymbol.Name = yyvsp[-2].c ;
@@ -5724,20 +5679,20 @@ case 323:
;
break;}
case 324:
-#line 2520 "Gmsh.y"
+#line 2519 "Gmsh.y"
{
yyval.l=ListOfDouble_L;
;
break;}
case 325:
-#line 2528 "Gmsh.y"
+#line 2527 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
;
break;}
case 326:
-#line 2533 "Gmsh.y"
+#line 2532 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){
@@ -5748,7 +5703,7 @@ case 326:
;
break;}
case 327:
-#line 2542 "Gmsh.y"
+#line 2541 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
TheSymbol.Name = yyvsp[-2].c ;
@@ -5762,13 +5717,13 @@ case 327:
;
break;}
case 328:
-#line 2554 "Gmsh.y"
+#line 2553 "Gmsh.y"
{
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
;
break;}
case 329:
-#line 2558 "Gmsh.y"
+#line 2557 "Gmsh.y"
{
for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){
List_Read(ListOfDouble2_L, i, &d) ;
@@ -5778,7 +5733,7 @@ case 329:
;
break;}
case 330:
-#line 2566 "Gmsh.y"
+#line 2565 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5791,33 +5746,33 @@ case 330:
;
break;}
case 331:
-#line 2580 "Gmsh.y"
+#line 2579 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-7].d, (int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d);
;
break;}
case 332:
-#line 2584 "Gmsh.y"
+#line 2583 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d, 255);
;
break;}
case 333:
-#line 2588 "Gmsh.y"
+#line 2587 "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 334:
-#line 2593 "Gmsh.y"
+#line 2592 "Gmsh.y"
{
yyval.u = Get_ColorForString(ColorString, -1, yyvsp[0].c, &flag);
if(flag) vyyerror("Unknown Color '%s'", yyvsp[0].c);
;
break;}
case 335:
-#line 2598 "Gmsh.y"
+#line 2597 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-4].c))){
vyyerror("Unknown Color Option Class '%s'", yyvsp[-4].c);
@@ -5835,13 +5790,13 @@ case 335:
;
break;}
case 336:
-#line 2617 "Gmsh.y"
+#line 2616 "Gmsh.y"
{
yyval.l = ListOfColor_L;
;
break;}
case 337:
-#line 2621 "Gmsh.y"
+#line 2620 "Gmsh.y"
{
if(!ListOfColor_L)
ListOfColor_L = List_Create(256,10,sizeof(unsigned int)) ;
@@ -5862,7 +5817,7 @@ case 337:
;
break;}
case 338:
-#line 2643 "Gmsh.y"
+#line 2642 "Gmsh.y"
{
if(!ListOfColor_L)
ListOfColor_L = List_Create(256,10,sizeof(unsigned int)) ;
@@ -5872,25 +5827,25 @@ case 338:
;
break;}
case 339:
-#line 2651 "Gmsh.y"
+#line 2650 "Gmsh.y"
{
List_Add(ListOfColor_L, &(yyvsp[0].u)) ;
;
break;}
case 340:
-#line 2658 "Gmsh.y"
+#line 2657 "Gmsh.y"
{
yyval.c = yyvsp[0].c;
;
break;}
case 341:
-#line 2662 "Gmsh.y"
+#line 2661 "Gmsh.y"
{
yyval.c = yyvsp[-1].c;
;
break;}
case 342:
-#line 2666 "Gmsh.y"
+#line 2665 "Gmsh.y"
{
for(i = 0 ; i<List_Nbr(ListOfDouble_L) ; i++){
if(!i){
@@ -5916,7 +5871,7 @@ case 342:
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/lib/bison.simple"
+#line 498 "/usr/local/share/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
@@ -6111,32 +6066,8 @@ yyerrhandle:
yystate = yyn;
goto yynewstate;
-
- yyacceptlab:
- /* YYACCEPT comes here. */
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
-#endif
- }
- return 0;
-
- yyabortlab:
- /* YYABORT comes here. */
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
-#endif
- }
- return 1;
}
-#line 2690 "Gmsh.y"
+#line 2689 "Gmsh.y"
void InitSymbols(void){
diff --git a/Parser/Gmsh.tab.cpp.h b/Parser/Gmsh.tab.cpp.h
index 4a4d722c1b66665aab40ec8d45bedb6bea28d804..ac1bce85bd14f6ee22c6058c6681188269542609 100644
--- a/Parser/Gmsh.tab.cpp.h
+++ b/Parser/Gmsh.tab.cpp.h
@@ -7,167 +7,167 @@ typedef union {
Shape s;
List_T *l;
} YYSTYPE;
-#define tDOUBLE 257
-#define tSTRING 258
-#define tBIGSTR 259
-#define tEND 260
-#define tAFFECT 261
-#define tDOTS 262
-#define tPi 263
-#define tExp 264
-#define tLog 265
-#define tLog10 266
-#define tSqrt 267
-#define tSin 268
-#define tAsin 269
-#define tCos 270
-#define tAcos 271
-#define tTan 272
-#define tRand 273
-#define tAtan 274
-#define tAtan2 275
-#define tSinh 276
-#define tCosh 277
-#define tTanh 278
-#define tFabs 279
-#define tFloor 280
-#define tCeil 281
-#define tFmod 282
-#define tModulo 283
-#define tHypot 284
-#define tPrintf 285
-#define tSprintf 286
-#define tDraw 287
-#define tPoint 288
-#define tCircle 289
-#define tEllipsis 290
-#define tLine 291
-#define tSurface 292
-#define tSpline 293
-#define tVolume 294
-#define tCharacteristic 295
-#define tLength 296
-#define tParametric 297
-#define tElliptic 298
-#define tPlane 299
-#define tRuled 300
-#define tTransfinite 301
-#define tComplex 302
-#define tPhysical 303
-#define tUsing 304
-#define tBump 305
-#define tProgression 306
-#define tRotate 307
-#define tTranslate 308
-#define tSymmetry 309
-#define tDilate 310
-#define tExtrude 311
-#define tDuplicata 312
-#define tLoop 313
-#define tRecombine 314
-#define tDelete 315
-#define tCoherence 316
-#define tIntersect 317
-#define tView 318
-#define tAttractor 319
-#define tLayers 320
-#define tScalarTetrahedron 321
-#define tVectorTetrahedron 322
-#define tTensorTetrahedron 323
-#define tScalarTriangle 324
-#define tVectorTriangle 325
-#define tTensorTriangle 326
-#define tScalarLine 327
-#define tVectorLine 328
-#define tTensorLine 329
-#define tScalarPoint 330
-#define tVectorPoint 331
-#define tTensorPoint 332
-#define tBSpline 333
-#define tNurbs 334
-#define tOrder 335
-#define tWith 336
-#define tBounds 337
-#define tKnots 338
-#define tColor 339
-#define tFor 340
-#define tIn 341
-#define tEndFor 342
-#define tIf 343
-#define tEndIf 344
-#define tExit 345
-#define tReturn 346
-#define tCall 347
-#define tFunction 348
-#define tMesh 349
-#define tB_SPLINE_SURFACE_WITH_KNOTS 350
-#define tB_SPLINE_CURVE_WITH_KNOTS 351
-#define tCARTESIAN_POINT 352
-#define tTRUE 353
-#define tFALSE 354
-#define tUNSPECIFIED 355
-#define tU 356
-#define tV 357
-#define tEDGE_CURVE 358
-#define tVERTEX_POINT 359
-#define tORIENTED_EDGE 360
-#define tPLANE 361
-#define tFACE_OUTER_BOUND 362
-#define tEDGE_LOOP 363
-#define tADVANCED_FACE 364
-#define tVECTOR 365
-#define tDIRECTION 366
-#define tAXIS2_PLACEMENT_3D 367
-#define tISO 368
-#define tENDISO 369
-#define tENDSEC 370
-#define tDATA 371
-#define tHEADER 372
-#define tFILE_DESCRIPTION 373
-#define tFILE_SCHEMA 374
-#define tFILE_NAME 375
-#define tMANIFOLD_SOLID_BREP 376
-#define tCLOSED_SHELL 377
-#define tADVANCED_BREP_SHAPE_REPRESENTATION 378
-#define tFACE_BOUND 379
-#define tCYLINDRICAL_SURFACE 380
-#define tCONICAL_SURFACE 381
-#define tCIRCLE 382
-#define tTRIMMED_CURVE 383
-#define tGEOMETRIC_SET 384
-#define tCOMPOSITE_CURVE_SEGMENT 385
-#define tCONTINUOUS 386
-#define tCOMPOSITE_CURVE 387
-#define tTOROIDAL_SURFACE 388
-#define tPRODUCT_DEFINITION 389
-#define tPRODUCT_DEFINITION_SHAPE 390
-#define tSHAPE_DEFINITION_REPRESENTATION 391
-#define tELLIPSE 392
-#define tTrimmed 393
-#define tSolid 394
-#define tEndSolid 395
-#define tVertex 396
-#define tFacet 397
-#define tNormal 398
-#define tOuter 399
-#define tLoopSTL 400
-#define tEndLoop 401
-#define tEndFacet 402
-#define tAFFECTPLUS 403
-#define tAFFECTMINUS 404
-#define tAFFECTTIMES 405
-#define tAFFECTDIVIDE 406
-#define tOR 407
-#define tAND 408
-#define tEQUAL 409
-#define tNOTEQUAL 410
-#define tAPPROXEQUAL 411
-#define tLESSOREQUAL 412
-#define tGREATEROREQUAL 413
-#define tCROSSPRODUCT 414
-#define tPLUSPLUS 415
-#define tMINUSMINUS 416
-#define UNARYPREC 417
+#define tDOUBLE 258
+#define tSTRING 259
+#define tBIGSTR 260
+#define tEND 261
+#define tAFFECT 262
+#define tDOTS 263
+#define tPi 264
+#define tExp 265
+#define tLog 266
+#define tLog10 267
+#define tSqrt 268
+#define tSin 269
+#define tAsin 270
+#define tCos 271
+#define tAcos 272
+#define tTan 273
+#define tRand 274
+#define tAtan 275
+#define tAtan2 276
+#define tSinh 277
+#define tCosh 278
+#define tTanh 279
+#define tFabs 280
+#define tFloor 281
+#define tCeil 282
+#define tFmod 283
+#define tModulo 284
+#define tHypot 285
+#define tPrintf 286
+#define tSprintf 287
+#define tDraw 288
+#define tPoint 289
+#define tCircle 290
+#define tEllipsis 291
+#define tLine 292
+#define tSurface 293
+#define tSpline 294
+#define tVolume 295
+#define tCharacteristic 296
+#define tLength 297
+#define tParametric 298
+#define tElliptic 299
+#define tPlane 300
+#define tRuled 301
+#define tTransfinite 302
+#define tComplex 303
+#define tPhysical 304
+#define tUsing 305
+#define tBump 306
+#define tProgression 307
+#define tRotate 308
+#define tTranslate 309
+#define tSymmetry 310
+#define tDilate 311
+#define tExtrude 312
+#define tDuplicata 313
+#define tLoop 314
+#define tRecombine 315
+#define tDelete 316
+#define tCoherence 317
+#define tIntersect 318
+#define tView 319
+#define tAttractor 320
+#define tLayers 321
+#define tScalarTetrahedron 322
+#define tVectorTetrahedron 323
+#define tTensorTetrahedron 324
+#define tScalarTriangle 325
+#define tVectorTriangle 326
+#define tTensorTriangle 327
+#define tScalarLine 328
+#define tVectorLine 329
+#define tTensorLine 330
+#define tScalarPoint 331
+#define tVectorPoint 332
+#define tTensorPoint 333
+#define tBSpline 334
+#define tNurbs 335
+#define tOrder 336
+#define tWith 337
+#define tBounds 338
+#define tKnots 339
+#define tColor 340
+#define tFor 341
+#define tIn 342
+#define tEndFor 343
+#define tIf 344
+#define tEndIf 345
+#define tExit 346
+#define tReturn 347
+#define tCall 348
+#define tFunction 349
+#define tMesh 350
+#define tB_SPLINE_SURFACE_WITH_KNOTS 351
+#define tB_SPLINE_CURVE_WITH_KNOTS 352
+#define tCARTESIAN_POINT 353
+#define tTRUE 354
+#define tFALSE 355
+#define tUNSPECIFIED 356
+#define tU 357
+#define tV 358
+#define tEDGE_CURVE 359
+#define tVERTEX_POINT 360
+#define tORIENTED_EDGE 361
+#define tPLANE 362
+#define tFACE_OUTER_BOUND 363
+#define tEDGE_LOOP 364
+#define tADVANCED_FACE 365
+#define tVECTOR 366
+#define tDIRECTION 367
+#define tAXIS2_PLACEMENT_3D 368
+#define tISO 369
+#define tENDISO 370
+#define tENDSEC 371
+#define tDATA 372
+#define tHEADER 373
+#define tFILE_DESCRIPTION 374
+#define tFILE_SCHEMA 375
+#define tFILE_NAME 376
+#define tMANIFOLD_SOLID_BREP 377
+#define tCLOSED_SHELL 378
+#define tADVANCED_BREP_SHAPE_REPRESENTATION 379
+#define tFACE_BOUND 380
+#define tCYLINDRICAL_SURFACE 381
+#define tCONICAL_SURFACE 382
+#define tCIRCLE 383
+#define tTRIMMED_CURVE 384
+#define tGEOMETRIC_SET 385
+#define tCOMPOSITE_CURVE_SEGMENT 386
+#define tCONTINUOUS 387
+#define tCOMPOSITE_CURVE 388
+#define tTOROIDAL_SURFACE 389
+#define tPRODUCT_DEFINITION 390
+#define tPRODUCT_DEFINITION_SHAPE 391
+#define tSHAPE_DEFINITION_REPRESENTATION 392
+#define tELLIPSE 393
+#define tTrimmed 394
+#define tSolid 395
+#define tEndSolid 396
+#define tVertex 397
+#define tFacet 398
+#define tNormal 399
+#define tOuter 400
+#define tLoopSTL 401
+#define tEndLoop 402
+#define tEndFacet 403
+#define tAFFECTPLUS 404
+#define tAFFECTMINUS 405
+#define tAFFECTTIMES 406
+#define tAFFECTDIVIDE 407
+#define tOR 408
+#define tAND 409
+#define tEQUAL 410
+#define tNOTEQUAL 411
+#define tAPPROXEQUAL 412
+#define tLESSOREQUAL 413
+#define tGREATEROREQUAL 414
+#define tCROSSPRODUCT 415
+#define tPLUSPLUS 416
+#define tMINUSMINUS 417
+#define UNARYPREC 418
extern YYSTYPE yylval;
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 9c28d67d6c1f65c15a8324e7cbf7164d08282c5b..b639cfa7d298d71cb1b8092a679ef7bead7c91ba 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.58 2001-01-09 19:40:57 remacle Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.59 2001-01-10 10:06:20 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -23,7 +23,7 @@
#ifdef __cplusplus
#include <stdlib.h>
-//#include <unistd.h>
+#include <unistd.h>
/* Use prototypes in function declarations. */
#define YY_USE_PROTOS
@@ -977,7 +977,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.58 2001-01-09 19:40:57 remacle Exp $
+// $Id: Gmsh.yy.cpp,v 1.59 2001-01-10 10:06:20 geuzaine Exp $
#include <stdio.h>
#include <stdlib.h>
@@ -1168,7 +1168,7 @@ YY_MALLOC_DECL
YY_DECL
{
register yy_state_type yy_current_state;
- register char *yy_cp = NULL, *yy_bp = NULL;
+ register char *yy_cp, *yy_bp;
register int yy_act;
#line 63 "Gmsh.l"
diff --git a/Parser/Makefile b/Parser/Makefile
index e8d781d90a4d083cc8c9110f0641a2fdab134a60..aaf8ba50e125f0ad1751bebf86a226484be2516a 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 2001-01-09 14:24:13 geuzaine Exp $
+# $Id: Makefile,v 1.13 2001-01-10 10:06:20 geuzaine Exp $
#
# Makefile for "libParser.a"
#
@@ -77,7 +77,7 @@ Gmsh.tab.o: Gmsh.tab.cpp ../Common/Gmsh.h ../Common/Message.h \
../Mesh/Create.h ../Common/Views.h ../Common/ColorTable.h \
../Geo/StepGeomDatabase.h ../Common/Options.h ../Graphics/Draw.h \
../Common/Colors.h Parser.h OpenFile.h FunctionManager.h \
- ../Common/Timer.h
+ ../Common/Timer.h ../Graphics/CreateFile.h
OpenFile.o: OpenFile.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 \