SR-9758: XMLParser.parse() should return false if abortParsing() is called.
#1867
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
YOCKOW
commented
Jan 31, 2019
Foundation/XMLParser.swift
Outdated
| if _parserError == nil { | ||
| _parserError = NSError(domain: XMLParser.errorDomain, code: Int(parseResult)) | ||
| } | ||
| result = false |
There was a problem hiding this comment.
I know this is not the best way, but it would be better than just return true.
spevans
reviewed
Jan 31, 2019
Foundation/XMLParser.swift
Outdated
| @@ -465,16 +465,18 @@ open class XMLParser : NSObject { | |||
| } | |||
|
|
|||
| internal func _handleParseResult(_ parseResult: Int32) -> Bool { | |||
| return true | |||
| /* | |||
| var result = true | |||
| if parseResult != 0 { | |||
| if parseResult != -1 { | |||
There was a problem hiding this comment.
It would be simpler to write this as :
if parseResult == 0 {
return true
} else {
if _parserError == nil {
_parserError = NSError(domain: XMLParser.errorDomain, code: Int(parseResult))
}
}
return false
If more interpretation of parseResult is added in the future, it will reduce the extra levels of indentation.
There was a problem hiding this comment.
Thank you for the review. I will rewrite it.
|
@swift-ci test |
|
@swift-ci test |
parkera
approved these changes
Jan 31, 2019
|
Thank you! |
|
@swift-ci test |
|
@swift-ci test and merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As the Apple's document says,
parse()should return false in there is an error or if the parsing operation is aborted.Resolves SR-9758.