-/* Copyright (C) 1995,1996,1998,1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
- gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
#include "libguile/root.h"
#include "libguile/strings.h"
#include "libguile/modules.h"
+#include "libguile/validate.h"
+#include "libguile/deprecation.h"
#include "libguile/strports.h"
when rw_active is SCM_PORT_NEITHER.
*/
-
-static scm_bits_t scm_tc16_strport;
+scm_t_bits scm_tc16_strport;
static int
stfill_buffer (SCM port)
{
- scm_port *pt = SCM_PTAB_ENTRY (port);
+ scm_t_port *pt = SCM_PTAB_ENTRY (port);
if (pt->read_pos >= pt->read_end)
return EOF;
/* change the size of a port's string to new_size. this doesn't
change read_buf_size. */
static void
-st_resize_port (scm_port *pt, off_t new_size)
+st_resize_port (scm_t_port *pt, off_t new_size)
{
SCM old_stream = SCM_PACK (pt->stream);
- SCM new_stream = scm_makstr (new_size, 0);
+ SCM new_stream = scm_allocate_string (new_size);
unsigned long int old_size = SCM_STRING_LENGTH (old_stream);
unsigned long int min_size = min (old_size, new_size);
unsigned long int i;
/* reset buffer. */
{
- pt->stream = new_stream;
+ pt->stream = SCM_UNPACK (new_stream);
pt->read_buf = pt->write_buf = SCM_STRING_UCHARS (new_stream);
pt->read_pos = pt->write_pos = pt->write_buf + index;
pt->write_end = pt->write_buf + pt->write_buf_size;
static void
st_flush (SCM port)
{
- scm_port *pt = SCM_PTAB_ENTRY (port);
+ scm_t_port *pt = SCM_PTAB_ENTRY (port);
if (pt->write_pos == pt->write_end)
{
static void
st_write (SCM port, const void *data, size_t size)
{
- scm_port *pt = SCM_PTAB_ENTRY (port);
+ scm_t_port *pt = SCM_PTAB_ENTRY (port);
const char *input = (char *) data;
while (size > 0)
int space = pt->write_end - pt->write_pos;
int write_len = (size > space) ? space : size;
- strncpy ((char *) pt->write_pos, input, write_len);
+ memcpy ((char *) pt->write_pos, input, write_len);
pt->write_pos += write_len;
size -= write_len;
input += write_len;
static void
st_end_input (SCM port, int offset)
{
- scm_port *pt = SCM_PTAB_ENTRY (port);
+ scm_t_port *pt = SCM_PTAB_ENTRY (port);
if (pt->read_pos - pt->read_buf < offset)
scm_misc_error ("st_end_input", "negative position", SCM_EOL);
static off_t
st_seek (SCM port, off_t offset, int whence)
{
- scm_port *pt = SCM_PTAB_ENTRY (port);
+ scm_t_port *pt = SCM_PTAB_ENTRY (port);
off_t target;
if (pt->rw_active == SCM_PORT_READ && offset == 0 && whence == SEEK_CUR)
static void
st_truncate (SCM port, off_t length)
{
- scm_port *pt = SCM_PTAB_ENTRY (port);
+ scm_t_port *pt = SCM_PTAB_ENTRY (port);
if (length > pt->write_buf_size)
st_resize_port (pt, length);
scm_mkstrport (SCM pos, SCM str, long modes, const char *caller)
{
SCM z;
- scm_port *pt;
- int str_len;
+ scm_t_port *pt;
+ size_t str_len;
SCM_ASSERT (SCM_INUMP(pos) && SCM_INUM(pos) >= 0, pos, SCM_ARG1, caller);
SCM_ASSERT (SCM_STRINGP (str), str, SCM_ARG1, caller);
scm_out_of_range (caller, pos);
if (!((modes & SCM_WRTNG) || (modes & SCM_RDNG)))
scm_misc_error ("scm_mkstrport", "port must read or write", SCM_EOL);
- SCM_NEWCELL (z);
+
SCM_DEFER_INTS;
- pt = scm_add_to_port_table (z);
- SCM_SET_CELL_TYPE (z, scm_tc16_strport | modes);
- SCM_SETPTAB_ENTRY (z, pt);
+ z = scm_new_port_table_entry (scm_tc16_strport);
+ pt = SCM_PTAB_ENTRY(z);
SCM_SETSTREAM (z, SCM_UNPACK (str));
+ SCM_SET_CELL_TYPE(z, scm_tc16_strport|modes);
pt->write_buf = pt->read_buf = SCM_STRING_UCHARS (str);
pt->read_pos = pt->write_pos = pt->read_buf + SCM_INUM (pos);
pt->write_buf_size = pt->read_buf_size = str_len;
/* create a new string from a string port's buffer. */
SCM scm_strport_to_string (SCM port)
{
- scm_port *pt = SCM_PTAB_ENTRY (port);
+ scm_t_port *pt = SCM_PTAB_ENTRY (port);
+ SCM str;
if (pt->rw_active == SCM_PORT_WRITE)
st_flush (port);
- return scm_makfromstr ((char *) pt->read_buf, pt->read_buf_size, 0);
+
+ str = scm_mem2string ((char *) pt->read_buf, pt->read_buf_size);
+ scm_remember_upto_here_1 (port);
+ return str;
}
+SCM_DEFINE (scm_object_to_string, "object->string", 1, 1, 0,
+ (SCM obj, SCM printer),
+ "Return a Scheme string obtained by printing @var{obj}.\n"
+ "Printing function can be specified by the optional second\n"
+ "argument @var{printer} (default: @code{write}).")
+#define FUNC_NAME s_scm_object_to_string
+{
+ SCM str, port;
+
+ if (!SCM_UNBNDP (printer))
+ SCM_VALIDATE_PROC (2, printer);
+
+ str = scm_allocate_string (0);
+ port = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_WRTNG, FUNC_NAME);
+
+ if (SCM_UNBNDP (printer))
+ scm_write (obj, port);
+ else
+ scm_call_2 (printer, obj, port);
+
+ return scm_strport_to_string (port);
+}
+#undef FUNC_NAME
+
SCM_DEFINE (scm_call_with_output_string, "call-with-output-string", 1, 0, 0,
(SCM proc),
"Calls the one-argument procedure @var{proc} with a newly created output\n"
scm_make_string (SCM_INUM0, SCM_UNDEFINED),
SCM_OPN | SCM_WRTNG,
FUNC_NAME);
- scm_apply (proc, p, scm_listofnull);
+ scm_call_1 (proc, p);
return scm_strport_to_string (p);
}
#undef FUNC_NAME
-
-
-/* Return a Scheme string obtained by printing a given object.
- */
-
-
-SCM
-scm_strprint_obj (SCM obj)
+SCM_DEFINE (scm_call_with_input_string, "call-with-input-string", 2, 0, 0,
+ (SCM string, SCM proc),
+ "Calls the one-argument procedure @var{proc} with a newly\n"
+ "created input port from which @var{string}'s contents may be\n"
+ "read. The value yielded by the @var{proc} is returned.")
+#define FUNC_NAME s_scm_call_with_input_string
{
- SCM str;
- SCM port;
-
- str = scm_makstr (0, 0);
- port = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_WRTNG, "scm_strprint_obj");
- scm_prin1 (obj, port, 1);
- {
- return scm_strport_to_string (port);
- }
+ SCM p = scm_mkstrport(SCM_INUM0, string, SCM_OPN | SCM_RDNG, FUNC_NAME);
+ return scm_call_1 (proc, p);
}
+#undef FUNC_NAME
+SCM_DEFINE (scm_open_input_string, "open-input-string", 1, 0, 0,
+ (SCM str),
+ "Take a string and return an input port that delivers characters\n"
+ "from the string. The port can be closed by\n"
+ "@code{close-input-port}, though its storage will be reclaimed\n"
+ "by the garbage collector if it becomes inaccessible.")
+#define FUNC_NAME s_scm_open_input_string
+{
+ SCM p = scm_mkstrport(SCM_INUM0, str, SCM_OPN | SCM_RDNG, FUNC_NAME);
+ return p;
+}
+#undef FUNC_NAME
+SCM_DEFINE (scm_open_output_string, "open-output-string", 0, 0, 0,
+ (void),
+ "Return an output port that will accumulate characters for\n"
+ "retrieval by @code{get-output-string}. The port can be closed\n"
+ "by the procedure @code{close-output-port}, though its storage\n"
+ "will be reclaimed by the garbage collector if it becomes\n"
+ "inaccessible.")
+#define FUNC_NAME s_scm_open_output_string
+{
+ SCM p;
+ p = scm_mkstrport (SCM_INUM0,
+ scm_make_string (SCM_INUM0, SCM_UNDEFINED),
+ SCM_OPN | SCM_WRTNG,
+ FUNC_NAME);
+ return p;
+}
+#undef FUNC_NAME
-SCM_DEFINE (scm_call_with_input_string, "call-with-input-string", 2, 0, 0,
- (SCM str, SCM proc),
- "Calls the one-argument procedure @var{proc} with a newly created input\n"
- "port from which @var{string}'s contents may be read. The value yielded\n"
- "by the @var{proc} is returned.")
-#define FUNC_NAME s_scm_call_with_input_string
+SCM_DEFINE (scm_get_output_string, "get-output-string", 1, 0, 0,
+ (SCM port),
+ "Given an output port created by @code{open-output-string},\n"
+ "return a string consisting of the characters that have been\n"
+ "output to the port so far.")
+#define FUNC_NAME s_scm_get_output_string
{
- SCM p = scm_mkstrport(SCM_INUM0, str, SCM_OPN | SCM_RDNG, FUNC_NAME);
- return scm_apply (proc, p, scm_listofnull);
+ SCM_VALIDATE_OPOUTSTRPORT (1, port);
+ return scm_strport_to_string (port);
}
#undef FUNC_NAME
-
/* 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. */
/* 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));
}
+SCM
+scm_c_eval_string_in_module (const char *expr, SCM module)
+{
+ return scm_eval_string_in_module (scm_makfrom0str (expr), module);
+}
+
-SCM_DEFINE (scm_eval_string, "eval-string", 1, 0, 0,
- (SCM string),
- "Evaluate @var{string} as the text representation of a Scheme form\n"
- "or forms, and return whatever value they produce.\n"
- "Evaluation takes place in (interaction-environment).")
-#define FUNC_NAME s_scm_eval_string
+static SCM
+inner_eval_string (void *data)
{
- SCM port = scm_mkstrport (SCM_INUM0, string, SCM_OPN | SCM_RDNG,
- "scm_eval_0str");
+ SCM port = (SCM)data;
SCM form;
SCM ans = SCM_UNSPECIFIED;
- SCM module = scm_interaction_environment ();
/* Read expressions from that port; ignore the values. */
while (!SCM_EOF_OBJECT_P (form = scm_read (port)))
- ans = scm_eval_x (form, module);
+ ans = scm_primitive_eval_x (form);
/* Don't close the port here; if we re-enter this function via a
continuation, then the next time we enter it, we'll get an error.
return ans;
}
+
+SCM_DEFINE (scm_eval_string_in_module, "eval-string", 1, 1, 0,
+ (SCM string, SCM module),
+ "Evaluate @var{string} as the text representation of a Scheme\n"
+ "form or forms, and return whatever value they produce.\n"
+ "Evaluation takes place in the given module, or the current\n"
+ "module when no module is given.\n"
+ "While the code is evaluated, the given module is made the\n"
+ "current one. The current module is restored when this\n"
+ "procedure returns.")
+#define FUNC_NAME s_scm_eval_string_in_module
+{
+ SCM port = scm_mkstrport (SCM_INUM0, string, SCM_OPN | SCM_RDNG,
+ FUNC_NAME);
+ if (SCM_UNBNDP (module))
+ module = scm_current_module ();
+ else
+ SCM_VALIDATE_MODULE (2, module);
+ return scm_c_call_with_current_module (module,
+ inner_eval_string, (void *)port);
+}
#undef FUNC_NAME
-static scm_bits_t
+SCM
+scm_eval_string (SCM string)
+{
+ return scm_eval_string_in_module (string, SCM_UNDEFINED);
+}
+
+static scm_t_bits
scm_make_stptob ()
{
- scm_bits_t tc = scm_make_port_type ("string", stfill_buffer, st_write);
+ scm_t_bits tc = scm_make_port_type ("string", stfill_buffer, st_write);
scm_set_port_mark (tc, scm_markstream);
scm_set_port_end_input (tc, st_end_input);
{
scm_tc16_strport = scm_make_stptob ();
-#ifndef SCM_MAGIC_SNARFER
#include "libguile/strports.x"
-#endif
}
HCoop / bpt / guile.git / blobdiff