Mercurial > hg > xemacs-beta
annotate src/opaque.h @ 5168:cf900a2f1fa3
extract gap array from extents.c, use in range tables
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-22 Ben Wing <ben@xemacs.org>
* Makefile.in.in (objs):
* array.c:
* array.c (gap_array_adjust_markers):
* array.c (gap_array_move_gap):
* array.c (gap_array_make_gap):
* array.c (gap_array_insert_els):
* array.c (gap_array_delete_els):
* array.c (gap_array_make_marker):
* array.c (gap_array_delete_marker):
* array.c (gap_array_delete_all_markers):
* array.c (gap_array_clone):
* array.h:
* depend:
* emacs.c (main_1):
* extents.c:
* extents.c (EXTENT_GAP_ARRAY_AT):
* extents.c (extent_list_num_els):
* extents.c (extent_list_locate):
* extents.c (extent_list_at):
* extents.c (extent_list_delete_all):
* extents.c (allocate_extent_list):
* extents.c (syms_of_extents):
* extents.h:
* extents.h (XEXTENT_LIST_MARKER):
* lisp.h:
* rangetab.c:
* rangetab.c (mark_range_table):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* rangetab.c (range_table_hash):
* rangetab.c (verify_range_table):
* rangetab.c (get_range_table_pos):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (put_range_table):
* rangetab.c (Fclear_range_table):
* rangetab.c (Fmap_range_table):
* rangetab.c (unified_range_table_bytes_needed):
* rangetab.c (unified_range_table_copy_data):
* rangetab.c (unified_range_table_lookup):
* rangetab.h:
* rangetab.h (struct range_table_entry):
* rangetab.h (struct Lisp_Range_Table):
* rangetab.h (rangetab_gap_array_at):
* symsinit.h:
Rename dynarr.c to array.c. Move gap array from extents.c to array.c.
Extract dynarr, gap array and stack-like malloc into new file array.h.
Rename GAP_ARRAY_NUM_ELS -> gap_array_length(). Add gap_array_at(),
gap_array_atp().
Rewrite range table code to use gap arrays. Make put_range_table()
smarter so that its operation is O(log n) for adding a localized
range.
* gc.c (lispdesc_block_size_1):
Don't ABORT() when two elements are located at the same place.
This will happen with a size-0 gap array -- both parts of the array
(before and after gap) are in the same place.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 22 Mar 2010 19:12:15 -0500 |
| parents | a9c41067dd88 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Opaque Lisp objects. |
| 2 Copyright (C) 1993 Sun Microsystems, Inc. | |
| 3 Copyright (C) 1995, 1996 Ben Wing. | |
| 4 | |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Written by Ben Wing, October 1993. */ | |
| 25 | |
| 440 | 26 #ifndef INCLUDED_opaque_h_ |
| 27 #define INCLUDED_opaque_h_ | |
| 428 | 28 |
| 29 typedef struct Lisp_Opaque | |
| 30 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
31 NORMAL_LISP_OBJECT_HEADER header; |
| 665 | 32 Bytecount size; |
| 428 | 33 max_align_t data[1]; |
| 34 } Lisp_Opaque; | |
| 35 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
36 DECLARE_LISP_OBJECT (opaque, Lisp_Opaque); |
| 428 | 37 #define XOPAQUE(x) XRECORD (x, opaque, Lisp_Opaque) |
| 617 | 38 #define wrap_opaque(p) wrap_record (p, opaque) |
| 428 | 39 #define OPAQUEP(x) RECORDP (x, opaque) |
| 40 /* #define CHECK_OPAQUE(x) CHECK_RECORD (x, opaque) | |
| 41 Opaque pointers should never escape to the Lisp level, so | |
| 42 functions should not be doing this. */ | |
| 43 | |
| 440 | 44 /* Alternative DATA arguments to make_opaque() */ |
| 442 | 45 #define OPAQUE_CLEAR ((const void *) 0) |
| 46 #define OPAQUE_UNINIT ((const void *) -1) | |
| 428 | 47 |
| 48 #define OPAQUE_SIZE(op) ((op)->size) | |
| 49 #define OPAQUE_DATA(op) ((void *) ((op)->data)) | |
| 50 #define XOPAQUE_SIZE(op) OPAQUE_SIZE (XOPAQUE (op)) | |
| 51 #define XOPAQUE_DATA(op) OPAQUE_DATA (XOPAQUE (op)) | |
| 52 | |
| 665 | 53 Lisp_Object make_opaque (const void *data, Bytecount size); |
| 428 | 54 |
| 55 typedef struct Lisp_Opaque_Ptr | |
| 56 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
57 NORMAL_LISP_OBJECT_HEADER header; |
| 428 | 58 void *ptr; |
| 59 } Lisp_Opaque_Ptr; | |
| 60 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
61 DECLARE_LISP_OBJECT (opaque_ptr, Lisp_Opaque_Ptr); |
| 428 | 62 #define XOPAQUE_PTR(x) XRECORD (x, opaque_ptr, Lisp_Opaque_Ptr) |
| 617 | 63 #define wrap_opaque_ptr(p) wrap_record (p, opaque_ptr) |
| 428 | 64 #define OPAQUE_PTRP(x) RECORDP (x, opaque_ptr) |
| 65 | |
| 1650 | 66 EXTERN_C MODULE_API Lisp_Object make_opaque_ptr (void *val); |
| 67 EXTERN_C MODULE_API void free_opaque_ptr (Lisp_Object ptr); | |
| 428 | 68 |
| 69 #define get_opaque_ptr(op) (XOPAQUE_PTR (op)->ptr) | |
| 70 #define set_opaque_ptr(op, ptr_) (XOPAQUE_PTR (op)->ptr = (ptr_)) | |
| 71 | |
| 440 | 72 #endif /* INCLUDED_opaque_h_ */ |