From c96f8afe3b3e453dcc6d4b8c9e0ae3b143e2188f Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Mon, 23 Dec 2024 12:14:46 +0100
Subject: WIP

---
 src/ctor.h | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'src/ctor.h')

diff --git a/src/ctor.h b/src/ctor.h
index e0e2bef..3d963b3 100644
--- a/src/ctor.h
+++ b/src/ctor.h
@@ -59,6 +59,7 @@ enum class toolchain
 	none,
 	gcc,
 	clang,
+	msvc,
 };
 
 struct source
@@ -90,6 +91,9 @@ enum class cxx_opt
 	output,                          //  -o
 	debug,                           //  -g
 	warn_all,                        //  -Wall
+	warn_conversion,                 //  -Wconversion
+	warn_shadow,                     //  -Wshadow
+	warn_extra,                      //  -Wextra
 	warnings_as_errors,              //  -Werror
 	generate_dep_tree,               //  -MMD
 	no_link,                         //  -c
@@ -98,6 +102,7 @@ enum class cxx_opt
 	optimization,                    //  -O<arg>
 	position_independent_code,       //  -fPIC
 	position_independent_executable, //  -fPIE
+	define,                          //  -D<arg>[=<arg2>]
 	custom,                          // entire option taken verbatim from <arg>
 };
 
@@ -107,6 +112,9 @@ enum class c_opt
 	output,                          //  -o
 	debug,                           //  -g
 	warn_all,                        //  -Wall
+	warn_conversion,                 //  -Wconversion
+	warn_shadow,                     //  -Wshadow
+	warn_extra,                      //  -Wextra
 	warnings_as_errors,              //  -Werror
 	generate_dep_tree,               //  -MMD
 	no_link,                         //  -c
@@ -115,6 +123,7 @@ enum class c_opt
 	optimization,                    //  -O<arg>
 	position_independent_code,       //  -fPIC
 	position_independent_executable, //  -fPIE
+	define,                          //  -D<arg>[=<arg2>]
 	custom,                          // entire option taken verbatim from <arg>
 };
 
@@ -159,15 +168,21 @@ public:
 	flag(std::string_view str);
 	flag(const char* str);
 	flag(T opt_) : opt(opt_) {}
-	flag(T opt_, std::string_view arg_) : opt(opt_), arg(arg_) {}
-	flag(T opt_, const char* arg_) : opt(opt_), arg(arg_) {}
-	flag(ctor::toolchain toolchain_, T opt_) : toolchain(toolchain_), opt(opt_) {}
-	flag(ctor::toolchain toolchain_, T opt_, const char* arg_) : toolchain(toolchain_), opt(opt_), arg(arg_) {}
-	flag(ctor::toolchain toolchain_, T opt_, std::string_view arg_) : toolchain(toolchain_), opt(opt_), arg(arg_) {}
+	flag(T opt_, std::string_view arg_, std::string_view arg2_ = "")
+		: opt(opt_), arg(arg_), arg2(arg2_) {}
+	flag(T opt_, const char* arg_, const char* arg2_ = "")
+		: opt(opt_), arg(arg_), arg2(arg2_) {}
+	flag(ctor::toolchain toolchain_, T opt_)
+		: toolchain(toolchain_), opt(opt_) {}
+	flag(ctor::toolchain toolchain_, T opt_, const char* arg_, const char* arg2_ = "")
+		: toolchain(toolchain_), opt(opt_), arg(arg_), arg2(arg2_) {}
+	flag(ctor::toolchain toolchain_, T opt_, std::string_view arg_, std::string_view arg2_ = "")
+		: toolchain(toolchain_), opt(opt_), arg(arg_), arg2(arg2_) {}
 
 	ctor::toolchain toolchain{ctor::toolchain::any};
 	T opt{};
 	std::string arg;
+	std::string arg2;
 };
 
 using c_flag = ctor::flag<ctor::c_opt>;
@@ -253,12 +268,12 @@ namespace cfg
 constexpr auto builddir = "builddir";
 
 constexpr auto host_cc = "host-cc";
-constexpr auto host_cxx = "host-cpp";
+constexpr auto host_cxx = "host-cxx";
 constexpr auto host_ar = "host-ar";
 constexpr auto host_ld = "host-ld";
 
 constexpr auto build_cc = "build-cc";
-constexpr auto build_cxx = "build-cpp";
+constexpr auto build_cxx = "build-cxx";
 constexpr auto build_ar = "build-ar";
 constexpr auto build_ld = "build-ld";
 
@@ -269,7 +284,7 @@ constexpr auto ctor_libdir = "ctor-libdir";
 struct configuration
 {
 	bool has(const std::string& key) const;
-	const std::string& get(const std::string& key, const std::string& default_value = {}) const;
+	std::string get(const std::string& key, const std::string& default_value = {}) const;
 
 	ctor::toolchain host_toolchain{ctor::toolchain::none};
 	ctor::arch host_arch{ctor::arch::unknown};
-- 
cgit v1.2.3