comparison src/extents.h @ 5133:444a448b2f53

Merge branch ben-lisp-object into default branch
author Ben Wing <ben@xemacs.org>
date Sun, 07 Mar 2010 06:47:37 -0600
parents a9c41067dd88
children 1fae11d56ad2
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5133:444a448b2f53
1 /* Copyright (c) 1994, 1995 Free Software Foundation. 1 /* Copyright (c) 1994, 1995 Free Software Foundation.
2 Copyright (c) 1995, 1996, 2002 Ben Wing. 2 Copyright (c) 1995, 1996, 2002, 2010 Ben Wing.
3 3
4 This file is part of XEmacs. 4 This file is part of XEmacs.
5 5
6 XEmacs is free software; you can redistribute it and/or modify it 6 XEmacs is free software; you can redistribute it and/or modify it
7 under the terms of the GNU General Public License as published by the 7 under the terms of the GNU General Public License as published by the
21 /* Synched up with: Not in FSF. */ 21 /* Synched up with: Not in FSF. */
22 22
23 #ifndef INCLUDED_extents_h_ 23 #ifndef INCLUDED_extents_h_
24 #define INCLUDED_extents_h_ 24 #define INCLUDED_extents_h_
25 25
26 DECLARE_LRECORD (extent, struct extent); 26 DECLARE_LISP_OBJECT (extent, struct extent);
27 #define XEXTENT(x) XRECORD (x, extent, struct extent) 27 #define XEXTENT(x) XRECORD (x, extent, struct extent)
28 #define wrap_extent(p) wrap_record (p, extent) 28 #define wrap_extent(p) wrap_record (p, extent)
29 #define EXTENTP(x) RECORDP (x, extent) 29 #define EXTENTP(x) RECORDP (x, extent)
30 #define CHECK_EXTENT(x) CHECK_RECORD (x, extent) 30 #define CHECK_EXTENT(x) CHECK_RECORD (x, extent)
31 #define CONCHECK_EXTENT(x) CONCHECK_RECORD (x, extent) 31 #define CONCHECK_EXTENT(x) CONCHECK_RECORD (x, extent)
32 32
33 struct extent_auxiliary; 33 struct extent_auxiliary;
34 34
35 DECLARE_LRECORD (extent_auxiliary, struct extent_auxiliary); 35 DECLARE_LISP_OBJECT (extent_auxiliary, struct extent_auxiliary);
36 #define XEXTENT_AUXILIARY(x) \ 36 #define XEXTENT_AUXILIARY(x) \
37 XRECORD (x, extent_auxiliary, struct extent_auxiliary) 37 XRECORD (x, extent_auxiliary, struct extent_auxiliary)
38 #define wrap_extent_auxiliary(p) wrap_record (p, extent_auxiliary) 38 #define wrap_extent_auxiliary(p) wrap_record (p, extent_auxiliary)
39 #define EXTENT_AUXILIARYP(x) RECORDP (x, extent_auxiliary) 39 #define EXTENT_AUXILIARYP(x) RECORDP (x, extent_auxiliary)
40 #define CHECK_EXTENT_AUXILIARY(x) CHECK_RECORD (x, extent_auxiliary) 40 #define CHECK_EXTENT_AUXILIARY(x) CHECK_RECORD (x, extent_auxiliary)
41 #define CONCHECK_EXTENT_AUXILIARY(x) CONCHECK_RECORD (x, extent_auxiliary) 41 #define CONCHECK_EXTENT_AUXILIARY(x) CONCHECK_RECORD (x, extent_auxiliary)
42 42
43 struct extent_info; 43 struct extent_info;
44 44
45 DECLARE_LRECORD (extent_info, struct extent_info); 45 DECLARE_LISP_OBJECT (extent_info, struct extent_info);
46 #define XEXTENT_INFO(x) XRECORD (x, extent_info, struct extent_info) 46 #define XEXTENT_INFO(x) XRECORD (x, extent_info, struct extent_info)
47 #define wrap_extent_info(p) wrap_record (p, extent_info) 47 #define wrap_extent_info(p) wrap_record (p, extent_info)
48 #define EXTENT_INFOP(x) RECORDP (x, extent_info) 48 #define EXTENT_INFOP(x) RECORDP (x, extent_info)
49 #define CHECK_EXTENT_INFO(x) CHECK_RECORD (x, extent_info) 49 #define CHECK_EXTENT_INFO(x) CHECK_RECORD (x, extent_info)
50 #define CONCHECK_EXTENT_INFO(x) CONCHECK_RECORD (x, extent_info) 50 #define CONCHECK_EXTENT_INFO(x) CONCHECK_RECORD (x, extent_info)
51 51
52 #ifdef NEW_GC 52 #ifdef NEW_GC
53 struct gap_array_marker; 53 struct gap_array_marker;
54 54
55 DECLARE_LRECORD (gap_array_marker, struct gap_array_marker); 55 DECLARE_LISP_OBJECT (gap_array_marker, struct gap_array_marker);
56 #define XGAP_ARRAY_MARKER(x) \ 56 #define XGAP_ARRAY_MARKER(x) \
57 XRECORD (x, gap_array_marker, struct gap_array_marker) 57 XRECORD (x, gap_array_marker, struct gap_array_marker)
58 #define wrap_gap_array_marker(p) wrap_record (p, gap_array_marker) 58 #define wrap_gap_array_marker(p) wrap_record (p, gap_array_marker)
59 #define GAP_ARRAY_MARKERP(x) RECORDP (x, gap_array_marker) 59 #define GAP_ARRAY_MARKERP(x) RECORDP (x, gap_array_marker)
60 #define CHECK_GAP_ARRAY_MARKER(x) CHECK_RECORD (x, gap_array_marker) 60 #define CHECK_GAP_ARRAY_MARKER(x) CHECK_RECORD (x, gap_array_marker)
61 #define CONCHECK_GAP_ARRAY_MARKER(x) CONCHECK_RECORD (x, gap_array_marker) 61 #define CONCHECK_GAP_ARRAY_MARKER(x) CONCHECK_RECORD (x, gap_array_marker)
62 62
63 struct gap_array; 63 struct gap_array;
64 64
65 DECLARE_LRECORD (gap_array, struct gap_array); 65 DECLARE_LISP_OBJECT (gap_array, struct gap_array);
66 #define XGAP_ARRAY(x) XRECORD (x, gap_array, struct gap_array) 66 #define XGAP_ARRAY(x) XRECORD (x, gap_array, struct gap_array)
67 #define wrap_gap_array(p) wrap_record (p, gap_array) 67 #define wrap_gap_array(p) wrap_record (p, gap_array)
68 #define GAP_ARRAYP(x) RECORDP (x, gap_array) 68 #define GAP_ARRAYP(x) RECORDP (x, gap_array)
69 #define CHECK_GAP_ARRAY(x) CHECK_RECORD (x, gap_array) 69 #define CHECK_GAP_ARRAY(x) CHECK_RECORD (x, gap_array)
70 #define CONCHECK_GAP_ARRAY(x) CONCHECK_RECORD (x, gap_array) 70 #define CONCHECK_GAP_ARRAY(x) CONCHECK_RECORD (x, gap_array)
71 71
72 struct extent_list_marker; 72 struct extent_list_marker;
73 73
74 DECLARE_LRECORD (extent_list_marker, struct extent_list_marker); 74 DECLARE_LISP_OBJECT (extent_list_marker, struct extent_list_marker);
75 #define XEXTENT_LIST_MARKER(x) \ 75 #define XEXTENT_LIST_MARKER(x) \
76 XRECORD (x, extent_list_marker, struct extent_list_marker) 76 XRECORD (x, extent_list_marker, struct extent_list_marker)
77 #define wrap_extent_list_marker(p) wrap_record (p, extent_list_marker) 77 #define wrap_extent_list_marker(p) wrap_record (p, extent_list_marker)
78 #define EXTENT_LIST_MARKERP(x) RECORDP (x, extent_list_marker) 78 #define EXTENT_LIST_MARKERP(x) RECORDP (x, extent_list_marker)
79 #define CHECK_EXTENT_LIST_MARKER(x) CHECK_RECORD (x, extent_list_marker) 79 #define CHECK_EXTENT_LIST_MARKER(x) CHECK_RECORD (x, extent_list_marker)
80 #define CONCHECK_EXTENT_LIST_MARKER(x) CONCHECK_RECORD (x, extent_list_marker) 80 #define CONCHECK_EXTENT_LIST_MARKER(x) CONCHECK_RECORD (x, extent_list_marker)
81 81
82 struct extent_list; 82 struct extent_list;
83 83
84 DECLARE_LRECORD (extent_list, struct extent_list); 84 DECLARE_LISP_OBJECT (extent_list, struct extent_list);
85 #define XEXTENT_LIST(x) XRECORD (x, extent_list, struct extent_list) 85 #define XEXTENT_LIST(x) XRECORD (x, extent_list, struct extent_list)
86 #define wrap_extent_list(p) wrap_record (p, extent_list) 86 #define wrap_extent_list(p) wrap_record (p, extent_list)
87 #define EXTENT_LISTP(x) RECORDP (x, extent_list) 87 #define EXTENT_LISTP(x) RECORDP (x, extent_list)
88 #define CHECK_EXTENT_LIST(x) CHECK_RECORD (x, extent_list) 88 #define CHECK_EXTENT_LIST(x) CHECK_RECORD (x, extent_list)
89 #define CONCHECK_EXTENT_LIST(x) CONCHECK_RECORD (x, extent_list) 89 #define CONCHECK_EXTENT_LIST(x) CONCHECK_RECORD (x, extent_list)
90 90
91 struct stack_of_extents; 91 struct stack_of_extents;
92 92
93 DECLARE_LRECORD (stack_of_extents, struct stack_of_extents); 93 DECLARE_LISP_OBJECT (stack_of_extents, struct stack_of_extents);
94 #define XSTACK_OF_EXTENTS(x) \ 94 #define XSTACK_OF_EXTENTS(x) \
95 XRECORD (x, stack_of_extents, struct stack_of_extents) 95 XRECORD (x, stack_of_extents, struct stack_of_extents)
96 #define wrap_stack_of_extents(p) wrap_record (p, stack_of_extents) 96 #define wrap_stack_of_extents(p) wrap_record (p, stack_of_extents)
97 #define STACK_OF_EXTENTSP(x) RECORDP (x, stack_of_extents) 97 #define STACK_OF_EXTENTSP(x) RECORDP (x, stack_of_extents)
98 #define CHECK_STACK_OF_EXTENTS(x) CHECK_RECORD (x, stack_of_extents) 98 #define CHECK_STACK_OF_EXTENTS(x) CHECK_RECORD (x, stack_of_extents)
226 void extent_fragment_delete (struct extent_fragment *ef); 226 void extent_fragment_delete (struct extent_fragment *ef);
227 227
228 /* from alloc.c */ 228 /* from alloc.c */
229 struct extent *allocate_extent (void); 229 struct extent *allocate_extent (void);
230 230
231 void allocate_extent_auxiliary (EXTENT ext); 231 void attach_extent_auxiliary (EXTENT ext);
232 void init_buffer_extents (struct buffer *b); 232 void init_buffer_extents (struct buffer *b);
233 void uninit_buffer_extents (struct buffer *b); 233 void uninit_buffer_extents (struct buffer *b);
234 234
235 #ifdef ERROR_CHECK_EXTENTS 235 #ifdef ERROR_CHECK_EXTENTS
236 void sledgehammer_extent_check (Lisp_Object obj); 236 void sledgehammer_extent_check (Lisp_Object obj);