Mercurial > hg > xemacs-beta
view lisp/config.el @ 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
;;; config.el --- access configuration parameters ;; Copyright (C) 1997 Sun Microsystems, Inc. ;; Author: Martin Buchholz ;; Keywords: configure ;; 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 in FSF. ;;; Commentary: ;;; Code: (defvar config-value-file (expand-file-name "config.values" doc-directory) "File containing configuration parameters and their values.") (defvar config-value-hash-table nil "Hash table to store configuration parameters and their values.") ;;;###autoload (defun config-value-hash-table () "Return hash table of configuration parameters and their values." (when (null config-value-hash-table) (setq config-value-hash-table (make-hash-table :size 300)) (save-excursion (let ((buf (get-buffer-create " *Config*"))) (set-buffer buf) (erase-buffer) (insert-file-contents config-value-file) (goto-char (point-min)) (condition-case nil (while t (let* ((key (read buf)) (value (read buf)) (prev (gethash key config-value-hash-table))) (cond ((null prev) (puthash key value config-value-hash-table)) ((atom prev) (puthash key (list prev value) config-value-hash-table)) (t (nconc prev (list value)))))) (end-of-file nil))) (kill-buffer " *Config*"))) config-value-hash-table) ;;;###autoload (defun config-value (config-symbol) "Return the value of the configuration parameter CONFIG_SYMBOL." (gethash config-symbol (config-value-hash-table))) (provide 'config) ;;; config.el ends here