Mercurial > hg > xemacs-beta
view src/terminfo.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 | 308d34e9f07d |
children |
line wrap: on
line source
/* Interface from Emacs to terminfo. Copyright (C) 1985, 1986, 1993 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: FSF 19.30. */ #include <config.h> #include <string.h> /* Every little bit of this God-damned file has caused all manner of headaches due to inconsistent and incorrect header files on one system or other, and we don't currently need anything here, so just comment the whole damn lot out!!! */ #ifndef HAVE_TERMIOS #ifdef AIX #include <termio.h> #endif /* AIX */ /* Interface to curses/terminfo library. Turns out that all of the terminfo-level routines look like their termcap counterparts except for tparm, which replaces tgoto. Not only is the calling sequence different, but the string format is different too. */ #include CURSES_H_FILE /* Sun, in their infinite lameness, supplies (possibly) broken headers even under Solaris. GCC feels it necessary to correct things by supplying its own headers. Unfortunately, if you build GCC under one version of Solaris and then upgrade your Solaris, you may get screwed because Sun in their continuing lameness changes curses.h in such a way that the "fixed" GCC headers are now broken. (GCC is equally lame in that it supplies "fixed" headers for curses.h but not term.h.) However, it seems to work to just not include term.h under Solaris, so we try that. KLUDGE! */ #if !(defined (__GNUC__) && defined (SOLARIS2)) #include TERM_H_FILE #endif extern void *xmalloc (int size); #if 0 /* If this isn't declared somewhere, too bad */ extern char * tparm (const char *string, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9); #endif /* XEmacs: renamed this function because just tparam() conflicts with ncurses (We don't use this function anyway!) */ char * emacs_tparam (const char *string, char *outstring, int UNUSED (len), int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) { char *temp; temp = (char *) tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); if (outstring == 0) outstring = (char *) xmalloc (strlen (temp) + 1); strcpy (outstring, temp); return outstring; } #endif /* not HAVE_TERMIOS */