Mercurial > hg > xemacs-beta
annotate 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 |
| rev | line source |
|---|---|
| 428 | 1 /* Interface from Emacs to terminfo. |
| 2 Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2286
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 7 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2286
diff
changeset
|
8 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2286
diff
changeset
|
9 option) any later version. |
| 428 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2286
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 18 |
| 19 /* Synched up with: FSF 19.30. */ | |
| 20 | |
| 21 #include <config.h> | |
| 22 | |
| 23 #include <string.h> | |
| 24 | |
| 25 /* Every little bit of this God-damned file has caused all manner | |
| 26 of headaches due to inconsistent and incorrect header files | |
| 27 on one system or other, and we don't currently need anything here, | |
| 28 so just comment the whole damn lot out!!! */ | |
| 29 | |
| 30 #ifndef HAVE_TERMIOS | |
| 31 | |
| 32 #ifdef AIX | |
| 33 #include <termio.h> | |
| 34 #endif /* AIX */ | |
| 35 | |
| 36 /* Interface to curses/terminfo library. | |
| 37 Turns out that all of the terminfo-level routines look | |
| 38 like their termcap counterparts except for tparm, which replaces | |
| 39 tgoto. Not only is the calling sequence different, but the string | |
| 40 format is different too. | |
| 41 */ | |
| 42 | |
| 442 | 43 #include CURSES_H_FILE |
| 428 | 44 /* Sun, in their infinite lameness, supplies (possibly) broken headers |
| 45 even under Solaris. GCC feels it necessary to correct things by | |
| 46 supplying its own headers. Unfortunately, if you build GCC under | |
| 47 one version of Solaris and then upgrade your Solaris, you may get | |
| 48 screwed because Sun in their continuing lameness changes curses.h | |
| 49 in such a way that the "fixed" GCC headers are now broken. (GCC | |
| 50 is equally lame in that it supplies "fixed" headers for curses.h | |
| 51 but not term.h.) However, it seems to work to just not include | |
| 52 term.h under Solaris, so we try that. KLUDGE! */ | |
| 53 #if !(defined (__GNUC__) && defined (SOLARIS2)) | |
| 442 | 54 #include TERM_H_FILE |
| 428 | 55 #endif |
| 56 | |
| 57 extern void *xmalloc (int size); | |
| 58 | |
| 59 #if 0 /* If this isn't declared somewhere, too bad */ | |
| 442 | 60 extern char * tparm (const char *string, int arg1, int arg2, int arg3, |
| 428 | 61 int arg4, int arg5, int arg6, int arg7, int arg8, |
| 62 int arg9); | |
| 63 #endif | |
| 64 /* XEmacs: renamed this function because just tparam() conflicts with | |
| 65 ncurses (We don't use this function anyway!) */ | |
| 66 char * | |
| 2286 | 67 emacs_tparam (const char *string, char *outstring, int UNUSED (len), int arg1, |
| 428 | 68 int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, |
| 69 int arg8, int arg9) | |
| 70 { | |
| 71 char *temp; | |
| 72 | |
| 73 temp = (char *) tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, | |
| 74 arg8, arg9); | |
| 75 if (outstring == 0) | |
| 76 outstring = (char *) xmalloc (strlen (temp) + 1); | |
| 77 strcpy (outstring, temp); | |
| 78 return outstring; | |
| 79 } | |
| 80 | |
| 81 #endif /* not HAVE_TERMIOS */ |