Mercurial > hg > xemacs-beta

comparison src/rangetab.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 308d34e9f07d
children 56144c8593a8
comparison
equal deleted inserted replaced
5559:f3ab0c29c246 5560:58b38d5b32d0
130 } 130 }
131 if (print_readably) 131 if (print_readably)
132 write_ascstring (printcharfun, "))"); 132 write_ascstring (printcharfun, "))");
133 else 133 else
134 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); 134 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj));
135 }
136
137 static void
138 range_table_print_preprocess (Lisp_Object object,
139 Lisp_Object print_number_table,
140 Elemcount *seen_object_count)
141 {
142 Lisp_Range_Table *rt = XRANGE_TABLE (object);
143 Elemcount ii;
144
145 for (ii = 0; ii < gap_array_length (rt->entries); ii++)
146 {
147 struct range_table_entry *entry
148 = gap_array_atp (rt->entries, ii, struct range_table_entry);
149 PRINT_PREPROCESS (entry->val, print_number_table, seen_object_count);
150 }
151 }
152
153 static void
154 range_table_nsubst_structures_descend (Lisp_Object new_, Lisp_Object old,
155 Lisp_Object object,
156 Lisp_Object number_table,
157 Boolint test_not_unboundp)
158 {
159 Lisp_Range_Table *rt = XRANGE_TABLE (object);
160 Elemcount ii;
161
162 /* We don't have to worry about the range table START and END values if
163 we're limiting nsubst_descend to the Lisp reader; it's a similar case
164 to the hash table test. */
165 for (ii = 0; ii < gap_array_length (rt->entries); ii++)
166 {
167 struct range_table_entry *entry
168 = gap_array_atp (rt->entries, ii, struct range_table_entry);
169
170 if (EQ (old, entry->val) == test_not_unboundp)
171 {
172 entry->val = new_;
173 }
174 else if (LRECORDP (entry->val) &&
175 HAS_OBJECT_METH_P (entry->val, nsubst_structures_descend))
176 {
177 nsubst_structures_descend (new_, old, entry->val, number_table,
178 test_not_unboundp);
179 }
180 }
135 } 181 }
136 182
137 static int 183 static int
138 range_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) 184 range_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase)
139 { 185 {
1031 1077
1032 1078
1033 /************************************************************************/ 1079 /************************************************************************/
1034 /* Initialization */ 1080 /* Initialization */
1035 /************************************************************************/ 1081 /************************************************************************/
1082 void
1083 rangetab_objects_create (void)
1084 {
1085 OBJECT_HAS_METHOD (range_table, print_preprocess);
1086 OBJECT_HAS_METHOD (range_table, nsubst_structures_descend);
1087 }
1036 1088
1037 void 1089 void
1038 syms_of_rangetab (void) 1090 syms_of_rangetab (void)
1039 { 1091 {
1040 INIT_LISP_OBJECT (range_table); 1092 INIT_LISP_OBJECT (range_table);