cleanups

Author: kkaefer

.clang-format

@@ -0,0 +1,18 @@
+Standard: Cpp11
+IndentWidth: 4
+AccessModifierOffset: -4
+UseTab: Never
+BinPackParameters: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+AlwaysBreakTemplateDeclarations: true
+NamespaceIndentation: None
+PointerBindsToType: true
+SpacesInParentheses: false
+BreakBeforeBraces: Attach
+ColumnLimit: 100
+Cpp11BracedListStyle: false
+SpacesBeforeTrailingComments: 1

Makefile

@@ -1,19 +1,14 @@
-CXXFLAGS = -std=c++11 -Wall -Wextra -Wno-unused-parameter
+CXXFLAGS = -std=c++11 -Wall -Wextra -Wpedantic -Weverything -Wno-c++98-compat -Wno-missing-prototypes -Wno-padded -Wno-unused-parameter
 
-BIN      = color
-SRCS     = main.cpp
-SRCS    += csscolorparser.cpp
-OBJS     = $(patsubst %.cpp,%.o,$(SRCS))
+build: test
 
-build: $(BIN)
-
-$(BIN): $(OBJS)
+test: csscolorparser.o test.o
 	$(CXX) $(CXXFLAGS) -o $@ $^
 
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $^
 
 clean:
-	rm -rf  *.o $(BIN)
+	rm -rf *.o test
 
 .PHONY: clean

csscolorparser.cpp

@@ -1,5 +1,5 @@
 // (c) Dean McNamee <dean@gmail.com>, 2012.
-// C++ port by Konstantin Käfer <mail@kkaefer.com>, 2014.
+// C++ port by Mapbox, Konstantin Käfer <mail@kkaefer.com>, 2014-2017.
 //
 // https://github.com/deanm/css-color-parser-js
 // https://github.com/kkaefer/css-color-parser-cpp
@@ -27,7 +27,6 @@
 #include <cstdint>
 #include <vector>
 #include <sstream>
