Update simplecpp

Author: glankk

externals/simplecpp/simplecpp.cpp

@@ -3299,6 +3299,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     // AlwaysFalse => drop all code in #if and #else
     enum IfState { True, ElseIsTrue, AlwaysFalse };
     std::stack<int> ifstates;
+    std::stack<Token *> iftokens;
     ifstates.push(True);
 
     std::stack<const Token *> includetokenstack;
@@ -3607,15 +3608,24 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         ifstates.push(AlwaysFalse);
                     else
                         ifstates.push(conditionIsTrue ? True : ElseIsTrue);
+                    iftokens.push(rawtok->previous);
                 } else if (ifstates.top() == True) {
                     ifstates.top() = AlwaysFalse;
+                    iftokens.top()->skip = rawtok->previous;
+                    iftokens.top() = rawtok->previous;
                 } else if (ifstates.top() == ElseIsTrue && conditionIsTrue) {
                     ifstates.top() = True;
+                    iftokens.top()->skip = rawtok->previous;
+                    iftokens.top() = rawtok->previous;
                 }
             } else if (rawtok->str() == ELSE) {
                 ifstates.top() = (ifstates.top() == ElseIsTrue) ? True : AlwaysFalse;
+                iftokens.top()->skip = rawtok->previous;
+                iftokens.top() = rawtok->previous;
             } else if (rawtok->str() == ENDIF) {
                 ifstates.pop();
+                iftokens.top()->skip = rawtok->previous;
+                iftokens.pop();
             } else if (rawtok->str() == UNDEF) {
                 if (ifstates.top() == True) {
                     const Token *tok = rawtok->next;
@@ -3627,7 +3637,10 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             } else if (ifstates.top() == True && rawtok->str() == PRAGMA && rawtok->next && rawtok->next->str() == ONCE && sameline(rawtok,rawtok->next)) {
                 pragmaOnce.insert(rawtok->location.file());
             }
-            rawtok = gotoNextLine(rawtok);
+            if (ifstates.top() != True && rawtok->previous && rawtok->previous->skip)
+                rawtok = rawtok->previous->skip;
+            else
+                rawtok = gotoNextLine(rawtok);
             continue;
         }
 

externals/simplecpp/simplecpp.h

@@ -109,12 +109,12 @@ namespace simplecpp {
     class SIMPLECPP_LIB Token {
     public:
         Token(const TokenString &s, const Location &loc, bool wsahead = false) :
-            whitespaceahead(wsahead), location(loc), previous(nullptr), next(nullptr), string(s) {
+            whitespaceahead(wsahead), location(loc), previous(nullptr), next(nullptr), skip(nullptr), string(s) {
             flags();
         }
 
         Token(const Token &tok) :
-            macro(tok.macro), op(tok.op), comment(tok.comment), name(tok.name), number(tok.number), whitespaceahead(tok.whitespaceahead), location(tok.location), previous(nullptr), next(nullptr), string(tok.string), mExpandedFrom(tok.mExpandedFrom) {
+            macro(tok.macro), op(tok.op), comment(tok.comment), name(tok.name), number(tok.number), whitespaceahead(tok.whitespaceahead), location(tok.location), previous(nullptr), next(nullptr), skip(nullptr), string(tok.string), mExpandedFrom(tok.mExpandedFrom) {
         }
 
         void flags() {
@@ -150,6 +150,7 @@ namespace simplecpp {
         Location location;
         Token *previous;
         Token *next;
+        Token *skip;
 
         const Token *previousSkipComments() const {
             const Token *tok = this->previous;