X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/a3e923770ef0e491b58aaac94413cba893eebcfc..a587d6a97338a0fd62173e60581ff07f55ec2042:/libguile/deprecated.h diff --git a/libguile/deprecated.h b/libguile/deprecated.h index 5570a4386..b9ea5792b 100644 --- a/libguile/deprecated.h +++ b/libguile/deprecated.h @@ -5,7 +5,7 @@ #ifndef SCM_DEPRECATED_H #define SCM_DEPRECATED_H -/* Copyright (C) 2003,2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2003,2004, 2005, 2006, 2007, 2009, 2010 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 @@ -24,7 +24,6 @@ */ #include "libguile/__scm.h" -#include "libguile/arrays.h" #include "libguile/strings.h" #include "libguile/eval.h" @@ -172,16 +171,6 @@ SCM_DEPRECATED SCM scm_read_and_eval_x (SCM port); #define SCM_SUBR_DOC(x) SCM_BOOL_F -SCM_DEPRECATED SCM scm_make_subr (const char *name, int type, SCM (*fcn) ()); -SCM_DEPRECATED SCM scm_make_subr_with_generic (const char *name, - int type, - SCM (*fcn) (), - SCM *gf); -SCM_DEPRECATED SCM scm_make_subr_opt (const char *name, - int type, - SCM (*fcn) (), - int set); - SCM_DEPRECATED SCM scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(), void * closure); @@ -240,11 +229,8 @@ SCM_DEPRECATED SCM scm_gentemp (SCM prefix, SCM obarray); #define scm_option scm_t_option #define scm_srcprops scm_t_srcprops #define scm_srcprops_chunk scm_t_srcprops_chunk -#define scm_info_frame scm_t_info_frame -#define scm_stack scm_t_stack #define scm_array scm_t_array #define scm_array_dim scm_t_array_dim -#define SCM_ARRAY_CONTIGUOUS SCM_ARRAY_FLAG_CONTIGUOUS #define SCM_FUNC_NAME (scm_makfrom0str (FUNC_NAME)) #define SCM_WTA(pos, scm) \ @@ -402,6 +388,14 @@ SCM_DEPRECATED char *scm_c_symbol2str (SCM obj, char *str, size_t *lenp); */ SCM_DEPRECATED double scm_truncate (double x); SCM_DEPRECATED double scm_round (double x); +/* Deprecated, use scm_expt */ +SCM_DEPRECATED SCM scm_sys_expt (SCM x, SCM y); + +/* if your platform doesn't have asinh et al */ +SCM_API double scm_asinh (double x); +SCM_API double scm_acosh (double x); +SCM_API double scm_atanh (double x); +SCM_API SCM scm_sys_atan2 (SCM z1, SCM z2); /* Deprecated because we don't want people to access the internal representation of strings directly. @@ -489,6 +483,15 @@ SCM_DEPRECATED scm_t_array_dim *scm_i_array_dims (SCM a); #define SCM_ARRAY_BASE(a) scm_i_array_base(a) #define SCM_ARRAY_DIMS(a) scm_i_array_dims(a) +SCM_DEPRECATED SCM scm_uniform_vector_read_x (SCM v, SCM port_or_fd, + SCM start, SCM end); +SCM_DEPRECATED SCM scm_uniform_vector_write (SCM v, SCM port_or_fd, + SCM start, SCM end); +SCM_DEPRECATED SCM scm_uniform_array_read_x (SCM ra, SCM port_or_fd, + SCM start, SCM end); +SCM_DEPRECATED SCM scm_uniform_array_write (SCM v, SCM port_or_fd, + SCM start, SCM end); + /* Deprecated because they should not be lvalues and we want people to use the official interfaces. */ @@ -499,7 +502,6 @@ SCM_DEPRECATED scm_t_array_dim *scm_i_array_dims (SCM a); #define scm_cur_loadp scm_i_cur_loadp () #define scm_progargs scm_i_progargs () #define scm_dynwinds scm_i_deprecated_dynwinds () -#define scm_last_debug_frame scm_i_deprecated_last_debug_frame () #define scm_stack_base scm_i_stack_base () SCM_DEPRECATED SCM scm_i_cur_inp (void); @@ -508,7 +510,6 @@ SCM_DEPRECATED SCM scm_i_cur_errp (void); SCM_DEPRECATED SCM scm_i_cur_loadp (void); SCM_DEPRECATED SCM scm_i_progargs (void); SCM_DEPRECATED SCM scm_i_deprecated_dynwinds (void); -SCM_DEPRECATED scm_t_debug_frame *scm_i_deprecated_last_debug_frame (void); SCM_DEPRECATED SCM_STACKITEM *scm_i_stack_base (void); /* Deprecated because it evaluates its argument twice. @@ -596,6 +597,35 @@ SCM_DEPRECATED scm_t_trampoline_1 scm_trampoline_1 (SCM proc); SCM_DEPRECATED scm_t_trampoline_2 scm_trampoline_2 (SCM proc); + +/* Deprecated 2009-12-06, use the procedures instead */ +#define SCM_PROCEDURE_WITH_SETTER_P(obj) (scm_is_true (scm_procedure_with_setter_p (obj))) +#define SCM_PROCEDURE(obj) SCM_STRUCT_PROCEDURE (obj, 0) +#define SCM_SETTER(obj) SCM_STRUCT_SETTER (obj, 1) + + + +/* Deprecated 2010-01-05, use SCM_PRIMITIVE_P instead */ +SCM_DEPRECATED int scm_i_subr_p (SCM x); +#define scm_subr_p(x) (scm_i_subr_p (x)) + + + +/* Deprecated 2010-01-31, use with-throw-handler instead */ +SCM_DEPRECATED SCM scm_lazy_catch (SCM tag, SCM thunk, SCM handler); +SCM_DEPRECATED SCM scm_internal_lazy_catch (SCM tag, + scm_t_catch_body body, + void *body_data, + scm_t_catch_handler handler, + void *handler_data); + + + +/* Deprecated 2010-03-31, use array-equal? instead */ +SCM_DEPRECATED SCM scm_raequal (SCM ra0, SCM ra1); + + + void scm_i_init_deprecated (void); #endif