From 740ea490d5cb20987dd382b17103290a360c9feb Mon Sep 17 00:00:00 2001
From: Tyler Neylon <tyler@bynomial.com>
Date: Thu, 30 Jun 2011 02:56:15 -0700
Subject: [PATCH] BNColor:Simplify named color implmnts with a macro

---
 BNColor.m | 69 +++++++++++++++----------------------------------------
 1 file changed, 18 insertions(+), 51 deletions(-)

diff --git a/BNColor.m b/BNColor.m
index 4905217..e56b8bb 100644
--- a/BNColor.m
+++ b/BNColor.m
@@ -13,6 +13,11 @@
 #define kGreenKey @"g"
 #define kBlueKey @"b"
 
+#define IMPL_NAMED_COLOR(name, r, g, b) \
++ (BNColor *)name { \
+  return [BNColor colorWithRed:r green:g blue:b]; \
+}
+
 @interface BNColor ()
 
 - (void)findMin:(float *)min max:(float *)max;
@@ -177,57 +182,19 @@ - (NSString *)description {
 
 #pragma mark named colors
 
-+ (BNColor *)redColor {
-  return [BNColor colorWithRed:1 green:0 blue:0];
-}
-
-+ (BNColor *)orangeColor {
-  return [BNColor colorWithRed:1 green:0.5 blue:0];
-}
-
-+ (BNColor *)yellowColor {
-  return [BNColor colorWithRed:1 green:1 blue:0];
-}
-
-+ (BNColor *)greenColor {
-  return [BNColor colorWithRed:0 green:1 blue:0];
-}
-
-+ (BNColor *)blueColor {
-  return [BNColor colorWithRed:0 green:0 blue:1];
-}
-
-+ (BNColor *)purpleColor {
-  return [BNColor colorWithRed:0.5 green:0 blue:0.5];
-}
-
-+ (BNColor *)magentaColor {
-  return [BNColor colorWithRed:1 green:0 blue:1];
-}
-
-+ (BNColor *)cyanColor {
-  return [BNColor colorWithRed:0 green:1 blue:1];
-}
-
-+ (BNColor *)brownColor {
-  return [BNColor colorWithRed:0.6 green:0.4 blue:0.2];
-}
-
-+ (BNColor *)blackColor {
-  return [BNColor colorWithRed:0 green:0 blue:0];
-}
-
-+ (BNColor *)darkGrayColor {
-  return [BNColor colorWithRed:1.0/3.0 green:1.0/3.0 blue:1.0/3.0];
-}
-
-+ (BNColor *)lightGrayColor {
-  return [BNColor colorWithRed:2.0/3.0 green:2.0/3.0 blue:2.0/3.0];
-}
-
-+ (BNColor *)whiteColor {
-  return [BNColor colorWithRed:1 green:1 blue:1];
-}
+IMPL_NAMED_COLOR(redColor, 1, 0, 0)
+IMPL_NAMED_COLOR(orangeColor, 1, 0.5, 0)
+IMPL_NAMED_COLOR(yellowColor, 1, 1, 0)
+IMPL_NAMED_COLOR(greenColor, 0, 1, 0)
+IMPL_NAMED_COLOR(blueColor, 0, 0, 1)
+IMPL_NAMED_COLOR(purpleColor, 0.5, 0, 0.5)
+IMPL_NAMED_COLOR(magentaColor, 1, 0, 1)
+IMPL_NAMED_COLOR(cyanColor, 0, 1, 1)
+IMPL_NAMED_COLOR(brownColor, 0.6, 0.4, 0.2)
+IMPL_NAMED_COLOR(blackColor, 0, 0, 0)
+IMPL_NAMED_COLOR(darkGrayColor, 1.0/3.0, 1.0/3.0, 1.0/3.0)
+IMPL_NAMED_COLOR(lightGrayColor, 2.0/3.0, 2.0/3.0, 2.0/3.0)
+IMPL_NAMED_COLOR(whiteColor, 1, 1, 1)
 
 + (BNColor *)randomBrightColor {
   BNColor *color = [BNColor beInit];