From 9fc46f5f08353691af77bd322fbc5587efd2b5a7 Mon Sep 17 00:00:00 2001
From: Kris Jusiak <kris@jusiak.net>
Date: Wed, 27 May 2020 10:20:15 -0600
Subject: [PATCH] :bug: [pph] Fix `sml.hpp` generation

Problem:
- `sml.hpp` generation using `tools/pph.sh` is out of date with `sml.hpp`.

Solution:
- Update files in sml/ folder to fix the generated `sml.hpp`.
---
 .github/workflows/pph-checker.yml           | 16 ++++++---
 .gitignore                                  |  1 +
 include/boost/sml.hpp                       | 37 +++++++++------------
 include/boost/sml/aux_/type_traits.hpp      |  4 +--
 include/boost/sml/aux_/utility.hpp          |  6 ++--
 include/boost/sml/back/policies.hpp         |  2 +-
 include/boost/sml/back/state_machine.hpp    |  6 ++--
 include/boost/sml/front/actions/process.hpp |  2 +-
 include/boost/sml/front/state.hpp           |  2 +-
 include/boost/sml/state_machine.hpp         |  2 +-
 include/boost/sml/transition_table.hpp      |  6 ++--
 test/CMakeLists.txt                         |  1 -
 tools/pph.sh                                | 10 +++---
 13 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/pph-checker.yml b/.github/workflows/pph-checker.yml
index d31ad064..fefe3091 100644
--- a/.github/workflows/pph-checker.yml
+++ b/.github/workflows/pph-checker.yml
@@ -1,4 +1,4 @@
-name: Pph Checker
+name: PPH checker
 
 on:
   push:
@@ -8,9 +8,17 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
-
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        name: [
+          ubuntu-18.04-clang-4.0
+        ]
+        include:
+          - name: ubuntu-18.04-clang-4.0
+            os: ubuntu-18.04
+            compiler: clang
+            version: "4.0"
     steps:
     - uses: actions/checkout@v2
     - name: Run pph
