diff options
| author | Mattias Andrée <maandree@kth.se> | 2016-03-04 23:50:00 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2016-03-04 23:50:00 +0100 |
| commit | 76d0af5599554d11f104d582cdac8fbaa8569fcc (patch) | |
| tree | 0ed9889a86d52ebd208382f2fd49dad0570d1f8c /src/zsets.c | |
| parent | Clean up, fix a few bugs, and add a test (diff) | |
| download | libzahl-76d0af5599554d11f104d582cdac8fbaa8569fcc.tar.gz libzahl-76d0af5599554d11f104d582cdac8fbaa8569fcc.tar.bz2 libzahl-76d0af5599554d11f104d582cdac8fbaa8569fcc.tar.xz | |
Clean up, add zerror and zperror, fix bugs and add more tests
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/zsets.c')
| -rw-r--r-- | src/zsets.c | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/src/zsets.c b/src/zsets.c index 24cdd48..2b91864 100644 --- a/src/zsets.c +++ b/src/zsets.c @@ -26,21 +26,45 @@ zsets(z_t a, const char *str) SET_SIGNUM(a, 0); +#if 1 + zset(libzahl_tmp_str_num, libzahl_const_1e19); switch ((str_end - str) % 19) { while (*str) { + zmul(a, a, libzahl_const_1e19); + temp = 0; #define X(n)\ case n:\ temp *= 10, temp += *str++ & 15; - X(0) X(18) X(17) X(16) X(15) X(14) X(13) X(12) X(11) - X(10) X(9) X(8) X(7) X(6) X(5) X(4) X(3) X(2) X(1) + X(0) X(18) X(17) X(16) X(15) X(14) X(13) X(12) X(11) + X(10) X(9) X(8) X(7) X(6) X(5) X(4) X(3) X(2) X(1) #undef X - - zmul(a, a, libzahl_const_1e19); - zsetu(libzahl_tmp_str_num, temp); + if (!temp) + continue; + libzahl_tmp_str_num->chars[0] = (zahl_char_t)temp; + temp >>= BITS_PER_CHAR; + libzahl_tmp_str_num->chars[1] = (zahl_char_t)temp; + libzahl_tmp_str_num->used = 1 + !!temp; zadd(a, a, libzahl_tmp_str_num); + } + } +#else + zset(libzahl_tmp_str_num, libzahl_const_1); + switch ((str_end - str) % 9) { + while (*str) { + zmul(a, a, libzahl_const_1e9); temp = 0; +#define X(n)\ + case n:\ + temp *= 10, temp += *str++ & 15; + X(0) X(8) X(7) X(6) X(5) X(4) X(3) X(2) X(1) +#undef X + if (!temp) + continue; + libzahl_tmp_str_num->chars[0] = temp; + zadd(a, a, libzahl_tmp_str_num); } } +#endif if (neg) SET_SIGNUM(a, -zsignum(a)); |