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

PP: Non-functional; fix typos and blank spaces.

Browse Source
This commit is contained in:
John Kessenich 2016-07-30 13:25:33 -06:00
parent 73d4fb5bc5
commit 7208473c69
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Test/baseResults/numeral.frag.out
View File

@ -7,8 +7,8 @@ ERROR: 0:17: '' : octal literal too big
ERROR: 0:18: '' : octal literal too big ERROR: 0:18: '' : octal literal too big
ERROR: 0:23: '' : octal literal digit too large ERROR: 0:23: '' : octal literal digit too large
ERROR: 0:24: '' : octal literal digit too large ERROR: 0:24: '' : octal literal digit too large
ERROR: 0:49: '' : bad digit in hexidecimal literal ERROR: 0:49: '' : bad digit in hexadecimal literal
ERROR: 0:50: '' : hexidecimal literal too big ERROR: 0:50: '' : hexadecimal literal too big
ERROR: 0:88: '' : float literal needs a decimal point or exponent ERROR: 0:88: '' : float literal needs a decimal point or exponent
ERROR: 0:98: '' : numeric literal too big ERROR: 0:98: '' : numeric literal too big
ERROR: 0:101: '' : numeric literal too big ERROR: 0:101: '' : numeric literal too big

2
Test/baseResults/specExamples.frag.out
View File

@ -2,7 +2,7 @@ specExamples.frag
Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
ERROR: 0:6: '=' : cannot convert from 'const uint' to 'global int' ERROR: 0:6: '=' : cannot convert from 'const uint' to 'global int'
ERROR: 0:20: '' : numeric literal too big ERROR: 0:20: '' : numeric literal too big
ERROR: 0:21: '' : hexidecimal literal too big ERROR: 0:21: '' : hexadecimal literal too big
ERROR: 0:37: 'view' : redefinition ERROR: 0:37: 'view' : redefinition
ERROR: 0:63: 'invariant' : can only apply to an output ERROR: 0:63: 'invariant' : can only apply to an output
ERROR: 0:68: 'lightPosition' : redefinition ERROR: 0:68: 'lightPosition' : redefinition

4
Test/baseResults/tokenLength.vert.out
View File

@ -2,10 +2,10 @@ tokenLength.vert
ERROR: 0:9: '' : numeric literal too big ERROR: 0:9: '' : numeric literal too big
ERROR: 0:10: '' : numeric literal too big ERROR: 0:10: '' : numeric literal too big
ERROR: 0:13: '' : octal literal too big ERROR: 0:13: '' : octal literal too big
ERROR: 0:14: '' : hexidecimal literal too big ERROR: 0:14: '' : hexadecimal literal too big
ERROR: 0:23: '' : float literal too long ERROR: 0:23: '' : float literal too long
ERROR: 0:32: '' : name too long ERROR: 0:32: '' : name too long
ERROR: 0:33: '' : hexidecimal literal too big ERROR: 0:33: '' : hexadecimal literal too big
ERROR: 0:34: '' : numeric literal too long ERROR: 0:34: '' : numeric literal too long
ERROR: 0:34: '' : octal literal too big ERROR: 0:34: '' : octal literal too big
ERROR: 0:35: '' : numeric literal too long ERROR: 0:35: '' : numeric literal too long

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 "SPIRV99.1370" #define GLSLANG_REVISION "SPIRV99.1373"
#define GLSLANG_DATE "30-Jul-2016" #define GLSLANG_DATE "30-Jul-2016"

16
glslang/MachineIndependent/Scan.cpp
View File

