BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Scanning: 1) rationalize end-of-input everywhere, 2) prevent infinite loop at end-of-input, 3) use positive chars.

Browse source 
Fixes issue #25. (char 255 aliased to -1 and missing tests for end of input).

1) All layers of input scanning now share a single EndOfInput value.
This avoids translation of it across layers of encapsulation.

2) Some places looking for end of line were not stopping on EndOfInput.

3) Use of "char" for the input made char values > 127 be negative numbers.
This allowed for aliasing of 255 to -1, etc.  This is fixed by using
unsigned char.
This commit is contained in:
John Kessenich 2015-07-27 09:37:55 -06:00
parent 91b977e172
commit c777fc2c4c
15 changed files with 134 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

22
glslang/MachineIndependent/Scan.cpp
View file

@ -81,10 +81,10 @@ bool TInputScanner::consumeComment()
get(); // consume the second '/'
c = get();
do {
while (c > 0 && c != '\\' && c != '\r' && c != '\n')
while (c != EndOfInput && c != '\\' && c != '\r' && c != '\n')
c = get();
if (c <= 0 || c == '\r' || c == '\n') {
if (c == EndOfInput || c == '\r' || c == '\n') {
while (c == '\r' || c == '\n')
c = get();
@ -104,7 +104,7 @@ bool TInputScanner::consumeComment()
} while (true);
// put back the last non-comment character
if (c > 0)
if (c != EndOfInput)
unget();
return true;
@ -114,7 +114,7 @@ bool TInputScanner::consumeComment()
get(); // consume the '*'
c = get();
do {
while (c > 0 && c != '*')
while (c != EndOfInput && c != '*')
c = get();
if (c == '*') {
c = get();
@ -142,7 +142,7 @@ void TInputScanner::consumeWhitespaceComment(bool& foundNonSpaceTab)
// if not starting a comment now, then done
int c = peek();
if (c != '/' || c < 0)
if (c != '/' || c == EndOfInput)
return;
// skip potential comment
@ -188,10 +188,10 @@ bool TInputScanner::scanVersion(int& version, EProfile& profile, bool& notFirstT
} else
do {
c = get();
} while (c > 0 && c != '\n' && c != '\r');
} while (c != EndOfInput && c != '\n' && c != '\r');
while (peek() == '\n' || peek() == '\r')
get();
if (peek() < 0)
if (peek() == EndOfInput)
return true;
}
lookingInMiddle = true;
@ -249,12 +249,12 @@ bool TInputScanner::scanVersion(int& version, EProfile& profile, bool& notFirstT
char profileString[maxProfileLength];
int profileLength;
for (profileLength = 0; profileLength < maxProfileLength; ++profileLength) {
if (c < 0 || c == ' ' || c == '\t' || c == '\n' || c == '\r')
if (c == EndOfInput || c == ' ' || c == '\t' || c == '\n' || c == '\r')
break;
profileString[profileLength] = (char)c;
c = get();
}
if (c > 0 && c != ' ' && c != '\t' && c != '\n' && c != '\r') {
if (c != EndOfInput && c != ' ' && c != '\t' && c != '\n' && c != '\r') {
versionNotFirst = true;
continue;
}
@ -600,8 +600,8 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
case PpAtomConstDouble: parserToken->sType.lex.d = ppToken.dval; return DOUBLECONSTANT;
case PpAtomIdentifier: return tokenizeIdentifier();
case EOF: return 0;
case EndOfInput: return 0;
default:
char buf[2];
buf[0] = (char)ppToken.token;