emacs: src/buffer.c comparison

comparison src/buffer.c @ 2776:8bf3bb4c20dd

* lisp.h (Lisp_Overlay): New tag. (OVERLAYP): New predicate. (CHECK_OVERLAY): New type-checker. (Qoverlayp): New extern declaration. * buffer.c (Foverlayp): New function. (Qoverlayp): New atom. (overlays_at, recenter_overlay_lists): Abort if we encounter an invalid overlay. (syms_of_buffer): defsubr Soverlayp; initialize Qoverlayp. (Fdelete_overlay): Set the overlay's markers to point nowhere. Use CHECK_OVERLAY instead of signalling a special error. (Fmove_overlay, Foverlay_put): Use CHECK_OVERLAY instead of signalling a special error. (Foverlay_get): Use CHECK_OVERLAY. * fns.c (internal_equal): Define this for overlays. * buffer.h (OVERLAY_VALID): Define in terms of OVERLAYP. * print.c (print): Give overlays their own print syntax. * alloc.c (mark_object): Treat overlays like conses. * buffer.c (Foverlay_get): Return Qnil if the requested property is missing from the property list.

author	Jim Blandy <jimb@redhat.com>
date	Fri, 14 May 1993 14:36:01 +0000
parents	16db9d1af886
children	995c6e665599

comparison

equal deleted inserted replaced

-:72277ed7609e
+:8bf3bb4c20dd
 Lisp_Object Qprotected_field;
 Lisp_Object QSFundamental;	/* A string "Fundamental" */
 Lisp_Object Qkill_buffer_hook;
+Lisp_Object Qoverlayp;
 /* For debugging; temporary.  See set_buffer_internal.  */
 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */
 nsberror (spec)
 }
 /* Find all the overlays in the current buffer that contain position POS.
 Return the number found, and store them in a vector in *VEC_PTR.
 Store in *LEN_PTR the size allocated for the vector.
-Store in *NEXT_PTR the next position after POS where an overlay starts.
+Store in *NEXT_PTR the next position after POS where an overlay starts,
+or ZV if there are no more overlays.
 *VEC_PTR and *LEN_PTR should contain a valid vector and size
 when this function is called.  */
 int
 Lisp_Object tail, overlay, start, end, result;
 int idx = 0;
 int len = *len_ptr;
 Lisp_Object *vec = *vec_ptr;
 int next = ZV;
