Mercurial > hg > xemacs-beta
annotate lisp/x-scrollbar.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 |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-scrollbar.el --- scrollbar resourcing and such. |
| 2 | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 ;; Copyright (C) 1995, 1996 Ben Wing. | |
| 6 | |
| 7 ;; Author: Ben Wing <ben@xemacs.org> | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: extensions, dumped | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
13 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
14 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
15 ;; 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:
502
diff
changeset
|
16 ;; option) any later version. |
| 428 | 17 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
18 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
19 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
20 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
21 ;; for more details. |
| 428 | 22 |
| 23 ;; 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:
502
diff
changeset
|
24 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 25 |
| 26 ;;; Synched up with: Not synched. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs (when X and menubar support is compiled in). | |
| 31 | |
| 32 ;;; Code: | |
| 33 | |
| 502 | 34 (globally-declare-fboundp |
| 35 '(x-init-specifier-from-resources x-get-resource)) | |
| 36 | |
| 428 | 37 (defun x-init-scrollbar-from-resources (locale) |
| 38 (x-init-specifier-from-resources | |
| 39 (specifier-fallback scrollbar-width) 'natnum locale | |
| 40 '("scrollBarWidth" . "ScrollBarWidth") | |
| 41 ;; The name strings are wrong, but the scrollbar name is | |
| 42 ;; non-deterministic so it is a poor way to set a resource | |
| 43 ;; for the scrollbar anyhow. | |
| 44 (cond ((featurep 'athena-scrollbars) | |
| 45 '("scrollbar.thickness" . "ScrollBar.Thickness")) | |
| 46 ((featurep 'lucid-scrollbars) | |
| 47 '("scrollbar.width" . "XlwScrollBar.Width")) | |
| 48 ((featurep 'motif-scrollbars) | |
| 49 '("scrollbar.width" . "XmScrollBar.Width")))) | |
| 50 ;; Athena scrollbars accept either 'thickness' or 'width'. | |
| 51 ;; If any of the previous resources succeeded, the following | |
| 52 ;; call does nothing; so there's no harm in doing it all the | |
| 53 ;; time. | |
| 54 (if (featurep 'athena-scrollbars) | |
| 55 (x-init-specifier-from-resources | |
| 56 (specifier-fallback scrollbar-width) 'natnum locale | |
| 57 '("scrollbar.width" . "ScrollBar.Width"))) | |
| 58 | |
| 59 ;; lather, rinse, repeat. | |
| 60 (x-init-specifier-from-resources | |
| 61 (specifier-fallback scrollbar-height) 'natnum locale | |
| 62 '("scrollBarHeight" . "ScrollBarHeight") | |
| 63 ;; The name strings are wrong, but the scrollbar name is | |
| 64 ;; non-deterministic so it is a poor way to set a resource | |
| 65 ;; for the scrollbar anyhow. | |
| 66 (cond ((featurep 'athena-scrollbars) | |
| 67 '("scrollbar.thickness" . "ScrollBar.Thickness")) | |
| 68 ((featurep 'lucid-scrollbars) | |
| 69 '("scrollbar.height" . "XlwScrollBar.Height")) | |
| 70 ((featurep 'motif-scrollbars) | |
| 71 '("scrollbar.height" . "XmScrollBar.Height")))) | |
| 72 ;; Athena scrollbars accept either 'thickness' or 'height'. | |
| 73 ;; If any of the previous resources succeeded, the following | |
| 74 ;; call does nothing; so there's no harm in doing it all the | |
| 75 ;; time. | |
| 76 (if (featurep 'athena-scrollbars) | |
| 77 (x-init-specifier-from-resources | |
| 78 (specifier-fallback scrollbar-height) 'natnum locale | |
| 79 '("scrollbar.height" . "ScrollBar.Height"))) | |
| 80 | |
| 81 ;; Now do ScrollBarPlacement.scrollBarPlacement | |
| 82 (let ((case-fold-search t) | |
| 83 (resval (x-get-resource "ScrollBarPlacement" "scrollBarPlacement" | |
| 442 | 84 'string locale nil 'warn))) |
| 428 | 85 (cond |
| 86 ((null resval)) | |
| 87 ((string-match "^top[_-]left$" resval) | |
| 88 (set-specifier scrollbar-on-top-p t locale) | |
| 89 (set-specifier scrollbar-on-left-p t locale)) | |
| 90 ((string-match "^top[_-]right$" resval) | |
| 91 (set-specifier scrollbar-on-top-p t locale) | |
| 92 (set-specifier scrollbar-on-left-p nil locale)) | |
| 93 ((string-match "^bottom[_-]left$" resval) | |
| 94 (set-specifier scrollbar-on-top-p nil locale) | |
| 95 (set-specifier scrollbar-on-left-p t locale)) | |
| 96 ((string-match "^bottom[_-]right$" resval) | |
| 97 (set-specifier scrollbar-on-top-p nil locale) | |
| 98 (set-specifier scrollbar-on-left-p nil locale)) | |
| 99 (t | |
| 100 (display-warning 'resource | |
| 101 (format "Illegal value '%s' for scrollBarPlacement resource" resval))))) | |
| 102 | |
| 103 ) | |
| 104 | |
| 105 ;;; x-scrollbar.el ends here |