diff --git a/.gitignore b/.gitignore
index f1d1be40..761a4a9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/build*/
 /BUILD*/
 /*.log
 *.out
diff --git a/include/boost/sml.hpp b/include/boost/sml.hpp
index 5a41e8e3..e998d86d 100644
--- a/include/boost/sml.hpp
+++ b/include/boost/sml.hpp
@@ -6,17 +6,14 @@
 //
 #ifndef BOOST_SML_HPP
 #define BOOST_SML_HPP
-#if defined(_MSC_VER) && !defined(__clang__)
-#define COMPILING_WITH_MSVC
-#endif
 #if (__cplusplus < 201305L && _MSC_VER < 1900)
 #error "[Boost].SML requires C++14 support (Clang-3.4+, GCC-5.1+, MSVC-2015+)"
 #else
-#define BOOST_SML_VERSION 1'1'0
+#define BOOST_SML_VERSION 1'1'1
 #define BOOST_SML_NAMESPACE_BEGIN \
   namespace boost {               \
   namespace sml {                 \
-  inline namespace v1_1_0 {
+  inline namespace v1_1_1 {
 #define BOOST_SML_NAMESPACE_END \
   }                             \
   }                             \
@@ -44,7 +41,7 @@
 #define __BOOST_SML_TEMPLATE_KEYWORD template
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic"
-#elif defined(COMPILING_WITH_MSVC)
+#elif defined(_MSC_VER) && !defined(__clang__)
 #define __BOOST_SML_DEFINED_HAS_BUILTIN
 #define __has_builtin(...) __has_builtin##__VA_ARGS__
 #define __has_builtin__make_integer_seq(...) 1
@@ -52,7 +49,7 @@
 #define __BOOST_SML_VT_INIT
 #define __BOOST_SML_ZERO_SIZE_ARRAY(...)
 #define __BOOST_SML_ZERO_SIZE_ARRAY_CREATE(...) __VA_ARGS__ ? __VA_ARGS__ : 1
-#if (defined(COMPILING_WITH_MSVC) && _MSC_VER >= 1910)  // MSVC 2017
+#if defined(_MSC_VER) && !defined(__clang__) && _MSC_VER >= 1910  // MSVC 2017
 #define __BOOST_SML_TEMPLATE_KEYWORD template
 #else
 #define __BOOST_SML_TEMPLATE_KEYWORD
@@ -125,7 +122,7 @@ struct is_same : false_type {};
 template <class T>
 struct is_same<T, T> : true_type {};
 template <class T, class U>
-#if defined(COMPILING_WITH_MSVC)
+#if defined(_MSC_VER) && !defined(__clang__)
 struct is_base_of : integral_constant<bool, __is_base_of(T, U)> {
 };
 #else
@@ -136,7 +133,7 @@ decltype(T(declval<TArgs>()...), true_type{}) test_is_constructible(int);
 template <class, class...>
 false_type test_is_constructible(...);
 template <class T, class... TArgs>
-#if defined(COMPILING_WITH_MSVC)
+#if defined(_MSC_VER) && !defined(__clang__)
 struct is_constructible : decltype(test_is_constructible<T, TArgs...>(0)) {
 };
 #else
@@ -341,7 +338,7 @@ struct missing_ctor_parameter {
   operator U() {
     return {};
   }
-#if !defined(COMPILING_WITH_MSVC)
+#if !defined(_MSC_VER) && !defined(__clang__)
   template <class TMissing, __BOOST_SML_REQUIRES(!aux::is_base_of<pool_type_base, TMissing>::value)>
   operator TMissing &() const {
     static_assert(missing_ctor_parameter<TMissing>::value,
@@ -414,7 +411,7 @@ template <template <class...> class T, class... Ts>
 struct size<T<Ts...>> {
   static constexpr auto value = sizeof...(Ts);
 };
-#if defined(COMPILING_WITH_MSVC)
+#if defined(_MSC_VER) && !defined(__clang__)
 constexpr int max_impl() { return 0; }
 constexpr int max_impl(int r) { return r; }
 constexpr int max_impl(int r, int i) { return r > i ? r : i; }
@@ -461,7 +458,7 @@ auto get_type_name(const char *ptr, index_sequence<Ns...>) {
 }
 template <class T>
 const char *get_type_name() {
-#if defined(COMPILING_WITH_MSVC)
+#if defined(_MSC_VER) && !defined(__clang__)
   return detail::get_type_name<T, 34>(__FUNCSIG__, make_index_sequence<sizeof(__FUNCSIG__) - 34 - 8>{});
 #elif defined(__clang__)
   return detail::get_type_name<T, 58>(__PRETTY_FUNCTION__, make_index_sequence<sizeof(__PRETTY_FUNCTION__) - 58 - 2>{});
@@ -523,7 +520,6 @@ class queue_event {
   }
   queue_event &operator=(queue_event &&other) {
     dtor(data);
-
     id = other.id;
     dtor = other.dtor;
     move = other.move;
@@ -1201,7 +1197,7 @@ TPolicy get_policy(aux::pair<T, TPolicy> *);
 template <class SM, class... TPolicies>
 struct sm_policy {
   static_assert(aux::is_same<aux::remove_reference_t<SM>, SM>::value, "SM type can't have qualifiers");
-#if defined(COMPILING_WITH_MSVC)
+#if defined(_MSC_VER) && !defined(__clang__)
   using default_dispatch_policy = policies::jump_table;
 #elif defined(__clang__)
   using default_dispatch_policy = policies::jump_table;
@@ -1994,7 +1990,7 @@ template <template <class...> class T>
 using defer_queue = back::policies::defer_queue<T>;
 template <template <class...> class T>
 using process_queue = back::policies::process_queue<T>;
-#if defined(COMPILING_WITH_MSVC)
+#if defined(_MSC_VER) && !defined(__clang__)
 template <class T, class... TPolicies, class T__ = aux::remove_reference_t<decltype(aux::declval<T>())>>
 using sm = back::sm<back::sm_policy<T__, TPolicies...>>;
 #else
@@ -2122,7 +2118,7 @@ struct state<TState(history_state)> : state_impl<state<TState(history_state)>> {
     return transition<T, state>{t, *this};
   }
 };
-#if defined(COMPILING_WITH_MSVC)
+#if defined(_MSC_VER) && !defined(__clang__)
 template <class T, class T__ = aux::remove_reference_t<decltype(aux::declval<T>())>, class = void>
 struct state_sm {
   using type = state<T>;
@@ -2593,7 +2589,7 @@ struct transition<state<internal>, state<S2>, front::event<E>, always, none> {
 };
 }
 using _ = back::_;
-#if !defined(COMPILING_WITH_MSVC)
+#if !defined(_MSC_VER) && !defined(__clang__)
 template <class TEvent>
 constexpr front::event<TEvent> event{};
 #else
@@ -2610,7 +2606,7 @@ template <class T>
 front::event<back::exception<T>> exception __BOOST_SML_VT_INIT;
 using anonymous = back::anonymous;
 using initial = back::initial;
-#if !defined(COMPILING_WITH_MSVC)
+#if !defined(_MSC_VER) && !defined(__clang__)
 template <class T>
 constexpr typename front::state_sm<T>::type state{};
 #else
@@ -2618,7 +2614,7 @@ template <class T>
 typename front::state_sm<T>::type state __BOOST_SML_VT_INIT;
 #endif
 inline namespace literals {
-#if !defined(COMPILING_WITH_MSVC)
+#if !defined(_MSC_VER) && !defined(__clang__)
 template <class T, T... Chrs>
 constexpr auto operator""_s() {
   return front::state<aux::string<T, Chrs...>>{};
@@ -2649,10 +2645,9 @@ BOOST_SML_NAMESPACE_END
 #elif defined(__GNUC__) && defined(__BOOST_SML_DEFINED_HAS_BUILTIN)
 #undef __has_builtin
 #pragma GCC diagnostic pop
-#elif defined(COMPILING_WITH_MSVC) && defined(__BOOST_SML_DEFINED_HAS_BUILTIN)
+#elif defined(_MSC_VER) && !defined(__clang__) && defined(__BOOST_SML_DEFINED_HAS_BUILTIN)
 #undef __has_builtin
 #undef __has_builtin__make_integer_seq
 #endif
-#undef COMPILING_WITH_MSVC
 #endif
 #endif
diff --git a/include/boost/sml/aux_/type_traits.hpp b/include/boost/sml/aux_/type_traits.hpp
index dab6ccea..fe9fc653 100644
--- a/include/boost/sml/aux_/type_traits.hpp
+++ b/include/boost/sml/aux_/type_traits.hpp
@@ -83,7 +83,7 @@ template <class T>
 struct is_same<T, T> : true_type {};
 
 template <class T, class U>
-#if defined(_MSC_VER)  // __pph__
+#if defined(_MSC_VER) && !defined(__clang__)  // __pph__
 struct is_base_of : integral_constant<bool, __is_base_of(T, U)> {
 };
 #else   // __pph__
@@ -95,7 +95,7 @@ decltype(T(declval<TArgs>()...), true_type{}) test_is_constructible(int);
 template <class, class...>
 false_type test_is_constructible(...);
 template <class T, class... TArgs>
-#if defined(_MSC_VER)  // __pph__
+#if defined(_MSC_VER) && !defined(__clang__)  // __pph__
 struct is_constructible : decltype(test_is_constructible<T, TArgs...>(0)) {
 };
 #else   // __pph__
diff --git a/include/boost/sml/aux_/utility.hpp b/include/boost/sml/aux_/utility.hpp
index 762a4975..4166bbc8 100644
--- a/include/boost/sml/aux_/utility.hpp
+++ b/include/boost/sml/aux_/utility.hpp
@@ -160,7 +160,7 @@ struct missing_ctor_parameter {
     return {};
   }
 
-#if !defined(_MSC_VER)  // __pph__
+#if !defined(_MSC_VER) && !defined(__clang__)  // __pph__
   template <class TMissing, __BOOST_SML_REQUIRES(!aux::is_base_of<pool_type_base, TMissing>::value)>
   operator TMissing &() const {
     static_assert(missing_ctor_parameter<TMissing>::value,
@@ -253,7 +253,7 @@ struct size<T<Ts...>> {
   static constexpr auto value = sizeof...(Ts);
 };
 
-#if defined(_MSC_VER)  // __pph__
+#if defined(_MSC_VER) && !defined(__clang__)  // __pph__
 constexpr int max_impl() { return 0; }
 constexpr int max_impl(int r) { return r; }
 constexpr int max_impl(int r, int i) { return r > i ? r : i; }
@@ -306,7 +306,7 @@ auto get_type_name(const char *ptr, index_sequence<Ns...>) {
 
 template <class T>
 const char *get_type_name() {
-#if defined(_MSC_VER)  // __pph__
+#if defined(_MSC_VER) && !defined(__clang__)  // __pph__
   return detail::get_type_name<T, 34>(__FUNCSIG__, make_index_sequence<sizeof(__FUNCSIG__) - 34 - 8>{});
 #elif defined(__clang__)  // __pph__
   return detail::get_type_name<T, 58>(__PRETTY_FUNCTION__, make_index_sequence<sizeof(__PRETTY_FUNCTION__) - 58 - 2>{});
diff --git a/include/boost/sml/back/policies.hpp b/include/boost/sml/back/policies.hpp
index 09284d6c..ee2d6d0d 100644
--- a/include/boost/sml/back/policies.hpp
+++ b/include/boost/sml/back/policies.hpp
@@ -39,7 +39,7 @@ template <class SM, class... TPolicies>
 struct sm_policy {
   static_assert(aux::is_same<aux::remove_reference_t<SM>, SM>::value, "SM type can't have qualifiers");
 
-#if defined(_MSC_VER)  // __pph__
+#if defined(_MSC_VER) && !defined(__clang__)  // __pph__
   using default_dispatch_policy = policies::jump_table;
 #elif defined(__clang__)  // __pph__
   using default_dispatch_policy = policies::jump_table;
diff --git a/include/boost/sml/back/state_machine.hpp b/include/boost/sml/back/state_machine.hpp
index de2c5843..0a686e6b 100644
--- a/include/boost/sml/back/state_machine.hpp
+++ b/include/boost/sml/back/state_machine.hpp
@@ -174,13 +174,13 @@ struct sm_impl : aux::conditional_t<aux::is_empty<typename TSM::sm>::value, aux:
             __BOOST_SML_REQUIRES(aux::is_base_of<get_generic_t<TEvent>, events_ids_t>::value)>
   bool process_internal_generic_event(const TEvent &event, TDeps &deps, TSubs &subs, state_t &current_state) {
     policies::log_process_event<sm_t>(aux::type<logger_t>{}, deps, event);
-#if BOOST_SML_DISABLE_EXCEPTIONS
+#if BOOST_SML_DISABLE_EXCEPTIONS  // __pph__
     return process_event_impl<get_event_mapping_t<get_generic_t<TEvent>, mappings>>(event, deps, subs, states_t{},
                                                                                     current_state);
-#else
+#else   // __pph__
     return process_event_noexcept<get_event_mapping_t<get_generic_t<TEvent>, mappings>>(event, deps, subs, current_state,
                                                                                         has_exceptions{});
-#endif
+#endif  // __pph__
   }
 
   template <class TEvent, class TDeps, class TSubs,
diff --git a/include/boost/sml/front/actions/process.hpp b/include/boost/sml/front/actions/process.hpp
index 7f9c5ef4..14768750 100644
--- a/include/boost/sml/front/actions/process.hpp
+++ b/include/boost/sml/front/actions/process.hpp
@@ -19,7 +19,7 @@ struct process {
     explicit process_impl(const TEvent& event) : event(event) {}
 
     template <class T, class TSM, class TDeps, class TSubs>
-    void operator()(const T&, TSM&, TDeps&, TSubs&) {
+    void operator()(const T&, TSM&, TDeps&, TSubs& subs) {
       aux::get<get_root_sm_t<TSubs>>(subs).process_.push(event);
     }
 
diff --git a/include/boost/sml/front/state.hpp b/include/boost/sml/front/state.hpp
index b5a1acb7..84f02f70 100644
--- a/include/boost/sml/front/state.hpp
+++ b/include/boost/sml/front/state.hpp
@@ -101,7 +101,7 @@ struct state<TState(history_state)> : state_impl<state<TState(history_state)>> {
   }
 };
 
-#if defined(_MSC_VER)  // __pph__
+#if defined(_MSC_VER) && !defined(__clang__)  // __pph__
 template <class T, class T__ = aux::remove_reference_t<decltype(aux::declval<T>())>, class = void>
 struct state_sm {
   using type = state<T>;
diff --git a/include/boost/sml/state_machine.hpp b/include/boost/sml/state_machine.hpp
index 235bba40..b9501820 100644
--- a/include/boost/sml/state_machine.hpp
+++ b/include/boost/sml/state_machine.hpp
@@ -27,7 +27,7 @@ using process_queue = back::policies::process_queue<T>;
 
 /// state machine
 
-#if defined(_MSC_VER)  // __pph__
+#if defined(_MSC_VER) && !defined(__clang__)  // __pph__
 template <class T, class... TPolicies, class T__ = aux::remove_reference_t<decltype(aux::declval<T>())>>
 using sm = back::sm<back::sm_policy<T__, TPolicies...>>;
 #else   // __pph__
diff --git a/include/boost/sml/transition_table.hpp b/include/boost/sml/transition_table.hpp
index 2ec76d4d..91eefc38 100644
--- a/include/boost/sml/transition_table.hpp
+++ b/include/boost/sml/transition_table.hpp
@@ -21,7 +21,7 @@ using _ = back::_;
 
 /// events
 
-#if !defined(_MSC_VER)  // __pph__
+#if !defined(_MSC_VER) && !defined(__clang__)  // __pph__
 template <class TEvent>
 constexpr front::event<TEvent> event{};
 #else   // __pph__
@@ -46,7 +46,7 @@ using initial = back::initial;
 
 /// states
 
-#if !defined(_MSC_VER)  // __pph__
+#if !defined(_MSC_VER) && !defined(__clang__)  // __pph__
 template <class T>
 constexpr typename front::state_sm<T>::type state{};
 #else   // __pph__
@@ -55,7 +55,7 @@ typename front::state_sm<T>::type state __BOOST_SML_VT_INIT;
 #endif  // __pph__
 
 inline namespace literals {
-#if !defined(_MSC_VER)  // __pph__
+#if !defined(_MSC_VER) && !defined(__clang__)  // __pph__
 template <class T, T... Chrs>
 constexpr auto operator""_s() {
   return front::state<aux::string<T, Chrs...>>{};
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 73dcd370..f4526884 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,4 +24,3 @@ endif()
 
 add_subdirectory(ft)
 add_subdirectory(ut)
-
diff --git a/tools/pph.sh b/tools/pph.sh
index 63eb207b..5a6e70f0 100755
--- a/tools/pph.sh
+++ b/tools/pph.sh
@@ -32,6 +32,7 @@ pph() {
   echo "#pragma clang diagnostic ignored \"-Wzero-length-array\""
   echo "#elif defined(__GNUC__)"
   echo "#if !defined(__has_builtin)"
+  echo "#define __BOOST_SML_DEFINED_HAS_BUILTIN"
   echo "#define __has_builtin(...) 0"
   echo "#endif"
   echo "#define __BOOST_SML_UNUSED __attribute__((unused))"
@@ -41,14 +42,15 @@ pph() {
   echo "#define __BOOST_SML_TEMPLATE_KEYWORD template"
   echo "#pragma GCC diagnostic push"
   echo "#pragma GCC diagnostic ignored \"-Wpedantic\""
-  echo "#elif defined(_MSC_VER)"
+  echo "#elif defined(_MSC_VER) && !defined(__clang__)"
+  echo "#define __BOOST_SML_DEFINED_HAS_BUILTIN"
   echo "#define __has_builtin(...) __has_builtin##__VA_ARGS__"
   echo "#define __has_builtin__make_integer_seq(...) 1"
   echo "#define __BOOST_SML_UNUSED"
   echo "#define __BOOST_SML_VT_INIT"
   echo "#define __BOOST_SML_ZERO_SIZE_ARRAY(...)"
   echo "#define __BOOST_SML_ZERO_SIZE_ARRAY_CREATE(...) __VA_ARGS__ ? __VA_ARGS__ : 1"
-  echo "#if (_MSC_VER >= 1910) // MSVC 2017"
+  echo "#if defined(_MSC_VER) && !defined(__clang__) && _MSC_VER >= 1910  // MSVC 2017"
   echo "#define __BOOST_SML_TEMPLATE_KEYWORD template "
   echo "#else"
   echo "#define __BOOST_SML_TEMPLATE_KEYWORD"
@@ -78,10 +80,10 @@ pph() {
   echo "#undef __BOOST_SML_TEMPLATE_KEYWORD"
   echo "#if defined(__clang__)"
   echo "#pragma clang diagnostic pop"
-  echo "#elif defined(__GNUC__)"
+  echo "#elif defined(__GNUC__) && defined(__BOOST_SML_DEFINED_HAS_BUILTIN)"
   echo "#undef __has_builtin"
   echo "#pragma GCC diagnostic pop"
-  echo "#elif defined(_MSC_VER)"
+  echo "#elif defined(_MSC_VER) && !defined(__clang__) && defined(__BOOST_SML_DEFINED_HAS_BUILTIN)"
   echo "#undef __has_builtin"
   echo "#undef __has_builtin__make_integer_seq"
   echo "#endif"