Fix #2095: correct the indentation.

This also made it obvious some code was (functionally correctly) repeated, so deleted that too.

Fix #2095: correct the indentation.
c480237b · John Kessenich · 9606a5cb · c480237b
Commit c480237b authored Mar 01, 2020 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

Scan.cpp glslang/MachineIndependent/Scan.cpp +6 -8

No files found.
--- a/glslang/MachineIndependent/Scan.cpp
+++ b/glslang/MachineIndependent/Scan.cpp
@@ -187,17 +187,15 @@ bool TInputScanner::scanVersion(int& version, EProfile& profile, bool& notFirstT
        if (lookingInMiddle) {
            notFirstToken = true;
            // 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 {
                    c = get();
                } while (c != EndOfInput && c != '\n' && c != '\r');
-                while (peek() == '\n' || peek() == '\r')
+            }
-                    get();
+            while (peek() == '\n' || peek() == '\r')
-                if (peek() == EndOfInput)
+                get();
-                    return true;
+            if (peek() == EndOfInput)
+                return true;
        }
        lookingInMiddle = true;