@ -55,7 +55,7 @@
// Required to avoid missing prototype warnings for some compilers // Required to avoid missing prototype warnings for some compilers
int yylex(YYSTYPE*, glslang::TParseContext&); int yylex(YYSTYPE*, glslang::TParseContext&);
namespace glslang { namespace glslang {
// read past any white space // read past any white space
@ -564,7 +564,7 @@ void TScanContext::fillInKeywordMap()
(*KeywordMap)["superp"] = SUPERP; (*KeywordMap)["superp"] = SUPERP;
ReservedSet = new std::unordered_set<const char*, str_hash, str_eq>; ReservedSet = new std::unordered_set<const char*, str_hash, str_eq>;
ReservedSet->insert("common"); ReservedSet->insert("common");
ReservedSet->insert("partition"); ReservedSet->insert("partition");
ReservedSet->insert("active"); ReservedSet->insert("active");
@ -678,7 +678,7 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
case PpAtomDecrement: return DEC_OP; case PpAtomDecrement: return DEC_OP;
case PpAtomIncrement: return INC_OP; case PpAtomIncrement: return INC_OP;
case PpAtomConstInt: parserToken->sType.lex.i = ppToken.ival; return INTCONSTANT; case PpAtomConstInt: parserToken->sType.lex.i = ppToken.ival; return INTCONSTANT;
case PpAtomConstUint: parserToken->sType.lex.i = ppToken.ival; return UINTCONSTANT; case PpAtomConstUint: parserToken->sType.lex.i = ppToken.ival; return UINTCONSTANT;
case PpAtomConstInt64: parserToken->sType.lex.i64 = ppToken.i64val; return INT64CONSTANT; case PpAtomConstInt64: parserToken->sType.lex.i64 = ppToken.i64val; return INT64CONSTANT;
@ -850,7 +850,7 @@ int TScanContext::tokenizeIdentifier()
case MAT3X4: case MAT3X4:
case MAT4X2: case MAT4X2:
case MAT4X3: case MAT4X3:
case MAT4X4: case MAT4X4:
return matNxM(); return matNxM();
case DMAT2: case DMAT2:
@ -976,7 +976,7 @@ int TScanContext::tokenizeIdentifier()
case USAMPLER2DARRAY: case USAMPLER2DARRAY:
afterType = true; afterType = true;
return nonreservedKeyword(300, 130); return nonreservedKeyword(300, 130);
case ISAMPLER2DRECT: case ISAMPLER2DRECT:
case USAMPLER2DRECT: case USAMPLER2DRECT:
afterType = true; afterType = true;
@ -994,7 +994,7 @@ int TScanContext::tokenizeIdentifier()
if (parseContext.extensionsTurnedOn(Num_AEP_texture_buffer, AEP_texture_buffer)) if (parseContext.extensionsTurnedOn(Num_AEP_texture_buffer, AEP_texture_buffer))
return keyword; return keyword;
return es30ReservedFromGLSL(140); return es30ReservedFromGLSL(140);
case SAMPLER2DMS: case SAMPLER2DMS:
case ISAMPLER2DMS: case ISAMPLER2DMS:
case USAMPLER2DMS: case USAMPLER2DMS:
@ -1113,7 +1113,7 @@ int TScanContext::tokenizeIdentifier()
case NOPERSPECTIVE: case NOPERSPECTIVE:
return es30ReservedFromGLSL(130); return es30ReservedFromGLSL(130);
case SMOOTH: case SMOOTH:
if ((parseContext.profile == EEsProfile && parseContext.version < 300) || if ((parseContext.profile == EEsProfile && parseContext.version < 300) ||
(parseContext.profile != EEsProfile && parseContext.version < 130)) (parseContext.profile != EEsProfile && parseContext.version < 130))
@ -1172,7 +1172,7 @@ int TScanContext::tokenizeIdentifier()
bool reserved = parseContext.profile == EEsProfile || parseContext.version >= 130; bool reserved = parseContext.profile == EEsProfile || parseContext.version >= 130;
return identifierOrReserved(reserved); return identifierOrReserved(reserved);
} }
default: default:
parseContext.infoSink.info.message(EPrefixInternalError, "Unknown glslang keyword", loc); parseContext.infoSink.info.message(EPrefixInternalError, "Unknown glslang keyword", loc);
return 0; return 0;

12
glslang/MachineIndependent/preprocessor/Pp.cpp
View File

