Add macro name for __VA_OPT__ syntax errors

Author: glankk

simplecpp.cpp

@@ -1764,7 +1764,7 @@ namespace simplecpp {
                 for (const Token *tok = valueToken; tok && tok != endToken;) {
                     if (tok->str() == "__VA_OPT__") {
                         if (!sameline(tok, tok->next) || tok->next->op != '(')
-                            throw Error(tok->location, "Missing opening parenthesis for __VA_OPT__");
+                            throw Error(tok->location, "In definition of '" + nameTokDef->str() + "': Missing opening parenthesis for __VA_OPT__");
                         tok = tok->next->next;
                         int par = 1;
                         while (tok && tok != endToken) {
@@ -1773,7 +1773,7 @@ namespace simplecpp {
                             else if (tok->op == ')')
                                 par--;
                             else if (tok->str() == "__VA_OPT__")
-                                throw Error(tok->location, "__VA_OPT__ cannot be nested");
+                                throw Error(tok->location, "In definition of '" + nameTokDef->str() + "': __VA_OPT__ cannot be nested");
                             if (par == 0) {
                                 tok = tok->next;
                                 break;
@@ -1783,7 +1783,7 @@ namespace simplecpp {
                         }
                         if (par != 0) {
                             const Token *const lastTok = expandValue.back() ? expandValue.back() : valueToken->next;
-                            throw Error(lastTok->location, "Missing closing parenthesis for __VA_OPT__");
+                            throw Error(lastTok->location, "In definition of '" + nameTokDef->str() + "': Missing closing parenthesis for __VA_OPT__");
                         }
                     } else {
                         expandValue.push_back(new Token(*tok));

test.cpp

@@ -923,7 +923,7 @@ static void define_va_opt_3()
 
     simplecpp::OutputList outputList;
     ASSERT_EQUALS("", preprocess(code1, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, Missing closing parenthesis for __VA_OPT__\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': Missing closing parenthesis for __VA_OPT__\n",
                   toString(outputList));
 
     outputList.clear();
@@ -934,7 +934,7 @@ static void define_va_opt_3()
                          "err()";
 
     ASSERT_EQUALS("", preprocess(code2, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, Missing opening parenthesis for __VA_OPT__\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': Missing opening parenthesis for __VA_OPT__\n",
                   toString(outputList));
 }
 
@@ -946,7 +946,7 @@ static void define_va_opt_4()
 
     simplecpp::OutputList outputList;
     ASSERT_EQUALS("", preprocess(code1, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, Missing opening parenthesis for __VA_OPT__\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': Missing opening parenthesis for __VA_OPT__\n",
                   toString(outputList));
 
     outputList.clear();
@@ -956,7 +956,7 @@ static void define_va_opt_4()
                          "err()";
 
     ASSERT_EQUALS("", preprocess(code2, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, Missing opening parenthesis for __VA_OPT__\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': Missing opening parenthesis for __VA_OPT__\n",
                   toString(outputList));
 }
 
@@ -968,7 +968,7 @@ static void define_va_opt_5()
 
     simplecpp::OutputList outputList;
     ASSERT_EQUALS("", preprocess(code, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, Missing opening parenthesis for __VA_OPT__\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': Missing opening parenthesis for __VA_OPT__\n",
                   toString(outputList));
 }
 
@@ -980,7 +980,7 @@ static void define_va_opt_6()
 
     simplecpp::OutputList outputList;
     ASSERT_EQUALS("", preprocess(code, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, __VA_OPT__ cannot be nested\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': __VA_OPT__ cannot be nested\n",
                   toString(outputList));
 }
 
@@ -991,23 +991,23 @@ static void define_va_opt_7()
 
     simplecpp::OutputList outputList;
     ASSERT_EQUALS("", preprocess(code1, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, Missing opening parenthesis for __VA_OPT__\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': Missing opening parenthesis for __VA_OPT__\n",
                   toString(outputList));
 
     outputList.clear();
 
     const char code2[] = "#define err(...) __VA_OPT__(";
 
     ASSERT_EQUALS("", preprocess(code2, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, Missing closing parenthesis for __VA_OPT__\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': Missing closing parenthesis for __VA_OPT__\n",
                   toString(outputList));
 
     outputList.clear();
 
     const char code3[] = "#define err(...) __VA_OPT__(x";
 
     ASSERT_EQUALS("", preprocess(code3, &outputList));
-    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, Missing closing parenthesis for __VA_OPT__\n",
+    ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, In definition of 'err': Missing closing parenthesis for __VA_OPT__\n",
                   toString(outputList));
 }