From 1fbc68f61168eeb775cb1bcc54b4d8c0f6ba30ef Mon Sep 17 00:00:00 2001
From: Zach Laine <whatwasthataddress@gmail.com>
Date: Sat, 12 Nov 2016 14:32:55 -0600
Subject: [PATCH] Add test of templated transform_expression.

---
 test/CMakeLists.txt                |  5 ++--
 test/user_expression_transform.cpp | 44 +++++++++++++++---------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fa8ee8a..60d9161 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,9 +18,10 @@ endmacro()
 add_test_executable(print)
 add_test_executable(default_eval)
 add_test_executable(user_operator_eval)
-add_test_executable(user_eval_expression_as) 
-add_test_executable(user_operator_and_eval_expression_as) 
+add_test_executable(user_eval_expression_as)
+add_test_executable(user_operator_and_eval_expression_as)
 add_test_executable(user_expression_transform)
+add_test_executable(user_expression_transform_2)
 add_test_executable(placeholder_eval)
 add_test_executable(call_expr)
 add_test_executable(reference_returns)
diff --git a/test/user_expression_transform.cpp b/test/user_expression_transform.cpp
index 8a63636..e559397 100644
--- a/test/user_expression_transform.cpp
+++ b/test/user_expression_transform.cpp
@@ -12,7 +12,7 @@ using term = boost::proto17::terminal<T>;
 namespace bp17 = boost::proto17;
 
 
-namespace user_2 {
+namespace user {
 
     struct number
     {
@@ -77,11 +77,11 @@ namespace user_2 {
 
 TEST(user_expression_transform, test_user_expression_transform)
 {
-    term<user_2::number> k{{2.0}};
+    term<user::number> k{{2.0}};
 
-    term<user_2::number> a{{1.0}};
-    term<user_2::number> x{{42.0}};
-    term<user_2::number> y{{3.0}};
+    term<user::number> a{{1.0}};
+    term<user::number> x{{42.0}};
+    term<user::number> y{{3.0}};
 
     {
         bp17::expression<
@@ -90,15 +90,15 @@ TEST(user_expression_transform, test_user_expression_transform)
                 bp17::expr_kind::multiplies,
                 bp17::expression<
                     bp17::expr_kind::multiplies,
-                    term<user_2::number>,
-                    term<user_2::number>
+                    term<user::number>,
+                    term<user::number>
                 >,
-                term<user_2::number>
+                term<user::number>
             >,
-            term<user_2::number>
+            term<user::number>
         > expr = k * a * x + y;
 
-        user_2::number result = expr;
+        user::number result = expr;
         EXPECT_EQ(result.value, 87);
     }
 
@@ -107,39 +107,39 @@ TEST(user_expression_transform, test_user_expression_transform)
             bp17::expr_kind::plus,
             bp17::expression<
                 bp17::expr_kind::multiplies,
-                term<user_2::number>,
-                term<user_2::number>
+                term<user::number>,
+                term<user::number>
             >,
-            term<user_2::number>
+            term<user::number>
         > expr = a * x + y;
 
-        user_2::number result = expr;
+        user::number result = expr;
         EXPECT_EQ(result.value, 55);
     }
 
     {
         bp17::expression<
             bp17::expr_kind::multiplies,
-            term<user_2::number>,
+            term<user::number>,
             bp17::expression<
                 bp17::expr_kind::plus,
                 bp17::expression<
                     bp17::expr_kind::multiplies,
-                    term<user_2::number>,
-                    term<user_2::number>
+                    term<user::number>,
+                    term<user::number>
                 >,
-                term<user_2::number>
+                term<user::number>
             >
         > expr = k * (a * x + y);
 
-        user_2::number result = expr;
+        user::number result = expr;
         EXPECT_EQ(result.value, 110);
     }
 
     {
         auto expr = (a * x + y) * (a * x + y) + (a * x + y);
 
-        user_2::number result = expr;
+        user::number result = expr;
 
         // Note: +10 not done at the top level naxpy opportunity.
         EXPECT_EQ(result.value, 55 * 55 + 55);
@@ -151,8 +151,8 @@ TEST(user_expression_transform, test_user_expression_transform)
 #if 0
     bp17::expression<
         bp17::expr_kind::multiplies,
-        term<user::number>,
-        term<user::number>
+        term<user_2::number>,
+        term<user_2::number>
     > expr = a * x;
 #endif
 }