pike.git/ src/ builtin_functions.c

2001-06-21

2001-06-21 12:28:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 9776dd7057a1f2033db8d153c339c2b6bc30ce55 (31 lines) (+18/-13) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed support for Unicode 3.1 case-information.

Rev: bin/make_ci.pike:1.6
Rev: src/builtin_functions.c:1.380

5:   \*/   /**/   #include "global.h" - RCSID("$Id: builtin_functions.c,v 1.379 2001/06/19 22:48:14 per Exp $"); + RCSID("$Id: builtin_functions.c,v 1.380 2001/06/21 12:27:59 grubba Exp $");   #include "interpret.h"   #include "svalue.h"   #include "pike_macros.h"
221:   }      struct case_info { -  int low; /* low end of range. */ -  int mode; -  int data; +  INT32 low; /* low end of range. */ +  INT32 mode; +  INT32 data;   };      #define CIM_NONE 0 /* Case-less */
238:   #else /* !IN_TPIKE */   #include "case_info.h"   #endif /* IN_TPIKE */ -  { 0x10000, CIM_NONE, 0x0000, }, /* End sentinel. */ +  { 0x7fffffff, CIM_NONE, 0x0000, }, /* End sentinel. */   };    - static struct case_info *find_ci(int c) + static struct case_info *find_ci(INT32 c)   {    static struct case_info *cache = NULL;    struct case_info *ci = cache;    int lo = 0;    int hi = NELEM(case_info);    -  if ((c < 0) || (c > 0xffff)) +  if ((c < 0) || (c > 0xeffff)) { +  /* Negative, or plane 15 and above. */    return NULL; -  +  }       if ((ci) && (ci[0].low <= c) && (ci[1].low > c)) {    return ci;
269:    return(cache = (struct case_info *)case_info + lo);   }    - static struct case_info *find_ci_shift0(int c) + static struct case_info *find_ci_shift0(INT32 c)   {    static struct case_info *cache = NULL;    struct case_info *ci = cache;    int lo = 0;    int hi = CASE_INFO_SHIFT0_HIGH;    -  if ((c < 0) || (c > 0xffff)) +  if ((c < 0) || (c > 0xefffff)) { +  /* Negative, or plane 15 and above. */    return NULL; -  +  }       if ((ci) && (ci[0].low <= c) && (ci[1].low > c)) {    return ci;
298:   }      #define DO_LOWER_CASE(C) do {\ -  int c = C; \ +  INT32 c = C; \    struct case_info *ci = find_ci(c); \    if (ci) { \    switch(ci->mode) { \
312:    } while(0)      #define DO_LOWER_CASE_SHIFT0(C) do {\ -  int c = C; \ +  INT32 c = C; \    struct case_info *ci = find_ci_shift0(c); \    if (ci) { \    switch(ci->mode) { \
326:    } while(0)      #define DO_UPPER_CASE(C) do {\ -  int c = C; \ +  INT32 c = C; \    struct case_info *ci = find_ci(c); \    if (ci) { \    switch(ci->mode) { \
340:    } while(0)      #define DO_UPPER_CASE_SHIFT0(C) do {\ -  int c = C; \ +  INT32 c = C; \    struct case_info *ci = find_ci_shift0(c); \    if (ci) { \    switch(ci->mode) { \