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

PP: Rationalize names of tokens.

Browse Source
This commit is contained in:
John Kessenich 2016-12-21 11:55:53 -07:00
parent 2dcdda921f
commit 0c4b7c931a
6 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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 date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1715"
#define GLSLANG_DATE "20-Dec-2016"
#define GLSLANG_REVISION "Overload400-PrecQual.1719"
#define GLSLANG_DATE "21-Dec-2016"

10
glslang/MachineIndependent/Scan.cpp
View File

@ -674,11 +674,11 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
parseContext.error(loc, "illegal use of escape character", "\\", "");
break;
case PpAtomAdd: return ADD_ASSIGN;
case PpAtomSub: return SUB_ASSIGN;
case PpAtomMul: return MUL_ASSIGN;
case PpAtomDiv: return DIV_ASSIGN;
case PpAtomMod: return MOD_ASSIGN;
case PPAtomAddAssign: return ADD_ASSIGN;
case PPAtomSubAssign: return SUB_ASSIGN;
case PPAtomMulAssign: return MUL_ASSIGN;
case PPAtomDivAssign: return DIV_ASSIGN;
case PPAtomModAssign: return MOD_ASSIGN;
case PpAtomRight: return RIGHT_OP;
case PpAtomLeft: return LEFT_OP;

11
glslang/MachineIndependent/preprocessor/PpAtom.cpp
View File

@ -94,11 +94,12 @@ const struct {
const char* str;
} tokens[] = {
{ PpAtomAdd, "+=" },
{ PpAtomSub, "-=" },
{ PpAtomMul, "*=" },
{ PpAtomDiv, "/=" },
{ PpAtomMod, "%=" },
{ PPAtomAddAssign, "+=" },
{ PPAtomSubAssign, "-=" },
{ PPAtomMulAssign, "*=" },
{ PPAtomDivAssign, "/=" },
{ PPAtomModAssign, "%=" },
{ PpAtomRight, ">>" },
{ PpAtomLeft, "<<" },
{ PpAtomAnd, "&&" },

10
glslang/MachineIndependent/preprocessor/PpScanner.cpp
View File

@ -529,7 +529,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
if (ch == '-') {
return PpAtomDecrement;
} else if (ch == '=') {
return PpAtomSub;
return PPAtomSubAssign;
} else {
ungetch();
return '-';
@ -539,7 +539,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
if (ch == '+') {
return PpAtomIncrement;
} else if (ch == '=') {
return PpAtomAdd;
return PPAtomAddAssign;
} else {
ungetch();
return '+';
@ -547,7 +547,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
case '*':
ch = getch();
if (ch == '=') {
return PpAtomMul;
return PPAtomMulAssign;
} else {
ungetch();
return '*';
@ -555,7 +555,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
case '%':
ch = getch();
if (ch == '=') {
return PpAtomMod;
return PPAtomModAssign;
} else {
ungetch();
return '%';
@ -681,7 +681,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
// loop again to get the next token...
break;
} else if (ch == '=') {
return PpAtomDiv;
return PPAtomDivAssign;
} else {
ungetch();
return '/';

10
glslang/MachineIndependent/preprocessor/PpTokens.h
View File

@ -86,11 +86,11 @@ enum EFixedAtoms {
// Operators
PpAtomAdd,
PpAtomSub,
PpAtomMul,
PpAtomDiv,
PpAtomMod,
PPAtomAddAssign,
PPAtomSubAssign,
PPAtomMulAssign,
PPAtomDivAssign,
PPAtomModAssign,
PpAtomRight,
PpAtomLeft,

10
hlsl/hlslScanContext.cpp
View File

@ -430,11 +430,11 @@ EHlslTokenClass HlslScanContext::tokenizeClass(HlslToken& token)
parseContext.error(loc, "illegal use of escape character", "\\", "");
break;
case PpAtomAdd: return EHTokAddAssign;
case PpAtomSub: return EHTokSubAssign;
case PpAtomMul: return EHTokMulAssign;
case PpAtomDiv: return EHTokDivAssign;
case PpAtomMod: return EHTokModAssign;
case PPAtomAddAssign: return EHTokAddAssign;
case PPAtomSubAssign: return EHTokSubAssign;
case PPAtomMulAssign: return EHTokMulAssign;
case PPAtomDivAssign: return EHTokDivAssign;
case PPAtomModAssign: return EHTokModAssign;
case PpAtomRight: return EHTokRightOp;
case PpAtomLeft: return EHTokLeftOp;