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

Merge pull request #53 from google/get-string-name-or-num

Browse source 
Add getStringNameOrNum() in TSourceLoc.
This commit is contained in:
John Kessenich 2015-08-06 22:06:34 -06:00
commit 3473a4b98f
3 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -620,13 +620,7 @@ int TPpContext::CPPinclude(TPpToken* ppToken)
std::ostringstream content;
content << "#line " << forNextLine << " " << "\"" << sourceName << "\"\n";
content << replacement << (replacement.back() == '\n' ? "" : "\n");
content << "#line " << directiveLoc.line + forNextLine << " ";
if (directiveLoc.name != nullptr) {
content << "\"" << directiveLoc.name << "\"";
} else {
content << directiveLoc.string;
}
content << "\n";
content << "#line " << directiveLoc.line + forNextLine << " " << directiveLoc.getStringNameOrNum() << "\n";
pushInput(new TokenizableString(directiveLoc, content.str(), this));
}
// At EOF, there's no "current" location anymore.
@ -1015,13 +1009,9 @@ int TPpContext::MacroExpand(int atom, TPpToken* ppToken, bool expandUndef, bool
return 1;
case PpAtomFileMacro: {
if (const char* current_file = parseContext.getCurrentLoc().name) {
if (parseContext.getCurrentLoc().name)
parseContext.ppRequireExtensions(ppToken->loc, 1, &E_GL_GOOGLE_cpp_style_line_directive, "filename-based __FILE__");
sprintf(ppToken->name, "\"%s\"", current_file);
} else {
ppToken->ival = parseContext.getCurrentLoc().string;
sprintf(ppToken->name, "%d", ppToken->ival);
}
sprintf(ppToken->name, "%s", ppToken->loc.getStringNameOrNum().c_str());
UngetToken(PpAtomConstInt, ppToken);
return 1;
}