GitHub/HTMLKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change block-based implementation the "in-body" start-tag handling for "li", "dd" & "dt" to for-loop

Browse Source 
Easier to read and comprehend
This commit is contained in:
iska
2015-04-05 18:00:20 +02:00
parent e5738cc48f
commit dabf24fa1c
1 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HTMLKit/HTMLParser.m
+13 -26
View File
@@ -1140,39 +1140,26 @@
} else if ([tagName isEqualToAny:@"li", @"dd", @"dt", nil]) {
/** li, dd & dt cases are all same, hence the merge */
_framesetOkFlag = NO;
HTMLElement *node = self.currentNode;
NSUInteger index = _stackOfOpenElements.count - 1;
// Start Tag: li, dd, dt
// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inbody
// No cycles ~> blocks instead of gotos
dispatch_block_t done = ^{
if ([_stackOfOpenElements hasElementInButtonScopeWithTagName:@"p"]) {
[self closePElement];
for (HTMLElement *node in _stackOfOpenElements.reverseObjectEnumerator.allObjects) {
if ([node.tagName isEqualToString:tagName]) {
[self generateImpliedEndTagsExceptForElement:tagName];
if (![self.currentNode.tagName isEqualToString:tagName]) {
[self emitParseError:@"Unexpected Start Tag (%@) in <body>", tagName];
}
[_stackOfOpenElements popElementsUntilElementPoppedWithTagName:tagName];
break;
} else if (IsSpecialElement(node) && ![node.tagName isEqualToAny:@"address", @"div", @"p", nil]) {
break;
}
};
dispatch_block_t loop = ^{
[self generateImpliedEndTagsExceptForElement:tagName];
if (![self.currentNode.tagName isEqualToString:tagName]) {
[self emitParseError:@"Unexpected Start Tag (%@) in <body>", tagName];
}
[_stackOfOpenElements popElementsUntilElementPoppedWithTagName:tagName];
done();
};
if ([node.tagName isEqualToString:tagName]) {
loop();
}
if (IsSpecialElement(node) && ![node.tagName isEqualToAny:@"address", @"div", @"p", nil]) {
done();
} else {
node = _stackOfOpenElements[--index];
loop();
if ([_stackOfOpenElements hasElementInButtonScopeWithTagName:@"p"]) {
[self closePElement];
}
[self insertElementForToken:token];
} else if ([tagName isEqualToString:@"plaintext"]) {
if ([_stackOfOpenElements hasElementInButtonScopeWithTagName:@"p"]) {