Skip to content

G
glslang
Commit 7208473c by John Kessenich
Options

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

parent 73d4fb5b
Showing with 12 additions and 12 deletions
Test/baseResults/numeral.frag.out
...@@ -7,8 +7,8 @@ ERROR: 0:17: '' : octal literal too big ...@@ -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
......
Test/baseResults/specExamples.frag.out
...@@ -2,7 +2,7 @@ specExamples.frag ...@@ -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
......
Test/baseResults/tokenLength.vert.out
...@@ -2,10 +2,10 @@ tokenLength.vert ...@@ -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
......
glslang/Include/revision.h
...@@ -2,5 +2,5 @@ ...@@ -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"
glslang/MachineIndependent/preprocessor/PpScanner.cpp
...@@ -298,7 +298,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken) ...@@ -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) ...@@ -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) ...@@ -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)
...@@ -447,7 +447,7 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken) ...@@ -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)
......
glslang/MachineIndependent/preprocessor/PpTokens.h
...@@ -125,7 +125,7 @@ enum EFixedAtoms { ...@@ -125,7 +125,7 @@ enum EFixedAtoms {
PpAtomConstDouble, PpAtomConstDouble,
PpAtomConstString, PpAtomConstString,
// Indentifiers // Identifiers
PpAtomIdentifier, PpAtomIdentifier,
// preprocessor "keywords" // preprocessor "keywords"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment