Merge branch 'refactor/tokenizer' into autobuild/tokenizer

POV-Ray · May 23, 2018 · ae2ae6a · ae2ae6a
2 parents 1ea91bd + af7e2a8
commit ae2ae6a
Show file tree

Hide file tree

Showing 8 changed files with 309 additions and 250 deletions.
diff --git a/source/base/fileinputoutput.cpp b/source/base/fileinputoutput.cpp
@@ -511,37 +511,35 @@ POV_OFF_T IMemStream::tellg() const
 
 bool IMemStream::seekg(POV_OFF_T posi, unsigned int whence)
 {
-    if(!fail)
+    // Any seek operation renders the end-of-file status and unget buffer's content obsolete.
-    {
+    fail = false;
-        // Any seek operation renders the unget buffer's content obsolete.
+    mUngetBuffer = EOF;
-        mUngetBuffer = EOF;
 
-        switch(whence)
+    switch(whence)
-        {
+    {
-            case seek_set:
+        case seek_set:
-                if (posi < formalStart)
+            if (posi < formalStart)
-                    fail = true;
+                fail = true;
-                else if (posi - formalStart <= size)
+            else if (posi - formalStart <= size)
-                    pos = posi - formalStart;
+                pos = posi - formalStart;
-                else
+            else
-                    fail = true;
+                fail = true;
-                break;
+            break;
-            case seek_cur:
+        case seek_cur:
-                if ((posi <= size) && (pos <= size-posi))
+            if ((posi <= size) && (pos <= size-posi))
-                    pos += posi;
+                pos += posi;
-                else
+            else
-                    fail = true;
+                fail = true;
-                break;
+            break;
-            case seek_end:
+        case seek_end:
-                if (posi <= size)
+            if (posi <= size)
-                    pos = size - posi;
+                pos = size - posi;
-                else
+            else
-                    fail = true;
+                fail = true;
-                break;
+            break;
-            default:
+        default:
-                POV_ASSERT(false);
+            POV_ASSERT(false);
-                break;
+            break;
-        }
     }
     return !fail;
 }

diff --git a/source/base/version.h b/source/base/version.h
@@ -100,7 +100,7 @@
 /// where `N` is a serial number starting at 1 in each phase, `TIME` is the number of minutes
 /// since 2000-01-01 00:00, and `FEATURE` is an arbitrary alphanumeric moniker for a particular
 /// experimental feature.
-#define POV_RAY_PRERELEASE          "x.tokenizer.9999"
+#define POV_RAY_PRERELEASE          "x.tokenizer.9673626"
 
 #if defined(DOXYGEN) && !defined(POV_RAY_PRERELEASE)
     // Work around doxygen being unable to document undefined macros.