From dc3de7a47091d6f865690e063d2bde488ad45a75 Mon Sep 17 00:00:00 2001
From: iska <iska.gp@gmail.com>
Date: Fri, 5 Jun 2015 17:05:22 +0200
Subject: [PATCH] Remove the HTMLNodeFilterValue enum since Reject and Skip are
 semantically equivalent

---
 HTMLKit/HTMLNodeFilter.h                | 9 +--------
 HTMLKit/HTMLNodeIterator.m              | 8 ++++----
 HTMLKitTests/HTMLKitNodeIteratorTests.m | 6 +++---
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/HTMLKit/HTMLNodeFilter.h b/HTMLKit/HTMLNodeFilter.h
index 021fe5a..40785a3 100644
--- a/HTMLKit/HTMLNodeFilter.h
+++ b/HTMLKit/HTMLNodeFilter.h
@@ -8,13 +8,6 @@
 
 #import <Foundation/Foundation.h>
 
-typedef NS_ENUM(unsigned short, HTMLNodeFilterValue)
-{
-	HTMLNodeFilterAccept = 1,
-	HTMLNodeFilterReject = 2,
-	HTMLNodeFilterSkip = 3
-};
-
 typedef NS_ENUM(unsigned long, HTMLNodeFilterShowOptions)
 {
 	HTMLNodeFilterShowAll = 0xFFFFFFFF,
@@ -30,6 +23,6 @@ typedef NS_ENUM(unsigned long, HTMLNodeFilterShowOptions)
 
 @protocol HTMLNodeFilter <NSObject>
 
-- (HTMLNodeFilterValue)acceptNode:(HTMLNode *)node;
+- (BOOL)acceptNode:(HTMLNode *)node;
 
 @end
diff --git a/HTMLKit/HTMLNodeIterator.m b/HTMLKit/HTMLNodeIterator.m
index a79ae6d..a23de3d 100644
--- a/HTMLKit/HTMLNodeIterator.m
+++ b/HTMLKit/HTMLNodeIterator.m
@@ -128,7 +128,7 @@ typedef NS_ENUM(short, TraverseDirection)
 			}
 			beforeNode = YES;
 		}
-	} while (FilterNode(self, node) != HTMLNodeFilterAccept);
+	} while (!FilterNode(self, node));
 
 	_referenceNode = node;
 	_pointerBeforeReferenceNode = beforeNode;
@@ -171,15 +171,15 @@ NS_INLINE HTMLNode * FollowingNode(HTMLNode *node, HTMLNode *root)
 	return nil;
 }
 
-NS_INLINE HTMLNodeFilterValue FilterNode(HTMLNodeIterator *iterator, HTMLNode *node)
+NS_INLINE BOOL FilterNode(HTMLNodeIterator *iterator, HTMLNode *node)
 {
 	unsigned long nthBit = (1 << (node.nodeType - 1)) & iterator.whatToShow;
 	if (!nthBit) {
-		return HTMLNodeFilterSkip;
+		return NO;
 	}
 
 	if (iterator.filter == nil) {
-		return HTMLNodeFilterAccept;
+		return YES;
 	}
 
 	return [iterator.filter acceptNode:node];
diff --git a/HTMLKitTests/HTMLKitNodeIteratorTests.m b/HTMLKitTests/HTMLKitNodeIteratorTests.m
index 4fadae1..a9b05f2 100644
--- a/HTMLKitTests/HTMLKitNodeIteratorTests.m
+++ b/HTMLKitTests/HTMLKitNodeIteratorTests.m
@@ -14,14 +14,14 @@
 
 @implementation CommentNodeFilter
 
-- (HTMLNodeFilterValue)acceptNode:(HTMLNode *)node
+- (BOOL)acceptNode:(HTMLNode *)node
 {
 	if (node.nodeType == HTMLNodeComment) {
 		if ([[(HTMLComment *)node data] rangeOfString:@"second"].location != NSNotFound) {
-			return HTMLNodeFilterAccept;
+			return YES;
 		}
 	}
-	return HTMLNodeFilterReject;
+	return NO;
 }
 
 @end