Remove ctor::flags construct and apply tool specific flags (ie. ctor::cxx_flags, ...) directly in build config. Loosen generator requirements, to allow for lambda's directly.new_syntax

5 files changed, 59 insertions, 67 deletions

diff --git a/test/suite/ctor_files/ctor.cc.bar b/test/suite/ctor_files/ctor.cc.bar
index 2342c3a..f73f400 100644
--- a/test/suite/ctor_files/ctor.cc.bar
+++ b/test/suite/ctor_files/ctor.cc.bar
@@ -16,15 +16,13 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 			ctor::sources{
 				"hello.cc",
 			},
-			ctor::flags{
-				ctor::cxx_flags{
-					"-std=c++20",
-					"-O3",
-					"-g",
-					"-Wall",
-					"-Werror",
-					"-fexceptions",
-				},
+			ctor::cxx_flags{
+				"-std=c++20",
+				"-O3",
+				"-g",
+				"-Wall",
+				"-Werror",
+				"-fexceptions",
 			},
 			ctor::externals({"bar"}),
 		}
diff --git a/test/suite/ctor_files/ctor.cc.base b/test/suite/ctor_files/ctor.cc.base
index 3734415..cc06e85 100644
--- a/test/suite/ctor_files/ctor.cc.base
+++ b/test/suite/ctor_files/ctor.cc.base
@@ -16,15 +16,13 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 			ctor::sources{
 				"hello.cc",
 			},
-			ctor::flags{
-				ctor::cxx_flags{
-					"-std=c++20",
-					"-O3",
-					"-g",
-					"-Wall",
-					"-Werror",
-					"-fexceptions",
-				},
+			ctor::cxx_flags{
+				"-std=c++20",
+				"-O3",
+				"-g",
+				"-Wall",
+				"-Werror",
+				"-fexceptions",
 			},
 			ctor::externals({"bar"}),
 		}
diff --git a/test/suite/ctor_files/ctor.cc.generated b/test/suite/ctor_files/ctor.cc.generated
index fe7e173..96b6fb5 100644
--- a/test/suite/ctor_files/ctor.cc.generated
+++ b/test/suite/ctor_files/ctor.cc.generated
@@ -17,15 +17,13 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 			ctor::sources{
 				{ "world.cc", ctor::source_type::generated },
 			},
-			ctor::flags{
-				ctor::cxx_flags{
-					"-std=c++20",
-					"-O3",
-					"-g",
-					"-Wall",
-					"-Werror",
-					"-fexceptions",
-				},
+			ctor::cxx_flags{
+				"-std=c++20",
+				"-O3",
+				"-g",
+				"-Wall",
+				"-Werror",
+				"-fexceptions",
 			},
 		},
 		{
@@ -33,15 +31,13 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 			ctor::sources{
 				{ "foo.cc", ctor::source_type::generated },
 			},
-			ctor::flags{
-				ctor::cxx_flags{
-					"-std=c++20",
-					"-O3",
-					"-g",
-					"-Wall",
-					"-Werror",
-					"-fexceptions",
-				},
+			ctor::cxx_flags{
+				"-std=c++20",
+				"-O3",
+				"-g",
+				"-Wall",
+				"-Werror",
+				"-fexceptions",
 			},
 		},
 		{
@@ -50,24 +46,25 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 				{"hello.cc", ctor::output_file{"world.cc"}},
 				{"hello.cc", ctor::output_file{"foo.cc"}},
 			},
-			ctor::GeneratorOneToOne{[](const std::string& input,
-			               const std::string& output,
-			               const ctor::build_configuration& config,
-			               const ctor::settings& settings)
+			[](const std::string& input,
+			   const std::string& output,
+			   const ctor::build_configuration& config,
+			   const ctor::settings& settings)
 			{
 				namespace fs = std::filesystem;
 				std::cout << "Input: " << input << '\n';
 				std::cout << "Output: " << output << '\n';
 				fs::copy_file(input, output, fs::copy_options::overwrite_existing);
 				return 0;
-			}}
+			},
 		},
 
 		{
 			ctor::target("many_to_one"),
 			ctor::sources{
 				{"many_to_one.cc", ctor::source_type::generated}
-			}
+			},
+			ctor::cxx_flags{"-fexceptions"},
 		},
 		{
 			ctor::target("many_to_one.cc"),
@@ -75,10 +72,10 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 				{"foo.cc", ctor::source_type::generated},
 				{"hello.cc"},
 			},
