From 09e235eb60fba5df8ee7a1000d8d0bf57ddf75df Mon Sep 17 00:00:00 2001
From: Alexander Ljungberg <aljungberg@wireload.net>
Date: Sun, 8 Jul 2012 21:26:47 +0100
Subject: [PATCH] Refs #1603. Optimise slightly.

---
 Foundation/CPIndexSet.j | 30 ++++++++++++++----------------
 Foundation/CPRange.h    |  2 ++
 Foundation/CPRange.j    | 10 ++--------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/Foundation/CPIndexSet.j b/Foundation/CPIndexSet.j
index c7210c8b7..1d3dd8060 100644
--- a/Foundation/CPIndexSet.j
+++ b/Foundation/CPIndexSet.j
@@ -315,7 +315,7 @@
     var range = _ranges[rangeIndex];
 
     // Check if it's actually in this range.
-    if (CPLocationInRange(anIndex, range))
+    if (_CPLocationInRange(anIndex, range))
         return anIndex;
 
     // If not, it must be the first element of this range.
@@ -346,7 +346,7 @@
     var range = _ranges[rangeIndex];
 
     // Check if it's actually in this range.
-    if (CPLocationInRange(anIndex, range))
+    if (_CPLocationInRange(anIndex, range))
         return anIndex;
 
     // If not, it must be the first element of this range.
@@ -495,7 +495,7 @@
 
 - (void)enumerateIndexesInRange:(CPRange)enumerationRange options:(CPEnumerationOptions)options usingBlock:(Function /*(int idx, @ref BOOL stop)*/)aFunction
 {
-    if (!_count || CPEmptyRange(enumerationRange))
+    if (!_count || _CPEmptyRange(enumerationRange))
         return;
 
     var shouldStop = NO,
@@ -539,7 +539,7 @@
 
         for (; rangeIndex !== rangeStop; rangeIndex += rangeIncrement)
         {
-            if (CPLocationInRange(rangeIndex, enumerationRange))
+            if (_CPLocationInRange(rangeIndex, enumerationRange))
             {
                 aFunction(rangeIndex, AT_REF(shouldStop));
                 if (shouldStop)
@@ -564,7 +564,7 @@
     if (!_count)
         return CPNotFound;
 
-    return [self indexInRange:CPMakeRange(0, _CPMaxRange(_ranges[_ranges.length - 1])) options:anOptions passingTest:aPredicate];
+    return [self indexInRange:_CPMakeRange(0, _CPMaxRange(_ranges[_ranges.length - 1])) options:anOptions passingTest:aPredicate];
 }
 
 - (CPIndexSet)indexesWithOptions:(CPEnumerationOptions)anOptions passingTest:(Function /*(int anIndex)*/)aPredicate
@@ -572,12 +572,12 @@
     if (!_count)
         return [CPIndexSet indexSet];
 
-    return [self indexesInRange:CPMakeRange(0, _CPMaxRange(_ranges[_ranges.length - 1])) options:anOptions passingTest:aPredicate];
+    return [self indexesInRange:_CPMakeRange(0, _CPMaxRange(_ranges[_ranges.length - 1])) options:anOptions passingTest:aPredicate];
 }
 
 - (unsigned)indexInRange:(CPRange)aRange options:(CPEnumerationOptions)anOptions passingTest:(Function /*(int anIndex)*/)aPredicate
 {
-    if (!_count || CPEmptyRange(aRange))
+    if (!_count || _CPEmptyRange(aRange))
         return CPNotFound;
 
     var shouldStop = NO,
@@ -600,9 +600,8 @@
 
     for (; index !== stop; index += increment)
     {
-        var range = _ranges[index];
-
-        var rangeIndex,
+        var range = _ranges[index],
+            rangeIndex,
             rangeStop,
             rangeIncrement;
 
@@ -621,7 +620,7 @@
 
         for (; rangeIndex !== rangeStop; rangeIndex += rangeIncrement)
         {
-            if (CPLocationInRange(rangeIndex, aRange))
+            if (_CPLocationInRange(rangeIndex, aRange))
             {
                 if (aPredicate(rangeIndex, AT_REF(shouldStop)))
                     return rangeIndex;
@@ -636,7 +635,7 @@
 
 - (CPIndexSet)indexesInRange:(CPRange)aRange options:(CPEnumerationOptions)anOptions passingTest:(Function /*(int anIndex)*/)aPredicate
 {
-    if (!_count || CPEmptyRange(aRange))
+    if (!_count || _CPEmptyRange(aRange))
         return [CPIndexSet indexSet];
 
     var shouldStop = NO,
@@ -660,9 +659,8 @@
     var indexesPassingTest = [CPMutableIndexSet indexSet];
     for (; index !== stop; index += increment)
     {
-        var range = _ranges[index];
-
-        var rangeIndex,
+        var range = _ranges[index],
+            rangeIndex,
             rangeStop,
             rangeIncrement;
 
@@ -681,7 +679,7 @@
 
         for (; rangeIndex !== rangeStop; rangeIndex += rangeIncrement)
         {
-            if (CPLocationInRange(rangeIndex, aRange))
+            if (_CPLocationInRange(rangeIndex, aRange))
             {
                 if (aPredicate(rangeIndex, AT_REF(shouldStop)))
                     [indexesPassingTest addIndex:rangeIndex];
diff --git a/Foundation/CPRange.h b/Foundation/CPRange.h
index f20a08f7a..ffd15058b 100644
--- a/Foundation/CPRange.h
+++ b/Foundation/CPRange.h
@@ -23,3 +23,5 @@
 #define _CPMaxRange(aRange) ((aRange).location + (aRange).length)
 #define _CPMakeRange(aLocation, aLength) { location:(aLocation), length:aLength }
 #define _CPMakeRangeCopy(aRange) { location:(aRange).location, length:(aRange).length }
+#define _CPEmptyRange(aRange) ((aRange).length === 0)
+#define _CPLocationInRange(aLocation, aRange) (((aLocation) >= (aRange).location) && ((aLocation) < _CPMaxRange(aRange)))
diff --git a/Foundation/CPRange.j b/Foundation/CPRange.j
index d96bbb834..f9f09a3ae 100755
--- a/Foundation/CPRange.j
+++ b/Foundation/CPRange.j
@@ -52,10 +52,7 @@ _function(CPMakeRangeCopy(aRange))
     @group CPRange
     @return YES if the range is empty
 */
-function CPEmptyRange(aRange)
-{
-    return aRange.length === 0;
-}
+_function(CPEmptyRange(aRange))
 
 /*!
     Finds the range maximum. (\c location + length)
@@ -83,10 +80,7 @@ function CPEqualRanges(lhsRange, rhsRange)
     @group CPRange
     @return BOOL \c YES if \c aLocation is within the range
 */
-function CPLocationInRange(aLocation, aRange)
-{
-    return (aLocation >= aRange.location) && (aLocation < CPMaxRange(aRange));
-}
+_function(CPLocationInRange(aLocation, aRange))
 
 /*!
     Creates a new range with the minimum \c location and a \c length