0033338: Coding - IGESToBRep_CurveAndSurface's method has unreachable code

Applied minor changes in Error Message descriptions and code formatting

src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx

@@ -226,304 +226,270 @@ TopoDS_Shape IGESToBRep_CurveAndSurface::TransferCurveAndSurface
 //function : TransferGeometry
 //purpose  : 
 //=======================================================================
-
 TopoDS_Shape IGESToBRep_CurveAndSurface::TransferGeometry
-                               (const Handle(IGESData_IGESEntity)& start,
+                               (const Handle(IGESData_IGESEntity)& theStart,
                                 const Message_ProgressRange& theProgress)
 {
-  // Declaration of messages// 
+// Declaration of messages// 
-  // DCE 22/12/98
+// DCE 22/12/98
-  //Message_Msg msg1005("IGES_1005");  //  Software error :  start IsNull.
+//Message_Msg aMsg1005("IGES_1001");  //  The type of the Start is not recognized
-  //Message_Msg msg1015("IGES_1015");  //  invalid type or exception raising (software error).
+//Message_Msg aMsg1005("IGES_1005");  //  Software error :  the Start IsNull.
-  //Message_Msg msg1010("IGES_1010");  //  Not sameparameter.
+//Message_Msg aMsg1015("IGES_1015");  //  invalid type or exception raising (software error).
-  //  Message_Msg msg1015("IGES_1015");
+//Message_Msg aMsg1010("IGES_1010");  //  Not sameparameter.
-  //Message_Msg msg210 ("XSTEP_210");  
+//Message_Msg aMsg1015("IGES_1020");  //  Associated entity IsNull
-  //Message_Msg msg202 ("XSTEP_202");
+//Message_Msg aMsg1015("IGES_1025");  //  No shape is found for the associated entity for the type 308
-  ////////////////////////////
+//Message_Msg aMsg1015("IGES_1030");  //  No shape is found for the associated entity for the type 402
-  TopoDS_Shape res;
+//Message_Msg aMsg1015("IGES_1035");  //  The conversion of a Location is not possible
-  gp_Trsf T408;
+//Message_Msg aMsg210 ("XSTEP_210");  //  No associated entities for the type 308
-  if (start.IsNull()) {
+//Message_Msg aMsg202 ("XSTEP_202");  //  No associated entities for the type 402
-    Message_Msg msg1005("IGES_1005");  //  Software error :  start IsNull.
+////////////////////////////
-    SendFail(start, msg1005);
+  TopoDS_Shape aRes;
-    return res;
+  gp_Trsf aT408;
+  if (theStart.IsNull())
+  {
+    const Message_Msg aMsg1005("IGES_1005");  //  Software error :  start IsNull.
+    SendFail(theStart, aMsg1005);
+    return aRes;
   }
 
-  // Read of the DE number and the type number of the entity
-  Handle(TCollection_HAsciiString) label = GetModel()->StringLabel(start);
-  //Standard_Integer typeNumber = start->TypeNumber();
-  
   // sln 13.06.2002 OCC448: Avoid transferring invisible sub entities which
   // logically depend on the one
-  Standard_Integer onlyvisible = Interface_Static::IVal("read.iges.onlyvisible");
+  const Standard_Integer anOnlyvisible = Interface_Static::IVal("read.iges.onlyvisible");
 
-  if (IGESToBRep::IsCurveAndSurface(start)) {
+  if (IGESToBRep::IsCurveAndSurface(theStart))
-    if(onlyvisible && start->BlankStatus() == 1)
+  {
-      return res;
+    if(anOnlyvisible && theStart->BlankStatus() == 1)
-    try {
+      return aRes;
+    try
+    {
       OCC_CATCH_SIGNALS
-        res = TransferCurveAndSurface(start, theProgress);
+      aRes = TransferCurveAndSurface(theStart, theProgress);
     }
-    catch(Standard_Failure const&) {
+    catch(Standard_Failure const&)
-      Message_Msg msg1015("IGES_1015");
+    {
-      SendFail(start, msg1015);
+      const Message_Msg aMsg1015("IGES_1015");
+      SendFail(theStart, aMsg1015);
     }
-    return res;
+    return aRes;
   }
 
   //408 : SingularSubfigure
-  if (start->IsKind(STANDARD_TYPE(IGESBasic_SingularSubfigure))) 
+  if (theStart->IsKind(STANDARD_TYPE(IGESBasic_SingularSubfigure)))
     {
-      if(onlyvisible && start->BlankStatus() == 1)
+      if(anOnlyvisible && theStart->BlankStatus() == 1)
-        return res;
+        return aRes;
 
-      DeclareAndCast(IGESBasic_SingularSubfigure, st408, start);
+      DeclareAndCast(IGESBasic_SingularSubfigure, aSt408, theStart);
-      Handle (IGESBasic_SubfigureDef) stsub = st408->Subfigure();
+      Handle (IGESBasic_SubfigureDef) aStsub = aSt408->Subfigure();
-      gp_XYZ trans = st408->Translation();
+      const gp_XYZ aTrans = aSt408->Translation();
-      gp_Vec vectr(trans);
+      gp_Vec aVectr(aTrans);
-      Standard_Real scunit = GetUnitFactor();
+      const Standard_Real aScunit = GetUnitFactor();
-      vectr.Multiply(scunit);
+      aVectr.Multiply(aScunit);
-      T408.SetTranslation(vectr);
+      aT408.SetTranslation(aVectr);
-      if (st408->HasScaleFactor()) {
+      if (aSt408->HasScaleFactor())
-	  Standard_Real scalef = st408->ScaleFactor();
+      {
-	  T408.SetScaleFactor(scalef);
+        const Standard_Real aScalef = aSt408->ScaleFactor();
-	}
+        aT408.SetScaleFactor(aScalef);
-      if (HasShapeResult(stsub)) {
-	res = GetShapeResult(stsub);
       }
-      else {
+      if (HasShapeResult(aStsub))
-	try {
+      {
-	  OCC_CATCH_SIGNALS
+        aRes = GetShapeResult(aStsub);
-	  res = TransferGeometry(stsub, theProgress);
+      }
-	}
+      else
-    catch(Standard_Failure const&) {
+      {
-	  res.Nullify();
+        try
-          Message_Msg msg1015("IGES_1015");
+        {
-	  SendFail( st408, msg1015);
+          OCC_CATCH_SIGNALS
-	}
+          aRes = TransferGeometry(aStsub, theProgress);
-	if (!res.IsNull()) {
+        }
-	  SetShapeResult(stsub,res);
+        catch(Standard_Failure const&)
-	}
+        {
+          aRes.Nullify();
+          const Message_Msg aMsg1015("IGES_1015");
+          SendFail(aSt408, aMsg1015);
+        }
+        if (!aRes.IsNull())
+        {
+          SetShapeResult(aStsub, aRes);
+        }
       }
     }
 
   // 308 : SubfigureDefinition
-  else if (start->IsKind(STANDARD_TYPE(IGESBasic_SubfigureDef))) {
+  else if (theStart->IsKind(STANDARD_TYPE(IGESBasic_SubfigureDef)))
-    DeclareAndCast(IGESBasic_SubfigureDef, st308, start);
+  {
-    TopoDS_Compound group;
+    DeclareAndCast(IGESBasic_SubfigureDef, aSt308, theStart);
-    BRep_Builder B;
+    TopoDS_Compound aGroup;
-    B.MakeCompound (group);
+    BRep_Builder aBuilder;
-    if (st308->NbEntities() < 1) {
+    aBuilder.MakeCompound (aGroup);
-      Message_Msg msg210 ("XSTEP_210");  
+    if (aSt308->NbEntities() < 1)
-      SendFail( st308, msg210);
-      return res;
-    }
-    Message_ProgressScope PS (theProgress, "Subfigure item", st308->NbEntities());
-    for (Standard_Integer i=1; i <= st308->NbEntities() && PS.More(); i++)
     {
-      Message_ProgressRange aRange = PS.Next();
+      const Message_Msg aMsg210 ("XSTEP_210");
-      TopoDS_Shape item;
+      SendFail(aSt308, aMsg210);
-      if (st308->AssociatedEntity(i).IsNull()) {
+      return aRes;
-	Message_Msg msg1020("IGES_1020");
+    }
-        msg1020.Arg(i);
+    Message_ProgressScope aPS (theProgress, "Subfigure item", aSt308->NbEntities());
-	SendWarning( st308, msg1020);
+    for (Standard_Integer anIndx =1; anIndx <= aSt308->NbEntities() && aPS.More(); anIndx++)
-	continue;
+    {
+      Message_ProgressRange aRange = aPS.Next();
+      TopoDS_Shape anItem;
+      if (aSt308->AssociatedEntity(anIndx).IsNull())
+      {
+        Message_Msg aMsg1020("IGES_1020");
+        aMsg1020.Arg(anIndx);
+        SendWarning(aSt308, aMsg1020);
+        continue;
       }
-      if(onlyvisible && st308->AssociatedEntity(i)->BlankStatus() == 1 )
+      if(anOnlyvisible && aSt308->AssociatedEntity(anIndx)->BlankStatus() == 1)
         continue;
 
-      if (HasShapeResult(st308->AssociatedEntity(i)))
+      if (HasShapeResult(aSt308->AssociatedEntity(anIndx)))
-	{
+      {
-	  item = GetShapeResult(st308->AssociatedEntity(i));
+        anItem = GetShapeResult(aSt308->AssociatedEntity(anIndx));
-	}
-      else {
-	try {      
-	  OCC_CATCH_SIGNALS
-	  item = TransferGeometry (st308->AssociatedEntity(i), aRange);
-	}
-    catch(Standard_Failure const&) {
-	  item.Nullify();
-	  Message_Msg msg1015("IGES_1015");
-	  SendFail( st308->AssociatedEntity(i), msg1015);
-	}
       }
-      if (item.IsNull()) {
+      else
-	Message_Msg msg1025("IGES_1025");
+      {
-        msg1025.Arg(i);
+        try
-	SendWarning (start,msg1025);
+        {
+          OCC_CATCH_SIGNALS
+          anItem = TransferGeometry (aSt308->AssociatedEntity(anIndx), aRange);
+        }
+        catch(Standard_Failure const&)
+        {
+          anItem.Nullify();
+          const Message_Msg aMsg1015("IGES_1015");
+          SendFail(aSt308->AssociatedEntity(anIndx), aMsg1015);
+        }
       }
-      else {
+      if (anItem.IsNull())
-	B.Add(group, item);
+      {
-	SetShapeResult (st308->AssociatedEntity(i),item);
+        Message_Msg aMsg1025("IGES_1025");
+        aMsg1025.Arg(anIndx);
+        SendWarning (theStart, aMsg1025);
+      }
+      else
+      {
+        aBuilder.Add(aGroup, anItem);
+        SetShapeResult (aSt308->AssociatedEntity(anIndx), anItem);
       }
     }
-    res = group;
+    aRes = aGroup;
   }
-  else if (start->IsKind(STANDARD_TYPE(IGESBasic_Group))) {
+  // 402 : Group Associativity
-    if(onlyvisible && start->BlankStatus() == 1)
+  else if (theStart->IsKind(STANDARD_TYPE(IGESBasic_Group)))
-      return res;      
+  {
+    if(anOnlyvisible && theStart->BlankStatus() == 1)
+      return aRes;
 
-    DeclareAndCast(IGESBasic_Group, st402f1, start);
+    DeclareAndCast(IGESBasic_Group, aSt402, theStart);
-    TopoDS_Compound group;
+    TopoDS_Compound aGroup;
-    BRep_Builder B;
+    BRep_Builder aBuilder;
-    B.MakeCompound (group);
+    aBuilder.MakeCompound (aGroup);
-    if (st402f1->NbEntities() < 1) {
+    const Standard_Integer aNbEnt = aSt402->NbEntities();
-      Message_Msg msg202 ("XSTEP_202");
+    if (aNbEnt < 1)
-      msg202.Arg(st402f1->FormNumber());
-      SendFail(st402f1, msg202);
-      return res;
-    }
-    Message_ProgressScope PS (theProgress, "Group item", st402f1->NbEntities());
-    Standard_Boolean ProblemInGroup = Standard_False;
-    for (Standard_Integer i=1; i <= st402f1->NbEntities() && PS.More(); i++)
     {
-      Message_ProgressRange aRange = PS.Next();
+      Message_Msg aMsg202 ("XSTEP_202");
-      TopoDS_Shape item;
+      aMsg202.Arg(aSt402->FormNumber());
-      if (st402f1->Entity(i).IsNull()) {
+      SendFail(aSt402, aMsg202);
-	Message_Msg msg1020("IGES_1020");
+      return aRes;
-	msg1020.Arg(i);
+    }
-	SendFail( st402f1, msg1020);
+    Message_ProgressScope aPS (theProgress, "Group item", aNbEnt);
-	continue;
+    Standard_Boolean aProblemInGroup = Standard_False;
+    for (Standard_Integer anIndx=1; anIndx <= aNbEnt && aPS.More(); anIndx++)
+    {
+      Message_ProgressRange aRange = aPS.Next();
+      TopoDS_Shape anItem;
+      if (aSt402->Entity(anIndx).IsNull())
+      {
+        Message_Msg aMsg1020("IGES_1020");
+        aMsg1020.Arg(anIndx);
+        SendFail(aSt402, aMsg1020);
+        continue;
       }
 
-      if(onlyvisible && st402f1->Entity(i)->BlankStatus() == 1)
+      if(anOnlyvisible && aSt402->Entity(anIndx)->BlankStatus() == 1)
         continue;
 
-      if (HasShapeResult(st402f1->Entity(i))) {
+      if (HasShapeResult(aSt402->Entity(anIndx)))
-	item = GetShapeResult(st402f1->Entity(i));
+      {
+        anItem = GetShapeResult(aSt402->Entity(anIndx));
       }
-      else {
+      else
-	try {
+      {
-	  OCC_CATCH_SIGNALS
+        try
-	  item = TransferGeometry (st402f1->Entity(i), aRange);
+        {
-	}
+          OCC_CATCH_SIGNALS
-    catch(Standard_Failure const&) {
+          anItem = TransferGeometry (aSt402->Entity(anIndx), aRange);
-	  item.Nullify();
+        }
-	  Message_Msg msg1015("IGES_1015");
+        catch(Standard_Failure const&)
-	  SendFail(st402f1->Entity(i),msg1015);
+        {
-	}
+          anItem.Nullify();
+          const Message_Msg aMsg1015("IGES_1015");
+          SendFail(aSt402->Entity(anIndx), aMsg1015);
+        }
       }
-      if (item.IsNull()) {
+      if (anItem.IsNull())
-	//Message_Msg msg1030("IGES_1030");
+      {
-	//msg1030.Arg(st402f1->FormNumber());
+        aProblemInGroup = Standard_True;
-	//msg1030.Arg(i);
-	//SendWarning (st402f1,msg1030);
-        ProblemInGroup = Standard_True;
       }
-      else {
+      else
-	B.Add(group, item);
+      {
-	SetShapeResult (st402f1->Entity(i),item);
+        aBuilder.Add(aGroup, anItem);
+        SetShapeResult (aSt402->Entity(anIndx), anItem);
       }
     }
-    res = group;
+    aRes = aGroup;
-    if(ProblemInGroup) {
+    if(aProblemInGroup)
-      Message_Msg msg1030("IGES_1030");
-      msg1030.Arg(st402f1->FormNumber());
-      SendWarning (st402f1,msg1030);
-    }
-  }
-  else if (start->IsKind(STANDARD_TYPE(IGESBasic_GroupWithoutBackP))) {	
-    
-    if(onlyvisible && start->BlankStatus() == 1)
-      return res;      
-    
-    DeclareAndCast(IGESBasic_GroupWithoutBackP, st402f7, start);
-    TopoDS_Compound group;
-//unused    Handle(TCollection_HAsciiString) label = GetModel()->StringLabel(st402f7);
-    BRep_Builder B;
-    B.MakeCompound (group);
-    if (st402f7->NbEntities() < 1) {
-      Message_Msg msg202 ("XSTEP_202");
-      msg202.Arg(st402f7->FormNumber());
-      SendFail(st402f7, msg202); 
-      return res;
-    }
-    Message_ProgressScope PS (theProgress, "Group item", st402f7->NbEntities());
-    Standard_Boolean ProblemInGroup = Standard_False;
-    for (Standard_Integer i=1; i <= st402f7->NbEntities() && PS.More(); i++)
     {
-      Message_ProgressRange aRange = PS.Next();
+      Message_Msg aMsg1030("IGES_1030");
-      TopoDS_Shape item;
+      aMsg1030.Arg(aSt402->FormNumber());
-      if (st402f7->Entity(i).IsNull()) {
+      SendWarning (aSt402, aMsg1030);
-	Message_Msg msg1020("IGES_1020");
-	msg1020.Arg(i);
-	SendFail( st402f7, msg1020);
-	continue;
-      }
-      
-      if(onlyvisible && st402f7->Entity(i)->BlankStatus() == 1 )
-        continue;      
-
-      if (HasShapeResult(st402f7->Entity(i))) {
-	item = GetShapeResult(st402f7->Entity(i));
-      }
-      else {
-	try {
-	  OCC_CATCH_SIGNALS
-	  item = TransferGeometry (st402f7->Entity(i), aRange);
-	}
-    catch(Standard_Failure const&) {
-	  item.Nullify();
-	  Message_Msg msg1015("IGES_1015");
-	  SendFail(st402f7->Entity(i),msg1015);
-	}
-      }
-      if (item.IsNull()) {
-	//Message_Msg msg1030("IGES_1030");
-	//msg1030.Arg(st402f7->FormNumber());
-	//msg1030.Arg(i);
-	//SendWarning (st402f7,msg1030);
-        ProblemInGroup = Standard_True;
-      }
-      else {
-	B.Add(group, item);
-	SetShapeResult (st402f7->Entity(i),item);
-      }
-    }
-    res = group;
-    if(ProblemInGroup) {
-      Message_Msg msg1030("IGES_1030");
-      msg1030.Arg(st402f7->FormNumber());
-      SendWarning (st402f7,msg1030);
     }
   }
-  else {
+  else
-    Message_Msg msg1001("IGES_1001");
+  {
-    msg1001.Arg(start->FormNumber());
+    Message_Msg aMsg1001("IGES_1001");
-    SendFail (start,msg1001);
+    aMsg1001.Arg(theStart->FormNumber());
-    return res;
+    SendFail (theStart, aMsg1001);
+    return aRes;
   }
 
-  if (start->HasTransf()) {
+  if (theStart->HasTransf())
-    gp_Trsf T;
+  {
+    gp_Trsf aT;
     SetEpsilon(1.E-04);
-    if (IGESData_ToolLocation::ConvertLocation(GetEpsilon(),start->CompoundLocation(),
+    if (IGESData_ToolLocation::ConvertLocation(GetEpsilon(), theStart->CompoundLocation(),
-                                               T,GetUnitFactor())) {
+                                               aT, GetUnitFactor()))
-      if (start->IsKind(STANDARD_TYPE(IGESBasic_SingularSubfigure))) 
+    {
-	{
+      if (theStart->IsKind(STANDARD_TYPE(IGESBasic_SingularSubfigure)))
-	  gp_XYZ tra = T.TranslationPart();
+      {
-	  gp_XYZ trans = T408.TranslationPart();
+        gp_XYZ aTra = aT.TranslationPart();
-	  tra.Add(trans);
+        const gp_XYZ aTrans = aT408.TranslationPart();
-	  T.SetTranslationPart(tra);
+        aTra.Add(aTrans);
-	  Standard_Real sc = T.ScaleFactor();
+        aT.SetTranslationPart(aTra);
-	  Standard_Real scalef = T408.ScaleFactor();
+        Standard_Real aSc = aT.ScaleFactor();
-	  sc = sc*scalef;
+        const Standard_Real aScalef = aT408.ScaleFactor();
-	  T.SetScaleFactor(sc);
+        aSc = aSc*aScalef;
-	}
+        aT.SetScaleFactor(aSc);
-      TopLoc_Location L(T);
+      }
-      res.Move(L, Standard_False);
+      const TopLoc_Location aLoc(aT);
+      aRes.Move(aLoc, Standard_False);
     }
-    else {
+    else
-      Message_Msg msg1035("IGES_1035");
+    {
-      SendWarning (start,msg1035);
+      const Message_Msg aMsg1035("IGES_1035");
+      SendWarning (theStart, aMsg1035);
     }
   }
-  else {
+  else
-    if (start->IsKind(STANDARD_TYPE(IGESBasic_SingularSubfigure))) {
+  {
-      TopLoc_Location L(T408);
+    if (theStart->IsKind(STANDARD_TYPE(IGESBasic_SingularSubfigure)))
-      res.Move(L);	  
+    {
+      const TopLoc_Location aLoc(aT408);
+      aRes.Move(aLoc);
     }
   }
-  return res;
+  return aRes;
 }