diff --git a/Geo/CAD.cpp b/Geo/CAD.cpp
index 8ce9e4424db880c7b6347a53d3cd5966454626f9..2526b0a100407a25a651f6677205e5c468712fe9 100644
--- a/Geo/CAD.cpp
+++ b/Geo/CAD.cpp
@@ -1,4 +1,4 @@
-// $Id: CAD.cpp,v 1.75 2004-05-12 22:51:07 geuzaine Exp $
+// $Id: CAD.cpp,v 1.76 2004-07-01 19:40:59 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -362,7 +362,7 @@ void CopyShape(int Type, int Num, int *New)
switch (Type) {
case MSH_POINT:
if(!(v = FindPoint(Num, THEM))) {
- Msg(GERROR, "Unknown Vertex %d", Num);
+ Msg(GERROR, "Unknown vertex %d", Num);
return;
}
newv = DuplicateVertex(v);
@@ -377,7 +377,7 @@ void CopyShape(int Type, int Num, int *New)
case MSH_SEGM_NURBS:
case MSH_SEGM_PARAMETRIC:
if(!(c = FindCurve(Num, THEM))) {
- Msg(GERROR, "Unknown Curve %d", Num);
+ Msg(GERROR, "Unknown curve %d", Num);
return;
}
newc = DuplicateCurve(c);
@@ -388,7 +388,7 @@ void CopyShape(int Type, int Num, int *New)
case MSH_SURF_REGL:
case MSH_SURF_PLAN:
if(!(s = FindSurface(Num, THEM))) {
- Msg(GERROR, "Unknown Surface %d", Num);
+ Msg(GERROR, "Unknown surface %d", Num);
return;
}
news = DuplicateSurface(s);
@@ -950,7 +950,7 @@ void ApplicationOnShapes(double matrix[4][4], List_T * ListShapes)
if(v)
ApplyTransformationToPoint(matrix, v);
else
- Msg(GERROR, "Unknown Point %d", O.Num);
+ Msg(GERROR, "Unknown point %d", O.Num);
break;
case MSH_SEGM_LINE:
case MSH_SEGM_SPLN:
@@ -964,7 +964,7 @@ void ApplicationOnShapes(double matrix[4][4], List_T * ListShapes)
if(c)
ApplyTransformationToCurve(matrix, c);
else
- Msg(GERROR, "Unknown Curve %d", O.Num);
+ Msg(GERROR, "Unknown curve %d", O.Num);
break;
case MSH_SURF_NURBS:
case MSH_SURF_REGL:
@@ -974,7 +974,7 @@ void ApplicationOnShapes(double matrix[4][4], List_T * ListShapes)
if(s)
ApplyTransformationToSurface(matrix, s);
else
- Msg(GERROR, "Unknown Surface %d", O.Num);
+ Msg(GERROR, "Unknown surface %d", O.Num);
break;
default:
Msg(GERROR, "Impossible to transform entity %d (of type %d)", O.Num,
@@ -1439,7 +1439,7 @@ int Extrude_ProtudeSurface(int type, int is,
List_Read(chapeau->Generatrices, i, &c);
if(c->Num < 0)
if(!(c = FindCurve(-c->Num, THEM))) {
- Msg(GERROR, "Unknown Curve %d", -c->Num);
+ Msg(GERROR, "Unknown curve %d", -c->Num);
return ps->Num;
}
c->Extrude = new ExtrudeParams(COPIED_ENTITY);
@@ -1758,7 +1758,7 @@ void ReplaceDuplicateCurves(Mesh * m)
if(!Tree_Search(allNonDuplicatedCurves, &c)) {
Tree_Insert(allNonDuplicatedCurves, &c);
if(!(c2 = FindCurve(-c->Num, m))) {
- Msg(GERROR, "Unknown Curve %d", -c->Num);
+ Msg(GERROR, "Unknown curve %d", -c->Num);
List_Delete(All);
return;
}
@@ -1767,7 +1767,7 @@ void ReplaceDuplicateCurves(Mesh * m)
else {
Tree_Suppress(m->Curves, &c);
if(!(c2 = FindCurve(-c->Num, m))) {
- Msg(GERROR, "Unknown Curve %d", -c->Num);
+ Msg(GERROR, "Unknown curve %d", -c->Num);
List_Delete(All);
return;
}
diff --git a/Geo/ExtractContour.cpp b/Geo/ExtractContour.cpp
index ac1f22ec10719fff61c6b19e18497f23e165562f..d99ebb481fec197bb5e6241efa7c9ec60fa463e5 100644
--- a/Geo/ExtractContour.cpp
+++ b/Geo/ExtractContour.cpp
@@ -1,4 +1,4 @@
-// $Id: ExtractContour.cpp,v 1.4 2004-06-30 00:57:50 geuzaine Exp $
+// $Id: ExtractContour.cpp,v 1.5 2004-07-01 19:40:59 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -57,7 +57,11 @@ void recurFindLinkedEdges(int ed, List_T * edges, Tree_T * points, Tree_T * link
nxa na;
int ip[2];
Curve *c = FindCurve(ed, THEM);
-
+ if(!c){
+ Msg(GERROR, "Unknown curve %d", ed);
+ return;
+ }
+
ip[0] = c->beg->Num;
ip[1] = c->end->Num;
@@ -129,6 +133,10 @@ void orientAndSortEdges(List_T *edges, Tree_T *links)
List_Read(temp, 0, &num);
List_Add(edges, &num);
Curve *c0 = FindCurve(abs(num), THEM);
+ if(!c0){
+ Msg(GERROR, "Unknown curve %d", abs(num));
+ return;
+ }
int sign = 1;
while(List_Nbr(edges) < List_Nbr(temp)){
@@ -141,6 +149,10 @@ void orientAndSortEdges(List_T *edges, Tree_T *links)
List_Read(lk.l, j, &na);
if(c0->Num != na.a && List_Search(temp, &na.a, fcmp_absint)){
Curve *c1 = FindCurve(abs(na.a), THEM);
+ if(!c1){
+ Msg(GERROR, "Unknown curve %d", abs(na.a));
+ return;
+ }
if(lk.n == c1->beg->Num){
sign = 1;
num = na.a;
@@ -171,6 +183,10 @@ int allEdgesLinked(int ed, List_T * edges)
int num;
List_Read(edges, i, &num);
Curve *c = FindCurve(abs(num), THEM);
+ if(!c){
+ Msg(GERROR, "Unknown curve %d", abs(num));
+ return 0;
+ }
int ip[2];
ip[0] = c->beg->Num;
ip[1] = c->end->Num;
@@ -210,6 +226,10 @@ void recurFindLinkedFaces(int fac, List_T * faces, Tree_T * edges, Tree_T * link
nxa na;
Curve *c;
Surface *s = FindSurface(abs(fac), THEM);
+ if(!s){
+ Msg(GERROR, "Unknown surface %d", abs(fac));
+ return;
+ }
for(int l = 0; l < List_Nbr(s->Generatrices); l++) {
List_Read(s->Generatrices, l, &c);
@@ -266,6 +286,10 @@ void createFaceLinks(Tree_T * links)
void recurOrientFace(int face, List_T *faces, List_T *available, Tree_T *links)
{
Surface *s = FindSurface(abs(face), THEM);
+ if(!s){
+ Msg(GERROR, "Unknown surface %d", abs(face));
+ return;
+ }
int ori = sign(face);
for(int i = 0; i < List_Nbr(s->Generatrices); i++){
@@ -281,6 +305,10 @@ void recurOrientFace(int face, List_T *faces, List_T *available, Tree_T *links)
if(num != abs(s->Num) && List_Search(available, &num, fcmp_absint) &&
List_ISearchSeq(faces, &num, fcmp_absint) < 0){
Surface *s2 = FindSurface(num, THEM);
+ if(!s2){
+ Msg(GERROR, "Unknown surface %d", num);
+ return;
+ }
for(int k = 0; k < List_Nbr(s2->Generatrices); k++){
Curve *c2;
List_Read(s2->Generatrices, k, &c2);
@@ -329,7 +357,10 @@ int allFacesLinked(int fac, List_T * faces)
int num;
List_Read(faces, i, &num);
Surface *s = FindSurface(abs(num), THEM);
-
+ if(!s){
+ Msg(GERROR, "Unknown surface %d", abs(num));
+ return 0;
+ }
for(int k = 0; k < List_Nbr(s->Generatrices); k++) {
Curve *c;
List_Read(s->Generatrices, k, &c);
diff --git a/Geo/GeoUtils.cpp b/Geo/GeoUtils.cpp
index 3645d8809313518d2a68987f059a85aa5cd06b5d..b38a365ac59e0144d52a3a6095a8ba3c2b6c07e3 100644
--- a/Geo/GeoUtils.cpp
+++ b/Geo/GeoUtils.cpp
@@ -1,4 +1,4 @@
-// $Id: GeoUtils.cpp,v 1.4 2004-06-30 00:57:50 geuzaine Exp $
+// $Id: GeoUtils.cpp,v 1.5 2004-07-01 19:40:59 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -44,7 +44,7 @@ void sortEdgesInLoop(int num, List_T *edges)
if((c = FindCurve(j, THEM)))
List_Add(temp, &c);
else
- Msg(GERROR, "Unknown Curve %d in Line Loop %d", j, num);
+ Msg(GERROR, "Unknown curve %d in line loop %d", j, num);
}
List_Reset(edges);
@@ -91,7 +91,7 @@ void setSurfaceGeneratrices(Surface *s, List_T *loops)
List_Read(loops, i, &iLoop);
EdgeLoop *el;
if(!(el = FindEdgeLoop(iLoop, THEM))) {
- Msg(GERROR, "Unknown Line Loop %d", iLoop);
+ Msg(GERROR, "Unknown line loop %d", iLoop);
List_Delete(s->Generatrices);
return;
}
@@ -102,7 +102,7 @@ void setSurfaceGeneratrices(Surface *s, List_T *loops)
for(int j = 0; j < List_Nbr(el->Curves); j++) {
List_Read(el->Curves, j, &ic);
if(!(c = FindCurve(ic, THEM))) {
- Msg(GERROR, "Unknown Curve %d", ic);
+ Msg(GERROR, "Unknown curve %d", ic);
List_Delete(s->Generatrices);
return;
}
@@ -116,7 +116,7 @@ void setSurfaceGeneratrices(Surface *s, List_T *loops)
List_Read(el->Curves, j, &ic);
ic *= -1;
if(!(c = FindCurve(ic, THEM))) {
- Msg(GERROR, "Unknown Curve %d", ic);
+ Msg(GERROR, "Unknown curve %d", ic);
List_Delete(s->Generatrices);
return;
}
@@ -140,7 +140,7 @@ void setVolumeSurfaces(Volume *v, List_T * loops)
List_Read(loops, i, &il);
SurfaceLoop *sl;
if(!(sl = FindSurfaceLoop(il, THEM))) {
- Msg(GERROR, "Unknown Surface Loop %d", il);
+ Msg(GERROR, "Unknown surface loop %d", il);
return;
}
else {
@@ -153,7 +153,7 @@ void setVolumeSurfaces(Volume *v, List_T * loops)
// surfaces. So we just store the signs in another list
// (beeerk...)
if(!(s = FindSurface(abs(is), THEM))) {
- Msg(GERROR, "Unknown Surface %d", is);
+ Msg(GERROR, "Unknown surface %d", is);
return;
}
else{
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index d031d5443015c599ed5f15359ee7e5df6c36a5be..ca51ec31b08eaa4ac1e7ed3d7ab232f4d753eed8 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -192,7 +192,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.196 2004-06-08 00:30:21 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.197 2004-07-01 19:40:59 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -6251,7 +6251,7 @@ case 233:
List_Read(yyvsp[-9].l, i, &p);
Vertex *v = FindPoint((int)p, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", (int)p);
+ yymsg(WARNING, "Unknown point %d", (int)p);
else{
Attractor *a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1,
yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d, v, NULL, NULL);
@@ -6272,7 +6272,7 @@ case 234:
List_Read(yyvsp[-3].l, i, &d);
Vertex *v = FindPoint((int)d, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", (int)d);
+ yymsg(WARNING, "Unknown point %d", (int)d);
else
v->lc = yyvsp[-1].d;
}
@@ -6545,7 +6545,7 @@ case 246:
List_Read(yyvsp[-9].l, i, &p);
Curve *c = FindCurve((int)p, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", (int)p);
+ yymsg(WARNING, "Unknown curve %d", (int)p);
else{
Attractor *a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1,
yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d, NULL, c, NULL);
@@ -6608,7 +6608,7 @@ case 249:
List_Read(yyvsp[-1].l, 0, &d);
EdgeLoop *el = FindEdgeLoop((int)d, THEM);
if(!el){
- yymsg(GERROR, "Unknown Line Loop %d", (int)d);
+ yymsg(GERROR, "Unknown line loop %d", (int)d);
}
else{
int j = List_Nbr(el->Curves);
@@ -6894,7 +6894,7 @@ case 269:
TheShape.Num = (int)d;
Vertex *v = FindPoint(TheShape.Num, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", TheShape.Num);
+ yymsg(WARNING, "Unknown point %d", TheShape.Num);
else{
TheShape.Type = MSH_POINT;
List_Add(yyval.l, &TheShape);
@@ -6912,7 +6912,7 @@ case 270:
TheShape.Num = (int)d;
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ yymsg(WARNING, "Unknown curve %d", TheShape.Num);
else{
TheShape.Type = c->Typ;
List_Add(yyval.l, &TheShape);
@@ -6930,7 +6930,7 @@ case 271:
TheShape.Num = (int)d;
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s)
- yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ yymsg(WARNING, "Unknown surface %d", TheShape.Num);
else{
TheShape.Type = s->Typ;
List_Add(yyval.l, &TheShape);
@@ -6948,7 +6948,7 @@ case 272:
TheShape.Num = (int)d;
Volume *v = FindVolume(TheShape.Num, THEM);
if(!v)
- yymsg(WARNING, "Unknown Volume %d", TheShape.Num);
+ yymsg(WARNING, "Unknown volume %d", TheShape.Num);
else{
TheShape.Type = v->Typ;
List_Add(yyval.l, &TheShape);
@@ -7147,7 +7147,7 @@ case 287:
else if(!strcmp(yyvsp[-1].c, "TimeSteps"))
CombineViews_Time(2, 0);
else
- yymsg(GERROR, "Unknown Combine command");
+ yymsg(GERROR, "Unknown 'Combine' command");
;
break;}
case 288:
@@ -7434,7 +7434,7 @@ case 311:
&ps, 1, NULL);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7454,7 +7454,7 @@ case 312:
&ps, 1, NULL);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7474,7 +7474,7 @@ case 313:
&ps, 1, NULL);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7501,7 +7501,7 @@ case 315:
&ps, 1, &extr);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7528,7 +7528,7 @@ case 317:
&ps, 1, &extr);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7555,7 +7555,7 @@ case 319:
&ps, 1, &extr);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7574,7 +7574,7 @@ case 320:
0, NULL);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7593,7 +7593,7 @@ case 321:
0, NULL);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7612,7 +7612,7 @@ case 322:
0, NULL);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7638,7 +7638,7 @@ case 324:
NEWREG(), &extr);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7664,7 +7664,7 @@ case 326:
NEWREG(), &extr);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7690,7 +7690,7 @@ case 328:
NEWREG(), &extr);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -7779,7 +7779,7 @@ case 334:
int j = (int)fabs(d);
Curve *c = FindCurve(j, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", j);
+ yymsg(WARNING, "Unknown curve %d", j);
else{
c->Method = TRANSFINI;
c->ipar[0] = (yyvsp[-1].d>2)?(int)yyvsp[-1].d:2;
@@ -7799,7 +7799,7 @@ case 335:
int j = (int)fabs(d);
Curve *c = FindCurve(j, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", j);
+ yymsg(WARNING, "Unknown curve %d", j);
else{
c->Method = TRANSFINI;
c->ipar[0] = (yyvsp[-4].d>2)?(int)yyvsp[-4].d:2;
@@ -7819,7 +7819,7 @@ case 336:
int j = (int)fabs(d);
Curve *c = FindCurve(j, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", j);
+ yymsg(WARNING, "Unknown curve %d", j);
else{
c->Method = TRANSFINI;
c->ipar[0] = (yyvsp[-4].d>2)?(int)yyvsp[-4].d:2;
@@ -7835,7 +7835,7 @@ case 337:
{
Surface *s = FindSurface((int)yyvsp[-4].d, THEM);
if(!s)
- yymsg(WARNING, "Unknown Surface %d", (int)yyvsp[-4].d);
+ yymsg(WARNING, "Unknown surface %d", (int)yyvsp[-4].d);
else{
s->Method = TRANSFINI;
int k = List_Nbr(yyvsp[-1].l);
@@ -7850,7 +7850,7 @@ case 337:
int j = (int)fabs(d);
Vertex *v = FindPoint(j, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", j);
+ yymsg(WARNING, "Unknown point %d", j);
else
List_Add(s->TrsfPoints, &v);
}
@@ -7864,7 +7864,7 @@ case 338:
{
Surface *s = FindSurface((int)yyvsp[-4].d, THEM);
if(!s)
- yymsg(WARNING, "Unknown Surface %d", (int)yyvsp[-4].d);
+ yymsg(WARNING, "Unknown surface %d", (int)yyvsp[-4].d);
else{
s->Method = ELLIPTIC;
int k = List_Nbr(yyvsp[-1].l);
@@ -7878,7 +7878,7 @@ case 338:
int j = (int)fabs(d);
Vertex *v = FindPoint(j, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", j);
+ yymsg(WARNING, "Unknown point %d", j);
else
List_Add(s->TrsfPoints, &v);
}
@@ -7892,7 +7892,7 @@ case 339:
{
Volume *v = FindVolume((int)yyvsp[-4].d, THEM);
if(!v)
- yymsg(WARNING, "Unknown Volume %d", (int)yyvsp[-4].d);
+ yymsg(WARNING, "Unknown volume %d", (int)yyvsp[-4].d);
else{
v->Method = TRANSFINI;
int k = List_Nbr(yyvsp[-1].l);
@@ -7906,7 +7906,7 @@ case 339:
int j = (int)fabs(d);
Vertex *vert = FindPoint(j, THEM);
if(!vert)
- yymsg(WARNING, "Unknown Point %d", j);
+ yymsg(WARNING, "Unknown point %d", j);
else
List_Add(v->TrsfPoints, &vert);
}
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 940783c67a18a6e1ffe941ee138f31db36bc3436..242b762263d2426265666ae875ea0b8f3ffcdca6 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
%{
-// $Id: Gmsh.y,v 1.172 2004-06-08 00:30:22 geuzaine Exp $
+// $Id: Gmsh.y,v 1.173 2004-07-01 19:41:00 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -1685,7 +1685,7 @@ Shape :
List_Read($3, i, &p);
Vertex *v = FindPoint((int)p, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", (int)p);
+ yymsg(WARNING, "Unknown point %d", (int)p);
else{
Attractor *a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1,
$6, $8, $10, v, NULL, NULL);
@@ -1704,7 +1704,7 @@ Shape :
List_Read($3, i, &d);
Vertex *v = FindPoint((int)d, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", (int)d);
+ yymsg(WARNING, "Unknown point %d", (int)d);
else
v->lc = $5;
}
@@ -1957,7 +1957,7 @@ Shape :
List_Read($3, i, &p);
Curve *c = FindCurve((int)p, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", (int)p);
+ yymsg(WARNING, "Unknown curve %d", (int)p);
else{
Attractor *a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1,
$6, $8, $10, NULL, c, NULL);
@@ -2017,7 +2017,7 @@ Shape :
List_Read($7, 0, &d);
EdgeLoop *el = FindEdgeLoop((int)d, THEM);
if(!el){
- yymsg(GERROR, "Unknown Line Loop %d", (int)d);
+ yymsg(GERROR, "Unknown line loop %d", (int)d);
}
else{
int j = List_Nbr(el->Curves);
@@ -2282,7 +2282,7 @@ ListOfShapes :
TheShape.Num = (int)d;
Vertex *v = FindPoint(TheShape.Num, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", TheShape.Num);
+ yymsg(WARNING, "Unknown point %d", TheShape.Num);
else{
TheShape.Type = MSH_POINT;
List_Add($$, &TheShape);
@@ -2298,7 +2298,7 @@ ListOfShapes :
TheShape.Num = (int)d;
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ yymsg(WARNING, "Unknown curve %d", TheShape.Num);
else{
TheShape.Type = c->Typ;
List_Add($$, &TheShape);
@@ -2314,7 +2314,7 @@ ListOfShapes :
TheShape.Num = (int)d;
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s)
- yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ yymsg(WARNING, "Unknown surface %d", TheShape.Num);
else{
TheShape.Type = s->Typ;
List_Add($$, &TheShape);
@@ -2330,7 +2330,7 @@ ListOfShapes :
TheShape.Num = (int)d;
Volume *v = FindVolume(TheShape.Num, THEM);
if(!v)
- yymsg(WARNING, "Unknown Volume %d", TheShape.Num);
+ yymsg(WARNING, "Unknown volume %d", TheShape.Num);
else{
TheShape.Type = v->Typ;
List_Add($$, &TheShape);
@@ -2525,7 +2525,7 @@ Command :
else if(!strcmp($2, "TimeSteps"))
CombineViews_Time(2, 0);
else
- yymsg(GERROR, "Unknown Combine command");
+ yymsg(GERROR, "Unknown 'Combine' command");
}
| tExit tEND
{
@@ -2780,7 +2780,7 @@ Extrude :
&ps, 1, NULL);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2798,7 +2798,7 @@ Extrude :
&ps, 1, NULL);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2816,7 +2816,7 @@ Extrude :
&ps, 1, NULL);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2839,7 +2839,7 @@ Extrude :
&ps, 1, &extr);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2862,7 +2862,7 @@ Extrude :
&ps, 1, &extr);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2885,7 +2885,7 @@ Extrude :
&ps, 1, &extr);
Curve *c = FindCurve(TheShape.Num, THEM);
if(!c){
- //yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown curve %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2905,7 +2905,7 @@ Extrude :
0, NULL);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2922,7 +2922,7 @@ Extrude :
0, NULL);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2939,7 +2939,7 @@ Extrude :
0, NULL);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2961,7 +2961,7 @@ Extrude :
NEWREG(), &extr);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -2984,7 +2984,7 @@ Extrude :
NEWREG(), &extr);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -3007,7 +3007,7 @@ Extrude :
NEWREG(), &extr);
Surface *s = FindSurface(TheShape.Num, THEM);
if(!s){
- //yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ //yymsg(WARNING, "Unknown surface %d", TheShape.Num);
TheShape.Type = 0;
}
else{
@@ -3095,7 +3095,7 @@ Transfinite :
int j = (int)fabs(d);
Curve *c = FindCurve(j, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", j);
+ yymsg(WARNING, "Unknown curve %d", j);
else{
c->Method = TRANSFINI;
c->ipar[0] = ($5>2)?(int)$5:2;
@@ -3113,7 +3113,7 @@ Transfinite :
int j = (int)fabs(d);
Curve *c = FindCurve(j, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", j);
+ yymsg(WARNING, "Unknown curve %d", j);
else{
c->Method = TRANSFINI;
c->ipar[0] = ($5>2)?(int)$5:2;
@@ -3131,7 +3131,7 @@ Transfinite :
int j = (int)fabs(d);
Curve *c = FindCurve(j, THEM);
if(!c)
- yymsg(WARNING, "Unknown Curve %d", j);
+ yymsg(WARNING, "Unknown curve %d", j);
else{
c->Method = TRANSFINI;
c->ipar[0] = ($5>2)?(int)$5:2;
@@ -3145,7 +3145,7 @@ Transfinite :
{
Surface *s = FindSurface((int)$4, THEM);
if(!s)
- yymsg(WARNING, "Unknown Surface %d", (int)$4);
+ yymsg(WARNING, "Unknown surface %d", (int)$4);
else{
s->Method = TRANSFINI;
int k = List_Nbr($7);
@@ -3160,7 +3160,7 @@ Transfinite :
int j = (int)fabs(d);
Vertex *v = FindPoint(j, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", j);
+ yymsg(WARNING, "Unknown point %d", j);
else
List_Add(s->TrsfPoints, &v);
}
@@ -3172,7 +3172,7 @@ Transfinite :
{
Surface *s = FindSurface((int)$4, THEM);
if(!s)
- yymsg(WARNING, "Unknown Surface %d", (int)$4);
+ yymsg(WARNING, "Unknown surface %d", (int)$4);
else{
s->Method = ELLIPTIC;
int k = List_Nbr($7);
@@ -3186,7 +3186,7 @@ Transfinite :
int j = (int)fabs(d);
Vertex *v = FindPoint(j, THEM);
if(!v)
- yymsg(WARNING, "Unknown Point %d", j);
+ yymsg(WARNING, "Unknown point %d", j);
else
List_Add(s->TrsfPoints, &v);
}
@@ -3198,7 +3198,7 @@ Transfinite :
{
Volume *v = FindVolume((int)$4, THEM);
if(!v)
- yymsg(WARNING, "Unknown Volume %d", (int)$4);
+ yymsg(WARNING, "Unknown volume %d", (int)$4);
else{
v->Method = TRANSFINI;
int k = List_Nbr($7);
@@ -3212,7 +3212,7 @@ Transfinite :
int j = (int)fabs(d);
Vertex *vert = FindPoint(j, THEM);
if(!vert)
- yymsg(WARNING, "Unknown Point %d", j);
+ yymsg(WARNING, "Unknown point %d", j);
else
List_Add(v->TrsfPoints, &vert);
}
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 141b2bcc6a555cd6ec31d47bfc3c66d73ab6a5ae..0684fd0ae95ce5b05bf2f5a760273181894f8b0f 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.195 2004-06-08 00:30:23 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.196 2004-07-01 19:41:00 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -1019,7 +1019,7 @@ char *yytext;
#line 1 "Gmsh.l"
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.195 2004-06-08 00:30:23 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.196 2004-07-01 19:41:00 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//