refactoring

cppd · cppd · commit 94bf2c4f1df1 · 2026-03-31T08:49:53.000+03:00
diff --git a/src/com/thread.h b/src/com/thread.h
@@ -42,6 +42,20 @@ inline int hardware_concurrency()
 
 class Threads final
 {
+        static void add_message(const char* const message, std::optional<std::string>& res)
+        {
+                if (!res)
+                {
+                        res = message;
+                        return;
+                }
+                if (!res->empty())
+                {
+                        *res += '\n';
+                }
+                *res += message;
+        }
+
         struct Thread final
         {
                 std::future<void> future;
@@ -62,20 +76,6 @@ class Threads final
         {
                 std::optional<std::string> res;
 
-                const auto add_message = [&](const char* const message)
-                {
-                        if (!res)
-                        {
-                                res = message;
-                                return;
-                        }
-                        if (!res->empty())
-                        {
-                                *res += '\n';
-                        }
-                        *res += message;
-                };
-
                 for (Thread& thread : threads_)
                 {
                         thread.thread.join();
@@ -88,11 +88,11 @@ class Threads final
                         }
                         catch (const std::exception& e)
                         {
-                                add_message(e.what());
+                                add_message(e.what(), res);
                         }
                         catch (...)
                         {
-                                add_message("Unknown error in thread");
+                                add_message("Unknown error in thread", res);
                         }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,20 @@ inline int hardware_concurrency()`
`42`	`42`
`43`	`43`	`class Threads final`
`44`	`44`	`{`
	`45`	`+ static void add_message(const char* const message, std::optional<std::string>& res)`
	`46`	`+ {`
	`47`	`+ if (!res)`
	`48`	`+ {`
	`49`	`+ res = message;`
	`50`	`+ return;`
	`51`	`+ }`
	`52`	`+ if (!res->empty())`
	`53`	`+ {`
	`54`	`+ *res += '\n';`
	`55`	`+ }`
	`56`	`+ *res += message;`
	`57`	`+ }`
	`58`	`+`
`45`	`59`	`struct Thread final`
`46`	`60`	`{`
`47`	`61`	`std::future<void> future;`
`@@ -62,20 +76,6 @@ class Threads final`
`62`	`76`	`{`
`63`	`77`	`std::optional<std::string> res;`
`64`	`78`
`65`		`- const auto add_message = [&](const char* const message)`
`66`		`- {`
`67`		`- if (!res)`
`68`		`- {`
`69`		`- res = message;`
`70`		`- return;`
`71`		`- }`
`72`		`- if (!res->empty())`
`73`		`- {`
`74`		`- *res += '\n';`
`75`		`- }`
`76`		`- *res += message;`
`77`		`- };`
`78`		`-`
`79`	`79`	`for (Thread& thread : threads_)`
`80`	`80`	`{`
`81`	`81`	`thread.thread.join();`
`@@ -88,11 +88,11 @@ class Threads final`
`88`	`88`	`}`
`89`	`89`	`catch (const std::exception& e)`
`90`	`90`	`{`
`91`		`- add_message(e.what());`
	`91`	`+ add_message(e.what(), res);`
`92`	`92`	`}`
`93`	`93`	`catch (...)`
`94`	`94`	`{`
`95`		`- add_message("Unknown error in thread");`
	`95`	`+ add_message("Unknown error in thread", res);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`