diff options
author | Roland McGrath <roland@gnu.org> | 1996-05-30 16:12:42 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-05-30 16:12:42 +0000 |
commit | 76060ec0b8b5d6f0a860a94f100dc6e48041bac3 (patch) | |
tree | b4ff1b5370a30a16705239598cb8e98f4b80b9ca /string | |
parent | c3352e623384fe221743a6d2212c17d9619041ef (diff) | |
download | glibc-76060ec0b8b5d6f0a860a94f100dc6e48041bac3.tar.gz |
Thu May 30 11:24:05 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>cvs/libc-960602cvs/libc-960601cvs/libc-960531
* po/header.pot: Replace with exact boilerplate pinard dictates.
* sysdeps/i386/strtok.S (Lillegal_argument): Remove this code to set
errno and the check that jumped to it.
* sysdeps/mach/hurd/Makefile (errnos.d): Use $(sed-remove-objpfx).
Thu May 30 03:21:57 1996 Ulrich Drepper <drepper@cygnus.com>
* FAQ: Document need of gperf program for developers.
* elf/elf.h: Fix typos in comments.
* libio/stdio.h [!__STRICT_ANSI__ || _POSIX_SOURCE]: Add
prototypes for `ctermid' and `cuserid'.
* locale/programs/locale.c: Switch to user selected locale
before printing variables.
* math/Makefile [$(long-double-fcts)==yes]: Define long-m-routines
and long-c-routines. Only if the `long double' data type is
available we need to compile the functions.
(libm-routines): Add $(long-m-routines).
(routines): Remove isinfl, isnanl. Use new file s_isinfl and
s_isnanl instead if `long double' is available.
* math/math.h: Include <mathcalls.h> again to define `long double'
functions.
* math/math_private.h: Define data types, prototypes and access
macros for `long double'.
* stdlib/stdlib.h: Add prototypes for `strtoll' and `strtoull'.
[GCC2 && OPTIMIZE]: Define strto{,u}ll as inline function which
calls __strto{,u}q_internal.
* stdlib/strfmon.c: Replace PTR by `void *'.
* stdlib/strtoq.c: Define strtoll as weak alias.
* stdlib/strtouq.c: Define strtoull as weak alias.
* string/tester.c: Correct `strsep' test.
* sysdeps/generic/strsep.c: Make compatible with BSD version.
Trailing characters of skip set are not skipped. In this case
empty tokens are returned.
* sysdeps/i386/isinfl.c, sysdeps/i386/isnanl.c,
sysdeps/ieee754/isinf.c, sysdeps/ieee754/isinfl.c,
sysdeps/ieee754/isnan.c, sysdeps/ieee754/isnanl.c: Removed. We
now use the versions part of libm.
* sysdeps/i386/strsep.S: Removed. Generic C version is of
similar speed.
* sysdeps/i386/strtok.S: Remove support for `strsep'.
* sysdeps/libm-i387/e_acosl.S, sysdeps/libm-i387/s_ceill.S,
sysdeps/libm-i387/s_copysignl.S, sysdeps/libm-i387/s_finitel.S,
sysdeps/libm-i387/s_floorl.S, sysdeps/libm-i387/s_isinfl.c,
sysdeps/libm-i387/s_isnanl.c, sysdeps/libm-i387/s_nextafterl.c,
sysdeps/libm-i387/s_rintl.S, sysdeps/libm-i387/s_significandl.S:
New i387 specific math functions implementing `long double'
versions.
* sysdeps/libm-ieee754/s_ceill.c,
sysdeps/libm-ieee754/s_copysignl.c,
sysdeps/libm-ieee754/s_fabsl.c, sysdeps/libm-ieee754/s_finitel.c,
sysdeps/libm-ieee754/s_floorl.c, sysdeps/libm-ieee754/s_isinfl.c,
sysdeps/libm-ieee754/s_isnanl.c,
sysdeps/libm-ieee754/s_nextafterl.c,
sysdeps/libm-ieee754/s_rintl.c, sysdeps/libm-ieee754/s_scalbnl.c,
sysdeps/libm-ieee754/s_significandl.c: New generic `long double'
versions of libm functions.
* sysdeps/libm-i387/e_exp.S: Add a few comments to explain the
Intel FPU nonsense.
* sysdeps/libm-i387/s_ceil.S, sysdeps/libm-i387/s_ceilf.S,
sysdeps/libm-i387/s_floor.S, sysdeps/libm-i387/s_floorf.S: Correct
handling of local variables. The old version created a stack
frame but stored the values outside.
* sysdeps/libm-ieee754/s_isinf.c, sysdeps/libm-ieee754/s_isnan.c
[!NO_LONG_DOUBLE]: Define alias with `long double' versions name.
* login/pututline_r.c: Include sys/stat.h. Fix typos.
according to currently used locale for category LC_CTYPE by
inet_nsap_ntoa. Now in <arpa/inet.h>.
_IO_dup2 to contain complete parameter list.
Diffstat (limited to 'string')
-rw-r--r-- | string/tester.c | 77 |
1 files changed, 45 insertions, 32 deletions
diff --git a/string/tester.c b/string/tester.c index 64ccce1e11..6be3d2dade 100644 --- a/string/tester.c +++ b/string/tester.c @@ -413,51 +413,64 @@ DEFUN(main, (argc, argv), int argc AND char **argv) cp = strcpy(one, "first, second, third"); equal(strsep(&cp, ", "), "first", 1); /* Basic test. */ equal(one, "first", 2); - equal(strsep(&cp, ", "), "second", 3); - equal(strsep(&cp, ", "), "third", 4); - check(strsep(&cp, ", ") == NULL, 5); + equal(strsep(&cp, ", "), "", 3); + equal(strsep(&cp, ", "), "second", 4); + equal(strsep(&cp, ", "), "", 5); + equal(strsep(&cp, ", "), "third", 6); + check(strsep(&cp, ", ") == NULL, 7); cp = strcpy(one, ", first, "); - equal(strsep(&cp, ", "), "", 6); /* null token. */ - equal(strsep(&cp, ", "), "", 7); + equal(strsep(&cp, ", "), "", 8); + equal(strsep(&cp, ", "), "", 9); + equal(strsep(&cp, ", "), "first", 10); /* Extra delims, 1 tok. */ + equal(strsep(&cp, ", "), "", 11); + check(strsep(&cp, ", ") == NULL, 12); cp = strcpy(one, "1a, 1b; 2a, 2b"); - equal(strsep(&cp, ", "), "1a", 8); /* Changing delim lists. */ - equal(strsep(&cp, "; "), "1b", 9); - equal(strsep(&cp, ", "), "2a", 10); + equal(strsep(&cp, ", "), "1a", 13); /* Changing delim lists. */ + equal(strsep(&cp, ", "), "", 14); + equal(strsep(&cp, "; "), "1b", 15); + equal(strsep(&cp, ", "), "", 16); + equal(strsep(&cp, ", "), "2a", 17); cp = strcpy(two, "x-y"); - equal(strsep(&cp, "-"), "x", 11); /* New string before done. */ - equal(strsep(&cp, "-"), "y", 12); - check(strsep(&cp, "-") == NULL, 13); + equal(strsep(&cp, "-"), "x", 18); /* New string before done. */ + equal(strsep(&cp, "-"), "y", 19); + check(strsep(&cp, "-") == NULL, 20); cp = strcpy(one, "a,b, c,, ,d"); - equal(strsep(&cp, ", "), "a", 14); /* Different separators. */ - equal(strsep(&cp, ", "), "b", 15); - equal(strsep(&cp, " ,"), "c", 16); /* Permute list too. */ - equal(strsep(&cp, " ,"), "d", 17); - check(strsep(&cp, ", ") == NULL, 18); - check(strsep(&cp, ", ") == NULL, 19); /* Persistence. */ + equal(strsep(&cp, ", "), "a", 21); /* Different separators. */ + equal(strsep(&cp, ", "), "b", 22); + equal(strsep(&cp, " ,"), "", 23); + equal(strsep(&cp, " ,"), "c", 24); /* Permute list too. */ + equal(strsep(&cp, " ,"), "", 25); + equal(strsep(&cp, " ,"), "", 26); + equal(strsep(&cp, " ,"), "", 27); + equal(strsep(&cp, " ,"), "d", 28); + check(strsep(&cp, ", ") == NULL, 29); + check(strsep(&cp, ", ") == NULL, 30); /* Persistence. */ cp = strcpy(one, ", "); - check(strsep(&cp, ", ") == one, 20); /* Null token. */ + equal(strsep(&cp, ", "), "", 31); + equal(strsep(&cp, ", "), "", 32); + check(strsep(&cp, ", ") == NULL, 33); /* No tokens. */ cp = strcpy(one, ""); - check(strsep(&cp, ", ") == NULL, 21); /* Empty string. */ + check(strsep(&cp, ", ") == NULL, 34); /* Empty string. */ cp = strcpy(one, "abc"); - equal(strsep(&cp, ", "), "abc", 22); /* No delimiters. */ - check(strsep(&cp, ", ") == NULL, 23); + equal(strsep(&cp, ", "), "abc", 35); /* No delimiters. */ + check(strsep(&cp, ", ") == NULL, 36); cp = strcpy(one, "abc"); - equal(strsep(&cp, ""), "abc", 24); /* Empty delimiter list. */ - check(strsep(&cp, "") == NULL, 25); + equal(strsep(&cp, ""), "abc", 37); /* Empty delimiter list. */ + check(strsep(&cp, "") == NULL, 38); (void) strcpy(one, "abcdefgh"); cp = strcpy(one, "a,b,c"); - equal(strsep(&cp, ","), "a", 26); /* Basics again... */ - equal(strsep(&cp, ","), "b", 27); - equal(strsep(&cp, ","), "c", 28); - check(strsep(&cp, ",") == NULL, 29); - equal(one+6, "gh", 30); /* Stomped past end? */ - equal(one, "a", 31); /* Stomped old tokens? */ - equal(one+2, "b", 32); - equal(one+4, "c", 33); + equal(strsep(&cp, ","), "a", 39); /* Basics again... */ + equal(strsep(&cp, ","), "b", 40); + equal(strsep(&cp, ","), "c", 41); + check(strsep(&cp, ",") == NULL, 42); + equal(one+6, "gh", 43); /* Stomped past end? */ + equal(one, "a", 44); /* Stomped old tokens? */ + equal(one+2, "b", 45); + equal(one+4, "c", 46); /* memcmp. */ it = "memcmp"; - check(memcmp("a", "a", 1) == 0, 1); /* Identity. */ + check(memcmp("a", "a", 1) == 0, 1); /* Identity. */ check(memcmp("abc", "abc", 3) == 0, 2); /* Multicharacter. */ check(memcmp("abcd", "abce", 4) < 0, 3); /* Honestly unequal. */ check(memcmp("abce", "abcd", 4) > 0, 4); |