-int startpos;
 for (tail = current_buffer->overlays_before;
 CONSP (tail);
 tail = XCONS (tail)->cdr)
 {
+int startpos;
 overlay = XCONS (tail)->car;
 if (! OVERLAY_VALID (overlay))
-	continue;
+	abort ();
 start = OVERLAY_START (overlay);
 end = OVERLAY_END (overlay);
 if (OVERLAY_POSITION (end) <= pos)
 	break;
 for (tail = current_buffer->overlays_after;
 CONSP (tail);
 tail = XCONS (tail)->cdr)
 {
+int startpos;
 overlay = XCONS (tail)->car;
 if (! OVERLAY_VALID (overlay))
-	continue;
+	abort ();
 start = OVERLAY_START (overlay);
 end = OVERLAY_END (overlay);
 startpos = OVERLAY_POSITION (start);
-if (startpos > pos)
+if (pos < startpos)
 	{
 	  if (startpos < next)
 	    next = startpos;
 	  break;
 	}
-if (OVERLAY_POSITION (end) > pos)
+if (pos < OVERLAY_POSITION (end))
 	{
 	  if (idx == len)
 	    {
 	      *len_ptr = len *= 2;
 	      vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object));
 next = XCONS (tail)->cdr;
 overlay = XCONS (tail)->car;
 /* If the overlay is not valid, get rid of it.  */
 if (!OVERLAY_VALID (overlay))
+#if 1
+	abort ();
+#else
 	{
 	  /* Splice the cons cell TAIL out of overlays_before.  */
 	  if (!NILP (prev))
 	    XCONS (prev)->cdr = next;
 	  else
 	    buf->overlays_before = next;
 	  tail = prev;
 	  continue;
 	}
+#endif
 beg = OVERLAY_START (overlay);
 end = OVERLAY_END (overlay);
 if (OVERLAY_POSITION (end) > pos)
 	      Lisp_Object otherbeg, otheroverlay, follower;
 	      int win;
 	      otheroverlay = XCONS (other)->car;
 	      if (! OVERLAY_VALID (otheroverlay))
-		continue;
+		abort ();
 	      otherbeg = OVERLAY_START (otheroverlay);
 	      if (OVERLAY_POSITION (otherbeg) >= where)
 		break;
 	    }
 next = XCONS (tail)->cdr;
 overlay = XCONS (tail)->car;
 /* If the overlay is not valid, get rid of it.  */
 if (!OVERLAY_VALID (overlay))
+#if 1
+	abort ();
+#else
 	{
 	  /* Splice the cons cell TAIL out of overlays_after.  */
 	  if (!NILP (prev))
 	    XCONS (prev)->cdr = next;
 	  else
 	    buf->overlays_after = next;
 	  tail = prev;
 	  continue;
 	}
+#endif
 beg = OVERLAY_START (overlay);
 end = OVERLAY_END (overlay);
 /* Stop looking, when we know that nothing further
 	      Lisp_Object otherend, otheroverlay;
 	      int win;
 	      otheroverlay = XCONS (other)->car;
 	      if (! OVERLAY_VALID (otheroverlay))
-		continue;
+		abort ();
 	      otherend = OVERLAY_END (otheroverlay);
 	      if (OVERLAY_POSITION (otherend) <= where)
 		break;
 	    }
 }
 XFASTINT (buf->overlay_center) = pos;
 }
+DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0,
+"Return t if OBJECT is an overlay.")
+(object)
+Lisp_Object object;
+{
+return (OVERLAYP (object) ? Qt : Qnil);
+}
 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 3, 0,
 "Create a new overlay with range BEG to END in BUFFER.\n\
 If omitted, BUFFER defaults to the current buffer.\n\
 BEG and END may be integers or markers.")
 (beg, end, buffer)
 }
 else
 end = Fset_marker (Fmake_marker (), end, buffer);
 overlay = Fcons (Fcons (beg, end), Qnil);
+XSETTYPE (overlay, Lisp_Overlay);
 /* Put the new overlay on the wrong list.  */
 end = OVERLAY_END (overlay);
 if (OVERLAY_POSITION (end) < XINT (b->overlay_center))
 b->overlays_after = Fcons (overlay, b->overlays_after);
 (overlay, beg, end, buffer)
 Lisp_Object overlay, beg, end, buffer;
 {
 struct buffer *b;
-if (!OVERLAY_VALID (overlay))
+CHECK_OVERLAY (overlay, 0);
-error ("Invalid overlay object");
 if (NILP (buffer))
 buffer = Fmarker_buffer (OVERLAY_START (overlay));
 CHECK_BUFFER (buffer, 3);
 CHECK_NUMBER_COERCE_MARKER (beg, 1);
 CHECK_NUMBER_COERCE_MARKER (end, 1);
 if (XINT (beg) > XINT (end))
 {
 (overlay)
 Lisp_Object overlay;
 {
 struct buffer *b;
-if (OVERLAY_VALID (overlay))
+CHECK_OVERLAY (overlay, 0);
-b = XBUFFER (Fmarker_buffer (OVERLAY_START (overlay)));
-else
+b = XBUFFER (Fmarker_buffer (OVERLAY_START (overlay)));
-/* Guess! */
-b = current_buffer;
 b->overlays_before = Fdelq (overlay, b->overlays_before);
 b->overlays_after  = Fdelq (overlay, b->overlays_after);
+Fset_marker (OVERLAY_START (overlay), 1, Qnil);
+Fset_marker (OVERLAY_END   (overlay), 1, Qnil);
 redisplay_region (b,
 		    OVERLAY_POSITION (OVERLAY_START (overlay)),
 		    OVERLAY_POSITION (OVERLAY_END   (overlay)));
 "Get the property of overlay OVERLAY with property name NAME.")
 (overlay, prop)
 Lisp_Object overlay, prop;
 {
 Lisp_Object plist;
-for (plist = Fcdr_safe (Fcdr_safe (overlay));
+CHECK_OVERLAY (overlay, 0);
+for (plist = Fcdr_safe (XCONS (overlay)->cdr);
 CONSP (plist) && CONSP (XCONS (plist)->cdr);
 plist = XCONS (XCONS (plist)->cdr)->cdr)
 {
 if (EQ (XCONS (plist)->car, prop))
 	return XCONS (XCONS (plist)->cdr)->car;
 }
+return Qnil;
 }
 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,
 "Set one property of overlay OVERLAY: give property PROP value VALUE.")
 (overlay, prop, value)
 Lisp_Object overlay, prop, value;
 {
 Lisp_Object plist, tail;
-if (!OVERLAY_VALID (overlay))
+CHECK_OVERLAY (overlay, 0);
-error ("Invalid overlay object");
 redisplay_region (XMARKER (OVERLAY_START (overlay))->buffer,
 		    OVERLAY_POSITION (OVERLAY_START (overlay)),
 		    OVERLAY_POSITION (OVERLAY_END   (overlay)));
-plist = Fcdr_safe (Fcdr_safe (overlay));
+plist = Fcdr_safe (XCONS (overlay)->cdr);
 for (tail = plist;
 CONSP (tail) && CONSP (XCONS (tail)->cdr);
 tail = XCONS (XCONS (tail)->cdr)->cdr)
 {
 staticpro (&QSFundamental);
 staticpro (&Vbuffer_alist);
 staticpro (&Qprotected_field);
 staticpro (&Qpermanent_local);
 staticpro (&Qkill_buffer_hook);
+staticpro (&Qoverlayp);
+Qoverlayp = intern ("overlayp");
 Fput (Qprotected_field, Qerror_conditions,
 	Fcons (Qprotected_field, Fcons (Qerror, Qnil)));
 Fput (Qprotected_field, Qerror_message,
 	build_string ("Attempt to modify a protected field"));
 defsubr (&Sbarf_if_buffer_read_only);
 defsubr (&Sbury_buffer);
 defsubr (&Slist_buffers);
 defsubr (&Skill_all_local_variables);
+defsubr (&Soverlayp);
 defsubr (&Smake_overlay);
 defsubr (&Sdelete_overlay);
 defsubr (&Smove_overlay);
 defsubr (&Soverlays_at);
 defsubr (&Snext_overlay_change);

Mercurial > emacs

comparison src/buffer.c @ 2776:8bf3bb4c20dd