introduce <macro>, new feature macro approach, use dollar macros more consistently

Author: Tsche

include/rsl/_impl/_config.h

@@ -0,0 +1,8 @@
+#pragma once
+#include <rsl/macro>
+// this file contains defaults for feature macros used in rsl-util
+
+#define OPT_RSL_STD_COMPAT    OPT_DEFAULT_ON   // RSL_STD_COMPAT
+#define OPT_RSL_POISON_STD    OPT_DEFAULT_OFF  // RSL_POISON_STD
+#define OPT_RSL_ENABLE_REVIEW OPT_DEFAULT_OFF  // RSL_ENABLE_REVIEW
+#define OPT_RSL_GLOBAL_REPR   OPT_DEFAULT_ON   // RSL_GLOBAL_REPR

include/rsl/_impl/macro/attributes.hpp

@@ -24,7 +24,4 @@
 #  define RSL_ENABLE_IF(...) __attribute__((enable_if(__VA_ARGS__)))
 #else
 #  define RSL_ENABLE_IF(...)
-#endif
-
-#define $inline(...) RSL_INLINE(__VA_ARGS__)
-#define $enable_if(...) RSL_ENABLE_IF(__VA_ARGS__)
+#endif

include/rsl/_impl/macro/compiler.hpp

@@ -8,14 +8,6 @@
 
 #define RSL_VERSION_ENCODE(major, minor, patch) ((major) * 1000000 + (minor) * 1000 + (patch))
 
-#ifndef __has_attribute
-#  define __has_attribute(x) 0
-#endif
-
-#ifndef __has_cpp_attribute
-#  define __has_cpp_attribute(x) 0
-#endif
-
 #if defined(__clang__)
 #  define RSL_COMPILER RSL_COMPILER_CLANG
 #  define RSL_COMPILER_VERSION \

include/rsl/_impl/macro/opt.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#define OPT_      +
+#define OPT_true  +
+#define OPT_1     +
+#define OPT_on    +
+#define OPT_ON    +
+#define OPT_false -
+#define OPT_0     -
+#define OPT_off   -
+#define OPT_OFF   -
+
+#define OPT_DEFAULT_ON  +
+#define OPT_DEFAULT_OFF -
+
+#define OPT_IMPL_EXPAND(x) OPT_##x
+#define USES_OPT(x)        ((OPT_IMPL_EXPAND(x) 1) == 1)

include/rsl/_impl/macros.hpp

@@ -5,7 +5,7 @@
 #include <meta>
 #include <algorithm>
 
-#include <rsl/_impl/macro/attributes.hpp>
+#include <rsl/macro>
 
 namespace rsl::_impl {
 template <std::meta::info... Members>

include/rsl/_impl/member_cache.hpp

@@ -1,8 +1,9 @@
 #pragma once
+#include <rsl/macro>
 
-#ifdef __unix__
+#if $os_is(LINUX)
 #  include <unistd.h>
-#elif defined(_WIN32) || defined(WIN32)
+#elif $os_is(WINDOWS)
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 
@@ -21,10 +22,12 @@
 
 namespace rsl::_impl_platform {
 inline bool isatty(int fd) {
-#if __unix__
+#if $os_is(LINUX)
   return bool(::isatty(fd));
-#else
+#elif $os_is(WINDOWS)
   return bool(::_isatty(fd));
+#else
+#  error "Unsupported platform"
 #endif
 }
 

include/rsl/_impl/platform/io.hpp

@@ -11,20 +11,9 @@
 #include <rsl/source_location>
 #include <rsl/expect>
 #include <rsl/string_view>
-#include <rsl/_impl/util/to_string.hpp>
-#include "_impl/macros.hpp"
-
-#define RSL_REVIEW_DEFAULT 1
 
-#if !defined(RSL_ENABLE_REVIEW)
-#  define RSL_IMPL_ENABLE_REVIEW 0
-#else
-#  if RSL_IMPL_IS_EMPTY(RSL_ENABLE_REVIEW)
-#    define RSL_IMPL_ENABLE_REVIEW 1
-#  else
-#    define RSL_IMPL_ENABLE_REVIEW RSL_ENABLE_REVIEW
-#  endif
-#endif
+#include <rsl/_impl/util/to_string.hpp>
+#include <rsl/_impl/_config.h>
 
 namespace rsl {
 namespace _error_impl {
@@ -89,7 +78,7 @@ constexpr void assert_violation(std::source_location sloc,
   }
 }
 
-#if RSL_IMPL_ENABLE_REVIEW
+#if $uses_opt(RSL_ENABLE_REVIEW)
 
 inline std::vector<std::string>& observations() {
   static std::vector<std::string> value;
@@ -156,7 +145,7 @@ constexpr bool assert_condition_wrapper(bool result, std::string_view message =
     }();                                                                                     \
   } while (false)
 
-#if RSL_IMPL_ENABLE_REVIEW
+#if $uses_opt(RSL_ENABLE_REVIEW)
 #  define constexpr_review(...)                                           \
     do {                                                                  \
       static constexpr auto _sloc = ::rsl::source_location();             \

include/rsl/assert

@@ -4,6 +4,8 @@
 #include <type_traits>
 #include <utility>
 #include <rsl/meta_traits>
+#include <rsl/_impl/_config.h>
+
 
 namespace rsl {
 inline namespace annotations {
@@ -198,12 +200,6 @@ constexpr bool in_range(U value) noexcept {
 }
 }  // namespace rsl
 
-#ifdef RSL_POISON_STD
-template <typename E>
-  requires std::is_enum_v<E>
-struct std::numeric_limits<E> : rsl::numeric_limits<E> {};
-#endif
-
 template <rsl::is_flag_enum E>
   requires std::is_scoped_enum_v<E>
 constexpr E operator~(E v) noexcept {

include/rsl/enum

@@ -0,0 +1,29 @@
+#pragma once
+#include <rsl/_impl/macro/attributes.hpp>
+#include <rsl/_impl/macro/compiler.hpp>
+#include <rsl/_impl/macro/opt.hpp>
+#include <rsl/_impl/macro/os.hpp>
+
+// compile environment checks
+
+/**
+ * @param compiler: one of UNKNOWN, CLANG, GCC, MSVC
+ */
+#define $compiler_is(compiler) (RSL_COMPILER == RSL_COMPILER_##compiler)
+
+/**
+ * @param stdlib: one of UNKNOWN, LIBCXX, GLIBCXX, MSVC
+ */
+#define $stdlib_is(stdlib) (RSL_STDLIB == RSL_STDLIB_##stdlib)
+
+/**
+ * @param os: one of UNKNOWN, WINDOWS, LINUX, MAC, FREEBSD, ANDROID, IOS
+ */
+#define $os_is(os) (RSL_OS == RSL_OS_##os)
+
+// feature macro helper
+#define $uses_opt(x) USES_OPT(x)
+
+// attributes
+#define $inline(...)    RSL_INLINE(__VA_ARGS__)
+#define $enable_if(...) RSL_ENABLE_IF(__VA_ARGS__)