fixed FileStream::unget() with subsequent calls (i.e. UTF-16 encoding)

Author: firewave

simplecpp.cpp

@@ -298,6 +298,8 @@ class simplecpp::TokenList::Stream {
 
 protected:
     void init() {
+        // initialize since we use peek() in getAndSkipBOM()
+        isUtf16 = false;
         bom = getAndSkipBOM();
         isUtf16 = (bom == 0xfeff || bom == 0xfffe);
     }
@@ -336,6 +338,7 @@ class simplecpp::TokenList::Stream {
     }
 
     unsigned short bom;
+protected:
     bool isUtf16;
 };
 
@@ -387,7 +390,14 @@ class FileStream : public simplecpp::TokenList::Stream {
         return ch;
     }
     virtual void unget() {
-        ungetc(lastCh, file);
+        if (isUtf16) {
+            // TODO: use ungetc() as well
+            // UTF-16 has subsequent unget() calls
+            fseek(file, -1, SEEK_CUR);
+        }
+        else
+            ungetc(lastCh, file);
+
     }
     virtual bool good() {
         return lastCh != EOF;