Intersect

Geo/CAD.h

-/* $Id: CAD.h,v 1.4 2000-11-26 15:43:45 geuzaine Exp $ */
+/* $Id: CAD.h,v 1.5 2000-12-13 22:27:45 geuzaine Exp $ */
 #ifndef _CAD_H_
 #define _CAD_H_
 
@@ -33,6 +33,7 @@ void Extrude_ProtudeSurface(int ep, int is,
 void ProtudeXYZ ( double &x, double &y, double &z, ExtrudeParams *e);
 void ReplaceAllDuplicates ( Mesh *m );
 void Coherence_PS(void);
+bool IntersectAllSegmentsTogether(void);
 
 void ModifyLcPoint(int ip, double lc);
 void TranslateShapes(double X,double Y,double Z,

Parser/Gmsh.l

-%{ /* $Id: Gmsh.l,v 1.20 2000-12-09 22:26:12 geuzaine Exp $ */
+%{ /* $Id: Gmsh.l,v 1.21 2000-12-13 22:27:45 geuzaine Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -135,6 +135,7 @@ Hypot                   return tHypot ;
 
 In                      return tIn;
 If                      return tIf;
+Intersect               return tIntersect;
 
 Knots			return tKnots;
 

Parser/Gmsh.tab.cpp.h

@@ -67,106 +67,107 @@ typedef union {
 #define	tRecombine	314
 #define	tDelete	315
 #define	tCoherence	316
-#define	tView	317
-#define	tAttractor	318
-#define	tLayers	319
-#define	tScalarTetrahedron	320
-#define	tVectorTetrahedron	321
-#define	tTensorTetrahedron	322
-#define	tScalarTriangle	323
-#define	tVectorTriangle	324
-#define	tTensorTriangle	325
-#define	tScalarLine	326
-#define	tVectorLine	327
-#define	tTensorLine	328
-#define	tScalarPoint	329
-#define	tVectorPoint	330
-#define	tTensorPoint	331
-#define	tBSpline	332
-#define	tNurbs	333
-#define	tOrder	334
-#define	tWith	335
-#define	tBounds	336
-#define	tKnots	337
-#define	tColor	338
-#define	tFor	339
-#define	tIn	340
-#define	tEndFor	341
-#define	tIf	342
-#define	tEndIf	343
-#define	tExit	344
-#define	tMerge	345
-#define	tReturn	346
-#define	tCall	347
-#define	tFunction	348
-#define	tB_SPLINE_SURFACE_WITH_KNOTS	349
-#define	tB_SPLINE_CURVE_WITH_KNOTS	350
-#define	tCARTESIAN_POINT	351
-#define	tTRUE	352
-#define	tFALSE	353
-#define	tUNSPECIFIED	354
-#define	tU	355
-#define	tV	356
-#define	tEDGE_CURVE	357
-#define	tVERTEX_POINT	358
-#define	tORIENTED_EDGE	359
-#define	tPLANE	360
-#define	tFACE_OUTER_BOUND	361
-#define	tEDGE_LOOP	362
-#define	tADVANCED_FACE	363
-#define	tVECTOR	364
-#define	tDIRECTION	365
-#define	tAXIS2_PLACEMENT_3D	366
-#define	tISO	367
-#define	tENDISO	368
-#define	tENDSEC	369
-#define	tDATA	370
-#define	tHEADER	371
-#define	tFILE_DESCRIPTION	372
-#define	tFILE_SCHEMA	373
-#define	tFILE_NAME	374
-#define	tMANIFOLD_SOLID_BREP	375
-#define	tCLOSED_SHELL	376
-#define	tADVANCED_BREP_SHAPE_REPRESENTATION	377
-#define	tFACE_BOUND	378
-#define	tCYLINDRICAL_SURFACE	379
-#define	tCONICAL_SURFACE	380
-#define	tCIRCLE	381
-#define	tTRIMMED_CURVE	382
-#define	tGEOMETRIC_SET	383
-#define	tCOMPOSITE_CURVE_SEGMENT	384
-#define	tCONTINUOUS	385
-#define	tCOMPOSITE_CURVE	386
-#define	tTOROIDAL_SURFACE	387
-#define	tPRODUCT_DEFINITION	388
-#define	tPRODUCT_DEFINITION_SHAPE	389
-#define	tSHAPE_DEFINITION_REPRESENTATION	390
-#define	tELLIPSE	391
-#define	tTrimmed	392
-#define	tSolid	393
-#define	tEndSolid	394
-#define	tVertex	395
-#define	tFacet	396
-#define	tNormal	397
-#define	tOuter	398
-#define	tLoopSTL	399
-#define	tEndLoop	400
-#define	tEndFacet	401
-#define	tAFFECTPLUS	402
-#define	tAFFECTMINUS	403
-#define	tAFFECTTIMES	404
-#define	tAFFECTDIVIDE	405
-#define	tOR	406
-#define	tAND	407
-#define	tEQUAL	408
-#define	tNOTEQUAL	409
-#define	tAPPROXEQUAL	410
-#define	tLESSOREQUAL	411
-#define	tGREATEROREQUAL	412
-#define	tCROSSPRODUCT	413
-#define	tPLUSPLUS	414
-#define	tMINUSMINUS	415
-#define	UNARYPREC	416
+#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	tMerge	346
+#define	tReturn	347
+#define	tCall	348
+#define	tFunction	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
 
 
 extern YYSTYPE yylval;

Parser/Gmsh.y

-%{ /* $Id: Gmsh.y,v 1.42 2000-12-11 22:09:43 geuzaine Exp $ */
+%{ /* $Id: Gmsh.y,v 1.43 2000-12-13 22:27:45 geuzaine Exp $ */
 
 #include <stdarg.h>
 
@@ -83,7 +83,7 @@ void skip_until (char *until);
 %token tPlane tRuled tTransfinite tComplex tPhysical
 %token tUsing tBump tProgression
 %token tRotate tTranslate tSymmetry tDilate tExtrude tDuplicata
-%token tLoop tRecombine tDelete tCoherence
+%token tLoop tRecombine tDelete tCoherence tIntersect
 %token tView tAttractor tLayers
 %token tScalarTetrahedron tVectorTetrahedron tTensorTetrahedron
 %token tScalarTriangle tVectorTriangle tTensorTriangle
@@ -2077,6 +2077,10 @@ Coherence :
     { 
       Coherence_PS();
     }
+  | tIntersect tEND
+    { 
+      IntersectAllSegmentsTogether();
+    }
 ;