Skip to content

G
glslang
Commit c480237b by John Kessenich
Options

Fix #2095: correct the indentation.

This also made it obvious some code was (functionally correctly) repeated, so deleted that too.
parent 9606a5cb
Showing with 2 additions and 4 deletions
glslang/MachineIndependent/Scan.cpp
...@@ -187,13 +187,11 @@ bool TInputScanner::scanVersion(int& version, EProfile& profile, bool& notFirstT ...@@ -187,13 +187,11 @@ bool TInputScanner::scanVersion(int& version, EProfile& profile, bool& notFirstT
if (lookingInMiddle) { if (lookingInMiddle) {
notFirstToken = true; notFirstToken = true;
// make forward progress by finishing off the current line plus extra new lines // make forward progress by finishing off the current line plus extra new lines
if (peek() == '\n' || peek() == '\r') { if (peek() != '\n' && peek() != '\r') {
while (peek() == '\n' || peek() == '\r')
get();
} else
do { do {
c = get(); c = get();
} while (c != EndOfInput && c != '\n' && c != '\r'); } while (c != EndOfInput && c != '\n' && c != '\r');
}
while (peek() == '\n' || peek() == '\r') while (peek() == '\n' || peek() == '\r')
get(); get();
if (peek() == EndOfInput) if (peek() == EndOfInput)
......
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