[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
guile/guile-core/libguile strports.h strports.c
From: |
Marius Vollmer |
Subject: |
guile/guile-core/libguile strports.h strports.c |
Date: |
Fri, 29 Jun 2001 16:13:15 -0700 |
CVSROOT: /cvs
Module name: guile
Changes by: Marius Vollmer <address@hidden> 01/06/29 16:13:14
Modified files:
guile-core/libguile: strports.h strports.c
Log message:
(scm_c_read_string): Renamed from
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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/strports.h.diff?cvsroot=OldCVS&tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/strports.c.diff?cvsroot=OldCVS&tr1=1.81&tr2=1.82&r1=text&r2=text
Patches:
Index: guile/guile-core/libguile/strports.c
diff -u guile/guile-core/libguile/strports.c:1.81
guile/guile-core/libguile/strports.c:1.82
--- guile/guile-core/libguile/strports.c:1.81 Tue Jun 26 08:46:40 2001
+++ guile/guile-core/libguile/strports.c Fri Jun 29 16:13:14 2001
@@ -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 @@
/* 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 @@
/* 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 @@
#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);
}
Index: guile/guile-core/libguile/strports.h
diff -u guile/guile-core/libguile/strports.h:1.19
guile/guile-core/libguile/strports.h:1.20
--- guile/guile-core/libguile/strports.h:1.19 Thu Jun 14 12:50:43 2001
+++ guile/guile-core/libguile/strports.h Fri Jun 29 16:13:14 2001
@@ -72,14 +72,16 @@
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 */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- guile/guile-core/libguile strports.h strports.c,
Marius Vollmer <=