Fix formatting
parent
39664d608d
commit
97b8e41997
|
@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
|
||||||
|
|
||||||
Copyright (c) 2006-2021, assimp team
|
Copyright (c) 2006-2021, assimp team
|
||||||
|
|
||||||
|
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use of this software in source and binary forms,
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
@ -40,7 +39,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** @file RemoveComments.cpp
|
/**
|
||||||
|
* @file RemoveComments.cpp
|
||||||
* @brief Defines the CommentRemover utility class
|
* @brief Defines the CommentRemover utility class
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -51,9 +51,7 @@ namespace Assimp {
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Remove line comments from a file
|
// Remove line comments from a file
|
||||||
void CommentRemover::RemoveLineComments(const char* szComment,
|
void CommentRemover::RemoveLineComments(const char* szComment, char* szBuffer, char chReplacement /* = ' ' */) {
|
||||||
char* szBuffer, char chReplacement /* = ' ' */)
|
|
||||||
{
|
|
||||||
// validate parameters
|
// validate parameters
|
||||||
ai_assert(nullptr != szComment);
|
ai_assert(nullptr != szComment);
|
||||||
ai_assert(nullptr != szBuffer);
|
ai_assert(nullptr != szBuffer);
|
||||||
|
@ -75,18 +73,18 @@ void CommentRemover::RemoveLineComments(const char* szComment,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strncmp(szBuffer + i,szComment,len)) {
|
if (!strncmp(szBuffer + i,szComment,len)) {
|
||||||
while (i < lenBuffer && !IsLineEnd(szBuffer[i]))
|
while (i < lenBuffer && !IsLineEnd(szBuffer[i])) {
|
||||||
szBuffer[i++] = chReplacement;
|
szBuffer[i++] = chReplacement;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Remove multi-line comments from a file
|
// Remove multi-line comments from a file
|
||||||
void CommentRemover::RemoveMultiLineComments(const char* szCommentStart,
|
void CommentRemover::RemoveMultiLineComments(const char* szCommentStart,
|
||||||
const char* szCommentEnd,char* szBuffer,
|
const char* szCommentEnd,char* szBuffer,
|
||||||
char chReplacement)
|
char chReplacement) {
|
||||||
{
|
|
||||||
// validate parameters
|
// validate parameters
|
||||||
ai_assert(nullptr != szCommentStart);
|
ai_assert(nullptr != szCommentStart);
|
||||||
ai_assert(nullptr != szCommentEnd);
|
ai_assert(nullptr != szCommentEnd);
|
||||||
|
@ -99,14 +97,16 @@ void CommentRemover::RemoveMultiLineComments(const char* szCommentStart,
|
||||||
|
|
||||||
while (*szBuffer) {
|
while (*szBuffer) {
|
||||||
// skip over quotes
|
// skip over quotes
|
||||||
if (*szBuffer == '\"' || *szBuffer == '\'')
|
if (*szBuffer == '\"' || *szBuffer == '\'') {
|
||||||
while (*szBuffer++ && *szBuffer != '\"' && *szBuffer != '\'');
|
while (*szBuffer++ && *szBuffer != '\"' && *szBuffer != '\'');
|
||||||
|
}
|
||||||
|
|
||||||
if (!strncmp(szBuffer,szCommentStart,len2)) {
|
if (!strncmp(szBuffer,szCommentStart,len2)) {
|
||||||
while (*szBuffer) {
|
while (*szBuffer) {
|
||||||
if (!::strncmp(szBuffer,szCommentEnd,len)) {
|
if (!::strncmp(szBuffer,szCommentEnd,len)) {
|
||||||
for (unsigned int i = 0; i < len;++i)
|
for (unsigned int i = 0; i < len;++i) {
|
||||||
*szBuffer++ = chReplacement;
|
*szBuffer++ = chReplacement;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue