diff options
author | Andy Wingo <wingo@pobox.com> | 2018-06-18 10:23:04 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2018-06-18 10:50:17 +0200 |
commit | 6f294ecc7522343be2774b18e2fe8e37ac58779c (patch) | |
tree | a564d7ff9c60443673167d6f8c913308a62f6c5b /libguile/ports.h | |
parent | 8a6f46ee96e0946e539e3a33c95c3228b63e9fb3 (diff) | |
download | guile-6f294ecc7522343be2774b18e2fe8e37ac58779c.tar.gz |
Devolve more validate macros
* libguile.h: Add chooks.h.
* libguile/Makefile.am: Add chooks.h and chooks.c.
* libguile/chooks.c:
* libguile/chooks.h: New files, for the C implementation of hooks.
Broken out to avoid cycles in gc.h includes.
* libguile/gc.h:
* libguile/gc.c (scm_i_gc_admin_mutex, scm_i_sweep_mutex): Remove unused
mutexes. Include chooks instead of hooks in the main header.
* libguile/deprecated.h (scm_gc_running_p): Deprecate this macro always
defined to 0.
(SCM_VALIDATE_VECTOR_OR_DVECTOR): Deprecate this weird one too.
* libguile/array-map.c: Add procs.h include.
* libguile/threads.h:
* libguile/vm.c:
* libguile/r6rs-ports.c: Add smob.h include.
* libguile/atomic.h (SCM_VALIDATE_ATOMIC_BOX): Devolve.
* libguile/deprecation.c (scm_c_issue_deprecation_warning): Remove use
of scm_gc_running_p.
* libguile/error.c (scm_error_scm): Remove use of scm_gc_running_p.
* libguile/filesys.h (SCM_VALIDATE_DIR)
* libguile/fluids.h (SCM_VALIDATE_FLUID)
* libguile/fports.h (SCM_VALIDATE_FPORT, SCM_VALIDATE_OPFPORT)
* libguile/generalized-arrays.h (SCM_VALIDATE_ARRAY)
* libguile/hooks.h (SCM_VALIDATE_HOOK)
* libguile/keywords.h (SCM_VALIDATE_KEYWORD)
* libguile/ports.h (SCM_VALIDATE_PORT, SCM_VALIDATE_INPUT_PORT)
(SCM_VALIDATE_OUTPUT_PORT, SCM_VALIDATE_OPINPORT)
(SCM_VALIDATE_OPENPORT, SCM_VALIDATE_OPPORT, SCM_VALIDATE_OPOUTPORT)
* libguile/procs.h (SCM_VALIDATE_PROC)
* libguile/random.h (SCM_VALIDATE_RSTATE)
* libguile/regex-posix.h (SCM_VALIDATE_RGXP)
* libguile/stacks.h (SCM_VALIDATE_STACK, SCM_VALIDATE_FRAME)
* libguile/strports.h (SCM_VALIDATE_OPOUTSTRPORT)
* libguile/struct.h (SCM_VALIDATE_STRUCT SCM_VALIDATE_VTABLE)
* libguile/symbols.h (SCM_VALIDATE_SYMBOL)
* libguile/variable.h (SCM_VALIDATE_VARIABLE)
* libguile/vectors.h (SCM_VALIDATE_VECTOR SCM_VALIDATE_VECTOR_LEN):
Devolve.
* libguile/validate.h: It's empty now!
hooks squish
Diffstat (limited to 'libguile/ports.h')
-rw-r--r-- | libguile/ports.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/libguile/ports.h b/libguile/ports.h index d131db5be..eb7c5e990 100644 --- a/libguile/ports.h +++ b/libguile/ports.h @@ -3,8 +3,8 @@ #ifndef SCM_PORTS_H #define SCM_PORTS_H -/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, - * 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. +/* Copyright (C) 1995-2001,2003-2004,2006,2008-2014,2018 + * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -87,6 +87,30 @@ typedef struct scm_t_port scm_t_port; #define SCM_PORT_TYPE(port) ((scm_t_port_type *) SCM_CELL_WORD_3 (port)) +#define SCM_VALIDATE_PORT(pos, port) \ + SCM_MAKE_VALIDATE_MSG (pos, port, PORTP, "port") + +#define SCM_VALIDATE_INPUT_PORT(pos, port) \ + SCM_MAKE_VALIDATE_MSG (pos, port, INPUT_PORT_P, "input port") + +#define SCM_VALIDATE_OUTPUT_PORT(pos, port) \ + SCM_MAKE_VALIDATE_MSG (pos, port, OUTPUT_PORT_P, "output port") + +#define SCM_VALIDATE_OPINPORT(pos, port) \ + SCM_MAKE_VALIDATE_MSG (pos, port, OPINPORTP, "open input port") + +#define SCM_VALIDATE_OPENPORT(pos, port) \ + do { \ + SCM_ASSERT (SCM_PORTP (port) && SCM_OPENP (port), \ + port, pos, FUNC_NAME); \ + } while (0) + +#define SCM_VALIDATE_OPPORT(pos, port) \ + SCM_MAKE_VALIDATE_MSG (pos, port, OPPORTP, "open port") + +#define SCM_VALIDATE_OPOUTPORT(pos, port) \ + SCM_MAKE_VALIDATE_MSG (pos, port, OPOUTPORTP, "open output port") + /* Port types, and their vtables. */ |