Update throw and assert macro

asherikov · asherikov · commit 01cca4f6a6d0 · 2024-06-30T18:56:38.000+04:00
diff --git a/extra_visitors/msgpack/src/reader.cpp b/extra_visitors/msgpack/src/reader.cpp
@@ -69,7 +69,7 @@ namespace ariles2
                     }
                     catch (const std::exception &e)
                     {
-                        CPPUT_THROW(std::string("Failed to parse the configuration file: ") + e.what());
+                        CPPUT_THROW("Failed to parse the configuration file: ", e.what());
                     }
 
                     nameless_counter_ = 0;
diff --git a/extra_visitors/msgpack/src/reader_compact.cpp b/extra_visitors/msgpack/src/reader_compact.cpp
@@ -60,7 +60,7 @@ namespace ariles2
                     }
                     catch (const std::exception &e)
                     {
-                        CPPUT_THROW(std::string("Failed to parse the configuration file: ") + e.what());
+                        CPPUT_THROW("Failed to parse the configuration file: ", e.what());
                     }
                 }
 
diff --git a/extra_visitors/protobuf3/ariles2/visitors/protobuf3/reader.h b/extra_visitors/protobuf3/ariles2/visitors/protobuf3/reader.h
@@ -38,7 +38,7 @@ namespace ariles2
                 }
                 catch (std::exception &e)
                 {
-                    CPPUT_THROW(std::string("Copying failed: ") + e.what());
+                    CPPUT_THROW("Copying failed: ", e.what());
                 }
             }
 
@@ -57,7 +57,7 @@ namespace ariles2
                 }
                 catch (const std::exception &e)
                 {
-                    CPPUT_THROW("entry: " + name + " // " + std::string(e.what()));
+                    CPPUT_THROW("entry: ", name, " // ", e.what());
                 }
             }
         };
diff --git a/extra_visitors/protobuf3/ariles2/visitors/protobuf3/writer.h b/extra_visitors/protobuf3/ariles2/visitors/protobuf3/writer.h
@@ -38,7 +38,7 @@ namespace ariles2
                 }
                 catch (std::exception &e)
                 {
-                    CPPUT_THROW(std::string("Copying failed: ") + e.what());
+                    CPPUT_THROW("Copying failed: ", e.what());
                 }
             }
         };
diff --git a/include/ariles2/internal/exception.h b/include/ariles2/internal/exception.h
@@ -20,16 +20,16 @@
     CPPUT_THROW_EXCEPTION(std::runtime_error, cpput::concat::simple("In ", __func__, "() // ", __VA_ARGS__))
 
 
-#define CPPUT_PERSISTENT_ASSERT(condition, message)                                                                    \
+#define CPPUT_PERSISTENT_ASSERT(condition, ...)                                                                        \
     if (!(condition))                                                                                                  \
     {                                                                                                                  \
-        CPPUT_THROW(message);                                                                                          \
+        CPPUT_THROW(__VA_ARGS__);                                                                                      \
     };
 
 #ifdef DNDEBUG
-#    define CPPUT_ASSERT(condition, message)
+#    define CPPUT_ASSERT(condition, ...)
 #else
-#    define CPPUT_ASSERT(condition, message) CPPUT_PERSISTENT_ASSERT(condition, message)
+#    define CPPUT_ASSERT(condition, ...) CPPUT_PERSISTENT_ASSERT(condition, __VA_ARGS__)
 #endif
 
 #endif
diff --git a/include/ariles2/visitors/copyfrom.h b/include/ariles2/visitors/copyfrom.h
@@ -53,7 +53,7 @@ namespace ariles2
                 }
                 catch (std::exception &e)
                 {
-                    CPPUT_THROW(std::string("Copying failed: ") + e.what());
+                    CPPUT_THROW("Copying failed: ", e.what());
                 }
             }
 
@@ -72,7 +72,7 @@ namespace ariles2
                 }
                 catch (const std::exception &e)
                 {
-                    CPPUT_THROW("entry: " + name + " // " + std::string(e.what()));
+                    CPPUT_THROW("entry: ", name, " // ", e.what());
                 }
             }
         };
