comparison src/bytecode.c @ 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 ac37a5f7e5be
children 56144c8593a8
comparison
equal deleted inserted replaced
5559:f3ab0c29c246 5560:58b38d5b32d0
92 0, 92 0,
93 compiled_function_args_description, 93 compiled_function_args_description,
94 size_compiled_function_args, 94 size_compiled_function_args,
95 Lisp_Compiled_Function_Args); 95 Lisp_Compiled_Function_Args);
96 #endif /* NEW_GC */ 96 #endif /* NEW_GC */
97
98 static void set_compiled_function_arglist (Lisp_Compiled_Function *,
99 Lisp_Object);
100 static void set_compiled_function_constants (Lisp_Compiled_Function *,
101 Lisp_Object);
102 static void set_compiled_function_interactive (Lisp_Compiled_Function *,
103 Lisp_Object);
97 104
98 EXFUN (Ffetch_bytecode, 1); 105 EXFUN (Ffetch_bytecode, 1);
99 106
100 Lisp_Object Qbyte_code, Qcompiled_functionp, Qinvalid_byte_code; 107 Lisp_Object Qbyte_code, Qcompiled_functionp, Qinvalid_byte_code;
101 108
2358 internal_equal (f1->arglist, f2->arglist, depth + 1) && 2365 internal_equal (f1->arglist, f2->arglist, depth + 1) &&
2359 internal_equal (f1->doc_and_interactive, 2366 internal_equal (f1->doc_and_interactive,
2360 f2->doc_and_interactive, depth + 1)); 2367 f2->doc_and_interactive, depth + 1));
2361 } 2368 }
2362 2369
2370 static void
2371 compiled_function_print_preprocess (Lisp_Object object,
2372 Lisp_Object print_number_table,
2373 Elemcount *seen_object_count)
2374 {
2375 Lisp_Compiled_Function *cf = XCOMPILED_FUNCTION (object);
2376
2377 PRINT_PREPROCESS (compiled_function_arglist (cf), print_number_table,
2378 seen_object_count);
2379
2380 PRINT_PREPROCESS (compiled_function_constants (cf), print_number_table,
2381 seen_object_count);
2382
2383 if (cf->flags.interactivep)
2384 {
2385 PRINT_PREPROCESS (compiled_function_interactive (cf),
2386 print_number_table, seen_object_count);
2387 }
2388 }
2389
2390 static void
2391 compiled_function_nsubst_structures_descend (Lisp_Object new_, Lisp_Object old,
2392 Lisp_Object object,
2393 Lisp_Object number_table,
2394 Boolint test_not_unboundp)
2395 {
2396 Lisp_Compiled_Function *cf = XCOMPILED_FUNCTION (object);
2397 Lisp_Object arglist = compiled_function_arglist (cf);
2398 Lisp_Object constants = compiled_function_constants (cf);
2399
2400 if (EQ (arglist, old) == test_not_unboundp)
2401 {
2402 set_compiled_function_arglist (cf, new_);
2403 }
2404 else if (CONSP (arglist))
2405 {
2406 nsubst_structures_descend (new_, old, arglist, number_table,
2407 test_not_unboundp);
2408 }
2409
2410 if (EQ (constants, old) == test_not_unboundp)
2411 {
2412 set_compiled_function_constants (cf, new_);
2413 }
2414 else
2415 {
2416 nsubst_structures_descend (new_, old, constants, number_table,
2417 test_not_unboundp);
2418 }
2419
2420 /* We're not descending into the instructions here, because this function
2421 is initially for use in the Lisp reader, where it only makes sense to
2422 use the #%d= syntax for lrecords. */
2423
2424 if (cf->flags.interactivep)
2425 {
2426 Lisp_Object interactive = compiled_function_interactive (cf);
2427 if (EQ (interactive, old) == test_not_unboundp)
2428 {
2429 set_compiled_function_interactive (cf, new_);
2430 }
2431 else if (LRECORDP (interactive) &&
2432 HAS_OBJECT_METH_P (interactive, nsubst_structures_descend))
2433 {
2434 nsubst_structures_descend (new_, old, interactive, number_table,
2435 test_not_unboundp);
2436 }
2437 }
2438 }
2439
2363 static Hashcode 2440 static Hashcode
2364 compiled_function_hash (Lisp_Object obj, int depth, Boolint UNUSED (equalp)) 2441 compiled_function_hash (Lisp_Object obj, int depth, Boolint UNUSED (equalp))
2365 { 2442 {
2366 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (obj); 2443 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (obj);
2367 return HASH3 ((f->flags.documentationp << 2) + 2444 return HASH3 ((f->flags.documentationp << 2) +
2605 f->doc_and_interactive = new_doc; 2682 f->doc_and_interactive = new_doc;
2606 } 2683 }
2607 } 2684 }
2608 } 2685 }
2609 2686
2687 static void
2688 set_compiled_function_arglist (Lisp_Compiled_Function *f, Lisp_Object new_)
2689 {
2690 CHECK_LIST (new_);
2691 f->arglist = new_;
2692
2693 /* Recalculate the optimized version of the function, since this depends
2694 on the arglist. */
2695 f->instructions = compiled_function_instructions (f);
2696 optimize_compiled_function (wrap_compiled_function (f));
2697 }
2698
2699 static void
2700 set_compiled_function_constants (Lisp_Compiled_Function *f, Lisp_Object new_)
2701 {
2702 CHECK_VECTOR (new_);
2703 f->constants = new_;
2704 }
2705
2706 static void
2707 set_compiled_function_interactive (Lisp_Compiled_Function *f, Lisp_Object new_)
2708 {
2709 assert (f->flags.interactivep);
2710
2711 if (f->flags.documentationp && f->flags.domainp)
2712 {
2713 XSETCAR (XCDR (f->doc_and_interactive), new_);
2714 }
2715 else if (f->flags.documentationp)
2716 {
2717 XSETCDR (f->doc_and_interactive, new_);
2718 }
2719 else if (f->flags.domainp)
2720 {
2721 XSETCAR (f->doc_and_interactive, new_);
2722 }
2723 else
2724 {
2725 f->doc_and_interactive = new_;
2726 }
2727 }
2610 2728
2611 DEFUN ("compiled-function-arglist", Fcompiled_function_arglist, 1, 1, 0, /* 2729 DEFUN ("compiled-function-arglist", Fcompiled_function_arglist, 1, 1, 0, /*
2612 Return the argument list of the compiled-function object FUNCTION. 2730 Return the argument list of the compiled-function object FUNCTION.
2613 */ 2731 */
2614 (function)) 2732 (function))
2779 XINT (stack_depth), 2897 XINT (stack_depth),
2780 XVECTOR_DATA (constants)); 2898 XVECTOR_DATA (constants));
2781 } 2899 }
2782 2900
2783 2901
2902 void
2903 bytecode_objects_create (void)
2904 {
2905 OBJECT_HAS_METHOD (compiled_function, print_preprocess);
2906 OBJECT_HAS_METHOD (compiled_function, nsubst_structures_descend);
2907 }
2908
2784 void 2909 void
2785 syms_of_bytecode (void) 2910 syms_of_bytecode (void)
2786 { 2911 {
2787 INIT_LISP_OBJECT (compiled_function); 2912 INIT_LISP_OBJECT (compiled_function);
2788 #ifdef NEW_GC 2913 #ifdef NEW_GC