From 9f158a44b7e88c1dcfb8d56f4f85d642fc423b59 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Fri, 17 Oct 2014 08:17:49 -0700
Subject: Purge stray occurrences of "void *" from code base.

* lib.c (cobj_print_op): In the format call, cast
the C pointer to val, since the ~p conversion now
takes a val rather than void *.
(cptr_equal_op, obj_print, obj_pprint): Remove cast to
void *, since obj now already has the type that ~p expects.

* lib.h (struct any): Use mem_t * instead of void *.

* parser.h (yyscan_t): Repeat the definition from inside
the Flex-generated lex.yy.c.
(yylex_init, yylex_destroy, yyget_extra, yyset_extra): Re-declare
using yyscan_t typedef in place of void *.

* parser.l (yyget_column, yyerrprepf): Re-declare using yyscan_t.
(grammar): Use yyg in place of yyscanner in calls to yyerrprepf.

* parser.y (yylex, %lex-param): Use yyscan_t instead of void *.
(parse): Use yyscan_t for local variable.

* signal.c (stack): Change type from void * to mem_t *.

* stream.c (vformat): Conversion specifier p extracts val
instead of void *.
(run): Use casts that only remove const, not all the way to void *.

* txr.1: Documented p conversion specifier of format.

* Makefile (OBJS-y): Initialize with := to make sure it is a
simple variable, and not a macro.
(SRCS): New variable, listing source files.
(enforce): New rule for enforcing coding conventions.
Currently checks for void * occurrences.
---
 lib.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib.c')

diff --git a/lib.c b/lib.c
index 4b929c97..33717864 100644
--- a/lib.c
+++ b/lib.c
@@ -5177,7 +5177,7 @@ void cobj_print_op(val obj, val out)
 {
   put_string(lit("#<"), out);
   obj_print(obj->co.cls, out);
-  format(out, lit(": ~p>"), obj->co.handle, nao);
+  format(out, lit(": ~p>"), (val) obj->co.handle, nao);
 }
 
 static val cptr_equal_op(val left, val right)
@@ -6555,11 +6555,11 @@ finish:
     obj->co.ops->print(obj, out);
     return obj;
   case ENV:
-    format(out, lit("#<environment: ~p>"), (void *) obj, nao);
+    format(out, lit("#<environment: ~p>"), obj, nao);
     return obj;
   }
 
-  format(out, lit("#<garbage: ~p>"), (void *) obj, nao);
+  format(out, lit("#<garbage: ~p>"), obj, nao);
   return obj;
 }
 
@@ -6686,11 +6686,11 @@ finish:
     obj->co.ops->print(obj, out);
     return obj;
   case ENV:
-    format(out, lit("#<environment: ~p>"), (void *) obj, nao);
+    format(out, lit("#<environment: ~p>"), obj, nao);
     return obj;
   }
 
-  format(out, lit("#<garbage: ~p>"), (void *) obj, nao);
+  format(out, lit("#<garbage: ~p>"), obj, nao);
   return obj;
 }
 
-- 
cgit v1.2.3