diff src/syntax.c @ 28269:fd13be8ae190

Changes towards better type safety regarding intervals, primarily regarding the "parent" handle. These just separate out the different usages based on the type of parent (interval vs lisp object); later changes will do type checking and enforcement. * intervals.h (NULL_INTERVAL): Cast to INTERVAL type. (INT_LISPLIKE): New macro. (NULL_INTERVAL_P): Use it. (INTERVAL_HAS_PARENT, INTERVAL_HAS_OBJECT, SET_INTERVAL_PARENT, SET_INTERVAL_OBJECT, INTERVAL_PARENT, COPY_INTERVAL_PARENT, GET_INTERVAL_OBJECT, INTERVAL_PARENT_OR_NULL): New macros. * alloc.c (make_interval, gc_sweep): Use new macros; eliminate all explicit references to "parent" field of struct interval and associated unclean type conversions. * intervals.c (create_root_interval, root_interval, rotate_right, rotate_left, balance_possible_root_interval, split_interval_right, split_interval_left, interval_start_pos, find_interval, next_interval, previous_interval, update_interval, adjust_intervals_for_insertion, delete_node, delete_interval, adjust_intervals_for_deletion, merge_interval_right, merge_interval_left, reproduce_tree, graft_intervals_into_buffer, copy_intervals_to_string): Likewise. * intervals.h (AM_LEFT_CHILD, AM_RIGHT_CHILD, RESET_INTERVAL): Likewise. * syntax.c (update_syntax_table): Likewise. * intervals.c (reproduce_tree_obj): New function, like reproduce_tree but takes a Lisp_Object for the parent. Declare with prototype. (graft_intervals_into_buffer): Use it when appropriate. (reproduce_tree): Declare with prototype. (balance_possible_root_interval): Check that the parent is a lisp object before trying to examine its type.

--- a/src/syntax.c	Wed Mar 22 14:25:38 2000 +0000
+++ b/src/syntax.c	Wed Mar 22 21:44:05 2000 +0000
@@ -140,14 +140,14 @@
       while (!NULL_PARENT (i)) 
 	{
 	  if (AM_RIGHT_CHILD (i))
-	    i->parent->position = i->position
+	    INTERVAL_PARENT (i)->position = i->position
 	      - LEFT_TOTAL_LENGTH (i) + TOTAL_LENGTH (i) /* right end */
-	      - TOTAL_LENGTH (i->parent)
-	      + LEFT_TOTAL_LENGTH (i->parent);
+	      - TOTAL_LENGTH (INTERVAL_PARENT (i))
+	      + LEFT_TOTAL_LENGTH (INTERVAL_PARENT (i));
 	  else
-	    i->parent->position = i->position - LEFT_TOTAL_LENGTH (i)
+	    INTERVAL_PARENT (i)->position = i->position - LEFT_TOTAL_LENGTH (i)
 	      + TOTAL_LENGTH (i);
-	  i = i->parent;
+	  i = INTERVAL_PARENT (i);
 	}
       i = gl_state.forward_i;
       gl_state.b_property = i->position - 1 - gl_state.offset;