Mercurial > hg > xemacs-beta
comparison lisp/bytecomp.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 | b90c153730c7 |
| children | 855b667dea13 |
comparison
equal
deleted
inserted
replaced
| 5559:f3ab0c29c246 | 5560:58b38d5b32d0 |
|---|---|
| 1933 custom-declare-variable)) | 1933 custom-declare-variable)) |
| 1934 (stringp (nth 3 form))) | 1934 (stringp (nth 3 form))) |
| 1935 (byte-compile-output-docform nil nil '("\n(" 3 ")") form nil | 1935 (byte-compile-output-docform nil nil '("\n(" 3 ")") form nil |
| 1936 (memq (car form) | 1936 (memq (car form) |
| 1937 '(autoload custom-declare-variable))) | 1937 '(autoload custom-declare-variable))) |
| 1938 (let ((print-escape-newlines t) | 1938 (let* ((print-escape-newlines t) |
| 1939 (print-length nil) | 1939 (print-length nil) |
| 1940 (print-level nil) | 1940 (print-level nil) |
| 1941 (print-readably t) ; print #[] for bytecode, 'x for (quote x) | 1941 (print-readably t) ; print #[] for bytecode, 'x for (quote x) |
| 1942 (print-gensym (if byte-compile-print-gensym '(t) nil)) | 1942 (print-gensym byte-compile-print-gensym) |
| 1943 print-gensym-alist) | 1943 (print-continuous-numbering print-gensym) |
| 1944 (print-circle t)) | |
| 1944 (when byte-compile-output-preface | 1945 (when byte-compile-output-preface |
| 1945 (princ "\n(progn " byte-compile-outbuffer) | 1946 (princ "\n(progn " byte-compile-outbuffer) |
| 1946 (prin1 byte-compile-output-preface byte-compile-outbuffer)) | 1947 (prin1 byte-compile-output-preface byte-compile-outbuffer)) |
| 1947 (princ "\n" byte-compile-outbuffer) | 1948 (princ "\n" byte-compile-outbuffer) |
| 1948 (prin1 form byte-compile-outbuffer) | 1949 (prin1 form byte-compile-outbuffer) |
| 1982 ;; negate POSITION. | 1983 ;; negate POSITION. |
| 1983 (if (and (stringp (nth (nth 1 info) form)) | 1984 (if (and (stringp (nth (nth 1 info) form)) |
| 1984 (> (length (nth (nth 1 info) form)) 0) | 1985 (> (length (nth (nth 1 info) form)) 0) |
| 1985 (char= (aref (nth (nth 1 info) form) 0) ?*)) | 1986 (char= (aref (nth (nth 1 info) form) 0) ?*)) |
| 1986 (setq position (- position))))) | 1987 (setq position (- position))))) |
| 1987 (let ((print-escape-newlines t) | 1988 (byte-compile-flush-pending) |
| 1988 (print-readably t) ; print #[] for bytecode, 'x for (quote x) | 1989 (let* ((print-escape-newlines t) |
| 1989 ;; Use a cons cell to say that we want | 1990 (print-readably t) ; print #[] for bytecode, 'x for (quote x) |
| 1990 ;; print-gensym-alist not to be cleared between calls | 1991 (print-gensym byte-compile-print-gensym) |
| 1991 ;; to print functions. | 1992 (print-continuous-numbering print-gensym) |
| 1992 (print-gensym (if byte-compile-print-gensym '(t) nil)) | 1993 (print-circle t) |
| 1993 print-gensym-alist | 1994 (index 0)) |
| 1994 (index 0)) | |
| 1995 (when byte-compile-output-preface | 1995 (when byte-compile-output-preface |
| 1996 (princ "\n(progn " byte-compile-outbuffer) | 1996 (princ "\n(progn " byte-compile-outbuffer) |
| 1997 (prin1 byte-compile-output-preface byte-compile-outbuffer)) | 1997 (prin1 byte-compile-output-preface byte-compile-outbuffer)) |
| 1998 (byte-compile-flush-pending) | |
| 1999 (if preface | 1998 (if preface |
| 2000 (progn | 1999 (progn |
| 2001 (insert preface) | 2000 (insert preface) |
| 2002 (prin1 name byte-compile-outbuffer))) | 2001 (prin1 name byte-compile-outbuffer))) |
| 2003 (insert (car info)) | 2002 (insert (car info)) |