comparison src/intervals.c @ 9125:a78f02f76f03

(create_root_interval, balance_possible_root_interval, delete_interval): Use type test macros.
author Karl Heuer <kwzh@gnu.org>
date Tue, 27 Sep 1994 02:30:34 +0000
parents 21517199cfae
children 1971a6a8cdc0
comparison
equal deleted inserted replaced
9124:8ed50a8939e9 9125:a78f02f76f03
68 68
69 CHECK_IMPURE (parent); 69 CHECK_IMPURE (parent);
70 70
71 new = make_interval (); 71 new = make_interval ();
72 72
73 if (XTYPE (parent) == Lisp_Buffer) 73 if (BUFFERP (parent))
74 { 74 {
75 new->total_length = (BUF_Z (XBUFFER (parent)) 75 new->total_length = (BUF_Z (XBUFFER (parent))
76 - BUF_BEG (XBUFFER (parent))); 76 - BUF_BEG (XBUFFER (parent)));
77 XBUFFER (parent)->intervals = new; 77 XBUFFER (parent)->intervals = new;
78 } 78 }
79 else if (XTYPE (parent) == Lisp_String) 79 else if (STRINGP (parent))
80 { 80 {
81 new->total_length = XSTRING (parent)->size; 81 new->total_length = XSTRING (parent)->size;
82 XSTRING (parent)->intervals = new; 82 XSTRING (parent)->intervals = new;
83 } 83 }
84 84
409 return interval; 409 return interval;
410 410
411 parent = (Lisp_Object) (interval->parent); 411 parent = (Lisp_Object) (interval->parent);
412 interval = balance_an_interval (interval); 412 interval = balance_an_interval (interval);
413 413
414 if (XTYPE (parent) == Lisp_Buffer) 414 if (BUFFERP (parent))
415 XBUFFER (parent)->intervals = interval; 415 XBUFFER (parent)->intervals = interval;
416 else if (XTYPE (parent) == Lisp_String) 416 else if (STRINGP (parent))
417 XSTRING (parent)->intervals = interval; 417 XSTRING (parent)->intervals = interval;
418 418
419 return interval; 419 return interval;
420 } 420 }
421 421
1047 owner = (Lisp_Object) i->parent; 1047 owner = (Lisp_Object) i->parent;
1048 parent = delete_node (i); 1048 parent = delete_node (i);
1049 if (! NULL_INTERVAL_P (parent)) 1049 if (! NULL_INTERVAL_P (parent))
1050 parent->parent = (INTERVAL) owner; 1050 parent->parent = (INTERVAL) owner;
1051 1051
1052 if (XTYPE (owner) == Lisp_Buffer) 1052 if (BUFFERP (owner))
1053 XBUFFER (owner)->intervals = parent; 1053 XBUFFER (owner)->intervals = parent;
1054 else if (XTYPE (owner) == Lisp_String) 1054 else if (STRINGP (owner))
1055 XSTRING (owner)->intervals = parent; 1055 XSTRING (owner)->intervals = parent;
1056 else 1056 else
1057 abort (); 1057 abort ();
1058 1058
1059 return; 1059 return;