Few adjustments to no-implicit-conversion patch.

* lib.h (c_u): New inline function: unsafe conversion to
ucnum, analogous to c_n for cnum.

* hash.c (equal_hash, hash_iter_init): Use UINT_PTR_MAX
instead of convert(ucnum, -1).
(eql_hash): mp_hash returns unsigned long, so
shouldn't require a cast to go to the uint_ptr_t.
The types are of the same size, or at worst it is a widening.
Also replace convert(ucnum, -1) by UINT_PTR_MAX here.
Combining the TAG_CHR and TAG_NUM cases, and using c_u,
which is more efficient since c_chr and c_num are non-inlined
functions which redundantly check type. We no longer
need a self variable in this function.
(eq_hash): Same TAG_CHR and TAG_NUM changes as eql_hash.

* regex.c (char_set_add): Reformat change to avoid line break
across assignment.

1 files changed, 2 insertions, 2 deletions

diff --git a/regex.c b/regex.c
index 1d971625..213ac98f 100644
--- a/regex.c
+++ b/regex.c
@@ -597,8 +597,8 @@ static void char_set_add(char_set_t *set, wchar_t ch)
     /* fallthrough */
   case CHSET_SMALL:
     assert (ch < 256);
-    set->s.bitcell[CHAR_SET_INDEX(ch)] |=
-      convert(bitcell_t, 1) << CHAR_SET_BIT(ch);
+    set->s.bitcell[CHAR_SET_INDEX(ch)] |= (convert(bitcell_t, 1)
+                                           << CHAR_SET_BIT(ch));
     break;
   case CHSET_LARGE:
     assert (ch < 0x10000);