Code cleanup

FelixPetriconi · Mar 26, 2015 · b6ebd5f · b6ebd5f
1 parent 58ff4a2
commit b6ebd5f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 31 deletions.
diff --git a/test/enum_extend_filtered_range_test.cpp b/test/enum_extend_filtered_range_test.cpp
@@ -27,7 +27,10 @@ enum Flags
 
 template <>
 enum_extend::extender<Flags>::instances enum_extend::extender<Flags>::all_values = {};
-enum_extend::extender<Flags>  FlagExtender(Flags::F0x00, Flags::F0x01, Flags::F0x02, Flags::F0x03, Flags::F0x04, Flags::F0x07, Flags::F0x08);
+enum_extend::extender<Flags>  FlagExtender(Flags::F0x00, Flags::F0x01, 
+                                           Flags::F0x02, Flags::F0x03, 
+                                           Flags::F0x04, Flags::F0x07, 
+                                           Flags::F0x08);
 
 
 class EnumExtenderFilterRangeTest : public ::testing::Test

diff --git a/test/enum_extend_macro_define_decoration_test.cpp b/test/enum_extend_macro_define_decoration_test.cpp
@@ -11,7 +11,6 @@
 #include "enum_extend/extender.hpp"
 #include "enum_extend/range.hpp"
 #include "enum_extend/enum_range.hpp"
-#include "enum_extend/decoration_range.hpp"
 #include "enum_extend/declare_decorated_enum.hpp"
 #include "enum_extend/define_decorated_enum.hpp"
 
@@ -28,7 +27,8 @@ template <typename T>
 std::vector<T> createReference();
 
 
-#define MACROCOLOR_DECO_ENUM_SPEC (MacroColorDecoEnum, ccharp, (DarkGray1, DarkGray1C)(MidGray1, MidGray1C)(LightGray1, LightGray1C))
+#define MACROCOLOR_DECO_ENUM_SPEC (MacroColorDecoEnum, ccharp, \
+  (DarkGray1, DarkGray1C)(MidGray1, MidGray1C)(LightGray1, LightGray1C))
 
 ENUM_EXTEND_DECLARE_1_DECORATED_ENUM(MACROCOLOR_DECO_ENUM_SPEC)
 ENUM_EXTEND_DEFINE_1_DECORATED_ENUM(MACROCOLOR_DECO_ENUM_SPEC)
@@ -46,7 +46,8 @@ ccharp DarkGray2C = "DarkGray2";
 ccharp MidGray2C = "MidGray2";
 ccharp LightGray2C = "LightGray2";
 
-#define MACROCOLOR_DECO_ENUM_CLASS_SPEC (MacroColorDecoEnumClass, ccharp, (DarkGray2, DarkGray2C)(MidGray2, MidGray2C)(LightGray2, LightGray2C))
+#define MACROCOLOR_DECO_ENUM_CLASS_SPEC (MacroColorDecoEnumClass, ccharp, \
+  (DarkGray2, DarkGray2C)(MidGray2, MidGray2C)(LightGray2, LightGray2C))
 
 ENUM_EXTEND_DECLARE_1_DECORATED_ENUM_CLASS(MACROCOLOR_DECO_ENUM_CLASS_SPEC)
 ENUM_EXTEND_DEFINE_1_DECORATED_ENUM_CLASS(MACROCOLOR_DECO_ENUM_CLASS_SPEC)
@@ -63,7 +64,8 @@ ccharp DarkGray3C = "DarkGray3";
 ccharp MidGray3C = "MidGray3";
 ccharp LightGray3C = "LightGray3";
 
-#define MACROCOLOR_DECO_TYPED_ENUM_SPEC (MacroColorDecoTypedEnum, short, ccharp, (DarkGray3, DarkGray3C)(MidGray3, MidGray3C)(LightGray3, LightGray3C))
+#define MACROCOLOR_DECO_TYPED_ENUM_SPEC (MacroColorDecoTypedEnum, short, ccharp, \
+  (DarkGray3, DarkGray3C)(MidGray3, MidGray3C)(LightGray3, LightGray3C))
 ENUM_EXTEND_DECLARE_1_DECORATED_TYPED_ENUM(MACROCOLOR_DECO_TYPED_ENUM_SPEC)
 ENUM_EXTEND_DEFINE_1_DECORATED_TYPED_ENUM(MACROCOLOR_DECO_TYPED_ENUM_SPEC)
 