-			ctor::GeneratorManyToOne{[](const std::vector<std::string>& input,
-			               const std::string& output,
-			               const ctor::build_configuration& config,
-			               const ctor::settings& settings)
+			[](const std::vector<std::string>& input,
+			   const std::string& output,
+			   const ctor::build_configuration& config,
+			   const ctor::settings& settings)
 			{
 				std::cout << "Output: " << output << '\n';
 				std::ofstream ofs(output);
@@ -97,7 +94,7 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 				}
 				ofs << "*/\n";
 				return 0;
-			}}
+			}
 		},
 
 	};
diff --git a/test/suite/ctor_files/ctor.cc.generated2 b/test/suite/ctor_files/ctor.cc.generated2
index acda99f..2e36c0e 100644
--- a/test/suite/ctor_files/ctor.cc.generated2
+++ b/test/suite/ctor_files/ctor.cc.generated2
@@ -30,34 +30,35 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 				{"hello.cc", ctor::output_file{"world.cc"}},
 				{"hello.cc", ctor::output_file{"foo.cc"}},
 			},
-			ctor::GeneratorOneToOne{[](const std::string& input,
-			               const std::string& output,
-			               const ctor::build_configuration& config,
-			               const ctor::settings& settings)
+			[](const std::string& input,
+			   const std::string& output,
+			   const ctor::build_configuration& config,
+			   const ctor::settings& settings)
 			{
 				namespace fs = std::filesystem;
 				std::cout << "Input: " << input << '\n';
 				std::cout << "Output: " << output << '\n';
 				fs::copy_file(input, output, fs::copy_options::overwrite_existing);
 				return 0;
-			}}
+			}
 		},
 
 		{
 			ctor::target("many_to_one"),
 			ctor::sources{
 				{"many_to_one.cc", ctor::source_type::generated}
-			}
+			},
+			ctor::cxx_flags{ "-fexceptions", },
 		},
 		{
 			ctor::target("many_to_one.cc"),
 			ctor::sources{
 				{"hello.cc"},
 			},
-			ctor::GeneratorManyToOne{[](const std::vector<std::string>& input,
-			               const std::string& output,
-			               const ctor::build_configuration& config,
-			               const ctor::settings& settings)
+			[](const std::vector<std::string>& input,
+			   const std::string& output,
+			   const ctor::build_configuration& config,
+			   const ctor::settings& settings)
 			{
 				std::cout << "Output: " << output << '\n';
 				std::ofstream ofs(output);
@@ -76,7 +77,7 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 				}
 				ofs << "*/\n";
 				return 0;
-			}}
+			}
 		},
 
 	};
diff --git a/test/suite/ctor_files/ctor.cc.multi b/test/suite/ctor_files/ctor.cc.multi
index cf86703..e45ad45 100644
--- a/test/suite/ctor_files/ctor.cc.multi
+++ b/test/suite/ctor_files/ctor.cc.multi
@@ -18,15 +18,13 @@ ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 			ctor::sources{
 				"hello.cc",
 			},
-			ctor::flags{
-				ctor::cxx_flags{
-					"-std=c++20",
-					"-O3",
-					"-g",
-					"-Wall",
-					"-Werror",
-					"-fexceptions",
-				},
+			ctor::cxx_flags{
+				"-std=c++20",
+				"-O3",
+				"-g",
+				"-Wall",
+				"-Werror",
+				"-fexceptions",
 			},
 			ctor::externals({"bar"}),
 		}