OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0023351: The use of 'if (A) {...} else if (A) {...}' pattern was detected.

Browse Source 
Got rid of duplicated code.
Got rid of redundant conditions' checks in Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const char** a) function.
This commit is contained in:
omy 2012-10-19 18:09:57 +04:00
parent 4dabfbf233
commit 7da2a6ab87
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/TestTopOpe/TestTopOpe_BOOPCommands.cxx
View File

@ -85,14 +85,14 @@ Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const c
else if (!strcmp(a[1],"OUT")) sta = TopAbs_OUT;
else if (!strcmp(a[1],"ON")) sta = TopAbs_ON;
if (sta==TopAbs_IN||sta==TopAbs_OUT||sta == TopAbs_ON) {
if (sta != TopAbs_UNKNOWN) {
if (na==2) { PBOOP->GetSplit(sta); } // tsp IN/ON/OUT
else if ( na > 2 ) {
TopAbs_ShapeEnum typ = TopAbs_SHAPE;
if (!strcmp(a[2],"e")) typ = TopAbs_EDGE;
else if (!strcmp(a[2],"f")) typ = TopAbs_FACE;
else if (!strcmp(a[2],"s")) typ = TopAbs_SOLID;
if (typ==TopAbs_EDGE||typ==TopAbs_FACE||typ==TopAbs_SOLID) {
if (typ != TopAbs_SHAPE) {
if (na == 3) {
// tsp IN/ON/OUT e/f/s
PBOOP->GetSplit(typ,sta);
@ -107,10 +107,6 @@ Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const c
for(i=2;i<na;i++) PBOOP->GetSplit(sta,atoi(a[i]));
}
}
else if ( na > 2 ) {
// tsp IN/ON/OUT i1 i2 ...
for(i=2;i<na;i++) PBOOP->GetSplit(sta,atoi(a[i]));
}
}
else { // tsp i1 i2 ...
for (i = 1; i < na; i++) {
@ -132,14 +128,14 @@ Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const c
else if (!strcmp(a[1],"OUT")) sta = TopAbs_OUT;
else if (!strcmp(a[1],"ON")) sta = TopAbs_ON;
if (sta==TopAbs_IN||sta==TopAbs_OUT||sta == TopAbs_ON) {
if (sta != TopAbs_UNKNOWN) {
if (na==2) { PBOOP->GetMerged(sta); } // tme IN/ON/OUT
else if ( na > 2 ) {
TopAbs_ShapeEnum typ = TopAbs_SHAPE;
if (!strcmp(a[2],"e")) typ = TopAbs_EDGE;
else if (!strcmp(a[2],"f")) typ = TopAbs_FACE;
else if (!strcmp(a[2],"s")) typ = TopAbs_SOLID;
if (typ==TopAbs_EDGE||typ==TopAbs_FACE||typ==TopAbs_SOLID) {
if (typ != TopAbs_SHAPE) {
if (na == 3) {
// tme IN/ON/OUT e/f/s
PBOOP->GetMerged(typ,sta);
@ -154,10 +150,6 @@ Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const c
for(i=2;i<na;i++) PBOOP->GetMerged(sta,atoi(a[i]));
}
}
else if ( na > 2 ) {
// tme IN/ON/OUT i1 i2 ...
for(i=2;i<na;i++) PBOOP->GetMerged(sta,atoi(a[i]));
}
}
else { // tme i1 i2 ...
for (i = 1; i < na; i++) {