@ -192,7 +192,7 @@ int TPpContext::CPPdefine(TPpToken* ppToken)
do { do {
int oldToken; int oldToken;
TPpToken oldPpToken; TPpToken oldPpToken;
TPpToken newPpToken; TPpToken newPpToken;
oldToken = ReadToken(symb->mac.body, &oldPpToken); oldToken = ReadToken(symb->mac.body, &oldPpToken);
newToken = ReadToken(mac.body, &newPpToken); newToken = ReadToken(mac.body, &newPpToken);
if (oldToken != newToken || oldPpToken != newPpToken) { if (oldToken != newToken || oldPpToken != newPpToken) {
@ -250,7 +250,7 @@ int TPpContext::CPPelse(int matchelse, TPpToken* ppToken)
if (token != '#') { if (token != '#') {
while (token != '\n' && token != EndOfInput) while (token != '\n' && token != EndOfInput)
token = scanToken(ppToken); token = scanToken(ppToken);
if (token == EndOfInput) if (token == EndOfInput)
return token; return token;
@ -495,7 +495,7 @@ int TPpContext::eval(int token, int precedence, bool shortCircuit, int& res, boo
if (op < 0 || binop[op].precedence <= precedence) if (op < 0 || binop[op].precedence <= precedence)
break; break;
int leftSide = res; int leftSide = res;
// Setup short-circuiting, needed for ES, unless already in a short circuit. // Setup short-circuiting, needed for ES, unless already in a short circuit.
// (Once in a short-circuit, can't turn off again, until that whole subexpression is done. // (Once in a short-circuit, can't turn off again, until that whole subexpression is done.
if (! shortCircuit) { if (! shortCircuit) {
@ -756,7 +756,7 @@ int TPpContext::CPPpragma(TPpToken* ppToken)
else else
parseContext.handlePragma(loc, tokens); parseContext.handlePragma(loc, tokens);
return token; return token;
} }
// #version: This is just for error checking: the version and profile are decided before preprocessing starts // #version: This is just for error checking: the version and profile are decided before preprocessing starts
@ -980,7 +980,7 @@ int TPpContext::tMacroInput::scan(TPpToken* ppToken)
if (token == EndOfInput) if (token == EndOfInput)
mac->busy = 0; mac->busy = 0;
return token; return token;
} }
@ -1060,7 +1060,7 @@ int TPpContext::MacroExpand(int atom, TPpToken* ppToken, bool expandUndef, bool
if (sym->mac.args) { if (sym->mac.args) {
token = scanToken(ppToken); token = scanToken(ppToken);
if (newLineOkay) { if (newLineOkay) {
while (token == '\n') while (token == '\n')
token = scanToken(ppToken); token = scanToken(ppToken);
} }
if (token != '(') { if (token != '(') {

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

@ -298,7 +298,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
ppToken->name[len++] = (char)ch; ppToken->name[len++] = (char)ch;
ch = getch(); ch = getch();
if (ch == 'x' || ch == 'X') { if (ch == 'x' || ch == 'X') {
// must be hexidecimal // must be hexadecimal
bool isUnsigned = false; bool isUnsigned = false;
bool isInt64 = false; bool isInt64 = false;
@ -319,11 +319,11 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
} else if (ch >= 'a' && ch <= 'f') { } else if (ch >= 'a' && ch <= 'f') {
ii = ch - 'a' + 10; ii = ch - 'a' + 10;
} else } else
pp->parseContext.ppError(ppToken->loc, "bad digit in hexidecimal literal", "", ""); pp->parseContext.ppError(ppToken->loc, "bad digit in hexadecimal literal", "", "");
ival = (ival << 4) | ii; ival = (ival << 4) | ii;
} else { } else {
if (! AlreadyComplained) { if (! AlreadyComplained) {
pp->parseContext.ppError(ppToken->loc, "hexidecimal literal too big", "", ""); pp->parseContext.ppError(ppToken->loc, "hexadecimal literal too big", "", "");
AlreadyComplained = 1; AlreadyComplained = 1;
} }
ival = 0xffffffffffffffffull; ival = 0xffffffffffffffffull;
@ -333,7 +333,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
(ch >= 'A' && ch <= 'F') || (ch >= 'A' && ch <= 'F') ||
(ch >= 'a' && ch <= 'f')); (ch >= 'a' && ch <= 'f'));
} else { } else {
pp->parseContext.ppError(ppToken->loc, "bad digit in hexidecimal literal", "", ""); pp->parseContext.ppError(ppToken->loc, "bad digit in hexadecimal literal", "", "");
} }
if (ch == 'u' || ch == 'U') { if (ch == 'u' || ch == 'U') {
if (len < MaxTokenLength) if (len < MaxTokenLength)
@ -405,7 +405,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
} }
if (ch == '.' || ch == 'e' || ch == 'f' || ch == 'E' || ch == 'F') if (ch == '.' || ch == 'e' || ch == 'f' || ch == 'E' || ch == 'F')
return pp->lFloatConst(len, ch, ppToken); return pp->lFloatConst(len, ch, ppToken);
// wasn't a float, so must be octal... // wasn't a float, so must be octal...
if (nonOctal) if (nonOctal)
pp->parseContext.ppError(ppToken->loc, "octal literal digit too large", "", ""); pp->parseContext.ppError(ppToken->loc, "octal literal digit too large", "", "");
@ -447,7 +447,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
break; break;
case '1': case '2': case '3': case '4': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': case '5': case '6': case '7': case '8': case '9':
// can't be hexidecimal or octal, is either decimal or floating point // can't be hexadecimal or octal, is either decimal or floating point
do { do {
if (len < MaxTokenLength) if (len < MaxTokenLength)
@ -705,7 +705,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
// Return 0 when no more tokens. // Return 0 when no more tokens.
// //
const char* TPpContext::tokenize(TPpToken* ppToken) const char* TPpContext::tokenize(TPpToken* ppToken)
{ {
int token = '\n'; int token = '\n';
for(;;) { for(;;) {

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

@ -125,7 +125,7 @@ enum EFixedAtoms {
PpAtomConstDouble, PpAtomConstDouble,
PpAtomConstString, PpAtomConstString,
// Indentifiers // Identifiers
PpAtomIdentifier, PpAtomIdentifier,
// preprocessor "keywords" // preprocessor "keywords"