Mercurial > hg > xemacs-beta
view lisp/paths.el @ 5560:58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
src/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* alloc.c:
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT_1):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (cons_print_preprocess):
* alloc.c (vector_print_preprocess):
* alloc.c (vector_nsubst_structures_descend):
* alloc.c (Fmake_symbol):
* alloc.c (UNMARK_symbol):
* alloc.c (sweep_symbols):
* alloc.c (reinit_alloc_objects_early):
* alloc.c (reinit_alloc_early):
* bytecode.c:
* bytecode.c (compiled_function_print_preprocess):
* bytecode.c (compiled_function_nsubst_structures_descend):
* bytecode.c (set_compiled_function_arglist):
* bytecode.c (set_compiled_function_interactive):
* bytecode.c (bytecode_objects_create):
* chartab.c:
* chartab.c (print_preprocess_mapper):
* chartab.c (nsubst_structures_mapper):
* chartab.c (char_table_nsubst_structures_descend):
* chartab.c (chartab_objects_create):
* elhash.c:
* elhash.c (nsubst_structures_map_hash_table):
* elhash.c (hash_table_nsubst_structures_descend):
* elhash.c (print_preprocess_mapper):
* elhash.c (hash_table_print_preprocess):
* elhash.c (inchash_eq):
* elhash.c (hash_table_objects_create):
* elhash.c (syms_of_elhash):
* elhash.h:
* emacs.c (main_1):
* fns.c:
* fns.c (check_eq_nokey):
* fns.c (Fnsubst):
* fns.c (syms_of_fns):
* lisp.h:
* lisp.h (struct Lisp_Symbol):
* lisp.h (IN_OBARRAY):
* lisp.h (struct):
* lisp.h (PRINT_PREPROCESS):
* lread.c (read1):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* print.c:
* print.c (PRINT_CIRCLE_LIMIT):
* print.c (print_continuous_numbering_changed):
* print.c (print_prepare):
* print.c (print_finish):
* print.c (Fprin1_to_string):
* print.c (print_cons):
* print.c (print_preprocess_inchash_eq):
* print.c (print_preprocess):
* print.c (print_sort_get_numbers):
* print.c (print_sort_compare_ordinals):
* print.c (print_gensym_or_circle):
* print.c (nsubst_structures_descend):
* print.c (nsubst_structures):
* print.c (print_internal):
* print.c (print_symbol):
* print.c (vars_of_print):
* rangetab.c:
* rangetab.c (range_table_print_preprocess):
* rangetab.c (range_table_nsubst_structures_descend):
* rangetab.c (rangetab_objects_create):
* rangetab.c (syms_of_rangetab):
* symbols.c:
* symbols.c (symbol_print_preprocess):
* symbols.c (Fintern):
* symbols.c (Funintern):
* symbols.c (reinit_symbol_objects_early):
* symbols.c (init_symbols_once_early):
* symsinit.h:
Implement print-circle, printing circular structures in a readable
fashion, and treating them appropriately on read. This is by means
of two new object methods, print_preprocess (detecting
circularities), and nsubst_structures_descend (replacing
placeholders with the read objects).
Expose the substitution to Lisp via #'nsubst and its new
:descend-structures keyword.
Store information as to whether symbols are interned in obarray or
not in their header, making checking for keywords and uninterned
symbols (and thus printing) cheaper.
Default print_gensym to t, as Common Lisp does, and as a
more-than-decade old comment suggests.
lisp/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-output-file-form):
* bytecomp.el (byte-compile-output-docform):
Bind print-circle, print-continuous-numbering in these functions,
now those variables are available.
* lisp.el (forward-sexp):
* lisp.el (backward-sexp):
Recognise leading #N= as being part of an expression.
tests/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
* automated/lisp-tests.el (literal-with-uninterned):
* automated/symbol-tests.el (foo):
Test print-circle, for printing (mutually-)recursive and circular
structures.
Bind print-continuous-numbering where appropriate.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 04 Sep 2011 19:51:35 +0100 |
| parents | 308d34e9f07d |
| children |
line wrap: on
line source
;;; paths.el --- define pathnames for use by various Emacs commands. ;; Copyright (C) 1986, 1988, 1993, 1994, 1997 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal, dumped ;; 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. ;;; Commentary: ;; This file is dumped with XEmacs. ;; These are default settings for names of certain files and directories ;; that Emacs needs to refer to from time to time. ;; If these settings are not right, override them with `setq' ;; in site-start.el. Do not change this file. ;;; Code: ;Note: FSF's version is: ;(defvar Info-default-directory-list ; (let ((start (list "/usr/local/lib/info/" ; ;; This comes second so that, if it is the same ; ;; as configure-info-directory (which is usually true) ; ;; and Emacs has been installed (also usually true) ; ;; then the list will end with two copies of this; ; ;; which means that the last dir file Info-insert-dir ; ;; finds will be the one in this directory. ; "/usr/local/info/")) ; (configdir (file-name-as-directory configure-info-directory))) ; (setq start (nconc start (list configdir))) ; start) ; "List of directories to search for Info documentation files. ;They are searched in the order they are given in this list. ;Therefore, the directory of Info files that come with Emacs ;normally should come last (so that local files override standard ones).") ;Our commented-out version is: ;(defvar Info-default-directory-list ; (let ((start (list "/usr/local/info/" ; "/usr/local/lib/info/")) ; (configdir (file-name-as-directory configure-info-directory))) ; (or (member configdir start) ; (setq start (nconc start (list configdir)))) ; (or (member (expand-file-name "../info/" data-directory) start) ; (setq start ; (nconc start ; (list (expand-file-name "../info/" data-directory))))) ; start) ; "List of directories to search for Info documentation files.") (defvar news-path "/usr/spool/news/" "The root directory below which all news files are stored.") (defvar news-inews-program nil "Program to post news.") ;(defvar gnus-default-nntp-server "" ; ;; set this to your local server ; "The name of the host running an NNTP server. ;If it is a string such as \":DIRECTORY\", then ~/DIRECTORY ;is used as a news spool. `gnus-nntp-server' is initialized from NNTPSERVER ;environment variable or, if none, this value.") ;(defvar gnus-nntp-service "nntp" ; "NNTP service name, usually \"nntp\" or 119). ;Go to a local news spool if its value is nil, in which case `gnus-nntp-server' ;should be set to `(system-name)'.") (defvar mh-progs nil "Directory containing MH commands.") (defvar mh-lib nil "Directory of MH library.") (defvar rmail-file-name "~/RMAIL" "Name of user's primary mail file.") (defconst rmail-spool-directory nil "Name of directory used by system mailer for delivering new mail. Its name should end with a slash.") (defconst sendmail-program nil "Program used to send messages.") (defconst remote-shell-program nil "Program used to execute shell commands on a remote machine.") (defconst term-file-prefix "term/" "If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))) You may set this variable to nil in your `.emacs' file if you do not wish the terminal-initialization file to be loaded.") (defconst manual-program nil "Program to run to print man pages.") (defconst abbrev-file-name "~/.abbrev_defs" "*Default name of file to read abbrevs from.") (defconst directory-abbrev-alist nil) ;; Formerly, the values of these variables were computed once ;; (at dump time). However, with the advent of pre-compiled binaries ;; and homebrewed systems such as Linux where who knows where the ;; hell the various programs may be located (if they even exist at all), ;; it's clear that we need to recompute these values at run time. ;; In typical short-sightedness, site administrators have been told up ;; till now to do `setq's in site-init.el, which is run only once -- ;; at dump time. So we have to do contortions to make sure we don't ;; override values set in site-init.el. (defun initialize-xemacs-paths () "Initialize the XEmacs path variables from the environment. Called automatically at dump time and run time. Do not call this. Will not override settings in site-init.el or site-run.el." (let ((l #'(lambda (var value) (let ((origsym (intern (concat "paths-el-original-" (symbol-name var))))) (if (running-temacs-p) (progn (set var value) (set origsym value)) (and (eq (symbol-value var) (symbol-value origsym)) (set var value))))))) (funcall l 'news-inews-program (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews") ((file-exists-p "/usr/local/inews") "/usr/local/inews") ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews") ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews") (t "inews"))) (funcall l 'mh-progs (cond ((file-directory-p "/usr/bin/mh") "/usr/bin/mh/") ((file-directory-p "/usr/local/bin/mh") "/usr/local/bin/mh/") ((file-directory-p "/usr/local/mh") "/usr/local/mh/") (t "/usr/local/bin/"))) (funcall l 'mh-libs (cond ((file-directory-p "/usr/lib/mh") "/usr/lib/mh/") ((file-directory-p "/usr/local/lib/mh") "/usr/local/lib/mh/") (t "/usr/local/bin/mh/"))) (funcall l 'rmail-spool-directory (cond ;; SVR4 and recent BSD are said to use this. ;; Rather than trying to know precisely which systems use it, ;; let's assume this dir is never used for anything else. ((file-exists-p "/var/mail") "/var/mail/") ((memq system-type '(hpux usg-unix-v irix)) "/usr/mail/") ((memq system-type '(linux)) "/var/spool/mail/") (t "/usr/spool/mail/"))) (funcall l 'sendmail-program (cond ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail") ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") (t "fakemail"))) ;In ../etc, to interface to /bin/mail. (funcall l 'remote-shell-program (cond ;; Some systems use rsh for the remote shell; others use that ;; name for the restricted shell and use remsh for the remote ;; shell. Let's try to guess based on what we actually find ;; out there. The restricted shell is almost certainly in ;; /bin or /usr/bin, so it's probably safe to assume that an ;; rsh found elsewhere is the remote shell program. The ;; converse is not true: /usr/bin/rsh could be either one, so ;; check that last. ((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh") ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh") ((file-exists-p "/bin/remsh") "/bin/remsh") ((file-exists-p "/usr/bin/remsh") "/usr/bin/remsh") ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh") ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh") ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh") ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh") ((file-exists-p "/usr/bin/rcmd") "/usr/bin/rcmd") ((file-exists-p "/bin/rcmd") "/bin/rcmd") ((file-exists-p "/bin/rsh") "/bin/rsh") ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh") (t "rsh"))) (funcall l 'manual-program ;; Solaris 2 has both of these files; prefer /usr/ucb/man ;; because the other has nonstandard argument conventions. (if (file-exists-p "/usr/ucb/man") "/usr/ucb/man" "/usr/bin/man")) (funcall l 'directory-abbrev-alist ;; Try to match various conventions for automounter temporary ;; mount points. These temporary mount points may go away, so ;; it's important that we only try to read files under the ;; "advertised" mount point, rather than the temporary one, or it ;; will look like files have been deleted on us. Whoever came up ;; with this design is clearly a moron of the first order, but ;; now we're stuck with it, no doubt until the end of time. ;; ;; For best results, automounter junk should go near the front of this ;; list, and other user translations should come after it. ;; ;; Our code handles the following empirically observed conventions: ;; /net is an actual directory! (some systems are not broken!) ;; /net/HOST -> /tmp_mnt/net/HOST (`standard' old Sun automounter) ;; /net/HOST -> /tmp_mnt/HOST (BSDI 4.0) ;; /net/HOST -> /a/HOST (Freebsd 2.2.x) ;; /net/HOST -> /amd/HOST (seen in amd sample config files) ;; ;; If your system has a different convention, you may have to change this. ;; Don't forget to send in a patch! (when (file-directory-p "/net") (append (when (file-directory-p "/tmp_mnt") (if (file-directory-p "/tmp_mnt/net") '(("\\`/tmp_mnt/net/" . "/net/")) '(("\\`/tmp_mnt/" . "/net/")))) (when (file-directory-p "/a") '(("\\`/a/" . "/net/"))) (when (file-directory-p "/amd") '(("\\`/amd/" . "/net/"))) ))) )) (if (running-temacs-p) (initialize-xemacs-paths)) ;;; paths.el ends here
