diff options
author | Michael Gran <spk121@yahoo.com> | 2009-07-29 06:38:32 -0700 |
---|---|---|
committer | Michael Gran <spk121@yahoo.com> | 2009-07-29 06:38:32 -0700 |
commit | 904a78f11d2d11a58d5df365a44c4fbbd4c96df3 (patch) | |
tree | c0df0bc8bfcb70ce62ce7de6d42b9df26352b7e8 /libguile/numbers.h | |
parent | 77332b21a01fac906ae4707426e00f01e62c0415 (diff) | |
download | guile-904a78f11d2d11a58d5df365a44c4fbbd4c96df3.tar.gz |
Add 32-bit characters
This adds the 32-bit standalone characters. Strings are still
8-bit. Characters larger than 8-bit can only be entered or
displayed in octal format at this point. At this point, the
terminal's display encoding is expected to be Latin-1.
* module/language/assembly/compile-bytecode.scm (write-bytecode):
add 32-bit char
* module/language/assembly.scm (object->assembly): add 32-bit char
(assembly->object): add 32-bit char
* libguile/vm-i-system.c (make-char32): new op
* libguile/print.c (iprin1): print 32-bit char
* libguile/numbers.h: add type scm_t_wchar
* libguile/numbers.c: add type scm_t_wchar
* libguile/chars.h: new type scm_t_wchar
(SCM_CODEPOINT_MAX): new
(SCM_IS_UNICODE_CHAR): new
(SCM_MAKE_CHAR): operate on 32-bit char
* libguile/chars.c: comparison operators now use Unicode
codepoints
(scm_c_upcase): now receives and returns scm_t_wchar
(scm_c_downcase): now receives and returns scm_t_wchar
Diffstat (limited to 'libguile/numbers.h')
-rw-r--r-- | libguile/numbers.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libguile/numbers.h b/libguile/numbers.h index 5bad4478b..f30f7d061 100644 --- a/libguile/numbers.h +++ b/libguile/numbers.h @@ -3,7 +3,7 @@ #ifndef SCM_NUMBERS_H #define SCM_NUMBERS_H -/* Copyright (C) 1995,1996,1998,2000,2001,2002,2003,2004,2005, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,2000,2001,2002,2003,2004,2005, 2006, 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 @@ -174,6 +174,11 @@ typedef struct scm_t_complex double imag; } scm_t_complex; +#ifndef SCM_WCHAR_DEFINED +typedef scm_t_int32 scm_t_wchar; +#define SCM_WCHAR_DEFINED +#endif + SCM_API SCM scm_exact_p (SCM x); @@ -322,6 +327,9 @@ SCM_API SCM scm_from_int32 (scm_t_int32 x); SCM_API scm_t_uint32 scm_to_uint32 (SCM x); SCM_API SCM scm_from_uint32 (scm_t_uint32 x); +SCM_API scm_t_wchar scm_to_wchar (SCM x); +SCM_API SCM scm_from_wchar (scm_t_wchar x); + #if SCM_HAVE_T_INT64 SCM_API scm_t_int64 scm_to_int64 (SCM x); |