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

0026613: Coding - avoid use of macros in Resource_Manager.cxx

Browse Source 
Replace macros by enum Resource_KindOfLine.
This commit is contained in:
kgv 2015-09-02 16:47:09 +03:00 committed by bugmaster
parent dd2f1b7500
commit 969d1cafab
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Resource/Resource_Manager.cxx
View File

@ -32,13 +32,18 @@
#include <algorithm> #include <algorithm>
#include <errno.h> #include <errno.h>
#define END 0
#define EMPTY 1
#define COMMENT 2
#define RESOURCE 3
#define ERROR -1
static Standard_Integer WhatKindOfLine(OSD_File& aFile, //! Auxiliary enumeration for function WhatKindOfLine().
enum Resource_KindOfLine
{
Resource_KOL_End,
Resource_KOL_Empty,
Resource_KOL_Comment,
Resource_KOL_Resource,
Resource_KOL_Error
};
static Resource_KindOfLine WhatKindOfLine(OSD_File& aFile,
TCollection_AsciiString& aToken1, TCollection_AsciiString& aToken1,
TCollection_AsciiString& aToken2); TCollection_AsciiString& aToken2);
@ -104,7 +109,7 @@ Resource_Manager::Resource_Manager(const Standard_CString aName,
void Resource_Manager::Load(TCollection_AsciiString& aPath, void Resource_Manager::Load(TCollection_AsciiString& aPath,
Resource_DataMapOfAsciiStringAsciiString& aMap) Resource_DataMapOfAsciiStringAsciiString& aMap)
{ {
Standard_Integer Kind; Resource_KindOfLine aKind;
TCollection_AsciiString Token1, Token2; TCollection_AsciiString Token1, Token2;
TCollection_AsciiString Directory, Name; TCollection_AsciiString Directory, Name;
TCollection_AsciiString FileName; TCollection_AsciiString FileName;
@ -117,16 +122,17 @@ void Resource_Manager::Load(TCollection_AsciiString& aPath,
return; return;
} }
Standard_Integer LineNumber = 1; Standard_Integer LineNumber = 1;
while ((Kind = WhatKindOfLine(File, Token1, Token2)) != END) { while ((aKind = WhatKindOfLine(File, Token1, Token2)) != Resource_KOL_End) {
switch (Kind) { switch (aKind) {
case COMMENT : case Resource_KOL_End:
case EMPTY : case Resource_KOL_Comment:
case Resource_KOL_Empty:
break ; break ;
case RESOURCE : case Resource_KOL_Resource:
if (!aMap.Bind(Token1,Token2)) if (!aMap.Bind(Token1,Token2))
aMap(Token1) = Token2; aMap(Token1) = Token2;
break; break;
case ERROR : case Resource_KOL_Error:
if (myVerbose) if (myVerbose)
cout << "Resource Manager: Syntax error at line " cout << "Resource Manager: Syntax error at line "
<< LineNumber << " in file : " << FileName << endl; << LineNumber << " in file : " << FileName << endl;
@ -140,7 +146,7 @@ void Resource_Manager::Load(TCollection_AsciiString& aPath,
<< " file \"" << FileName << "\" loaded" << endl; << " file \"" << FileName << "\" loaded" << endl;
} }
static Standard_Integer WhatKindOfLine(OSD_File& aFile, static Resource_KindOfLine WhatKindOfLine(OSD_File& aFile,
TCollection_AsciiString& aToken1, TCollection_AsciiString& aToken1,
TCollection_AsciiString& aToken2) TCollection_AsciiString& aToken2)
{ {
@ -149,18 +155,18 @@ static Standard_Integer WhatKindOfLine(OSD_File& aFile,
TCollection_AsciiString Line ; TCollection_AsciiString Line ;
if (!GetLine(aFile,Line)) if (!GetLine(aFile,Line))
return END; return Resource_KOL_End;
if (Line.Value(1) == '!') if (Line.Value(1) == '!')
return COMMENT; return Resource_KOL_Comment;
Pos1 = Line.FirstLocationNotInSet(WhiteSpace, 1, Line.Length()); Pos1 = Line.FirstLocationNotInSet(WhiteSpace, 1, Line.Length());
if (Line.Value(Pos1) == '\n') if (Line.Value(Pos1) == '\n')
return EMPTY; return Resource_KOL_Empty;
Pos2 = Line.Location(1,':',Pos1,Line.Length()); Pos2 = Line.Location(1,':',Pos1,Line.Length());
if (!Pos2 || Pos1 == Pos2) if (!Pos2 || Pos1 == Pos2)
return ERROR; return Resource_KOL_Error;
for (Pos = Pos2-1; Line.Value(Pos) == '\t' || Line.Value(Pos) == ' ' ; Pos--); for (Pos = Pos2-1; Line.Value(Pos) == '\t' || Line.Value(Pos) == ' ' ; Pos--);
aToken1 = Line.SubString(Pos1, Pos); aToken1 = Line.SubString(Pos1, Pos);
@ -188,7 +194,7 @@ static Standard_Integer WhatKindOfLine(OSD_File& aFile,
} }
if (Debug) if (Debug)
cout << "'\t Value = '" << aToken2 << "'" << endl << flush; cout << "'\t Value = '" << aToken2 << "'" << endl << flush;
return RESOURCE; return Resource_KOL_Resource;
} }
// Retourne 0 (EOF) ou une ligne toujours terminee par <NL>. // Retourne 0 (EOF) ou une ligne toujours terminee par <NL>.