mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-06 07:30:28 +02:00
Code Activity

remove deprecated functions from unif.c

Browse source 
* libguile/unif.h:
* libguile/unif.c: Remove deprecated functions.

* module/ice-9/deprecated.scm: Remove array-related deprecated
  functions.

* NEWS: Update.
This commit is contained in:
Andy Wingo 2009-07-16 21:51:47 +02:00
parent 3b0b6bc1dd
commit 86d88a223c
4 changed files with 36 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

92
NEWS
View file

@ -8,73 +8,25 @@ Please send Guile bug reports to bug-guile@gnu.org.
(During the 1.9 series, we will keep an incremental NEWS for the latest (During the 1.9 series, we will keep an incremental NEWS for the latest
prerelease, and a full NEWS corresponding to 1.8 -> 2.0.) prerelease, and a full NEWS corresponding to 1.8 -> 2.0.)
Changes in 1.9.1 (since the 1.9.0 prerelease): Changes in 1.9.2 (since the 1.9.1 prerelease):
** `scm_set_port_seek' and `scm_set_port_truncate' use the `scm_t_off' type ** Removed deprecated uniform array procedures: scm_make_uve,
scm_array_prototype, scm_list_to_uniform_array,
scm_dimensions_to_uniform_array, scm_make_ra, scm_shap2ra, scm_cvref,
scm_ra_set_contp, scm_aind, scm_raprin1
Previously they would use the `off_t' type, which is fragile since its These functions have been deprecated since early 2005.
definition depends on the application's value for `_FILE_OFFSET_BITS'.
** Automatically compiled files will be placed in ~/.cache, not ~/.guile-ccache. ** scm_array_p has one argument, not two
Actually, they will be placed in $XDG_CACHE_HOME/guile/ccache/1.9, Use of the second argument produced a deprecation warning, so it is
defaulting to XDG_CACHE_HOME=~/.cache. Users may remove their unlikely that any code out there actually used this functionality.
~/.guile-ccache directories.
** New language: Brainfuck. ** Removed deprecated uniform array procedures:
dimensions->uniform-array, list->uniform-array, array-prototype
Brainfuck is a toy language that closely models Turing machines. Guile's Instead, use make-typed-array, list->typed-array, or array-type,
brainfuck compiler is meant to be an example of implementing other respectively.
languages. See the manual for details, or
http://en.wikipedia.org/wiki/Brainfuck for more information about the
Brainfuck language itself.
** A number of Scheme files were corrected to be LGPLv3+.
Some Scheme files imported for the compiler were erroneously labeled as
being LGPLv2+ or GPLv2+. This oversight has been fixed.
** Bytevectors may now be accessed with a C-friendly API.
New functions: `scm_is_bytevector ()', `scm_c_bytevector_length ()',
`scm_c_bytevector_length ()', and `scm_c_bytevector_set_x ()'. See the
manual for details.
** Bytevectors are now accessible using the generalized-vector API.
As a side effect, this change allows compilation of literal bytevectors
(`#vu8(...)').
** Meta-commands to the REPL work better with strange languages.
Specifically, meta-commands that take expressions as arguments will use
the current language's reader to read those expressions, which may span
multiple lines, with readline integration if the user has that enabled.
** The object code file format has changed.
The objcode loader will complain about a "bad header cookie" if it
happens to find an old file. The workaround for that is currently to
find all stale .go files and remove them. This is likely to affect users
who have checked out Guile's git repository, not those that build from
tarballs.
** Vector access has been sped up considerably.
Guile's virtual machine now has vector and bytevector operations. Using
Guile to process large amounts of data is now easier. This is because
`vector-ref' and `vector-set!' now have fast opcodes. In addition, there
are opcodes for `ref' and `set' operations on bytevectors for everything
from 8-bit integers to 64-bit floating-point values.
In the next release, we hope to extend this speedup to other kinds of
uniform vectors.
** The `long_long' C type, deprecated in 1.8, has been removed.
** And of course, the usual collection of bugfixes.
Interested users should see the ChangeLog for more information.
Changes in 1.9.x (since the 1.8.x series): Changes in 1.9.x (since the 1.8.x series):
@ -569,6 +521,12 @@ the variable. This was an error, and was fixed.
As syntax-case is available by default, importing `(ice-9 syncase)' has As syntax-case is available by default, importing `(ice-9 syncase)' has
no effect, and will trigger a deprecation warning. no effect, and will trigger a deprecation warning.
** Removed deprecated uniform array procedures:
dimensions->uniform-array, list->uniform-array, array-prototype
Instead, use make-typed-array, list->typed-array, or array-type,
respectively.
* Changes to the C interface * Changes to the C interface
** The GH interface (deprecated in version 1.6, 2001) was removed. ** The GH interface (deprecated in version 1.6, 2001) was removed.
@ -597,6 +555,18 @@ definition depends on the application's value for `_FILE_OFFSET_BITS'.
** The `long_long' C type, deprecated in 1.8, has been removed ** The `long_long' C type, deprecated in 1.8, has been removed
** Removed deprecated uniform array procedures: scm_make_uve,
scm_array_prototype, scm_list_to_uniform_array,
scm_dimensions_to_uniform_array, scm_make_ra, scm_shap2ra, scm_cvref,
scm_ra_set_contp, scm_aind, scm_raprin1
These functions have been deprecated since early 2005.
** scm_array_p has one argument, not two
Use of the second argument produced a deprecation warning, so it is
unlikely that any code out there actually used this functionality.
* Changes to the distribution * Changes to the distribution
** Guile's license is now LGPLv3+ ** Guile's license is now LGPLv3+

336
libguile/unif.c
View file

@ -49,7 +49,6 @@
#include "libguile/vectors.h" #include "libguile/vectors.h"
#include "libguile/bytevectors.h" #include "libguile/bytevectors.h"
#include "libguile/list.h" #include "libguile/list.h"
#include "libguile/deprecation.h"
#include "libguile/dynwind.h" #include "libguile/dynwind.h"
#include "libguile/validate.h" #include "libguile/validate.h"
@ -146,114 +145,6 @@ make_typed_vector (SCM type, size_t len)
return creator (scm_from_size_t (len), SCM_UNDEFINED); return creator (scm_from_size_t (len), SCM_UNDEFINED);
} }
#if SCM_ENABLE_DEPRECATED
SCM_SYMBOL (scm_sym_s, "s");
SCM_SYMBOL (scm_sym_l, "l");
static int
singp (SCM obj)
{
if (!SCM_REALP (obj))
return 0;
else
{
double x = SCM_REAL_VALUE (obj);
float fx = x;
return (- SCM_FLTMAX < x) && (x < SCM_FLTMAX) && (fx == x);
}
}
SCM_API int scm_i_inump (SCM obj);
SCM_API scm_t_signed_bits scm_i_inum (SCM obj);
static SCM
prototype_to_type (SCM proto)
{
const char *type_name;
if (scm_is_eq (proto, SCM_BOOL_T))
type_name = "b";
else if (scm_is_eq (proto, SCM_MAKE_CHAR (0)))
type_name = "s8";
else if (SCM_CHARP (proto))
type_name = "a";
else if (scm_i_inump (proto))
{
if (scm_i_inum (proto) > 0)
type_name = "u32";
else
type_name = "s32";
}
else if (scm_is_eq (proto, scm_sym_s))
type_name = "s16";
else if (scm_is_eq (proto, scm_sym_l))
type_name = "s64";
else if (SCM_REALP (proto)
|| scm_is_true (scm_eqv_p (proto,
scm_divide (scm_from_int (1),
scm_from_int (3)))))
{
if (singp (proto))
type_name = "f32";
else
type_name = "f64";
}
else if (SCM_COMPLEXP (proto))
type_name = "c64";
else if (scm_is_null (proto))
type_name = NULL;
else
type_name = NULL;
if (type_name)
return scm_from_locale_symbol (type_name);
else
return SCM_BOOL_T;
}
static SCM
scm_i_get_old_prototype (SCM uvec)
{
if (scm_is_bitvector (uvec))
return SCM_BOOL_T;
else if (scm_is_string (uvec))
return SCM_MAKE_CHAR ('a');
else if (scm_is_true (scm_s8vector_p (uvec)))
return SCM_MAKE_CHAR ('\0');
else if (scm_is_true (scm_s16vector_p (uvec)))
return scm_sym_s;
else if (scm_is_true (scm_u32vector_p (uvec)))
return scm_from_int (1);
else if (scm_is_true (scm_s32vector_p (uvec)))
return scm_from_int (-1);
else if (scm_is_true (scm_s64vector_p (uvec)))
return scm_sym_l;
else if (scm_is_true (scm_f32vector_p (uvec)))
return scm_from_double (1.0);
else if (scm_is_true (scm_f64vector_p (uvec)))
return scm_divide (scm_from_int (1), scm_from_int (3));
else if (scm_is_true (scm_c64vector_p (uvec)))
return scm_c_make_rectangular (0, 1);
else if (scm_is_vector (uvec))
return SCM_EOL;
else
scm_misc_error (NULL, "~a has no prototype", scm_list_1 (uvec));
}
SCM
scm_make_uve (long k, SCM prot)
#define FUNC_NAME "scm_make_uve"
{
scm_c_issue_deprecation_warning
("`scm_make_uve' is deprecated, see the manual for alternatives.");
return make_typed_vector (prototype_to_type (prot), k);
}
#undef FUNC_NAME
#endif
int int
scm_is_array (SCM obj) scm_is_array (SCM obj)
{ {
@ -523,55 +414,21 @@ scm_array_handle_writable_elements (scm_t_array_handle *h)
scm_wrong_type_arg_msg (NULL, 0, h->array, "non-uniform array"); scm_wrong_type_arg_msg (NULL, 0, h->array, "non-uniform array");
} }
#if SCM_ENABLE_DEPRECATED
SCM_DEFINE (scm_array_p, "array?", 1, 1, 0,
(SCM obj, SCM prot),
"Return @code{#t} if the @var{obj} is an array, and @code{#f} if\n"
"not.")
#define FUNC_NAME s_scm_array_p
{
if (!SCM_UNBNDP (prot))
{
scm_c_issue_deprecation_warning
("Using prototypes with `array?' is deprecated."
" Use `typed-array?' instead.");
return scm_typed_array_p (obj, prototype_to_type (prot));
}
else
return scm_from_bool (scm_is_array (obj));
}
#undef FUNC_NAME
#else /* !SCM_ENABLE_DEPRECATED */
/* We keep the old 2-argument C prototype for a while although the old /* We keep the old 2-argument C prototype for a while although the old
PROT argument is always ignored now. C code should probably use PROT argument is always ignored now. C code should probably use
scm_is_array or scm_is_typed_array anyway. scm_is_array or scm_is_typed_array anyway.
*/ */
static SCM scm_i_array_p (SCM obj); SCM_DEFINE (scm_array_p, "array?", 1, 0, 0,
SCM_DEFINE (scm_i_array_p, "array?", 1, 0, 0,
(SCM obj), (SCM obj),
"Return @code{#t} if the @var{obj} is an array, and @code{#f} if\n" "Return @code{#t} if the @var{obj} is an array, and @code{#f} if\n"
"not.") "not.")
#define FUNC_NAME s_scm_i_array_p #define FUNC_NAME s_scm_array_p
{ {
return scm_from_bool (scm_is_array (obj)); return scm_from_bool (scm_is_array (obj));
} }
#undef FUNC_NAME #undef FUNC_NAME
SCM
scm_array_p (SCM obj, SCM prot)
{
return scm_from_bool (scm_is_array (obj));
}
#endif /* !SCM_ENABLE_DEPRECATED */
SCM_DEFINE (scm_typed_array_p, "typed-array?", 2, 0, 0, SCM_DEFINE (scm_typed_array_p, "typed-array?", 2, 0, 0,
(SCM obj, SCM type), (SCM obj, SCM type),
"Return @code{#t} if the @var{obj} is an array of type\n" "Return @code{#t} if the @var{obj} is an array of type\n"
@ -856,41 +713,6 @@ SCM_DEFINE (scm_make_array, "make-array", 1, 0, 1,
} }
#undef FUNC_NAME #undef FUNC_NAME
#if SCM_ENABLE_DEPRECATED
SCM_DEFINE (scm_dimensions_to_uniform_array, "dimensions->uniform-array", 2, 1, 0,
(SCM dims, SCM prot, SCM fill),
"@deffnx {Scheme Procedure} make-uniform-vector length prototype [fill]\n"
"Create and return a uniform array or vector of type\n"
"corresponding to @var{prototype} with dimensions @var{dims} or\n"
"length @var{length}. If @var{fill} is supplied, it's used to\n"
"fill the array, otherwise @var{prototype} is used.")
#define FUNC_NAME s_scm_dimensions_to_uniform_array
{
scm_c_issue_deprecation_warning
("`dimensions->uniform-array' is deprecated. "
"Use `make-typed-array' instead.");
if (scm_is_integer (dims))
dims = scm_list_1 (dims);
if (SCM_UNBNDP (fill))
{
/* Using #\nul as the prototype yields a s8 array, but numeric
arrays can't store characters, so we have to special case this.
*/
if (scm_is_eq (prot, SCM_MAKE_CHAR (0)))
fill = scm_from_int (0);
else
fill = prot;
}
return scm_make_typed_array (prototype_to_type (prot), fill, dims);
}
#undef FUNC_NAME
#endif
static void static void
scm_i_ra_set_contp (SCM ra) scm_i_ra_set_contp (SCM ra)
{ {
@ -2516,28 +2338,6 @@ l2ra (SCM lst, scm_t_array_handle *handle, ssize_t pos, size_t k)
} }
} }
#if SCM_ENABLE_DEPRECATED
SCM_DEFINE (scm_list_to_uniform_array, "list->uniform-array", 3, 0, 0,
(SCM ndim, SCM prot, SCM lst),
"Return a uniform array of the type indicated by prototype\n"
"@var{prot} with elements the same as those of @var{lst}.\n"
"Elements must be of the appropriate type, no coercions are\n"
"done.\n"
"\n"
"The argument @var{ndim} determines the number of dimensions\n"
"of the array. It is either an exact integer, giving the\n"
"number directly, or a list of exact integers, whose length\n"
"specifies the number of dimensions and each element is the\n"
"lower index bound of its dimension.")
#define FUNC_NAME s_scm_list_to_uniform_array
{
return scm_list_to_typed_array (prototype_to_type (prot), ndim, lst);
}
#undef FUNC_NAME
#endif
/* Print dimension DIM of ARRAY. /* Print dimension DIM of ARRAY.
*/ */
@ -2672,52 +2472,6 @@ scm_i_print_enclosed_array (SCM array, SCM port, scm_print_state *pstate)
static SCM static SCM
tag_to_type (const char *tag, SCM port) tag_to_type (const char *tag, SCM port)
{ {
#if SCM_ENABLE_DEPRECATED
{
/* Recognize the old syntax.
*/
const char *instead;
switch (tag[0])
{
case 'u':
instead = "u32";
break;
case 'e':
instead = "s32";
break;
case 's':
instead = "f32";
break;
case 'i':
instead = "f64";
break;
case 'y':
instead = "s8";
break;
case 'h':
instead = "s16";
break;
case 'l':
instead = "s64";
break;
case 'c':
instead = "c64";
break;
default:
instead = NULL;
break;
}
if (instead && tag[1] == '\0')
{
scm_c_issue_deprecation_warning_fmt
("The tag '%c' is deprecated for uniform vectors. "
"Use '%s' instead.", tag[0], instead);
return scm_from_locale_symbol (instead);
}
}
#endif
if (*tag == '\0') if (*tag == '\0')
return SCM_BOOL_T; return SCM_BOOL_T;
else else
@ -2897,28 +2651,6 @@ SCM_DEFINE (scm_array_type, "array-type", 1, 0, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
#if SCM_ENABLE_DEPRECATED
SCM_DEFINE (scm_array_prototype, "array-prototype", 1, 0, 0,
(SCM ra),
"Return an object that would produce an array of the same type\n"
"as @var{array}, if used as the @var{prototype} for\n"
"@code{make-uniform-array}.")
#define FUNC_NAME s_scm_array_prototype
{
if (SCM_I_ARRAYP (ra))
return scm_i_get_old_prototype (SCM_I_ARRAY_V (ra));
else if (scm_is_generalized_vector (ra))
return scm_i_get_old_prototype (ra);
else if (SCM_I_ENCLOSED_ARRAYP (ra))
return SCM_UNSPECIFIED;
else
scm_wrong_type_arg_msg (NULL, 0, ra, "array");
}
#undef FUNC_NAME
#endif
static SCM static SCM
array_mark (SCM ptr) array_mark (SCM ptr)
{ {
@ -2935,70 +2667,6 @@ array_free (SCM ptr)
return 0; return 0;
} }
#if SCM_ENABLE_DEPRECATED
SCM
scm_make_ra (int ndim)
{
scm_c_issue_deprecation_warning
("scm_make_ra is deprecated. Use scm_make_array or similar instead.");
return scm_i_make_ra (ndim, 0);
}
SCM
scm_shap2ra (SCM args, const char *what)
{
scm_c_issue_deprecation_warning
("scm_shap2ra is deprecated. Use scm_make_array or similar instead.");
return scm_i_shap2ra (args);
}
SCM
scm_cvref (SCM v, unsigned long pos, SCM last)
{
scm_c_issue_deprecation_warning
("scm_cvref is deprecated. Use scm_c_generalized_vector_ref instead.");
return scm_c_generalized_vector_ref (v, pos);
}
void
scm_ra_set_contp (SCM ra)
{
scm_c_issue_deprecation_warning
("scm_ra_set_contp is deprecated. There should be no need for it.");
scm_i_ra_set_contp (ra);
}
long
scm_aind (SCM ra, SCM args, const char *what)
{
scm_t_array_handle handle;
ssize_t pos;
scm_c_issue_deprecation_warning
("scm_aind is deprecated. Use scm_array_handle_pos instead.");
if (scm_is_integer (args))
args = scm_list_1 (args);
scm_array_get_handle (ra, &handle);
pos = scm_array_handle_pos (&handle, args) + SCM_I_ARRAY_BASE (ra);
scm_array_handle_release (&handle);
return pos;
}
int
scm_raprin1 (SCM exp, SCM port, scm_print_state *pstate)
{
scm_c_issue_deprecation_warning
("scm_raprin1 is deprecated. Use scm_display or scm_write instead.");
scm_iprin1 (exp, port, pstate);
return 1;
}
#endif
void void
scm_init_unif () scm_init_unif ()
{ {

21
libguile/unif.h
View file

@ -3,7 +3,7 @@
#ifndef SCM_UNIF_H #ifndef SCM_UNIF_H
#define SCM_UNIF_H #define SCM_UNIF_H
/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008 Free Software Foundation, Inc. /* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -42,7 +42,7 @@ typedef struct scm_t_array_dim
ssize_t inc; ssize_t inc;
} scm_t_array_dim; } scm_t_array_dim;
SCM_API SCM scm_array_p (SCM v, SCM prot); SCM_API SCM scm_array_p (SCM v);
SCM_API SCM scm_typed_array_p (SCM v, SCM type); SCM_API SCM scm_typed_array_p (SCM v, SCM type);
SCM_API SCM scm_make_array (SCM fill, SCM bounds); SCM_API SCM scm_make_array (SCM fill, SCM bounds);
SCM_API SCM scm_make_typed_array (SCM type, SCM fill, SCM bounds); SCM_API SCM scm_make_typed_array (SCM type, SCM fill, SCM bounds);
@ -170,23 +170,6 @@ SCM_INTERNAL SCM scm_i_make_ra (int ndim, int enclosed);
SCM_INTERNAL SCM scm_i_cvref (SCM v, size_t p, int enclosed); SCM_INTERNAL SCM scm_i_cvref (SCM v, size_t p, int enclosed);
SCM_INTERNAL SCM scm_i_read_array (SCM port, int c); SCM_INTERNAL SCM scm_i_read_array (SCM port, int c);
/* deprecated. */
#if SCM_ENABLE_DEPRECATED
SCM_API SCM scm_make_uve (long k, SCM prot);
SCM_API SCM scm_array_prototype (SCM ra);
SCM_API SCM scm_list_to_uniform_array (SCM ndim, SCM prot, SCM lst);
SCM_API SCM scm_dimensions_to_uniform_array (SCM dims, SCM prot, SCM fill);
SCM_API SCM scm_make_ra (int ndim);
SCM_API SCM scm_shap2ra (SCM args, const char *what);
SCM_API SCM scm_cvref (SCM v, unsigned long pos, SCM last);
SCM_API void scm_ra_set_contp (SCM ra);
SCM_API long scm_aind (SCM ra, SCM args, const char *what);
SCM_API int scm_raprin1 (SCM exp, SCM port, scm_print_state *pstate);
#endif
SCM_INTERNAL void scm_init_unif (void); SCM_INTERNAL void scm_init_unif (void);
#endif /* SCM_UNIF_H */ #endif /* SCM_UNIF_H */

12
module/ice-9/deprecated.scm
View file

@ -1,4 +1,4 @@
;;;; Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc. ;;;; Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -169,16 +169,6 @@
;; The strange prototype system for uniform arrays has been ;; The strange prototype system for uniform arrays has been
;; deprecated. ;; deprecated.
(define uniform-vector-fill! array-fill!)
(define make-uniform-vector dimensions->uniform-array)
(define (make-uniform-array prot . bounds)
(dimensions->uniform-array bounds prot))
(define (list->uniform-vector prot lst)
(list->uniform-array 1 prot lst))
(define-macro (eval-case . clauses) (define-macro (eval-case . clauses)
(issue-deprecation-warning (issue-deprecation-warning
"`eval-case' is deprecated. Use `eval-when' instead.") "`eval-case' is deprecated. Use `eval-when' instead.")