1 files changed, 39 insertions, 24 deletions

diff --git a/src/ctor.h b/src/ctor.h
index 3b64cb5..0892364 100644
--- a/src/ctor.h
+++ b/src/ctor.h
@@ -10,6 +10,7 @@
 #include <variant>
 #include <cstddef>
 #include <functional>
+#include <string_view>
 
 namespace ctor {
 
@@ -52,31 +53,37 @@ enum class arch
 	unknown, //!< Target platform architecture has not yet detected or was not possible to detect
 };
 
+enum class toolchain
+{
+	any,
+	none,
+	gcc,
+	clang,
+};
+
 struct source
 {
-	source(const char* file) : file(file) {}
-	source(const std::string& file) : file(file) {}
-	source(const char* file, ctor::language lang) : file(file), language(lang) {}
-	source(const std::string& file, ctor::language lang) : file(file), language(lang) {}
+	source(const char* file_) : file(file_) {} // convenience ctor
+
+	source(std::string_view file_) : source(file_, ctor::language::automatic) {}
+	source(std::string_view file_, ctor::language lang_) : file(file_), language(lang_) {}
+
+	source(std::string_view file_, std::string_view output_) : file(file_), output(output_) {}
+	source(std::string_view file_, ctor::language lang_, std::string_view output_) : file(file_), language(lang_), output(output_) {}
+
+	source(ctor::toolchain toolchain_, std::string_view file_) : file(file_), toolchain(toolchain_) {}
+	source(ctor::toolchain toolchain_, std::string_view file_, ctor::language lang_) : file(file_), toolchain(toolchain_), language(lang_) {}
 
-	source(const char* file, const char* output) : file(file), output(output) {}
-	source(const std::string& file, const std::string& output) : file(file), output(output) {}
-	source(const char* file, ctor::language lang, const char* output) : file(file), language(lang), output(output) {}
-	source(const std::string& file, ctor::language lang, const std::string& output) : file(file), language(lang), output(output) {}
+	source(ctor::toolchain toolchain_, std::string_view file_, std::string_view output_) : file(file_), toolchain(toolchain_), output(output_) {}
+
+	source(ctor::toolchain toolchain_, std::string_view file_, ctor::language lang_, std::string_view output_) : file(file_), toolchain(toolchain_), language(lang_), output(output_) {}
 
 	std::string file;
+	ctor::toolchain toolchain{ctor::toolchain::any};
 	ctor::language language{ctor::language::automatic};
 	std::string output{};
 };
 
-enum class toolchain
-{
-	any,
-	none,
-	gcc,
-	clang,
-};
-
 enum class cxx_opt
 {
 	//                                  gcc/clang
@@ -91,6 +98,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>
 };
 
@@ -108,6 +116,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>
 };
 
@@ -149,18 +158,24 @@ template<typename T>
 class flag
 {
 public:
-	flag(const std::string& str);
+	flag(std::string_view str);
 	flag(const char* str);
-	flag(T opt) : opt(opt) {}
-	flag(T opt, const std::string& 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, const std::string& arg) : toolchain(toolchain), opt(opt), arg(arg) {}
+	flag(T opt_) : opt(opt_) {}
+	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;
+	T opt{};
 	std::string arg;
+	std::string arg2;
 };
 
 using c_flag = ctor::flag<ctor::c_opt>;