diff --git a/Geo/CAD.cpp b/Geo/CAD.cpp index 309ad951d6cb013a8f3c9d87966c0f4544c5b0bc..1a683fc131ee772f14f6be0a981ebafbfc4704e7 100644 --- a/Geo/CAD.cpp +++ b/Geo/CAD.cpp @@ -1,4 +1,4 @@ -/* $Id: CAD.cpp,v 1.5 2000-11-24 08:04:14 geuzaine Exp $ */ +/* $Id: CAD.cpp,v 1.6 2000-11-24 10:21:21 geuzaine Exp $ */ #include "Gmsh.h" #include "Geo.h" @@ -1419,8 +1419,8 @@ void RotateShapes (double Ax,double Ay,double Az, ReplaceAllDuplicates ( THEM ); } -void SymetryShapes (double A,double B,double C, - double D, List_T *ListShapes, int x){ +void SymmetryShapes (double A,double B,double C, + double D, List_T *ListShapes, int x){ double matrix[4][4]; SetSymmetryMatrix(matrix,A,B,C,D); ApplicationOnShapes(matrix,ListShapes); diff --git a/Geo/CAD.h b/Geo/CAD.h index 1c382b732345edf38a85539851e3719b3a432caa..1102d6df064bc157fa3cab494ac7c87efd3472ff 100644 --- a/Geo/CAD.h +++ b/Geo/CAD.h @@ -1,4 +1,4 @@ -/* $Id: CAD.h,v 1.2 2000-11-23 14:11:30 geuzaine Exp $ */ +/* $Id: CAD.h,v 1.3 2000-11-24 10:21:21 geuzaine Exp $ */ #ifndef _CAD_H_ #define _CAD_H_ @@ -42,8 +42,8 @@ void DilatShapes(double X,double Y,double Z, double A, void RotateShapes (double Ax,double Ay,double Az, double Px,double Py, double Pz, double alpha, List_T *ListShapes); -void SymetryShapes (double A,double B,double C, - double D, List_T *ListShapes, int x); +void SymmetryShapes (double A,double B,double C, + double D, List_T *ListShapes, int x); void CopyShape(int Type, int Num, int *New); void DeletePoint(int ip); diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp index 85fb743388592fc94e13b53ab088d2dd56094bc4..2d93f05fce35995391d9d5fc39158078dce19673 100644 --- a/Parser/Gmsh.tab.cpp +++ b/Parser/Gmsh.tab.cpp @@ -55,7 +55,7 @@ #define tAssociation 305 #define tRotate 306 #define tTranslate 307 -#define tSymetry 308 +#define tSymmetry 308 #define tDilate 309 #define tExtrude 310 #define tDuplicata 311 @@ -146,7 +146,7 @@ #define UMINUS 396 #line 1 "Gmsh.y" - /* $Id: Gmsh.tab.cpp,v 1.5 2000-11-24 09:44:00 geuzaine Exp $ */ + /* $Id: Gmsh.tab.cpp,v 1.6 2000-11-24 10:21:24 geuzaine Exp $ */ #include <stdarg.h> @@ -504,7 +504,7 @@ static const char * const yytname[] = { "$","error","$undefined.","tDOUBLE", "tFabs","tFloor","tCeil","tFmod","tModulo","tHypot","tPoint","tCircle","tEllipsis", "tLine","tSurface","tSpline","tVolume","tCharacteristic","tLength","tParametric", "tElliptic","tPlane","tRuled","tTransfinite","tComplex","tPhysical","tUsing", -"tPower","tBump","tProgression","tAssociation","tRotate","tTranslate","tSymetry", +"tPower","tBump","tProgression","tAssociation","tRotate","tTranslate","tSymmetry", "tDilate","tExtrude","tDuplicata","tLoop","tInclude","tRecombine","tDelete", "tCoherence","tView","tOffset","tAttractor","tLayers","tScalarSimplex","tVectorSimplex", "tTensorSimplex","tScalarTriangle","tVectorTriangle","tTensorTriangle","tScalarLine", @@ -2645,7 +2645,7 @@ case 122: case 123: #line 791 "Gmsh.y" { - SymetryShapes(yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-4].v[3],yyvsp[-1].l,1); + SymmetryShapes(yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-4].v[3],yyvsp[-1].l,1); yyval.l = yyvsp[-1].l; ; break;} diff --git a/Parser/Gmsh.tab.cpp.h b/Parser/Gmsh.tab.cpp.h index 6e6866a3384ff1d519f39159d714c2254bdd69eb..180d686defc2ea6aac9108c399569805379a5704 100644 --- a/Parser/Gmsh.tab.cpp.h +++ b/Parser/Gmsh.tab.cpp.h @@ -56,7 +56,7 @@ typedef union { #define tAssociation 305 #define tRotate 306 #define tTranslate 307 -#define tSymetry 308 +#define tSymmetry 308 #define tDilate 309 #define tExtrude 310 #define tDuplicata 311 diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y index d5b2f1549b7081220cd75687e39e9a4d4b341c21..47b0e6b6b160bd45329f7b058c709196d5e31ead 100644 --- a/Parser/Gmsh.y +++ b/Parser/Gmsh.y @@ -1,4 +1,4 @@ -%{ /* $Id: Gmsh.y,v 1.5 2000-11-24 09:44:00 geuzaine Exp $ */ +%{ /* $Id: Gmsh.y,v 1.6 2000-11-24 10:21:24 geuzaine Exp $ */ #include <stdarg.h> @@ -67,7 +67,7 @@ void Get_ColorPointerForString(StringXPointer SXP[], char * string, %token tCharacteristic tLength tParametric tElliptic %token tPlane tRuled tTransfinite tComplex tPhysical %token tUsing tPower tBump tProgression tAssociation -%token tRotate tTranslate tSymetry tDilate tExtrude tDuplicata +%token tRotate tTranslate tSymmetry tDilate tExtrude tDuplicata %token tLoop tInclude tRecombine tDelete tCoherence %token tView tOffset tAttractor tLayers %token tScalarSimplex tVectorSimplex tTensorSimplex @@ -787,9 +787,9 @@ Transform : RotateShapes($3[0],$3[1],$3[2],$5[0],$5[1],$5[2],$7,$10); $$ = $10; } - | tSymetry '(' VExpr ')' '{' MultipleShape '}' + | tSymmetry '(' VExpr ')' '{' MultipleShape '}' { - SymetryShapes($3[0],$3[1],$3[2],$3[3],$6,1); + SymmetryShapes($3[0],$3[1],$3[2],$3[3],$6,1); $$ = $6; } | tDilate '(' VExpr ',' FExpr ')' '{' MultipleShape '}' diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp index ad96c98e6024b31a418f14cd4f49f6915e4957a9..764b6a858f8f0ffe7fc06dee15b5f2e6eec7b07b 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.5 2000-11-24 09:44:00 geuzaine Exp $ + * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.6 2000-11-24 10:21:24 geuzaine Exp $ */ #define FLEX_SCANNER