v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix formatting

pull/4147/head
Kim Kulling 2021-11-12 09:56:45 +01:00 committed by GitHub
parent 39664d608d
commit 97b8e41997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
code/Common/RemoveComments.cpp
View File

@ -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,20 +39,19 @@ 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
*/ */
#include <assimp/RemoveComments.h> #include <assimp/RemoveComments.h>
#include <assimp/ParsingUtils.h> #include <assimp/ParsingUtils.h>
namespace Assimp { 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,8 +73,9 @@ 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;
}
} }
} }
} }
@ -84,9 +83,8 @@ void CommentRemover::RemoveLineComments(const char* szComment,
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// 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,18 +97,20 @@ 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;
} }
*szBuffer++ = chReplacement; *szBuffer++ = chReplacement;
} }
continue; continue;
} }