AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1251 from KhronosGroup/fix-1244

Browse Source 
Roll custom versions of isalpha/isalnum.
This commit is contained in:
Hans-Kristian Arntzen 2020-01-06 16:01:49 +01:00 committed by GitHub
commit 369bdf0b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spirv_cross_parsed_ir.cpp
View File

@ -128,6 +128,17 @@ void ParsedIR::set_id_bounds(uint32_t bounds)
block_meta.resize(bounds);
}
// Roll our own versions of these functions to avoid potential locale shenanigans.
static bool is_alpha(char c)
{
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
}
static bool is_alphanumeric(char c)
{
return is_alpha(c) || (c >= '0' && c <= '9');
}
static string ensure_valid_identifier(const string &name, bool member)
{
// Functions in glslangValidator are mangled with name(<mangled> stuff.
@ -143,20 +154,20 @@ static string ensure_valid_identifier(const string &name, bool member)
// _m<num> variables are reserved by the internal implementation,
// otherwise, make sure the name is a valid identifier.
if (i == 0)
c = isalpha(c) ? c : '_';
c = is_alpha(c) ? c : '_';
else if (i == 2 && str[0] == '_' && str[1] == 'm')
c = isalpha(c) ? c : '_';
c = is_alpha(c) ? c : '_';
else
c = isalnum(c) ? c : '_';
c = is_alphanumeric(c) ? c : '_';
}
else
{
// _<num> variables are reserved by the internal implementation,
// otherwise, make sure the name is a valid identifier.
if (i == 0 || (str[0] == '_' && i == 1))
c = isalpha(c) ? c : '_';
c = is_alpha(c) ? c : '_';
else
c = isalnum(c) ? c : '_';
c = is_alphanumeric(c) ? c : '_';
}
}
return str;