@@ -80,7 +82,8 @@ ccharp DarkGray4C = "DarkGray4";
 ccharp MidGray4C = "MidGray4";
 ccharp LightGray4C = "LightGray4";
 
-#define MACROCOLOR_DECO_TYPED_ENUM_CLASS_SPEC (MacroColorDecoTypedEnumClass, short, ccharp, (DarkGray4, DarkGray4C)(MidGray4, MidGray4C)(LightGray4, LightGray4C))
+#define MACROCOLOR_DECO_TYPED_ENUM_CLASS_SPEC (MacroColorDecoTypedEnumClass, short, ccharp, \
+  (DarkGray4, DarkGray4C)(MidGray4, MidGray4C)(LightGray4, LightGray4C))
 ENUM_EXTEND_DECLARE_1_DECORATED_TYPED_ENUM_CLASS(MACROCOLOR_DECO_TYPED_ENUM_CLASS_SPEC)
 ENUM_EXTEND_DEFINE_1_DECORATED_TYPED_ENUM_CLASS(MACROCOLOR_DECO_TYPED_ENUM_CLASS_SPEC)
 

diff --git a/test/enum_extend_with_decoration_test.cpp b/test/enum_extend_with_decoration_test.cpp
@@ -27,35 +27,28 @@ ccharp MidGrayC = "MidGray";
 ccharp LightGrayC = "LightGray";
 
 template <>
-enum_extend::extender<Gray, ccharp>::instances enum_extend::extender<Gray, ccharp>::all_values = {
+enum_extend::extender<Gray, ccharp>::instances 
+  enum_extend::extender<Gray, ccharp>::all_values = {
+
   std::make_tuple( Gray::DarkGray, DarkGrayC ), 
   std::make_tuple( Gray::MidGray, MidGrayC ), 
   std::make_tuple( Gray::LightGray, LightGrayC ) 
 };
 
-using DecoratedGray = std::tuple<Gray, ccharp>;
-Gray& operator++(Gray& e);
-Gray& operator--(Gray& e);
-Gray operator++(Gray& e, int);
-Gray operator--(Gray& e, int);
-
 
 Gray& operator++(Gray& e) { return enum_extend::extender<Gray, ccharp>::increment(e); }
 Gray& operator--(Gray& e) { return enum_extend::extender<Gray, ccharp>::decrement(e); }
 Gray operator++(Gray& e, int) {
-    auto tmp = e;                                                            
-    enum_extend::extender<Gray, ccharp>::increment(e);
-    return tmp;                                                              
-  }          
+  auto tmp = e;                                                            
+  enum_extend::extender<Gray, ccharp>::increment(e);
+  return tmp;                                                              
+}          
 
 Gray operator--(Gray& e, int) {
-    auto tmp = e;                                                            
-    enum_extend::extender<Gray, ccharp>::decrement(e);
-    return tmp;                                                              
-  }                                                                          
-
-
-
+  auto tmp = e;                                                            
+  enum_extend::extender<Gray, ccharp>::decrement(e);
+  return tmp;                                                              
+}                                                                          
 
 
 class EnumExtendWitDecorationTest : public ::testing::Test

diff --git a/test/enum_extend_with_multiple_decorations_test.cpp b/test/enum_extend_with_multiple_decorations_test.cpp
@@ -48,13 +48,6 @@ enum_extend::extender<Blue, StructuredDeco, ccharp>::instances
     std::make_tuple( Blue::LightBlue, sdLightBlue, LightBlueC ) 
   };
 
-using DecoratedBlue = std::tuple<Blue, StructuredDeco, ccharp>;
-Blue& operator++(Blue& e);
-Blue& operator--(Blue& e);
-Blue operator++(Blue& e, int);
-Blue operator--(Blue& e, int);
-
-
 Blue& operator++(Blue& e) { 
   return enum_extend::extender<Blue, StructuredDeco, ccharp>::increment(e); 
 }