Converting cast expressions to macros that are retargetted

to C++ style casts when compiling as C++.

* lib.h (strip_qual, convert, coerce): New casting macros.
(TAG_MASK, tag, type, wli_noex, auto_str, static_str,
litptr, num_fast, chr, lit_noex, nil, nao): Use cast macros.

* arith.c (mul, isqrt_fixnum, bit): Use cast macros.

* configure (INT_PTR_MAX): Define using cast macro.

* debug.c (debug_init): Use cast macro.

* eval.c (do_eval, expand_macro, reg_op, reg_mac, eval_init):
Use cast macros.

* filter.c (filter_init): Use cast macro.

* gc.c (more, mark_obj, in_heap, mark, sweep_one, unmark): Use
cast macros.

* hash.c (hash_double, equal_hash, eql_hash, hash_equal_op,
hash_hash_op, hash_print_op, hash_mark, make_hash, make_similar_hash,
copy_hash, gethash_c, gethash, gethash_f, gethash_n, remhash,
hash_count, get_hash_userdata, set_hash_userdata, hash_iter_destroy,
hash_iter_mark, hash_begin, hash_uni, hash_diff, hash_isec): Use
cast macros.

* lib.c (code2type, chk_malloc, chk_malloc_gc_more, chk_calloc,
chk_realloc, chk_strdup, num, c_num, string, mkstring, mkustring,
upcase_str, downcase_str, string_extend, sub_str, cat_str, trim_str,
c_chr, vector, vec_set_length, copy_vec, sub_vec, cat_vec,
cobj_print_op, obj_init): Likewise.

* match.c (do_match_line, hv_trampoline, match_files, dir_tables_init):
Likewise.

* parser.l (grammar): Likewise.

* parser.y (parse): Likewise.

* rand.c (make_state, make_random_state, random_fixnum, random):
Likewise.

* regex.c (CHAR_SET_L2_LO, CHAR_SET_L2_HI, CHAR_SET_L1_LO,
CHAR_SET_L1_HI, CHAR_SET_L0_LO, CHAR_SET_L0_HI, L0_full, L0_fill_range,
L1_full, L1_fill_range, L1_contains, L1_free, L2_full, L2_fill_range,
L2_contains, L2_free, L3_fill_range, L3_contains, L3_free,
char_set_create, char_set_cobj_destroy, nfa_state_accept,
nfa_state_empty, nfa_state_single, nfa_state_wild, nfa_state_set,

1 files changed, 7 insertions, 7 deletions

diff --git a/syslog.c b/syslog.c
index 22263e40..f5f13dda 100644
--- a/syslog.c
+++ b/syslog.c
@@ -115,13 +115,13 @@ val closelog_wrap(void)
 
 static void syslog_mark(val stream)
 {
-  val stuff = (val) stream->co.handle;
+  val stuff = coerce(val, stream->co.handle);
   gc_mark(stuff);
 }
 
 static val syslog_put_string(val stream, val str)
 {
-  val cell = (val) stream->co.handle;
+  val cell = coerce(val, stream->co.handle);
   cons_bind (prio, strstream, cell);
 
   for (;;) {
@@ -147,7 +147,7 @@ static val syslog_put_string(val stream, val str)
 
 static val syslog_put_char(val stream, val ch)
 {
-  val cell = (val) stream->co.handle;
+  val cell = coerce(val, stream->co.handle);
   cons_bind (prio, strstream, cell);
 
   if (ch == chr('\n')) {
@@ -163,7 +163,7 @@ static val syslog_put_char(val stream, val ch)
 
 static val syslog_put_byte(val stream, int ch)
 {
-  val cell = (val) stream->co.handle;
+  val cell = coerce(val, stream->co.handle);
   cons_bind (prio, strstream, cell);
 
   if (ch == '\n') {
@@ -180,7 +180,7 @@ static val syslog_put_byte(val stream, int ch)
 static val syslog_get_prop(val stream, val ind)
 {
   if (ind == prio_k) {
-    val cell = (val) stream->co.handle;
+    val cell = coerce(val, stream->co.handle);
     return car(cell);
   } else if (ind == name_k) {
     return lit("syslog");
@@ -191,7 +191,7 @@ static val syslog_get_prop(val stream, val ind)
 static val syslog_set_prop(val stream, val ind, val prop)
 {
   if (ind == prio_k) {
-    val cell = (val) stream->co.handle;
+    val cell = coerce(val, stream->co.handle);
     set(car_l(cell), prop);
     return t;
   }
@@ -221,6 +221,6 @@ static struct strm_ops syslog_strm_ops = {
 
 val make_syslog_stream(val prio)
 {
-  return cobj((mem_t *) cons(prio, make_string_output_stream()), 
+  return cobj(coerce(mem_t *, cons(prio, make_string_output_stream())),
               stream_s, &syslog_strm_ops.cobj_ops);
 }