gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 12:16:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for code plane 16 in character sets.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22914 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-05-12 15:13:12 +00:00
parent 8891b7e197
commit bc30035fa1
15 changed files with 16408 additions and 8200 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/NSCharacterSet.m
View file

@ -42,10 +42,10 @@
#include "NSCharacterSetData.h"
//PENDING: may want to make these less likely to conflict
#define UNICODE_SIZE 65536
#define UNICODE_MAX 1048576
#define UNICODE_SIZE 63336
#define UNICODE_MAX 1114112
#define BITMAP_SIZE 8192
#define BITMAP_MAX 131072
#define BITMAP_MAX 139264
#ifndef SETBIT
#define SETBIT(a,i) ((a) |= 1<<(i))
@ -83,7 +83,7 @@
- (NSData*) bitmapRepresentation
{
unsigned i = 16;
unsigned i = 17;
while (i > 0 && [self hasMemberInPlane: i-1] == NO)
{
@ -128,7 +128,7 @@
{
unsigned bit;
if (aPlane >= 16)
if (aPlane > 16)
{
return NO;
}
@ -203,6 +203,13 @@
{
unsigned byte = aCharacter/8;
if (aCharacter >= UNICODE_MAX)
{
[NSException raise: NSInvalidArgumentException
format: @"[%@-%@] argument (0x%08x) is too large",
NSStringFromClass([self class]), NSStringFromSelector(_cmd),
aCharacter];
}
if (byte < _length && ISSET(_data[byte], aCharacter % 8))
{
return YES;
@ -298,7 +305,7 @@
- (NSData*) bitmapRepresentation
{
unsigned i = 16;
unsigned i = 17;
while (i > 0 && [self hasMemberInPlane: i-1] == NO)
{
@ -824,7 +831,7 @@ static Class abstractMutableClass = nil;
oImp = (BOOL (*)(id,SEL,unichar))
[anObject methodForSelector: @selector(characterIsMember:)];
for (p = 0; p < 16; p++)
for (p = 0; p <= 16; p++)
{
if ([self hasMemberInPlane: p] == YES)
{
@ -872,6 +879,13 @@ static Class abstractMutableClass = nil;
{
int plane = (aCharacter >> 16);
if (aCharacter >= UNICODE_MAX)
{
[NSException raise: NSInvalidArgumentException
format: @"[%@-%@] argument (0x%08x) is too large",
NSStringFromClass([self class]), NSStringFromSelector(_cmd),
aCharacter];
}
if (plane == 0)
{
unichar u = (unichar)(aCharacter & 0xffff);