merge loek/scripts into loek/config

5 files changed, 56 insertions, 20 deletions

diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index d5dbd9f..bbeaad9 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -1,10 +1,12 @@
 target_sources(crepe PUBLIC
 	color.cpp
 	log.cpp
+	fmt.cpp
 )
 
 target_sources(crepe PUBLIC FILE_SET HEADERS FILES
 	color.h
 	log.h
+	fmt.h
 )
 
diff --git a/src/crepe/util/fmt.cpp b/src/crepe/util/fmt.cpp
new file mode 100644
index 0000000..8ef1164
--- /dev/null
+++ b/src/crepe/util/fmt.cpp
@@ -0,0 +1,33 @@
+#include <cstdarg>
+#include <cstdio>
+#include <string>
+
+#include "fmt.h"
+
+using namespace std;
+
+string crepe::util::va_stringf(va_list args, const char * fmt) {
+	va_list args_copy;
+	va_copy(args_copy, args);
+
+	size_t sz = vsnprintf(NULL, 0, fmt, args_copy) + 1;
+	char * msg = (char *) malloc(sz);
+	va_end(args_copy);
+
+	vsnprintf(msg, sz, fmt, args);
+
+	string out = msg;
+	free(msg);
+
+	va_end(args);
+
+	return out;
+}
+
+string crepe::util::stringf(const char * fmt, ...) {
+	va_list args;
+	va_start(args, fmt);
+	string out = va_stringf(args, fmt);
+	va_end(args);
+	return out;
+}
diff --git a/src/crepe/util/fmt.h b/src/crepe/util/fmt.h
new file mode 100644
index 0000000..44c426f
--- /dev/null
+++ b/src/crepe/util/fmt.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <string>
+
+namespace crepe::util {
+
+std::string va_stringf(va_list args, const char * fmt);
+std::string stringf(const char * fmt, ...);
+
+} // namespace crepe::util
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index ba12ba5..e3e9f1f 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -3,6 +3,7 @@
 #include <cstdlib>
 #include <string>
 
+#include "fmt.h"
 #include "log.h"
 #include "../api/Config.h"
 
@@ -16,40 +17,30 @@ static const char * const LOG_PREFIX[] = {
 	[log_level::ERROR] = "[ERROR] ",
 };
 
-static void va_logf(enum log_level level, va_list args, const std::string fmt) {
+static void log(enum log_level level, const std::string msg) {
 	auto & cfg = crepe::api::Config::get_instance();
 	if (level < cfg.log.level) return;
 
-	va_list args_copy;
-	va_copy(args_copy, args);
-
-	// prepend log level and ensure newline
-	std::string format_fixed = LOG_PREFIX[level] + fmt;
-	if (!format_fixed.ends_with("\n")) format_fixed += "\n";
-
-	size_t sz = vsnprintf(NULL, 0, format_fixed.c_str(), args_copy) + 1;
-	char * msg = (char *) malloc(sz);
-	va_end(args_copy);
-
-	vsnprintf(msg, sz, format_fixed.c_str(), args);
+	using namespace std;
+	string final = string(LOG_PREFIX[level]) + msg;
+	if (!final.ends_with("\n")) final += "\n";
 
 	// TODO: also log to file or smth
-	printf("%s", msg);
+	printf("%s", final.c_str());
 	fflush(stdout);
-
-	free(msg);
 }
 
 void crepe::util::logf(const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
-	va_logf(crepe::util::log_level::DEBUG, args, fmt);
+	log(log_level::DEBUG, va_stringf(args, fmt));
 	va_end(args);
 }
 
 void crepe::util::logf(log_level level, const char * fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
-	va_logf(level, args, fmt);
+	log(level, va_stringf(args, fmt));
 	va_end(args);
 }
+
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index d5494c7..c5d8665 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -7,7 +7,7 @@
 
 // utility macros
 #define _crepe_logf_here(lvl, fmt, ...) \
-	crepe::util::logf(lvl, "%s%s (%s:%d)" fmt "\n", \
+	crepe::util::logf(lvl, "%s%s (%s:%d)%s" fmt "\n", \
 					  crepe::util::color::FG_WHITE, __PRETTY_FUNCTION__, \
 					  __FILE_NAME__, __LINE__, crepe::util::color::RESET, \
 					  __VA_ARGS__)
@@ -15,7 +15,7 @@
 // very illegal global function-style macros
 // NOLINTBEGIN
 #define dbg_logf(fmt, ...) _crepe_logf_here(util::log_level::DEBUG, ": " fmt, __VA_ARGS__)
-#define dbg_log(str) _crepe_logf_here(util::log_level::DEBUG, ": %s", str)
+#define dbg_log(str) _crepe_logf_here(util::log_level::DEBUG, "%s: " str, "")
 #define dbg_trace() _crepe_logf_here(util::log_level::TRACE, "%s", "")
 // NOLINTEND