mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-30 08:19:09 +00:00
Code Issues Releases Activity

Use collating info for [a-z]-type national ranges

Browse Source
This commit is contained in:
Andrey A. Chernov 1996-10-31 06:12:15 +00:00
parent 1b142f3fd2
commit 39bd0ffee6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=19280
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
contrib/libg++/librx/rx.c
View File

@ -4199,6 +4199,22 @@ group_in_compile_stack (compile_stack, regnum)
return false;
}
#ifdef __FreeBSD__
static int collate_range_cmp (a, b)
int a, b;
{
int r;
static char s[2][2];
if ((unsigned char)a == (unsigned char)b)
return 0;
s[0][0] = a;
s[1][0] = b;
if ((r = strcoll(s[0], s[1])) == 0)
r = (unsigned char)a - (unsigned char)b;
return r;
}
#endif
/*
* Read the ending character of a range (in a bracket expression) from the
@ -4246,15 +4262,30 @@ compile_range (rxb, cs, p_ptr, pend, translate, syntax, inv_tr, valid_inv_tr)
(*p_ptr)++;
#ifdef __FreeBSD__
if (collate_range_cmp (range_start, range_end) > 0)
#else
if (range_start > range_end)
#endif
return syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR;
#ifdef __FreeBSD__
for (this_char = 0; this_char < CHAR_SET_SIZE; this_char++)
if ( collate_range_cmp (range_start, this_char) <= 0
&& collate_range_cmp (this_char, range_end) <= 0
) {
rx_Bitset it =
inverse_translation (rxb, valid_inv_tr, inv_tr, translate, this_char);
rx_bitset_union (rxb->rx.local_cset_size, cs, it);
}
#else
for (this_char = range_start; this_char <= range_end; this_char++)
{
rx_Bitset it =
inverse_translation (rxb, valid_inv_tr, inv_tr, translate, this_char);
rx_bitset_union (rxb->rx.local_cset_size, cs, it);
}
#endif
return REG_NOERROR;
}