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 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.1715" #define GLSLANG_REVISION "Overload400-PrecQual.1719"
#define GLSLANG_DATE "20-Dec-2016" #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", "\\", ""); parseContext.error(loc, "illegal use of escape character", "\\", "");
break; break;
case PpAtomAdd: return ADD_ASSIGN; case PPAtomAddAssign: return ADD_ASSIGN;
case PpAtomSub: return SUB_ASSIGN; case PPAtomSubAssign: return SUB_ASSIGN;
case PpAtomMul: return MUL_ASSIGN; case PPAtomMulAssign: return MUL_ASSIGN;
case PpAtomDiv: return DIV_ASSIGN; case PPAtomDivAssign: return DIV_ASSIGN;
case PpAtomMod: return MOD_ASSIGN; case PPAtomModAssign: return MOD_ASSIGN;
case PpAtomRight: return RIGHT_OP; case PpAtomRight: return RIGHT_OP;
case PpAtomLeft: return LEFT_OP; case PpAtomLeft: return LEFT_OP;

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

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

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

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

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

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

10
hlsl/hlslScanContext.cpp
View File

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