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

(scm_c_read_string): Renamed from

Browse source 
scm_read_0str.  Also, added "const" qualifier to argument.
(scm_c_eval_string): Renamed from scm_eval_0str.
(scm_read_0str, scm_eval_0str): Deprecated.
This commit is contained in:
Marius Vollmer 2001-06-29 23:13:14 +00:00
parent 296d257ebf
commit ca13a04a26
2 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libguile/strports.c
View file

@ -59,6 +59,7 @@
#include "libguile/strings.h"
#include "libguile/modules.h"
#include "libguile/validate.h"
#include "libguile/deprecation.h"
#include "libguile/strports.h"
@ -428,12 +429,12 @@ SCM_DEFINE (scm_get_output_string, "get-output-string", 1, 0, 0,
/* Given a null-terminated string EXPR containing a Scheme expression
read it, and return it as an SCM value. */
SCM
scm_read_0str (char *expr)
scm_c_read_string (const char *expr)
{
SCM port = scm_mkstrport (SCM_INUM0,
scm_makfrom0str (expr),
SCM_OPN | SCM_RDNG,
"scm_eval_0str");
"scm_c_read_string");
SCM form;
/* Read expressions from that port; ignore the values. */
@ -446,11 +447,33 @@ scm_read_0str (char *expr)
/* Given a null-terminated string EXPR containing Scheme program text,
evaluate it, and return the result of the last expression evaluated. */
SCM
scm_eval_0str (const char *expr)
scm_c_eval_string (const char *expr)
{
return scm_eval_string (scm_makfrom0str (expr));
}
#if SCM_DEBUG_DEPRECATED == 0
SCM
scm_read_0str (char *expr)
{
scm_c_issue_deprecation_warning
("scm_read_0str is deprecated. Use scm_c_read_string instead.");
return scm_read_0str (expr);
}
SCM
scm_eval_0str (const char *expr)
{
scm_c_issue_deprecation_warning
("scm_eval_0str is deprecated. Use scm_c_eval_string instead.");
return scm_eval_0str (expr);
}
#endif
static SCM
inner_eval_string (void *data)
{
@ -479,7 +502,7 @@ SCM_DEFINE (scm_eval_string, "eval-string", 1, 0, 0,
#define FUNC_NAME s_scm_eval_string
{
SCM port = scm_mkstrport (SCM_INUM0, string, SCM_OPN | SCM_RDNG,
"scm_eval_0str");
"eval-string");
return scm_c_call_with_current_module (scm_interaction_environment (),
inner_eval_string, (void *)port);
}

6
libguile/strports.h
View file

@ -72,14 +72,16 @@ extern SCM scm_call_with_input_string (SCM str, SCM proc);
extern SCM scm_open_input_string (SCM str);
extern SCM scm_open_output_string (void);
extern SCM scm_get_output_string (SCM port);
extern SCM scm_read_0str (char *expr);
extern SCM scm_eval_0str (const char *expr);
extern SCM scm_c_read_string (const char *expr);
extern SCM scm_c_eval_string (const char *expr);
extern SCM scm_eval_string (SCM string);
extern void scm_init_strports (void);
#if (SCM_DEBUG_DEPRECATED == 0)
extern SCM scm_strprint_obj (SCM obj);
extern SCM scm_read_0str (char *expr);
extern SCM scm_eval_0str (const char *expr);
#endif /* SCM_DEBUG_DEPRECATED == 0 */