Factor or generic escape code logic

mattbierner · Jun 24, 2015 · b2c0581 · b2c0581
1 parent 963016f
commit b2c0581
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/stt tetris.xcodeproj/project.pbxproj b/stt tetris.xcodeproj/project.pbxproj
@@ -244,6 +244,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;

diff --git a/tetris/buffer.h b/tetris/buffer.h
@@ -10,7 +10,6 @@
 template <size_t width, size_t height>
 using empty_buffer = gen_grid<width, height, empty_pixel>;
 
-
 /**
     Draw another buffer on top of this buffer.
 */

diff --git a/tetris/color.h b/tetris/color.h
@@ -17,27 +17,26 @@ enum class Color : unsigned {
     Default = 9
 };
 
+template <unsigned x>
+using escape_code =
+    string_join<String<>,
+        decltype("\x1b["_string),
+        int_to_string<x>,
+        String<'m'>>;
+
 /**
     Convert a color to its foreground color code.
 */
 template <Color c>
-using color_to_fg_code =
-    string_join<String<>,
-        decltype("\x1b["_string),
-        int_to_string<30 + static_cast<unsigned>(c)>,
-        String<'m'>>;
-
+using color_to_fg_code = escape_code<30 + static_cast<unsigned>(c)>;
+
 /**
     Convert a color to its background color code.
 */
 template <Color c>
-using color_to_bg_code =
-    string_join<String<>,
-        decltype("\x1b["_string),
-        int_to_string<40 + static_cast<unsigned>(c)>,
-        String<'m'>>;
+using color_to_bg_code = escape_code<40 + static_cast<unsigned>(c)>;
 
 /**
     Reset all colors.
 */
-using colorReset = decltype("\x1b[0m"_string);
+using colorReset = escape_code<0>;
diff --git a/tetris/main.cpp b/tetris/main.cpp
@@ -29,7 +29,6 @@ void serialize_game()
 {
     std::ofstream s;
     s.open("current_game.h");
-    s << "#import \"game.h\"\n";
     s << "using state = ";
     print(s, serialize<state>{});
     s << ";";