Mercurial > hg > xemacs-beta
annotate lisp/gtk-ffi.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 | 4dee0387b9de |
| children |
| rev | line source |
|---|---|
| 462 | 1 ;;; gtk-ffi.el --- Foreign function interface for the GTK object system |
| 2 | |
| 3 ;; Copyright (C) 2000 Free Software Foundation | |
| 4 | |
| 5 ;; Maintainer: William Perry <wmperry@gnu.org> | |
| 6 ;; Keywords: extensions, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
462
diff
changeset
|
10 ;; 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:
462
diff
changeset
|
11 ;; 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:
462
diff
changeset
|
12 ;; 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:
462
diff
changeset
|
13 ;; option) any later version. |
| 462 | 14 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
462
diff
changeset
|
15 ;; 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:
462
diff
changeset
|
16 ;; 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:
462
diff
changeset
|
17 ;; 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:
462
diff
changeset
|
18 ;; for more details. |
| 462 | 19 |
| 20 ;; 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:
462
diff
changeset
|
21 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 462 | 22 |
| 23 ;;; Synched up with: Not in FSF | |
| 24 | |
| 25 ;;; Commentary: | |
| 26 | |
| 27 ;; This file is dumped with XEmacs. | |
| 28 | |
| 29 (defvar gtk-type-aliases '((GtkType . guint) | |
| 30 (GdkAtom . gulong) | |
| 31 (GdkBitmap . GdkWindow) | |
| 32 (time_t . guint) | |
| 33 (none . void) | |
| 34 (GdkDrawable . GdkWindow) | |
| 35 (GdkBitmap . GdkWindow) | |
| 36 (GdkPixmap . GdkWindow)) | |
| 37 "An assoc list of aliases for commonly used GTK types that are not | |
| 38 really part of the object system.") | |
| 39 | |
| 40 (defvar gtk-ffi-debug nil | |
|
5384
3889ef128488
Fix misspelled words, and some grammar, across the entire source tree.
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
41 "If non-nil, all functions defined with `gtk-import-function' will be checked |
| 462 | 42 for missing marshallers.") |
| 43 | |
| 44 (defun gtk-ffi-check-function (func) | |
| 45 ;; We don't call gtk-main or gtk-main-quit because it thoroughly | |
| 46 ;; hoses us (locks up xemacs handling events, but no lisp). | |
| 47 (if (not (memq func '(gtk-main gtk-main-quit))) | |
| 48 (condition-case err | |
| 49 (funcall func) | |
| 50 (error | |
| 51 (case (car err) | |
| 52 (wrong-number-of-arguments nil) | |
| 53 (error | |
| 54 (if (string= "Could not locate marshaller function" (nth 1 err)) | |
| 55 (progn | |
| 56 (set-buffer (get-buffer-create "needed marshallers")) | |
| 57 (display-buffer (current-buffer)) | |
| 58 (goto-char (point-max)) | |
| 59 (insert | |
| 60 (format "%S\n" | |
| 61 (split-string | |
| 62 (substring (nth 2 err) (length "emacs_gtk_marshal_")) "_+"))))))))))) | |
| 63 | |
| 64 (defmacro gtk-import-function (retval name &rest args) | |
| 65 (if (symbolp name) | |
| 66 (setq name (symbol-name name))) | |
| 67 (let ((lisp-name (intern (replace-in-string name "_" "-"))) | |
| 68 (doc-string nil)) | |
| 69 (setq retval (or (cdr-safe (assoc retval gtk-type-aliases)) retval) | |
| 70 doc-string (concat "The lisp version of " name ".\n" | |
| 71 (if args | |
| 72 (concat "Prototype: " (prin1-to-string args))))) | |
| 73 | |
| 74 ;; Drop off any naming of arguments, etc. | |
| 75 (if (and args (consp (car args))) | |
| 76 (setq args (mapcar 'car args))) | |
| 77 | |
| 78 ;; Get rid of any type aliases. | |
| 79 (setq args (mapcar (lambda (x) | |
| 80 (or (cdr-safe (assoc x gtk-type-aliases)) x)) args)) | |
| 81 | |
| 82 `(progn | |
| 83 (defun ,lisp-name (&rest args) | |
| 84 ,doc-string | |
| 85 (if (not (get (quote ,lisp-name) 'gtk-ffi nil)) | |
| 86 (put (quote ,lisp-name) 'gtk-ffi | |
| 87 (gtk-import-function-internal (quote ,retval) ,name | |
| 88 (quote ,args)))) | |
| 89 (gtk-call-function (get (quote ,lisp-name) 'gtk-ffi 'ignore) args)) | |
| 90 (and gtk-ffi-debug (gtk-ffi-check-function (quote ,lisp-name)))))) | |
| 91 | |
| 92 (defmacro gtk-import-variable (type name) | |
| 93 (if (symbolp name) (setq name (symbol-name name))) | |
| 94 (let ((lisp-name (intern (replace-in-string name "_" "-"))) | |
| 95 (doc-string nil)) | |
| 96 (setq type (or (cdr-safe (assoc type gtk-type-aliases)) type) | |
| 97 doc-string (concat "Retrieve the variable " name " (type: " (symbol-name type) ").\n")) | |
| 98 `(defun ,lisp-name () | |
| 99 ,doc-string | |
| 100 (gtk-import-variable-internal (quote ,type) ,name)))) | |
| 101 | |
| 102 (provide 'gtk-ffi) |
