Skip to content

Commit

Permalink
clang-formatted
Browse files Browse the repository at this point in the history
  • Loading branch information
@burgerbecky
burgerbecky committed Aug 12, 2019
1 parent be4cd7f commit f24c0e6
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 28 deletions.
57 changes: 32 additions & 25 deletions stripcomments/source/stripcomments.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static const char g_GenerationHeader[] =
***************************************/

void BURGER_API StripComments(
OutputMemoryStream* pOutput, const char* pInput, WordPtr uLength)
OutputMemoryStream* pOutput, const char* pInput, uintptr_t uLength)
{
enum eState {
REMOVING_WHITESPACE,
Expand All @@ -46,14 +46,14 @@ void BURGER_API StripComments(

if (uLength) {
// Not in an active quote
Word uQuoteCharacter = 0;
uint_t uQuoteCharacter = 0;
// Remove whitespace from the start of a line
eState eCurrentState = REMOVING_WHITESPACE;
eState eOldAsteriskState = REMOVING_WHITESPACE;
Word uCharacter;
uint_t uCharacter;
do {
// Pull out a character
uCharacter = reinterpret_cast<const Word8*>(pInput)[0];
uCharacter = reinterpret_cast<const uint8_t*>(pInput)[0];
--uLength;
++pInput;
// Process according to the current state
Expand All @@ -67,13 +67,13 @@ void BURGER_API StripComments(
break;
}
if ((uCharacter == '/') && (uLength)) {
if (reinterpret_cast<const Word8*>(pInput)[0] == '/') {
if (reinterpret_cast<const uint8_t*>(pInput)[0] == '/') {
--uLength;
++pInput;
eCurrentState = SLASH_COMMENT;
break;
}
if (reinterpret_cast<const Word8*>(pInput)[0] == '*') {
if (reinterpret_cast<const uint8_t*>(pInput)[0] == '*') {
++pInput;
--uLength;
eCurrentState = ASTERISK_COMMENT;
Expand All @@ -96,7 +96,8 @@ void BURGER_API StripComments(
if (uCharacter == '\\') {
if (uLength) {
pOutput->Append('\\');
uCharacter = reinterpret_cast<const Word8*>(pInput)[0];
uCharacter =
reinterpret_cast<const uint8_t*>(pInput)[0];
--uLength;
++pInput;
}
Expand All @@ -109,7 +110,7 @@ void BURGER_API StripComments(
// Is this an end of line?
if (uCharacter == '\r') {
if (uLength &&
reinterpret_cast<const Word8*>(pInput)[0] == '\n') {
reinterpret_cast<const uint8_t*>(pInput)[0] == '\n') {
++pInput;
--uLength;
}
Expand All @@ -122,14 +123,16 @@ void BURGER_API StripComments(
}
if (uCharacter == '/') {
if (uLength) {
if (reinterpret_cast<const Word8*>(pInput)[0] == '/') {
if (reinterpret_cast<const uint8_t*>(pInput)[0] ==
'/') {
++pInput;
--uLength;
eCurrentState = SLASH_COMMENT;
pOutput->Append('\n');
break;
}
if (reinterpret_cast<const Word8*>(pInput)[0] == '*') {
if (reinterpret_cast<const uint8_t*>(pInput)[0] ==
'*') {
++pInput;
--uLength;
eCurrentState = ASTERISK_COMMENT;
Expand All @@ -153,14 +156,14 @@ void BURGER_API StripComments(
break;
}
if ((uCharacter == '/') && (uLength)) {
if (reinterpret_cast<const Word8*>(pInput)[0] == '/') {
if (reinterpret_cast<const uint8_t*>(pInput)[0] == '/') {
--uLength;
++pInput;
pOutput->Append('\n');
eCurrentState = SLASH_COMMENT;
break;
}
if (reinterpret_cast<const Word8*>(pInput)[0] == '*') {
if (reinterpret_cast<const uint8_t*>(pInput)[0] == '*') {
++pInput;
--uLength;
eCurrentState = ASTERISK_COMMENT;
Expand All @@ -183,15 +186,16 @@ void BURGER_API StripComments(
if (uCharacter == '\\') {
if (uLength) {
pOutput->Append('\\');
uCharacter = reinterpret_cast<const Word8*>(pInput)[0];
uCharacter =
reinterpret_cast<const uint8_t*>(pInput)[0];
--uLength;
++pInput;
}
}
// Is this an end of line?
if (uCharacter == '\r') {
if (uLength &&
reinterpret_cast<const Word8*>(pInput)[0] == '\n') {
reinterpret_cast<const uint8_t*>(pInput)[0] == '\n') {
++pInput;
--uLength;
}
Expand All @@ -205,7 +209,7 @@ void BURGER_API StripComments(
case ASTERISK_COMMENT:
if (uCharacter == '*') {
if (uLength &&
reinterpret_cast<const Word8*>(pInput)[0] == '/') {
reinterpret_cast<const uint8_t*>(pInput)[0] == '/') {
++pInput;
--uLength;
eCurrentState = eOldAsteriskState;
Expand All @@ -223,11 +227,12 @@ void BURGER_API StripComments(
// condition. Thankfully, visual studio issues a warning for
// source containing this case
if (uLength) {
if (reinterpret_cast<const Word8*>(pInput)[0] == '\r') {
if (reinterpret_cast<const uint8_t*>(pInput)[0] ==
'\r') {
++pInput;
--uLength;
if (uLength &&
reinterpret_cast<const Word8*>(pInput)[0] ==
reinterpret_cast<const uint8_t*>(pInput)[0] ==
'\n') {
++pInput;
--uLength;
Expand All @@ -236,7 +241,8 @@ void BURGER_API StripComments(
break;
}

if (reinterpret_cast<const Word8*>(pInput)[0] == '\n') {
if (reinterpret_cast<const uint8_t*>(pInput)[0] ==
'\n') {
++pInput;
--uLength;
// Stay in the // comment mode
Expand All @@ -250,7 +256,7 @@ void BURGER_API StripComments(
// Time to stop discarding text?
if (uCharacter == '\r') {
if (uLength &&
reinterpret_cast<const Word8*>(pInput)[0] == '\n') {
reinterpret_cast<const uint8_t*>(pInput)[0] == '\n') {
++pInput;
--uLength;
}
Expand Down Expand Up @@ -285,7 +291,7 @@ int BURGER_ANSIAPI main(int argc, const char** argv)
const CommandParameter* MyParms[] = {&CPP, &Label};
argv = MyApp.GetArgv();
argc = CommandParameter::Process(MyApp.GetArgc(), argv, MyParms,
sizeof(MyParms) / sizeof(MyParms[0]),
BURGER_ARRAYSIZE(MyParms),
"Usage: stripcomments InputFile [Outputfile]\n\n"
"This will strip C++ style comments from a source file.\n"
"Copyright Rebecca Ann Heineman.\n",
Expand All @@ -295,7 +301,7 @@ int BURGER_ANSIAPI main(int argc, const char** argv)
MyApp.SetArgc(argc);
Filename InputFilename;
InputFilename.SetFromNative(argv[1]);
WordPtr uLength;
uintptr_t uLength;
const char* pInputBuffer = static_cast<const char*>(
FileManager::LoadFile(&InputFilename, &uLength));

Expand Down Expand Up @@ -343,18 +349,19 @@ int BURGER_ANSIAPI main(int argc, const char** argv)
Output.Append("\"\"");
} else {
const char* pWork = pInputBuffer;
Word bQuoted = FALSE;
uint_t bQuoted = FALSE;
do {
if (!bQuoted) {
Output.Append("\n\"");
bQuoted = TRUE;
}
Word uTemp = reinterpret_cast<const Word8*>(pWork)[0];
uint_t uTemp =
reinterpret_cast<const uint8_t*>(pWork)[0];
++pWork;
--uLength;
if (uTemp == '\r') {
if (uLength &&
reinterpret_cast<const Word8*>(pWork)[0] ==
reinterpret_cast<const uint8_t*>(pWork)[0] ==
'\n') {
++pWork;
--uLength;
Expand Down Expand Up @@ -383,7 +390,7 @@ int BURGER_ANSIAPI main(int argc, const char** argv)

// Save the text file to disk

Word uResult = Output.SaveFile(&OutputFilename);
uint_t uResult = Output.SaveFile(&OutputFilename);
if (uResult) {
printf("Error in saving %s\n", OutputFilename.GetNative());
}
Expand Down
2 changes: 1 addition & 1 deletion stripcomments/source/stripcomments.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#endif

extern void BURGER_API StripComments(
OutputMemoryStream* pOutput, const char* pInput, WordPtr uLength);
OutputMemoryStream* pOutput, const char* pInput, uintptr_t uLength);
extern int BURGER_ANSIAPI main(int argc, const char** argv);

#endif
4 changes: 2 additions & 2 deletions stripcomments/stripcommentsv19win.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<CallingConvention>FastCall</CallingConvention>
</ClCompile>
<Link>
<AdditionalDependencies>burgerlibv19w32ltc.lib;Kernel32.lib;Gdi32.lib;Shell32.lib;Ole32.lib;User32.lib;Advapi32.lib;version.lib;Ws2_32.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>burgerv19w32ltc.lib;Kernel32.lib;Gdi32.lib;Shell32.lib;Ole32.lib;User32.lib;Advapi32.lib;version.lib;Ws2_32.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
Expand Down Expand Up @@ -120,7 +120,7 @@
<CallingConvention>FastCall</CallingConvention>
</ClCompile>
<Link>
<AdditionalDependencies>burgerlibv19w64ltc.lib;Kernel32.lib;Gdi32.lib;Shell32.lib;Ole32.lib;User32.lib;Advapi32.lib;version.lib;Ws2_32.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>burgerv19w64ltc.lib;Kernel32.lib;Gdi32.lib;Shell32.lib;Ole32.lib;User32.lib;Advapi32.lib;version.lib;Ws2_32.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
Expand Down

0 comments on commit f24c0e6

Please sign in to comment.