comparison src/syntax.c @ 5140:e5380fdaf8f1

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 05:38:34 -0600
parents a9c41067dd88
children 6c6d78781d59
comparison
equal deleted inserted replaced
5139:a48ef26d87ee 5140:e5380fdaf8f1
257 { XD_LISP_OBJECT, offsetof (struct syntax_cache, end) }, 257 { XD_LISP_OBJECT, offsetof (struct syntax_cache, end) },
258 { XD_END } 258 { XD_END }
259 }; 259 };
260 260
261 #ifdef NEW_GC 261 #ifdef NEW_GC
262 DEFINE_LRECORD_IMPLEMENTATION ("syntax-cache", syntax_cache, 262 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("syntax-cache", syntax_cache,
263 1, /*dumpable-flag*/ 263 0, syntax_cache_description_1,
264 0, 0, 0, 0, 0, 264 Lisp_Syntax_Cache);
265 syntax_cache_description_1,
266 Lisp_Syntax_Cache);
267 #else /* not NEW_GC */ 265 #else /* not NEW_GC */
268 266
269 const struct sized_memory_description syntax_cache_description = { 267 const struct sized_memory_description syntax_cache_description = {
270 sizeof (struct syntax_cache), 268 sizeof (struct syntax_cache),
271 syntax_cache_description_1 269 syntax_cache_description_1
521 void 519 void
522 init_buffer_syntax_cache (struct buffer *buf) 520 init_buffer_syntax_cache (struct buffer *buf)
523 { 521 {
524 struct syntax_cache *cache; 522 struct syntax_cache *cache;
525 #ifdef NEW_GC 523 #ifdef NEW_GC
526 buf->syntax_cache = alloc_lrecord_type (struct syntax_cache, 524 buf->syntax_cache = XSYNTAX_CACHE (ALLOC_NORMAL_LISP_OBJECT (syntax_cache));
527 &lrecord_syntax_cache);
528 #else /* not NEW_GC */ 525 #else /* not NEW_GC */
529 buf->syntax_cache = xnew_and_zero (struct syntax_cache); 526 buf->syntax_cache = xnew_and_zero (struct syntax_cache);
530 #endif /* not NEW_GC */ 527 #endif /* not NEW_GC */
531 cache = buf->syntax_cache; 528 cache = buf->syntax_cache;
532 cache->object = wrap_buffer (buf); 529 cache->object = wrap_buffer (buf);
2391 2388
2392 void 2389 void
2393 syms_of_syntax (void) 2390 syms_of_syntax (void)
2394 { 2391 {
2395 #ifdef NEW_GC 2392 #ifdef NEW_GC
2396 INIT_LRECORD_IMPLEMENTATION (syntax_cache); 2393 INIT_LISP_OBJECT (syntax_cache);
2397 #endif /* NEW_GC */ 2394 #endif /* NEW_GC */
2398 DEFSYMBOL (Qsyntax_table_p); 2395 DEFSYMBOL (Qsyntax_table_p);
2399 DEFSYMBOL (Qsyntax_table); 2396 DEFSYMBOL (Qsyntax_table);
2400 2397
2401 DEFSUBR (Fsyntax_table_p); 2398 DEFSUBR (Fsyntax_table_p);