diff --git a/HTMLKit.playground/Pages/CSS Selectors.xcplaygroundpage/Contents.swift b/HTMLKit.playground/Pages/CSS Selectors.xcplaygroundpage/Contents.swift index a363d85..3a4b40f 100644 --- a/HTMLKit.playground/Pages/CSS Selectors.xcplaygroundpage/Contents.swift +++ b/HTMLKit.playground/Pages/CSS Selectors.xcplaygroundpage/Contents.swift @@ -46,7 +46,7 @@ hasAdjacentHeader = document.elementsMatchingSelector(generalSiblingSelector(typ nonParagraphChildOfDiv = document.elementsMatchingSelector( allOf([ childOfElementSelector(typeSelector("div")), - nay(typeSelector("p")) + not(typeSelector("p")) ]) ) @@ -66,8 +66,8 @@ secondOfType = firstDivElement.elementsMatchingSelector(nthOfTypeSelector(CSSNth var notParagraphAndNotDiv = firstDivElement.querySelectorAll(":not(p):not(div)") notParagraphAndNotDiv = firstDivElement.elementsMatchingSelector( allOf([ - nay(typeSelector("p")), - nay(typeSelector("div")) + not(typeSelector("p")), + not(typeSelector("div")) ]) ) diff --git a/HTMLKit/CSSSelectorParser.m b/HTMLKit/CSSSelectorParser.m index 6297ccf..b3f0f63 100644 --- a/HTMLKit/CSSSelectorParser.m +++ b/HTMLKit/CSSSelectorParser.m @@ -332,7 +332,7 @@ [self emitError:error reason:@"Expected closing right parenthesis ')'"]; } - return nay(subSelector); + return not(subSelector); } else if ([pseudoClass isEqualToAny:@"lt", @"gt", @"eq", nil]) { [_inputStream consumeWhitespace]; if (![_inputStream consumeCharacter:LEFT_PARENTHESIS]) { diff --git a/HTMLKit/CSSSelectors.h b/HTMLKit/CSSSelectors.h index 307a111..4d6d309 100644 --- a/HTMLKit/CSSSelectors.h +++ b/HTMLKit/CSSSelectors.h @@ -220,7 +220,7 @@ extern CSSSelector * generalSiblingSelector(CSSSelector *selector); @param selector The selector which should be negated. @returns A negation selector. */ -extern CSSSelector * nay(CSSSelector *selector); +extern CSSSelector * not(CSSSelector *selector); /** CSS has-descendant selector, e.g. 'div:has(p)' diff --git a/HTMLKit/CSSSelectors.m b/HTMLKit/CSSSelectors.m index d4e864f..55d9b0b 100644 --- a/HTMLKit/CSSSelectors.m +++ b/HTMLKit/CSSSelectors.m @@ -140,7 +140,7 @@ CSSSelector * generalSiblingSelector(CSSSelector *selector) #pragma mark - Pseudo Functions -CSSSelector * nay(CSSSelector *selector) +CSSSelector * not(CSSSelector *selector) { return [CSSPseudoFunctionSelector notSelector:selector]; } diff --git a/HTMLKit/CSSStructuralPseudoSelectors.m b/HTMLKit/CSSStructuralPseudoSelectors.m index 26ef4a7..af99dea 100644 --- a/HTMLKit/CSSStructuralPseudoSelectors.m +++ b/HTMLKit/CSSStructuralPseudoSelectors.m @@ -183,7 +183,7 @@ CSSSelector * enabledSelector() typeSelector(@"menuitem"), typeSelector(@"fieldset"), ]); - return namedPseudoSelector(@"enabled", allOf(@[candiate, nay(disabledSelector())])); + return namedPseudoSelector(@"enabled", allOf(@[candiate, not(disabledSelector())])); } CSSSelector * disabledSelector() @@ -206,7 +206,7 @@ CSSSelector * disabledSelector() ]), allOf(@[ descendantOfElementSelector(disabledFieldset), - nay(firstLegendDecendantDisabledFieldSet) + not(firstLegendDecendantDisabledFieldSet) ]) ]); @@ -249,7 +249,7 @@ CSSSelector * optionalSelector() typeSelector(@"select"), typeSelector(@"textarea") ]); - CSSSelector *noAttribute = nay(hasAttributeSelector(@"required")); + CSSSelector *noAttribute = not(hasAttributeSelector(@"required")); return namedPseudoSelector(@"optional", allOf(@[candidate, noAttribute])); }