BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PP: Non-functional: rationalize TPpToken.

Browse source 
Always keep 'token' outside.
Always return the string to upper levels inside.
This commit is contained in:
John Kessenich 2016-12-20 19:42:53 -07:00
parent 1fbb9c1430
commit 54af2de761
6 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
glslang/MachineIndependent/ShaderLang.cpp
View file

@ -931,7 +931,11 @@ struct DoPreprocessing {
});
int lastToken = EndOfInput; // lastToken records the last token processed.
while (const char* tok = ppContext.tokenize(ppToken)) {
do {
int token = ppContext.tokenize(ppToken);
if (token == EndOfInput)
break;
bool isNewString = lineSync.syncToMostRecentString();
bool isNewLine = lineSync.syncToLine(ppToken.loc.line);
@ -946,14 +950,14 @@ struct DoPreprocessing {
// and also not around special tokens. This helps with readability
// and consistency.
if (!isNewString && !isNewLine && lastToken != EndOfInput &&
(unNeededSpaceTokens.find((char)ppToken.token) == std::string::npos) &&
(unNeededSpaceTokens.find((char)token) == std::string::npos) &&
(unNeededSpaceTokens.find((char)lastToken) == std::string::npos) &&
(noSpaceBeforeTokens.find((char)ppToken.token) == std::string::npos)) {
(noSpaceBeforeTokens.find((char)token) == std::string::npos)) {
outputStream << " ";
}
lastToken = ppToken.token;
outputStream << tok;
}
lastToken = token;
outputStream << ppToken.name;
} while (true);
outputStream << std::endl;
*outputString = outputStream.str();