PP: Add missing atoms that effect -E mode.
When preprocessing only, some tokens were emitted as <bad token>. This fixes them to preserve their original content. This supplants PR #182, with a correction and test results.
This commit is contained in:
@@ -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 "SPIRV99.1377"
|
||||
#define GLSLANG_DATE "02-Aug-2016"
|
||||
#define GLSLANG_REVISION "SPIRV99.1383"
|
||||
#define GLSLANG_DATE "04-Aug-2016"
|
||||
|
||||
@@ -98,6 +98,32 @@ const struct {
|
||||
int val;
|
||||
const char* str;
|
||||
} tokens[] = {
|
||||
|
||||
{ PpAtomAdd, "+=" },
|
||||
{ PpAtomSub, "-=" },
|
||||
{ PpAtomMul, "*=" },
|
||||
{ PpAtomDiv, "/=" },
|
||||
{ PpAtomMod, "%=" },
|
||||
{ PpAtomRight, ">>" },
|
||||
{ PpAtomLeft, "<<" },
|
||||
{ PpAtomAnd, "&&" },
|
||||
{ PpAtomOr, "||" },
|
||||
{ PpAtomXor, "^^" },
|
||||
|
||||
{ PpAtomRightAssign, ">>=" },
|
||||
{ PpAtomLeftAssign, "<<=" },
|
||||
{ PpAtomAndAssign, "&=" },
|
||||
{ PpAtomOrAssign, "|=" },
|
||||
{ PpAtomXorAssign, "^=" },
|
||||
|
||||
{ PpAtomEQ, "==" },
|
||||
{ PpAtomNE, "!=" },
|
||||
{ PpAtomGE, ">=" },
|
||||
{ PpAtomLE, "<=" },
|
||||
|
||||
{ PpAtomDecrement, "--" },
|
||||
{ PpAtomIncrement, "++" },
|
||||
|
||||
{ PpAtomDefine, "define" },
|
||||
{ PpAtomDefined, "defined" },
|
||||
{ PpAtomUndef, "undef" },
|
||||
@@ -121,8 +147,7 @@ const struct {
|
||||
{ PpAtomFileMacro, "__FILE__" },
|
||||
{ PpAtomVersionMacro, "__VERSION__" },
|
||||
|
||||
{ PpAtomInclude, "include" },
|
||||
|
||||
{ PpAtomInclude, "include" },
|
||||
};
|
||||
|
||||
} // end anonymous namespace
|
||||
|
||||
Reference in New Issue
Block a user