mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PP: Add missing i64val code.

Browse Source 
Also, checking both 'atom' and 'name' is redundant, and I'm hoping to
eliminate more atom stuff.
This commit is contained in:
John Kessenich 2016-12-19 15:32:04 -07:00
parent 432576fdce
commit bfff871dad
2 changed files with 6 additions and 5 deletions
Show Stats 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 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). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1704" #define GLSLANG_REVISION "Overload400-PrecQual.1706"
#define GLSLANG_DATE "19-Dec-2016" #define GLSLANG_DATE "19-Dec-2016"

9
glslang/MachineIndependent/preprocessor/PpContext.h
View File

@ -92,17 +92,18 @@ namespace glslang {
class TPpToken { class TPpToken {
public: public:
TPpToken() : token(0), space(false), ival(0), dval(0.0), atom(0) TPpToken() : token(0), space(false), ival(0), dval(0.0), i64val(0), atom(0)
{ {
loc.init(); loc.init();
name[0] = 0; name[0] = 0;
} }
// This is used for comparing macro definitions, so checks what is relevant for that.
bool operator==(const TPpToken& right) bool operator==(const TPpToken& right)
{ {
return token == right.token && atom == right.atom && return token == right.token && space == right.space &&
ival == right.ival && dval == right.dval && ival == right.ival && dval == right.dval && i64val == right.i64val &&
strcmp(name, right.name) == 0; strncmp(name, right.name, MaxTokenLength) == 0;
} }
bool operator!=(const TPpToken& right) { return ! operator==(right); } bool operator!=(const TPpToken& right) { return ! operator==(right); }