From bfb16509bd35927637e214727264019e125d29ec Mon Sep 17 00:00:00 2001
From: Zach Laine <whatwasthataddress@gmail.com>
Date: Fri, 4 Nov 2016 18:36:24 -0500
Subject: [PATCH] evaluate_expression_as -> eval_expression_as

---
 expression.hpp | 14 +++++++-------
 sketch.cpp     |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/expression.hpp b/expression.hpp
index b4844e9..7dd57d7 100644
--- a/expression.hpp
+++ b/expression.hpp
@@ -13,23 +13,23 @@ namespace boost::proto17 {
     namespace adl_detail {
 
         template <typename R, typename E, typename ...T>
-        constexpr auto evaluate_expression_as (E const & expr, hana::basic_type<R>, T && ...t)
+        constexpr auto eval_expression_as (E const & expr, hana::basic_type<R>, T && ...t)
         { return static_cast<R>(detail::default_eval_expr(expr, hana::make_tuple(static_cast<T &&>(t)...))); }
 
-        struct evaluate_expression_as_fn
+        struct eval_expression_as_fn
         {
             template <typename R, typename E, typename ...T>
             constexpr auto operator() (E const & expr, hana::basic_type<R> rtype, T && ...t) const
-            { return evaluate_expression_as(expr, rtype, static_cast<T &&>(t)...); }
+            { return eval_expression_as(expr, rtype, static_cast<T &&>(t)...); }
         };
 
     }
 
-    using adl_detail::evaluate_expression_as_fn;
+    using adl_detail::eval_expression_as_fn;
 
     inline namespace function_objects {
 
-        inline constexpr evaluate_expression_as_fn evaluate_expression_as{};
+        inline constexpr eval_expression_as_fn eval_expression_as{};
 
     }
 
@@ -41,7 +41,7 @@ namespace boost::proto17 {
     // TODO: static assert/SFINAE sizeof...(T) >= highest-indexed placeholder + 1
     template <typename R, typename Expr, typename ...T>
     auto evaluate_as (Expr const & expr, T && ...t)
-    { return evaluate_expression_as(expr, hana::basic_type<R>{}, static_cast<T &&>(t)...); }
+    { return eval_expression_as(expr, hana::basic_type<R>{}, static_cast<T &&>(t)...); }
 
     template <expr_kind Kind, typename ...T>
     struct expression
@@ -73,7 +73,7 @@ namespace boost::proto17 {
 
         template <typename R>
         operator R ()
-        { return evaluate_expression_as(*this, hana::basic_type<R>{}); }
+        { return eval_expression_as(*this, hana::basic_type<R>{}); }
 
         template <typename U>
         auto operator+ (U && rhs) const &
diff --git a/sketch.cpp b/sketch.cpp
index f8b2dfc..30e59b5 100644
--- a/sketch.cpp
+++ b/sketch.cpp
@@ -1032,7 +1032,7 @@ namespace test {
     { return number{a.value - b.value}; }
 
     template <typename E, typename ...T>
-    constexpr auto evaluate_expression_as (
+    constexpr auto eval_expression_as (
         E const & expr,
         boost::hana::basic_type<test::number>,
         T && ...t)
@@ -1103,7 +1103,7 @@ void user_operator_eval ()
     std::cout << "\n";
 }
 
-void user_evaluate_expression_as ()
+void user_eval_expression_as ()
 {
     term<test::number> unity{{1.0}};
     double d_ = 42.0;
@@ -1123,7 +1123,7 @@ void user_evaluate_expression_as ()
         >
     > unevaluated_expr = unity + std::move(expr);
 
-    std::cout << "\nuser_evaluate_expression_as()\n";
+    std::cout << "\nuser_eval_expression_as()\n";
 
     {
         test::number result = unity;
@@ -1228,7 +1228,7 @@ int main ()
     print();
 
     default_eval();
-    user_evaluate_expression_as();
+    user_eval_expression_as();
     user_operator_eval();
 
     placeholder_eval();