Mercurial > hg > xemacs-beta

comparison src/fns.c @ 5560:58b38d5b32d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3310f36295a0
children 56144c8593a8
comparison
equal deleted inserted replaced
5559:f3ab0c29c246 5560:58b38d5b32d0
57 Lisp_Object Qvector, Qarray, Qbit_vector, QsortX, Q_from_end, Q_initial_value; 57 Lisp_Object Qvector, Qarray, Qbit_vector, QsortX, Q_from_end, Q_initial_value;
58 Lisp_Object Qmapconcat, QmapcarX, Qmapvector, Qmapcan, Qmapc, Qmap, Qmap_into; 58 Lisp_Object Qmapconcat, QmapcarX, Qmapvector, Qmapcan, Qmapc, Qmap, Qmap_into;
59 Lisp_Object Qsome, Qevery, Qmaplist, Qmapl, Qmapcon, Qreduce, Qsubstitute; 59 Lisp_Object Qsome, Qevery, Qmaplist, Qmapl, Qmapcon, Qreduce, Qsubstitute;
60 Lisp_Object Q_start1, Q_start2, Q_end1, Q_end2, Q_if_, Q_if_not, Q_stable; 60 Lisp_Object Q_start1, Q_start2, Q_end1, Q_end2, Q_if_, Q_if_not, Q_stable;
61 Lisp_Object Q_test_not, Q_count, Qnsubstitute, Qdelete_duplicates, Qmismatch; 61 Lisp_Object Q_test_not, Q_count, Qnsubstitute, Qdelete_duplicates, Qmismatch;
62 Lisp_Object Q_descend_structures;
62 63
63 Lisp_Object Qintersection, Qset_difference, Qnset_difference; 64 Lisp_Object Qintersection, Qset_difference, Qnset_difference;
64 Lisp_Object Qnunion, Qnintersection, Qsubsetp, Qcar_less_than_car; 65 Lisp_Object Qnunion, Qnintersection, Qsubsetp, Qcar_less_than_car;
65 66
66 Lisp_Object Qbase64_conversion_error; 67 Lisp_Object Qbase64_conversion_error;
205 Lisp_Bit_Vector); 206 Lisp_Bit_Vector);
206 207
207 /* Various test functions for #'member*, #'assoc* and the other functions 208 /* Various test functions for #'member*, #'assoc* and the other functions
208 that take both TEST and KEY arguments. */ 209 that take both TEST and KEY arguments. */
209 210
210 static Boolint 211 Boolint
211 check_eq_nokey (Lisp_Object UNUSED (test), Lisp_Object UNUSED (key), 212 check_eq_nokey (Lisp_Object UNUSED (test), Lisp_Object UNUSED (key),
212 Lisp_Object item, Lisp_Object elt) 213 Lisp_Object item, Lisp_Object elt)
213 { 214 {
214 return EQ (item, elt); 215 return EQ (item, elt);
215 } 216 }
9301 Substitute NEW for OLD everywhere in TREE (destructively). 9302 Substitute NEW for OLD everywhere in TREE (destructively).
9302 9303
9303 Any element of TREE which is `eql' to OLD is changed to NEW (via a call to 9304 Any element of TREE which is `eql' to OLD is changed to NEW (via a call to
9304 `setcar'). 9305 `setcar').
9305 9306
9306 See `member*' for the meaning of the keywords. 9307 See `member*' for the meaning of the keywords. The keyword
9307 9308 :descend-structures, not specified by Common Lisp, allows callers to specify
9308 arguments: (NEW OLD TREE &key (TEST #'eql) (KEY #'identity) TEST-NOT) 9309 that non-cons objects (vectors and range tables, among others) should also
9310 undergo substitution.
9311
9312 arguments: (NEW OLD TREE &key (TEST #'eql) (KEY #'identity) TEST-NOT DESCEND-STRUCTURES)
9309 */ 9313 */
9310 (int nargs, Lisp_Object *args)) 9314 (int nargs, Lisp_Object *args))
9311 { 9315 {
9312 Lisp_Object result, alist = noseeum_cons (noseeum_cons (args[1], args[0]), 9316 Lisp_Object new_ = args[0], old = args[1], tree = args[2], result, alist;
9313 Qnil); 9317 Boolint test_not_unboundp = 1;
9318 check_test_func_t check_test = NULL;
9319
9320 PARSE_KEYWORDS (Fnsubst, nargs, args, 6, (test, if_, test_not, if_not, key,
9321 descend_structures), NULL);
9322 if (!NILP (descend_structures))
9323 {
9324 check_test = get_check_test_function (old, &test, test_not, if_, if_not,
9325 key, &test_not_unboundp);
9326
9327 return nsubst_structures (new_, old, tree, check_test, test_not_unboundp,
9328 test, key);
9329
9330 }
9331
9332 alist = noseeum_cons (noseeum_cons (old, new_), Qnil);
9314 args[1] = alist; 9333 args[1] = alist;
9315 result = Fnsublis (nargs - 1, args + 1); 9334 result = Fnsublis (nargs - 1, args + 1);
9316 free_cons (XCAR (alist)); 9335 free_cons (XCAR (alist));
9317 free_cons (alist); 9336 free_cons (alist);
9318 9337
11705 defkeyword (&Q_if_, ":if"); 11724 defkeyword (&Q_if_, ":if");
11706 DEFKEYWORD (Q_if_not); 11725 DEFKEYWORD (Q_if_not);
11707 DEFKEYWORD (Q_test_not); 11726 DEFKEYWORD (Q_test_not);
11708 DEFKEYWORD (Q_count); 11727 DEFKEYWORD (Q_count);
11709 DEFKEYWORD (Q_stable); 11728 DEFKEYWORD (Q_stable);
11729 DEFKEYWORD (Q_descend_structures);
11710 11730
11711 DEFSYMBOL (Qyes_or_no_p); 11731 DEFSYMBOL (Qyes_or_no_p);
11712 11732
11713 DEFERROR_STANDARD (Qbase64_conversion_error, Qconversion_error); 11733 DEFERROR_STANDARD (Qbase64_conversion_error, Qconversion_error);
11714 11734