mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-19 19:20:23 +02:00
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
244 lines
5.6 KiB
C
244 lines
5.6 KiB
C
/* Copyright (C) 2001,2008,2009 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
|
|
*/
|
|
|
|
/* FIXME! Need to check that the fetch is within the current program */
|
|
|
|
/* This file is included in vm_engine.c */
|
|
|
|
VM_DEFINE_LOADER (80, load_unsigned_integer, "load-unsigned-integer")
|
|
{
|
|
size_t len;
|
|
|
|
FETCH_LENGTH (len);
|
|
if (SCM_LIKELY (len <= 8))
|
|
{
|
|
scm_t_uint64 val = 0;
|
|
while (len-- > 0)
|
|
val = (val << 8U) + FETCH ();
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_from_uint64 (val));
|
|
NEXT;
|
|
}
|
|
else
|
|
SCM_MISC_ERROR ("load-unsigned-integer: not implemented yet", SCM_EOL);
|
|
}
|
|
|
|
VM_DEFINE_LOADER (81, load_integer, "load-integer")
|
|
{
|
|
size_t len;
|
|
|
|
FETCH_LENGTH (len);
|
|
if (SCM_LIKELY (len <= 4))
|
|
{
|
|
int val = 0;
|
|
while (len-- > 0)
|
|
val = (val << 8) + FETCH ();
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_from_int (val));
|
|
NEXT;
|
|
}
|
|
else
|
|
SCM_MISC_ERROR ("load-integer: not implemented yet", SCM_EOL);
|
|
}
|
|
|
|
VM_DEFINE_LOADER (82, load_number, "load-number")
|
|
{
|
|
size_t len;
|
|
|
|
FETCH_LENGTH (len);
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_string_to_number (scm_from_locale_stringn ((char *)ip, len),
|
|
SCM_UNDEFINED /* radix = 10 */));
|
|
/* Was: scm_istring2number (ip, len, 10)); */
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (83, load_string, "load-string")
|
|
{
|
|
size_t len;
|
|
int width;
|
|
SCM str;
|
|
|
|
FETCH_LENGTH (len);
|
|
FETCH_WIDTH (width);
|
|
SYNC_REGISTER ();
|
|
if (width == 1)
|
|
{
|
|
char *buf;
|
|
str = scm_i_make_string (len, &buf);
|
|
memcpy (buf, (char *) ip, len);
|
|
}
|
|
else if (width == 4)
|
|
{
|
|
scm_t_wchar *wbuf;
|
|
str = scm_i_make_wide_string (len, &wbuf);
|
|
memcpy ((char *) wbuf, (char *) ip, len * width);
|
|
}
|
|
else
|
|
SCM_MISC_ERROR ("load-string: invalid character width", SCM_EOL);
|
|
PUSH (str);
|
|
ip += len * width;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (84, load_symbol, "load-symbol")
|
|
{
|
|
size_t len;
|
|
int width;
|
|
SCM str;
|
|
FETCH_LENGTH (len);
|
|
FETCH_WIDTH (width);
|
|
SYNC_REGISTER ();
|
|
if (width == 1)
|
|
{
|
|
char *buf;
|
|
str = scm_i_make_string (len, &buf);
|
|
memcpy (buf, (char *) ip, len);
|
|
}
|
|
else if (width == 4)
|
|
{
|
|
scm_t_wchar *wbuf;
|
|
str = scm_i_make_wide_string (len, &wbuf);
|
|
memcpy ((char *) wbuf, (char *) ip, len * width);
|
|
}
|
|
else
|
|
SCM_MISC_ERROR ("load-symbol: invalid character width", SCM_EOL);
|
|
PUSH (scm_string_to_symbol (str));
|
|
ip += len * width;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (85, load_keyword, "load-keyword")
|
|
{
|
|
size_t len;
|
|
int width;
|
|
SCM str;
|
|
FETCH_LENGTH (len);
|
|
FETCH_WIDTH (width);
|
|
SYNC_REGISTER ();
|
|
if (width == 1)
|
|
{
|
|
char *buf;
|
|
str = scm_i_make_string (len, &buf);
|
|
memcpy (buf, (char *) ip, len);
|
|
}
|
|
else if (width == 4)
|
|
{
|
|
scm_t_wchar *wbuf;
|
|
str = scm_i_make_wide_string (len, &wbuf);
|
|
memcpy ((char *) wbuf, (char *) ip, len * width);
|
|
}
|
|
else
|
|
SCM_MISC_ERROR ("load-keyword: invalid character width", SCM_EOL);
|
|
PUSH (scm_symbol_to_keyword (scm_string_to_symbol (str)));
|
|
ip += len * width;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (86, load_program, "load-program")
|
|
{
|
|
scm_t_uint32 len;
|
|
SCM objs, objcode;
|
|
|
|
POP (objs);
|
|
SYNC_REGISTER ();
|
|
|
|
if (scm_is_vector (objs) && scm_is_false (scm_c_vector_ref (objs, 0)))
|
|
scm_c_vector_set_x (objs, 0, scm_current_module ());
|
|
|
|
objcode = scm_c_make_objcode_slice (SCM_PROGRAM_OBJCODE (fp[-1]), ip);
|
|
len = sizeof (struct scm_objcode) + SCM_OBJCODE_TOTAL_LEN (objcode);
|
|
|
|
PUSH (scm_make_program (objcode, objs, SCM_BOOL_F));
|
|
|
|
ip += len;
|
|
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_INSTRUCTION (87, link_now, "link-now", 0, 1, 1)
|
|
{
|
|
SCM what;
|
|
POP (what);
|
|
SYNC_REGISTER ();
|
|
PUSH (resolve_variable (what, scm_current_module ()));
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (88, define, "define")
|
|
{
|
|
SCM str, sym;
|
|
size_t len;
|
|
|
|
int width;
|
|
FETCH_LENGTH (len);
|
|
FETCH_WIDTH (width);
|
|
SYNC_REGISTER ();
|
|
if (width == 1)
|
|
{
|
|
char *buf;
|
|
str = scm_i_make_string (len, &buf);
|
|
memcpy (buf, (char *) ip, len);
|
|
}
|
|
else if (width == 4)
|
|
{
|
|
scm_t_wchar *wbuf;
|
|
str = scm_i_make_wide_string (len, &wbuf);
|
|
memcpy ((char *) wbuf, (char *) ip, len * width);
|
|
}
|
|
else
|
|
SCM_MISC_ERROR ("load define: invalid character width", SCM_EOL);
|
|
sym = scm_string_to_symbol (str);
|
|
ip += len * width;
|
|
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_sym2var (sym, scm_current_module_lookup_closure (), SCM_BOOL_T));
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (89, load_array, "load-array")
|
|
{
|
|
SCM type, shape;
|
|
size_t len;
|
|
FETCH_LENGTH (len);
|
|
POP (shape);
|
|
POP (type);
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_from_contiguous_typed_array (type, shape, ip, len));
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
/*
|
|
(defun renumber-ops ()
|
|
"start from top of buffer and renumber 'VM_DEFINE_FOO (\n' sequences"
|
|
(interactive "")
|
|
(save-excursion
|
|
(let ((counter 79)) (goto-char (point-min))
|
|
(while (re-search-forward "^VM_DEFINE_[^ ]+ (\\([^,]+\\)," (point-max) t)
|
|
(replace-match
|
|
(number-to-string (setq counter (1+ counter)))
|
|
t t nil 1)))))
|
|
*/
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|