From 477af1f4ab054e75ab114a8a9ad688440bc6ff6b Mon Sep 17 00:00:00 2001 From: iska Date: Sat, 1 Nov 2014 22:06:01 +0100 Subject: [PATCH] Change parse error message to 0x format instead of U+ --- HTMLKit/HTMLInputStreamReader.m | 6 +++--- HTMLKit/HTMLTokenizer.m | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/HTMLKit/HTMLInputStreamReader.m b/HTMLKit/HTMLInputStreamReader.m index 987e23c..e69b83f 100644 --- a/HTMLKit/HTMLInputStreamReader.m +++ b/HTMLKit/HTMLInputStreamReader.m @@ -81,7 +81,7 @@ return LINE_FEED; } if (CFStringIsSurrogateLowCharacter(nextInputCharacter)) { - NSString *reason = [NSString stringWithFormat:@"Non-Unicode character found (an isolated low surrogate: %X)", nextInputCharacter]; + NSString *reason = [NSString stringWithFormat:@"Non-Unicode character found (an isolated low surrogate: 0x%X)", nextInputCharacter]; [self emitParseError:reason]; return nextInputCharacter; } @@ -89,7 +89,7 @@ if (CFStringIsSurrogateHighCharacter(nextInputCharacter)) { UniChar surrogateLow = CFStringGetCharacterFromInlineBuffer(&_buffer, _location + 1); if (CFStringIsSurrogateLowCharacter(surrogateLow) == NO) { - NSString *reason = [NSString stringWithFormat:@"Non-Unicode character found (an isolated high surrogate: %X)", nextInputCharacter]; + NSString *reason = [NSString stringWithFormat:@"Non-Unicode character found (an isolated high surrogate: 0x%X)", nextInputCharacter]; [self emitParseError:reason]; return nextInputCharacter; } @@ -99,7 +99,7 @@ } if (isControlOrUndefinedCharacter(nextInputCharacter)) { - NSString *reason = [NSString stringWithFormat:@"A control/undefined character found: %X", nextInputCharacter]; + NSString *reason = [NSString stringWithFormat:@"A control/undefined character found: (0x%X)", nextInputCharacter]; [self emitParseError:reason]; } diff --git a/HTMLKit/HTMLTokenizer.m b/HTMLKit/HTMLTokenizer.m index b5735ea..e72bcb2 100644 --- a/HTMLKit/HTMLTokenizer.m +++ b/HTMLKit/HTMLTokenizer.m @@ -399,7 +399,7 @@ [self switchToState:HTMLTokenizerStateTagOpen]; break; case NULL_CHAR: - [self emitParseError:@"NULL character (U+0000) in Data State"]; + [self emitParseError:@"NULL character (0x0000) in Data State"]; [self emitCharacterToken:character]; break; case EOF: @@ -435,7 +435,7 @@ [self switchToState:HTMLTokenizerStateRCDATALessThanSign]; break; case NULL_CHAR: - [self emitParseError:@"NULL character (U+0000)in RCDATA state"]; + [self emitParseError:@"NULL character (0x0000)in RCDATA state"]; [self emitCharacterToken:REPLACEMENT_CHAR]; break; case EOF: @@ -468,7 +468,7 @@ [self switchToState:HTMLTokenizerStateRAWTEXTLessThanSign]; break; case NULL_CHAR: - [self emitParseError:@"NULL character (U+0000) in RAWTEXT state"]; + [self emitParseError:@"NULL character (0x0000) in RAWTEXT state"]; [self emitCharacterToken:REPLACEMENT_CHAR]; break; case EOF: @@ -488,7 +488,7 @@ [self switchToState:HTMLTokenizerStateScriptDataLessThanSign]; break; case NULL_CHAR: - [self emitParseError:@"NULL character (U+0000) in Script Data state"]; + [self emitParseError:@"NULL character (0x0000) in Script Data state"]; [self emitCharacterToken:REPLACEMENT_CHAR]; break; case EOF: @@ -505,7 +505,7 @@ UTF32Char character = [_inputStreamReader consumeNextInputCharacter]; switch (character) { case NULL_CHAR: - [self emitParseError:@"NULL character (U+0000) in PLAINTEXT state"]; + [self emitParseError:@"NULL character (0x0000) in PLAINTEXT state"]; [self emitCharacterToken:REPLACEMENT_CHAR]; break; case EOF: @@ -541,7 +541,7 @@ [_inputStreamReader reconsumeCurrentInputCharacter]; break; default: - [self emitParseError:@"Unexpected character (%X) in Tag Open state", character]; + [self emitParseError:@"Unexpected character (0x%X) in Tag Open state", character]; [self switchToState:HTMLTokenizerStateData]; [self emitCharacterToken:LESS_THAN_SIGN]; [_inputStreamReader reconsumeCurrentInputCharacter]; @@ -572,7 +572,7 @@ [_inputStreamReader reconsumeCurrentInputCharacter]; break; default: - [self emitParseError:@"Unexpected character (%X) in End Tag Open state", character]; + [self emitParseError:@"Unexpected character (0x%X) in End Tag Open state", character]; [self switchToState:HTMLTokenizerStateBogusComment]; [_inputStreamReader reconsumeCurrentInputCharacter]; break; @@ -1596,7 +1596,7 @@ #warning Implement HTML Elements and check for namespace in the _parser.adjustedCurrentNode.namespace [self switchToState:HTMLTokenizerStateCDATASection]; } else { - [self emitParseError:@"%@ unexpected/invalid character in Markup Declaration Open state", StringFromUTF32Char([_inputStreamReader nextInputCharacter])]; + [self emitParseError:@"Unexpected character in Markup Declaration Open state"]; [self switchToState:HTMLTokenizerStateBogusComment]; } }