mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

Remove traces of 'scm_memory_error'.

Browse source 
'scm_memory_error' was deprecated in 2014 in commit
c2247b782a and removed in 2017 in commit
c248ea10be.  This is a followup.

* libguile/error.h (SCM_MEMORY_ERROR): Remove.
* doc/guile-api.alist: Remove 'scm_memory_error'.
* doc/ref/api-control.texi (Handling Errors): Likewise.
(Dynamic Wind): Use 'scm_misc_error' instead of 'scm_memory_error'.
This commit is contained in:
Ludovic Courtès 2020-02-10 00:10:10 +01:00
parent 43cfae3634
commit 1a3e316c32
3 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/guile-api.alist
View file

@ -2263,7 +2263,6 @@
(scm_memoized_environment (groups scm C) (scan-data T))
(scm_memoized_p (groups scm C) (scan-data T))
(scm_memory_alloc_key (groups scm C) (scan-data B))
(scm_memory_error (groups scm C) (scan-data T))
(scm_memq (groups scm C) (scan-data T))
(scm_memv (groups scm C) (scan-data T))
(scm_merge (groups scm C) (scan-data T))

3
doc/ref/api-control.texi
View file

@ -1669,7 +1669,7 @@ scm_foo (SCM s1, SCM s2)
c_res = foo (c_s1, c_s2);
if (c_res == NULL)
scm_memory_error ("foo");
scm_misc_error ("foo", "out of memory!", SCM_EOL);
scm_dynwind_end ();
@ -2288,7 +2288,6 @@ and the call to these routines doesn't change @code{errno}.
@deftypefnx {C Function} void scm_wrong_num_args (SCM @var{proc})
@deftypefnx {C Function} void scm_wrong_type_arg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value})
@deftypefnx {C Function} void scm_wrong_type_arg_msg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value}, const char *@var{expected})
@deftypefnx {C Function} void scm_memory_error (char *@var{subr})
@deftypefnx {C Function} void scm_misc_error (const char *@var{subr}, const char *@var{message}, SCM @var{args})
Throw an error with the various keys described above.

4
libguile/error.h
View file

@ -1,7 +1,7 @@
#ifndef SCM_ERROR_H
#define SCM_ERROR_H
/* Copyright 1995-1998,2000-2002,2006,2008,2011,2014,2018
/* Copyright 1995-1998,2000-2002,2006,2008,2011,2014,2018,2020
Free Software Foundation, Inc.
This file is part of Guile.
@ -111,8 +111,6 @@ SCM_INTERNAL void scm_init_error (void);
#define SCM_SYSERROR do { scm_syserror (FUNC_NAME); } while (0)
#define SCM_MEMORY_ERROR do { scm_memory_error (FUNC_NAME); } while (0)
#define SCM_SYSERROR_MSG(str, args, val) \
do { scm_syserror_msg (FUNC_NAME, (str), (args), (val)); } while (0)