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

PP: Fix issue #426, recover from bad-source macro expansion.

Browse source
This commit is contained in:
John Kessenich 2017-01-02 17:56:08 -07:00
parent bc5196c003
commit faa720f14c
5 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glslang/Include/revision.h
View file

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1727"
#define GLSLANG_REVISION "Overload400-PrecQual.1728"
#define GLSLANG_DATE "02-Jan-2017"

14
glslang/MachineIndependent/preprocessor/Pp.cpp
View file

@ -934,12 +934,20 @@ TPpContext::TokenStream* TPpContext::PrescanMacroArg(TokenStream& arg, TPpToken*
TokenStream* expandedArg = new TokenStream;
pushInput(new tMarkerInput(this));
pushTokenStreamInput(arg);
while ((token = scanToken(ppToken)) != tMarkerInput::marker) {
while ((token = scanToken(ppToken)) != tMarkerInput::marker && token != EndOfInput) {
if (token == PpAtomIdentifier && MacroExpand(ppToken, false, newLineOkay) != 0)
continue;
RecordToken(*expandedArg, token, ppToken);
}
popInput();
if (token == EndOfInput) {
// MacroExpand ate the marker, so had bad input, recover
delete expandedArg;
expandedArg = nullptr;
} else {
// remove the marker
popInput();
}
return expandedArg;
}
@ -1133,7 +1141,7 @@ int TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, bool newLineOka
depth = 0;
while (1) {
token = scanToken(ppToken);
if (token == EndOfInput) {
if (token == EndOfInput || token == tMarkerInput::marker) {
parseContext.ppError(loc, "End of input in macro", "macro expansion", atomStrings.getString(macroAtom));
delete in;
return 0;