gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make unicode escapes more conventional.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13372 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-04-06 06:39:59 +00:00
parent b2d44357d6
commit 53c68375b9
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,6 +1,8 @@
2002-04-06 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSString.m: Fix error in unicode BOM handling
Write plist unicode escapes using the conventional \u rather than \U,
but read in either form.
* Source/GSString.m: Fix error in length of unicode data produced.
* Tools/cvtenc.m: Made easy to use and added instructions.

13
Source/NSString.m
View file

@ -3353,7 +3353,7 @@ handle_printf_atsign (FILE *stream,
}
else
{
sprintf(ptr, "\\U%04x", *from);
sprintf(ptr, "\\u%04x", *from);
ptr = &ptr[6];
}
break;
@ -4116,7 +4116,7 @@ static inline id parseQuotedString(pldata* pld)
escaped = 2;
hex = NO;
}
else if (escaped == 1 && c == 'U')
else if (escaped == 1 && (c == 'u' || c == 'U'))
{
escaped = 2;
hex = YES;
@ -4197,7 +4197,7 @@ static inline id parseQuotedString(pldata* pld)
hex = NO;
escaped++;
}
else if (escaped == 1 && c == 'U')
else if (escaped == 1 && (c == 'u' || c == 'U'))
{
chars[k] = 0;
hex = YES;
@ -4549,15 +4549,16 @@ nodeToObject(GSXMLNode* node)
memcpy(&buf[pos], &buf[pos+1],
(len - pos) * sizeof(unichar));
}
else if (buf[pos] == 'U')
else if (buf[pos] == 'u' || buf[pos] == 'U')
{
unichar val = 0;
unsigned i;
if (len < pos + 4)
{
[NSException raise: NSInternalInconsistencyException
format: @"Short escape sequence"];
[NSException raise:
NSInternalInconsistencyException
format: @"Short escape sequence"];
}
for (i = 1; i < 5; i++)
{