mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-11 14:21:10 +02:00
9c44cd4559
This adds full Unicode strings as a datatype, and it adds some
minimal functionality. The terminal and port encoding is assumed
to be ISO-8859-1. Non-ISO-8859-1 characters are written or
input as string character escapes.
The string character escapes now have 3 forms: \xXX \uXXXX and
\UXXXXXX, for unprintable characters that have 2, 4 or 6 hex digits.
The process for writing to strings has been modified. There is now a
function scm_i_string_start_writing that does the copy-on-write
conversion if necessary.
To compile strings that may be wide, the VM storage of strings and
string-likes has changed.
Most string-using functions have not yet been updated and may break
when used with wide strings.
* module/language/assembly/compile-bytecode.scm (write-bytecode):
use variable width string bytecode format
* module/language/assembly.scm (byte-length): use variable width
bytecode format
* libguile/vm-i-loader.c (load-string, load-symbol):
(load-keyword, define): use variable-width bytecode format
* libguile/vm-engine.h (FETCH_WIDTH): new macro
* libguile/strings.h: new declarations
* libguile/strings.c (make_wide_stringbuf): new function
(widen_stringbuf): new function
(scm_i_make_wide_string): new function
(scm_i_is_narrow_string): new function
(scm_i_string_wide_chars): new function
(scm_i_string_start_writing): new function
(scm_i_string_ref): new function
(scm_i_string_set_x): new function
(scm_i_is_narrow_symbol): new function
(scm_i_symbol_wide_chars, scm_i_symbol_ref): new function
(scm_string_width): new function
(unistring_escapes_to_guile_escapes): new function
(scm_to_stringn): new function
(scm_i_stringbuf_free): modify for wide strings
(scm_i_substring_copy): modify for wide strings
(scm_i_string_chars, scm_string_append): modify for wide strings
(scm_i_make_symbol, scm_to_locale_stringn): modify for wide strings
(scm_string_dump, scm_symbol_dump, scm_to_locale_stringbuf):
(scm_string, scm_i_deprecated_string_chars): modify for wide strings
(scm_from_locale_string, scm_from_locale_stringn): add null test
* libguile/srfi-13.c: add calls for scm_i_string_start_writing for
each call of scm_i_string_stop_writing
(scm_string_for_each): modify for wide strings
* libguile/socket.c: add calls for scm_i_string_start_writing for each
call of scm_i_string_stop_writing
* libguile/rw.c: add calls for scm_i_string_start_writing for each
call of scm_i_string_stop_writing
* libguile/read.c (scm_read_string): allow reading of wide strings
* libguile/print.h: add declaration for scm_charprint
* libguile/print.c (iprin1): print wide strings and add new string
escapes
(scm_charprint): new function
* libguile/ports.h: new declarations for scm_lfwrite_substr and
scm_lfwrite_str
* libguile/ports.c (update_port_lf): new function
(scm_lfwrite): use update_port_lf
(scm_lfwrite_substr): new function
(scm_lfwrite_str): new function
* test-suite/tests/asm-to-bytecode.test ("compiler"): add string
width byte to sting-like asm tests
109 lines
3.9 KiB
C
109 lines
3.9 KiB
C
/* classes: h_files */
|
||
|
||
#ifndef SCM_PRINT_H
|
||
#define SCM_PRINT_H
|
||
|
||
/* Copyright (C) 1995,1996,1998,2000,2001, 2003, 2004, 2006, 2008 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
|
||
* as published by the Free Software Foundation; either version 3 of
|
||
* the License, or (at your option) any later version.
|
||
*
|
||
* This library is distributed in the hope that it will be useful, but
|
||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
* Lesser General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU Lesser General Public
|
||
* License along with this library; if not, write to the Free Software
|
||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||
* 02110-1301 USA
|
||
*/
|
||
|
||
|
||
|
||
#include "libguile/__scm.h"
|
||
|
||
#include "libguile/options.h"
|
||
|
||
|
||
/* State information passed around during printing.
|
||
*/
|
||
#define SCM_PRINT_STATE_P(obj) (SCM_STRUCTP(obj) \
|
||
&& (scm_is_eq (SCM_STRUCT_VTABLE(obj), \
|
||
scm_print_state_vtable)))
|
||
#define SCM_PRINT_STATE(obj) ((scm_print_state *) SCM_STRUCT_DATA (obj))
|
||
|
||
#define RESET_PRINT_STATE(pstate) \
|
||
do { \
|
||
pstate->list_offset = 0; \
|
||
pstate->top = 0; \
|
||
} while (0)
|
||
|
||
#define SCM_WRITINGP(pstate) ((pstate)->writingp)
|
||
#define SCM_SET_WRITINGP(pstate, x) { (pstate)->writingp = (x); }
|
||
|
||
#define SCM_PORT_WITH_PS_P(p) SCM_TYP16_PREDICATE (scm_tc16_port_with_ps, p)
|
||
#define SCM_PORT_WITH_PS_PORT(p) SCM_CAR (SCM_CELL_OBJECT_1 (p))
|
||
#define SCM_PORT_WITH_PS_PS(p) SCM_CDR (SCM_CELL_OBJECT_1 (p))
|
||
|
||
#define SCM_COERCE_OUTPORT(p) \
|
||
(SCM_PORT_WITH_PS_P (p) ? SCM_PORT_WITH_PS_PORT (p) : p)
|
||
|
||
#define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwuwpwuwuwurprpw"
|
||
typedef struct scm_print_state {
|
||
SCM handle; /* Struct handle */
|
||
int revealed; /* Has the state escaped to Scheme? */
|
||
unsigned long writingp; /* Writing? */
|
||
unsigned long fancyp; /* Fancy printing? */
|
||
unsigned long level; /* Max level */
|
||
unsigned long length; /* Max number of objects per level */
|
||
SCM hot_ref; /* Hot reference */
|
||
unsigned long list_offset;
|
||
unsigned long top; /* Top of reference stack */
|
||
unsigned long ceiling; /* Max size of reference stack */
|
||
SCM ref_vect; /* Stack of references used during
|
||
circular reference detection;
|
||
a simple vector. */
|
||
SCM highlight_objects; /* List of objects to be highlighted */
|
||
} scm_print_state;
|
||
|
||
SCM_API SCM scm_print_state_vtable;
|
||
|
||
SCM_API scm_t_bits scm_tc16_port_with_ps;
|
||
|
||
SCM_API SCM scm_print_options (SCM setting);
|
||
SCM_API SCM scm_make_print_state (void);
|
||
SCM_API void scm_free_print_state (SCM print_state);
|
||
SCM_INTERNAL SCM scm_i_port_with_print_state (SCM port, SCM print_state);
|
||
SCM_API void scm_charprint (scm_t_uint32 c, SCM port);
|
||
SCM_API void scm_intprint (scm_t_intmax n, int radix, SCM port);
|
||
SCM_API void scm_uintprint (scm_t_uintmax n, int radix, SCM port);
|
||
SCM_API void scm_ipruk (char *hdr, SCM ptr, SCM port);
|
||
SCM_API void scm_iprlist (char *hdr, SCM exp, int tlr, SCM port, scm_print_state *pstate);
|
||
SCM_API void scm_print_symbol_name (const char *str, size_t len, SCM port);
|
||
SCM_API void scm_prin1 (SCM exp, SCM port, int writingp);
|
||
SCM_API void scm_iprin1 (SCM exp, SCM port, scm_print_state *pstate);
|
||
SCM_API SCM scm_write (SCM obj, SCM port);
|
||
SCM_API SCM scm_display (SCM obj, SCM port);
|
||
SCM_API SCM scm_simple_format (SCM port, SCM message, SCM args);
|
||
SCM_API SCM scm_newline (SCM port);
|
||
SCM_API SCM scm_write_char (SCM chr, SCM port);
|
||
SCM_API SCM scm_printer_apply (SCM proc, SCM exp, SCM port, scm_print_state *);
|
||
SCM_API SCM scm_port_with_print_state (SCM port, SCM pstate);
|
||
SCM_API SCM scm_get_print_state (SCM port);
|
||
SCM_API int scm_valid_oport_value_p (SCM val);
|
||
SCM_INTERNAL void scm_init_print (void);
|
||
|
||
#ifdef GUILE_DEBUG
|
||
SCM_API SCM scm_current_pstate (void);
|
||
#endif
|
||
|
||
#endif /* SCM_PRINT_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|