diff --git a/include/ariles2/visitors/copyto.h b/include/ariles2/visitors/copyto.h
@@ -53,7 +53,7 @@ namespace ariles2
                 }
                 catch (std::exception &e)
                 {
-                    CPPUT_THROW(std::string("Copying failed: ") + e.what());
+                    CPPUT_THROW("Copying failed: ", e.what());
                 }
             }
 
@@ -72,7 +72,7 @@ namespace ariles2
                 }
                 catch (const std::exception &e)
                 {
-                    CPPUT_THROW("entry: " + name + " // " + std::string(e.what()));
+                    CPPUT_THROW("entry: ", name, " // ", std::string(e.what()));
                 }
             }
         };
diff --git a/include/ariles2/visitors/read.h b/include/ariles2/visitors/read.h
@@ -85,8 +85,7 @@ namespace ariles2
                     std::string file_name_default = file_name;
                     config_ifs.open(file_name_default.c_str());
                 }
-                CPPUT_PERSISTENT_ASSERT(
-                        config_ifs.good(), std::string("Could not open configuration file: ") + file_name.c_str());
+                CPPUT_PERSISTENT_ASSERT(config_ifs.good(), "Could not open configuration file: ", file_name.c_str());
             }
 
 
@@ -419,9 +418,7 @@ namespace ariles2
                     }
                     catch (const std::exception &e)
                     {
-                        CPPUT_THROW(
-                                std::string("Failed to parse entry <") + convertSubtreeToString(subtree) + "> ||  "
-                                + e.what());
+                        CPPUT_THROW("Failed to parse entry <", convertSubtreeToString(subtree), "> ||  ", e.what());
                     }
 
                     this->endRoot(subtree);
@@ -430,8 +427,9 @@ namespace ariles2
                 {
                     CPPUT_PERSISTENT_ASSERT(
                             param.allow_missing_entries_,
-                            std::string("Configuration file does not contain entry '") + convertSubtreeToString(subtree)
-                                    + "'.");
+                            "Configuration file does not contain entry '",
+                            convertSubtreeToString(subtree),
+                            "'.");
                 }
             }
 
@@ -455,7 +453,7 @@ namespace ariles2
                     }
                     catch (const std::exception &e)
                     {
-                        CPPUT_THROW(std::string("Failed to parse entry <") + name + "> ||  " + e.what());
+                        CPPUT_THROW("Failed to parse entry <", name, "> ||  ", e.what());
                     }
 
                     this->endMapEntry();
@@ -465,7 +463,9 @@ namespace ariles2
                 {
                     CPPUT_PERSISTENT_ASSERT(
                             not override_missing_entries_locally and param.allow_missing_entries_,
-                            std::string("Configuration file does not contain entry '") + name + "'.");
+                            "Configuration file does not contain entry '",
+                            name,
+                            "'.");
                     return (false);
                 }
             }
diff --git a/include/ariles2/visitors/write.h b/include/ariles2/visitors/write.h
@@ -56,8 +56,7 @@ namespace ariles2
                 config_ofs.open(file_name.c_str());
 
                 CPPUT_PERSISTENT_ASSERT(
-                        config_ofs.good(),
-                        std::string("Could not open configuration file for writing: ") + file_name.c_str());
+                        config_ofs.good(), "Could not open configuration file for writing: ", file_name.c_str());
             }
 
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ namespace ariles2`
`69`	`69`	`}`
`70`	`70`	`catch (const std::exception &e)`
`71`	`71`	`{`
`72`		`- CPPUT_THROW(std::string("Failed to parse the configuration file: ") + e.what());`
	`72`	`+ CPPUT_THROW("Failed to parse the configuration file: ", e.what());`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`nameless_counter_ = 0;`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ namespace ariles2`
`60`	`60`	`}`
`61`	`61`	`catch (const std::exception &e)`
`62`	`62`	`{`
`63`		`- CPPUT_THROW(std::string("Failed to parse the configuration file: ") + e.what());`
	`63`	`+ CPPUT_THROW("Failed to parse the configuration file: ", e.what());`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ namespace ariles2`
`38`	`38`	`}`
`39`	`39`	`catch (std::exception &e)`
`40`	`40`	`{`
`41`		`- CPPUT_THROW(std::string("Copying failed: ") + e.what());`
	`41`	`+ CPPUT_THROW("Copying failed: ", e.what());`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`@@ -57,7 +57,7 @@ namespace ariles2`
`57`	`57`	`}`
`58`	`58`	`catch (const std::exception &e)`
`59`	`59`	`{`
`60`		`- CPPUT_THROW("entry: " + name + " // " + std::string(e.what()));`
	`60`	`+ CPPUT_THROW("entry: ", name, " // ", e.what());`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`};`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ namespace ariles2`
