Add -stub suffix to colour-names.cc

Made CMake copy the file renamed in case gperf isn't available. This should prevent the compiler from finding stub before generated file. Signed-off-by: Tin Švagelj <[email protected]>
brndnmtthws · Apr 24, 2024 · 5133193 · 5133193
1 parent f34b5dd
commit 5133193
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -61,6 +61,7 @@ if(APP_GPERF)
   )
 else(APP_GPERF)
   message(WARNING "'gperf' program not found, using stub colour-names.cc; colors names will not be parsed")
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/colour-names-stub.cc" "${CMAKE_BINARY_DIR}/colour-names.cc" COPYONLY)
 endif(APP_GPERF)
 
 set(conky_sources

diff --git a/src/colour-names.cc → src/colour-names-stub.cc b/src/colour-names.cc → src/colour-names-stub.cc
@@ -1,4 +1,4 @@
-/* 
+/*
  * To generate colour-names.cc, you must have gperf installed during build.
  * This is a dummy implementation for builds without gperf.
  * Color name matching will always return null (i.e. no match).
@@ -17,5 +17,6 @@ class color_name_hash {
 };
 
 const struct rgb *color_name_hash::in_word_set(const char *str, size_t len) {
-  return 0;
+  DBGP("color parsing not supported");
+  return nullptr;
 }
diff --git a/src/colours.cc b/src/colours.cc
@@ -31,6 +31,8 @@
 
 #include "logging.h"
 
+#include <optional>
+
 Colour Colour::from_argb32(uint32_t argb) {
   Colour out;
   out.alpha = argb >> 24;
@@ -111,14 +113,8 @@ Colour parse_color(const std::string &color) {
   std::optional<Colour> value_##name = name(color); \
   if (value_##name.has_value()) { return value_##name.value(); }
 
-  std::optional<Colour> value_parse_color_name = parse_color_name(color);
-  if (value_parse_color_name.has_value()) {
-    return value_parse_color_name.value();
-  }
-  std::optional<Colour> value_parse_hex_color = parse_hex_color(color);
-  if (value_parse_hex_color.has_value()) {
-    return value_parse_hex_color.value();
-  }
+  TRY_PARSER(parse_color_name)
+  TRY_PARSER(parse_hex_color)
 
 #undef TRY_PARSER