AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-10 04:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glslang/Include/Common.h
View File

@ -190,6 +190,13 @@ inline const TString String(const int i, const int base = 10)
struct TSourceLoc {
void init() { name = nullptr; string = 0; line = 0; column = 0; }
// Returns the name if it exists. Otherwise, returns the string number.
std::string getStringNameOrNum(bool quoteStringName = true) const
{
if (name != nullptr)
return quoteStringName ? ("\"" + std::string(name) + "\"") : name;
return std::to_string(string);
}
const char* name; // descriptive name for this string
int string;
int line;

8
glslang/Include/InfoSink.h
View File

@ -98,12 +98,8 @@ public:
void location(const TSourceLoc& loc) {
const int maxSize = 24;
char locText[maxSize];
if (loc.name != nullptr) {
append(loc.name);
snprintf(locText, maxSize, ":%d", loc.line);
} else {
snprintf(locText, maxSize, "%d:%d", loc.string, loc.line);
}
snprintf(locText, maxSize, ":%d", loc.line);
append(loc.getStringNameOrNum(false).c_str());
append(locText);
append(": ");
}

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;
}