Mercurial > hg > xemacs-beta
view src/select-xlike-inc.c @ 5908:6174848f3e6c
Use parse_integer() in read_atom(); support bases with ratios like integers
src/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* data.c (init_errors_once_early):
Move the Qunsupported_type here from numbers.c, so it's available
when the majority of our types are not supported.
* general-slots.h: Add it here, too.
* number.c: Remove the definition of Qunsupported_type from here.
* lread.c (read_atom):
Check if the first character could reflect a rational, if so, call
parse_integer(), don't check the syntax of the other
characters. This allows us to accept the non-ASCII digit
characters too.
If that worked partially, but not completely, and the next char is
a slash, try to parse as a ratio.
If that fails, try isfloat_string(), but only if the first
character could plausibly be part of a float.
Otherwise, treat as a symbol.
* lread.c (read_rational):
Rename from read_integer. Handle ratios with the same radix
specification as was used for integers.
* lread.c (read1):
Rename read_integer in this function. Support the Common Lisp
#NNNrMMM syntax for parsing a number MMM of arbitrary radix NNN.
man/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Numbers):
Describe the newly-supported arbitrary-base syntax for rationals
(integers and ratios). Describe that ratios can take the same base
specification as integers, something also new.
tests/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
Check the arbitrary-base integer reader syntax support, just
added. Check the reader base support for ratios, just added.
Check the non-ASCII-digit support in the reader, just added.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 09 May 2015 00:40:57 +0100 |
parents | 56144c8593a8 |
children |
line wrap: on
line source
/* Selection processing for XEmacs -- common btwn select-x.c and select-gtk.c Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs 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 General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not synched with FSF. */ #ifdef THIS_IS_X #define XE_ATOM_TYPE Atom #define XE_ATOM_TO_SYMBOL x_atom_to_symbol #define XE_SYMBOL_TO_ATOM symbol_to_x_atom #else #define XE_ATOM_TYPE GdkAtom #define XE_ATOM_TO_SYMBOL atom_to_symbol #define XE_SYMBOL_TO_ATOM symbol_to_gtk_atom #endif /* THIS_IS_X */ /* #### These are going to move into Lisp code(!) with the aid of some new functions I'm working on - ajh */ /* These functions convert from the selection data read from the server into something that we can use from elisp, and vice versa. Type: Format: Size: Elisp Type: ----- ------- ----- ----------- * 8 * String ATOM 32 1 Symbol ATOM 32 > 1 Vector of Symbols * 16 1 Integer * 16 > 1 Vector of Integers * 32 1 if <=16 bits: Integer if > 16 bits: Cons of top16, bot16 * 32 > 1 Vector of the above NOTE NOTE NOTE: Format == 32 means that the buffer will be C longs, which need not be 32-bit quantities. See the note in select-x.c (x_get_window_property). When converting a Lisp number to C, it is assumed to be of format 16 if it is an integer, and of format 32 if it is a cons of two integers. When converting a vector of numbers from Elisp to C, it is assumed to be of format 16 if every element in the vector is an integer, and is assumed to be of format 32 if any element is a cons of two integers. When converting an object to C, it may be of the form (SYMBOL . <data>) where SYMBOL is what we should claim that the type is. Format and representation are as above. NOTE: Under Mule, when someone shoves us a string without a type, we set the type to `COMPOUND_TEXT' and automatically convert to Compound Text. If the string has a type, we assume that the user wants the data sent as-is so we just do "binary" conversion. */ static Lisp_Object selection_data_to_lisp_data (struct device *d, Rawbyte *data, Bytecount size, XE_ATOM_TYPE type, int format) { #ifdef THIS_IS_X if (type == DEVICE_XATOM_NULL (d)) return QNULL; /* Convert any 8-bit data to a string, for compactness. */ else if (format == 8) return make_extstring ((Extbyte *) data, size, type == DEVICE_XATOM_TEXT (d) || type == DEVICE_XATOM_COMPOUND_TEXT (d) ? Qctext : Qbinary); /* Convert a single atom to a Lisp Symbol. Convert a set of atoms to a vector of symbols. */ else if (type == XA_ATOM) #else if (type == gdk_atom_intern ("NULL", 0)) return QNULL; /* Convert any 8-bit data to a string, for compactness. */ else if (format == 8) return make_extstring ((Extbyte *) data, size, ((type == gdk_atom_intern ("TEXT", FALSE)) || (type == gdk_atom_intern ("COMPOUND_TEXT", FALSE))) ? Qctext : Qbinary); /* Convert a single atom to a Lisp Symbol. Convert a set of atoms to a vector of symbols. */ else if (type == gdk_atom_intern ("ATOM", FALSE)) #endif /* THIS_IS_X */ { if (size == sizeof (XE_ATOM_TYPE)) return XE_ATOM_TO_SYMBOL (d, *((XE_ATOM_TYPE *) data)); else { Elemcount i; Elemcount len = size / sizeof (XE_ATOM_TYPE); Lisp_Object v = Fmake_vector (make_fixnum (len), Qzero); for (i = 0; i < len; i++) Faset (v, make_fixnum (i), XE_ATOM_TO_SYMBOL (d, ((XE_ATOM_TYPE *) data) [i])); return v; } } /* Convert a single 16 or small 32 bit number to a Lisp Int. If the number is > 16 bits, convert it to a cons of integers, 16 bits in each half. */ else if (format == 32 && size == sizeof (long)) return word_to_lisp (((unsigned long *) data) [0]); else if (format == 16 && size == sizeof (short)) return make_fixnum ((int) (((unsigned short *) data) [0])); /* Convert any other kind of data to a vector of numbers, represented as above (as an integer, or a cons of two 16 bit integers). #### Perhaps we should return the actual type to lisp as well. (x-get-selection-internal 'PRIMARY 'LINE_NUMBER) ==> [4 4] and perhaps it should be (x-get-selection-internal 'PRIMARY 'LINE_NUMBER) ==> (SPAN . [4 4]) Right now the fact that the return type was SPAN is discarded before lisp code gets to see it. */ else if (format == 16) { Elemcount i; Lisp_Object v = make_vector (size / 4, Qzero); for (i = 0; i < size / 4; i++) { int j = (int) ((unsigned short *) data) [i]; Faset (v, make_fixnum (i), make_fixnum (j)); } return v; } else { Elemcount i; Lisp_Object v = make_vector (size / 4, Qzero); for (i = 0; i < size / 4; i++) { unsigned long j = ((unsigned long *) data) [i]; Faset (v, make_fixnum (i), word_to_lisp (j)); } return v; } } static void lisp_data_to_selection_data (struct device *d, Lisp_Object obj, Rawbyte **data_ret, XE_ATOM_TYPE *type_ret, Bytecount *size_ret, int *format_ret) { Lisp_Object type = Qnil; if (CONSP (obj) && SYMBOLP (XCAR (obj))) { type = XCAR (obj); obj = XCDR (obj); if (CONSP (obj) && NILP (XCDR (obj))) obj = XCAR (obj); } if (EQ (obj, QNULL) || (EQ (type, QNULL))) { /* This is not the same as declining */ *format_ret = 32; *size_ret = 0; *data_ret = 0; type = QNULL; } else if (STRINGP (obj)) { const Extbyte *extval; Bytecount extvallen; LISP_STRING_TO_SIZED_EXTERNAL (obj, extval, extvallen, (NILP (type) ? Qctext : Qbinary)); *format_ret = 8; *size_ret = extvallen; *data_ret = xnew_rawbytes (*size_ret); memcpy (*data_ret, extval, *size_ret); #ifdef MULE if (NILP (type)) type = QCOMPOUND_TEXT; #else if (NILP (type)) type = QSTRING; #endif } else if (CHARP (obj)) { Ibyte buf[MAX_ICHAR_LEN]; Bytecount len; const Extbyte *extval; Bytecount extvallen; *format_ret = 8; len = set_itext_ichar (buf, XCHAR (obj)); TO_EXTERNAL_FORMAT (DATA, (buf, len), ALLOCA, (extval, extvallen), Qctext); *size_ret = extvallen; *data_ret = xnew_rawbytes (*size_ret); memcpy (*data_ret, extval, *size_ret); #ifdef MULE if (NILP (type)) type = QCOMPOUND_TEXT; #else if (NILP (type)) type = QSTRING; #endif } else if (SYMBOLP (obj)) { *format_ret = 32; *size_ret = 1; *data_ret = xnew_rawbytes (sizeof (XE_ATOM_TYPE) + 1); (*data_ret) [sizeof (XE_ATOM_TYPE)] = 0; (*(XE_ATOM_TYPE **) data_ret) [0] = XE_SYMBOL_TO_ATOM (d, obj, 0); if (NILP (type)) type = QATOM; } else if (FIXNUMP (obj) && XFIXNUM (obj) <= 0x7FFF && XFIXNUM (obj) >= -0x8000) { *format_ret = 16; *size_ret = 1; *data_ret = xnew_rawbytes (sizeof (short) + 1); (*data_ret) [sizeof (short)] = 0; (*(short **) data_ret) [0] = (short) XFIXNUM (obj); if (NILP (type)) type = QINTEGER; } else if (FIXNUMP (obj) || CONSP (obj)) { *format_ret = 32; *size_ret = 1; *data_ret = xnew_rawbytes (sizeof (long) + 1); (*data_ret) [sizeof (long)] = 0; (*(unsigned long **) data_ret) [0] = lisp_to_word (obj); if (NILP (type)) type = QINTEGER; } else if (VECTORP (obj)) { /* Lisp Vectors may represent a set of ATOMs; a set of 16 or 32 bit INTEGERs; or a set of ATOM_PAIRs (represented as [[A1 A2] [A3 A4] ...] */ Elemcount i; if (SYMBOLP (XVECTOR_DATA (obj) [0])) /* This vector is an ATOM set */ { if (NILP (type)) type = QATOM; *size_ret = XVECTOR_LENGTH (obj); *format_ret = 32; *data_ret = xnew_rawbytes ((*size_ret) * sizeof (XE_ATOM_TYPE)); for (i = 0; i < *size_ret; i++) if (SYMBOLP (XVECTOR_DATA (obj) [i])) (*(XE_ATOM_TYPE **) data_ret) [i] = XE_SYMBOL_TO_ATOM (d, XVECTOR_DATA (obj) [i], 0); else syntax_error ("all elements of the vector must be of the same type", obj); } #if 0 /* #### MULTIPLE doesn't work yet */ else if (VECTORP (XVECTOR_DATA (obj) [0])) /* This vector is an ATOM_PAIR set */ { if (NILP (type)) type = QATOM_PAIR; *size_ret = XVECTOR_LENGTH (obj); *format_ret = 32; *data_ret = xnew_rawbytes ((*size_ret) * sizeof (XE_ATOM_TYPE) * 2); for (i = 0; i < *size_ret; i++) if (VECTORP (XVECTOR_DATA (obj) [i])) { Lisp_Object pair = XVECTOR_DATA (obj) [i]; if (XVECTOR_LENGTH (pair) != 2) syntax_error ("elements of the vector must be vectors of exactly two elements", pair); (*(XE_ATOM_TYPE **) data_ret) [i * 2] = XE_SYMBOL_TO_ATOM (d, XVECTOR_DATA (pair) [0], 0); (*(XE_ATOM_TYPE **) data_ret) [(i * 2) + 1] = XE_SYMBOL_TO_ATOM (d, XVECTOR_DATA (pair) [1], 0); } else syntax_error ("all elements of the vector must be of the same type", obj); } #endif else /* This vector is an INTEGER set, or something like it */ { *size_ret = XVECTOR_LENGTH (obj); if (NILP (type)) type = QINTEGER; *format_ret = 16; for (i = 0; i < *size_ret; i++) if (CONSP (XVECTOR_DATA (obj) [i])) *format_ret = 32; else if (!FIXNUMP (XVECTOR_DATA (obj) [i])) syntax_error ("all elements of the vector must be integers or conses of integers", obj); *data_ret = xnew_rawbytes (*size_ret * (*format_ret/8)); for (i = 0; i < *size_ret; i++) if (*format_ret == 32) (*((unsigned long **) data_ret)) [i] = lisp_to_word (XVECTOR_DATA (obj) [i]); else (*((unsigned short **) data_ret)) [i] = (unsigned short) lisp_to_word (XVECTOR_DATA (obj) [i]); } } else invalid_argument ("unrecognized selection data", obj); *type_ret = XE_SYMBOL_TO_ATOM (d, type, 0); }