`53`	`53`	`}`
`54`	`54`	`catch (std::exception &e)`
`55`	`55`	`{`
`56`		`- CPPUT_THROW(std::string("Copying failed: ") + e.what());`
	`56`	`+ CPPUT_THROW("Copying failed: ", e.what());`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`@@ -72,7 +72,7 @@ namespace ariles2`
`72`	`72`	`}`
`73`	`73`	`catch (const std::exception &e)`
`74`	`74`	`{`
`75`		`- CPPUT_THROW("entry: " + name + " // " + std::string(e.what()));`
	`75`	`+ CPPUT_THROW("entry: ", name, " // ", e.what());`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`};`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,7 @@ namespace ariles2`
`85`	`85`	`std::string file_name_default = file_name;`
`86`	`86`	`config_ifs.open(file_name_default.c_str());`
`87`	`87`	`}`
`88`		`- CPPUT_PERSISTENT_ASSERT(`
`89`		`- config_ifs.good(), std::string("Could not open configuration file: ") + file_name.c_str());`
	`88`	`+ CPPUT_PERSISTENT_ASSERT(config_ifs.good(), "Could not open configuration file: ", file_name.c_str());`
`90`	`89`	`}`
`91`	`90`
`92`	`91`
`@@ -419,9 +418,7 @@ namespace ariles2`
`419`	`418`	`}`
`420`	`419`	`catch (const std::exception &e)`
`421`	`420`	`{`
`422`		`- CPPUT_THROW(`
`423`		`- std::string("Failed to parse entry <") + convertSubtreeToString(subtree) + "> \|\| "`
`424`		`- + e.what());`
	`421`	`+ CPPUT_THROW("Failed to parse entry <", convertSubtreeToString(subtree), "> \|\| ", e.what());`
`425`	`422`	`}`
`426`	`423`
`427`	`424`	`this->endRoot(subtree);`
`@@ -430,8 +427,9 @@ namespace ariles2`
`430`	`427`	`{`
`431`	`428`	`CPPUT_PERSISTENT_ASSERT(`
`432`	`429`	`param.allow_missing_entries_,`
`433`		`- std::string("Configuration file does not contain entry '") + convertSubtreeToString(subtree)`
`434`		`- + "'.");`
	`430`	`+ "Configuration file does not contain entry '",`
	`431`	`+ convertSubtreeToString(subtree),`
	`432`	`+ "'.");`
`435`	`433`	`}`
`436`	`434`	`}`
`437`	`435`
`@@ -455,7 +453,7 @@ namespace ariles2`
`455`	`453`	`}`
`456`	`454`	`catch (const std::exception &e)`
`457`	`455`	`{`
`458`		`- CPPUT_THROW(std::string("Failed to parse entry <") + name + "> \|\| " + e.what());`
	`456`	`+ CPPUT_THROW("Failed to parse entry <", name, "> \|\| ", e.what());`
`459`	`457`	`}`
`460`	`458`
`461`	`459`	`this->endMapEntry();`
`@@ -465,7 +463,9 @@ namespace ariles2`
`465`	`463`	`{`
`466`	`464`	`CPPUT_PERSISTENT_ASSERT(`
`467`	`465`	`not override_missing_entries_locally and param.allow_missing_entries_,`
`468`		`- std::string("Configuration file does not contain entry '") + name + "'.");`
	`466`	`+ "Configuration file does not contain entry '",`
	`467`	`+ name,`
	`468`	`+ "'.");`
`469`	`469`	`return (false);`
`470`	`470`	`}`
`471`	`471`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ namespace ariles2`
`56`	`56`	`config_ofs.open(file_name.c_str());`
`57`	`57`
`58`	`58`	`CPPUT_PERSISTENT_ASSERT(`
`59`		`- config_ofs.good(),`
`60`		`- std::string("Could not open configuration file for writing: ") + file_name.c_str());`
	`59`	`+ config_ofs.good(), "Could not open configuration file for writing: ", file_name.c_str());`
`61`	`60`	`}`
`62`	`61`
`63`	`62`