use std::runtime_error

Author: ludviggunne

simplecpp.cpp

@@ -2818,7 +2818,7 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
 
 static const char * const altopData[] = {"and","or","bitand","bitor","compl","not","not_eq","xor"};
 static const std::set<std::string> altop(&altopData[0], &altopData[8]);
-static bool simplifyName(simplecpp::TokenList &expr, simplecpp::OutputList *outputList)
+static void simplifyName(simplecpp::TokenList &expr)
 {
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->name) {
@@ -2832,20 +2832,11 @@ static bool simplifyName(simplecpp::TokenList &expr, simplecpp::OutputList *outp
                 if (alt)
                     continue;
             }
-            if (tok->next && tok->next->str() == "(") {
-                if (outputList) {
-                    simplecpp::Output err(tok->location.files);
-                    err.type = simplecpp::Output::SYNTAX_ERROR;
-                    err.location = tok->location;
-                    err.msg = "Undefined function-like macro in directive: " + tok->str() + "( ... )";
-                    outputList->push_back(err);
-                }
-                return false;
-            }
+            if (tok->next && tok->next->str() == "(")
+                throw std::runtime_error("undefined function-like macro invocation: " + tok->str() + "( ... )");
             tok->setstr("0");
         }
     }
-    return true;
 }
 
 /*
@@ -3117,14 +3108,12 @@ static void simplifyComments(simplecpp::TokenList &expr)
     }
 }
 
-static long long evaluate(simplecpp::TokenList &expr, const simplecpp::DUI &dui, const std::map<std::string, std::size_t> &sizeOfType, simplecpp::OutputList *outputList, bool &ok)
+static long long evaluate(simplecpp::TokenList &expr, const simplecpp::DUI &dui, const std::map<std::string, std::size_t> &sizeOfType)
 {
     simplifyComments(expr);
     simplifySizeof(expr, sizeOfType);
     simplifyHasInclude(expr, dui);
-    ok = simplifyName(expr, outputList);
-    if (!ok)
-        return 0;
+    simplifyName(expr);
     simplifyNumbers(expr);
     expr.constFold();
     // TODO: handle invalid expressions
@@ -3829,20 +3818,17 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         tok = tmp->previous;
                     }
                     try {
-                        bool ok = true;
                         if (ifCond) {
                             std::string E;
                             for (const simplecpp::Token *tok = expr.cfront(); tok; tok = tok->next)
                                 E += (E.empty() ? "" : " ") + tok->str();
-                            const long long result = evaluate(expr, dui, sizeOfType, outputList, ok);
+                            const long long result = evaluate(expr, dui, sizeOfType);
                             conditionIsTrue = (result != 0);
                             ifCond->push_back(IfCond(rawtok->location, E, result));
                         } else {
-                            const long long result = evaluate(expr, dui, sizeOfType, outputList, ok);
+                            const long long result = evaluate(expr, dui, sizeOfType);
                             conditionIsTrue = (result != 0);
                         }
-                        if (!ok)
-                            return;
                     } catch (const std::exception &e) {
                         if (outputList) {
                             Output out(rawtok->location.files);

test.cpp

@@ -1831,7 +1831,7 @@ static void ifUndefFuncStyleMacro()
                         "#endif\n";
     simplecpp::OutputList outputList;
     ASSERT_EQUALS("", preprocess(code, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Undefined function-like macro in directive: A( ... )\n", toString(outputList));
+    ASSERT_EQUALS("file0,1,syntax_error,failed to evaluate #if condition, undefined function-like macro invocation: A( ... )\n", toString(outputList));
 }
 
 static void location1()