-#include <cmath>
 #include <algorithm>
 
 namespace CSSColorParser {
@@ -117,12 +116,12 @@ const size_t namedColorCount = sizeof (namedColors) / sizeof (NamedColor);
 template <typename T>
 uint8_t clamp_css_byte(T i) {  // Clamp to integer 0 .. 255.
     i = ::round(i);  // Seems to be what Chrome does (vs truncation).
-    return i < 0 ? 0 : i > 255 ? 255 : i;
+    return i < 0 ? 0 : i > 255 ? 255 : uint8_t(i);
 }
 
 template <typename T>
 float clamp_css_float(T f) {  // Clamp to float 0.0 .. 1.0.
-    return f < 0 ? 0 : f > 1 ? 1 : f;
+    return f < 0 ? 0 : f > 1 ? 1 : float(f);
 }
 
 float parseFloat(const std::string& str) {
@@ -163,7 +162,7 @@ float css_hue_to_rgb(float m1, float m2, float h) {
         return m2;
     }
     if (h * 3.0f < 2.0f) {
-        return m1 + (m2 - m1) * (2.0 / 3.0 - h) * 6.0f;
+        return m1 + (m2 - m1) * (2.0f / 3.0f - h) * 6.0f;
     }
     return m1;
 }

csscolorparser.hpp

@@ -1,5 +1,5 @@
 // (c) Dean McNamee <dean@gmail.com>, 2012.
-// C++ port by Konstantin Käfer <mail@kkaefer.com>, 2014.
+// C++ port by Mapbox, Konstantin Käfer <mail@kkaefer.com>, 2014-2017.
 //
 // https://github.com/deanm/css-color-parser-js
 // https://github.com/kkaefer/css-color-parser-cpp
@@ -26,19 +26,30 @@
 #define CSS_COLOR_PARSER_CPP
 
 #include <string>
+#include <cmath>
 
 namespace CSSColorParser {
 
 struct Color {
-    inline Color() {}
+    inline Color() {
+    }
     inline Color(unsigned char r_, unsigned char g_, unsigned char b_, float a_)
-        : r(r_), g(g_), b(b_), a(a_) {}
+        : r(r_), g(g_), b(b_), a(a_ > 1 ? 1 : a_ < 0 ? 0 : a_) {
+    }
     unsigned char r = 0, g = 0, b = 0;
     float a = 1.0f;
 };
 
-Color parse(const std::string& css_str);
+inline bool operator==(const Color& lhs, const Color& rhs) {
+    return lhs.r == rhs.r && lhs.g == rhs.g && lhs.b == rhs.b && ::fabs(lhs.a - lhs.b) < 0.0001f;
+}
 
+inline bool operator!=(const Color& lhs, const Color& rhs) {
+    return !(lhs == rhs);
 }
 
+Color parse(const std::string& css_str);
+
+} // namespace CSSColorParser
+
 #endif

main.cpp

@@ -0,0 +1,58 @@
+#include "csscolorparser.hpp"
+
+#include <iostream>
+
+using namespace CSSColorParser;
+
+std::ostream& operator<<(std::ostream& os, const Color& color) {
+    return os << "rgba(" << int(color.r) << ", " << int(color.g) << ", " << int(color.b) << ", "
+              << color.a << ")";
+}
+
+static bool errored = false;
+
+void ASSERT_EQUAL(const Color& expected, const std::string& input) {
+    const auto actual = parse(input);
+    if (expected != actual) {
+        errored = true;
+        std::cerr << "\033[1mERROR!: expected " << expected << " != parsed " << actual
+                  << " when parsing \"" << input << "\"\033[0m" << std::endl;
+    } else {
+        std::cerr << "Passed: " << actual << std::endl;
+    }
+}
+
+void ASSERT_EQUAL(const Color& expected, const Color& actual) {
+    if (expected != actual) {
+        errored = true;
+        std::cerr << "\033[1mERROR!: expected " << expected << " != actual " << actual << "\"\033[0m" << std::endl;
+    } else {
+        std::cerr << "Passed: " << actual << std::endl;
+    }
+}
+
+int main() {
+    try {
+        ASSERT_EQUAL(Color{ 255, 128, 12, 0.5 }, " rgba (255, 128, 12, 0.5)");
+        ASSERT_EQUAL(Color{ 255, 255, 255, 1 }, "#fff");
+        ASSERT_EQUAL(Color{ 255, 0, 17, 1 }, "#ff0011");
+        ASSERT_EQUAL(Color{ 106, 90, 205, 1 }, "slateblue");
+        ASSERT_EQUAL(Color{ 0, 0, 0, 1 }, "blah");
+        ASSERT_EQUAL(Color{ 0, 0, 0, 1 }, "ffffff");
+        ASSERT_EQUAL(Color{ 226, 233, 233, 0.5 }, "hsla(900, 15%, 90%, 0.5)");
+        ASSERT_EQUAL(Color{ 0, 0, 0, 1 }, "hsla(900, 15%, 90%)");
+        ASSERT_EQUAL(Color{ 226, 233, 233, 1 }, "hsl(900, 15%, 90%)");
+        ASSERT_EQUAL(Color{ 226, 233, 233, 1 }, "hsl(900, 0.15, 90%)"); // NOTE: not spec compliamt.
+
+        // Out of range:
+        ASSERT_EQUAL(Color{ 0, 0, 0, 1 }, "xxx");
+        ASSERT_EQUAL(Color{ 255, 128, 12, 1 }, " rgba (255, 128, 12, 2)");
+        ASSERT_EQUAL(Color{ 255, 128, 12, 1 }, " rgba (400, 128, 12, 2)");
+        ASSERT_EQUAL(Color{ 255, 128, 12, 1 }, Color{ 255, 128, 12, 3 });
+    } catch(std::exception& ex) {
+        std::cerr << "EXCEPTION!: " << ex.what() << std::endl;
+        return 2;
+    }
+
+    return errored ? 1 : 0;
+}