[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r116985: * src/intervals.c (rotate_right, rotate_
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 r116985: * src/intervals.c (rotate_right, rotate_left): Fix up length computation. |
Date: |
Sat, 19 Apr 2014 18:13:32 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116985
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16234
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-04-19 14:13:26 -0400
message:
* src/intervals.c (rotate_right, rotate_left): Fix up length computation.
Also change identifiers to match the comments, and add more assertions.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/intervals.c intervals.c-20091113204419-o5vbwnq5f7feedwu-519
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-04-18 08:35:09 +0000
+++ b/src/ChangeLog 2014-04-19 18:13:26 +0000
@@ -1,3 +1,9 @@
+2014-04-19 Stefan Monnier <address@hidden>
+
+ * intervals.c (rotate_right, rotate_left): Fix up length computation.
+ Also change identifiers to match the comments, and add more assertions
+ (bug#16234).
+
2014-04-18 Eli Zaretskii <address@hidden>
* xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation
=== modified file 'src/intervals.c'
--- a/src/intervals.c 2014-01-21 02:28:57 +0000
+++ b/src/intervals.c 2014-04-19 18:13:26 +0000
@@ -332,39 +332,43 @@
*/
static INTERVAL
-rotate_right (INTERVAL interval)
+rotate_right (INTERVAL A)
{
- INTERVAL i;
- INTERVAL B = interval->left;
- ptrdiff_t old_total = interval->total_length;
+ INTERVAL B = A->left;
+ INTERVAL c = B->right;
+ ptrdiff_t old_total = A->total_length;
+
+ eassert (old_total > 0);
+ eassert (old_total
+ > TOTAL_LENGTH (B) + TOTAL_LENGTH (A->right));
+ eassert (TOTAL_LENGTH (B)
+ > TOTAL_LENGTH (B->left) + TOTAL_LENGTH (c));
/* Deal with any Parent of A; make it point to B. */
- if (! ROOT_INTERVAL_P (interval))
+ if (! ROOT_INTERVAL_P (A))
{
- if (AM_LEFT_CHILD (interval))
- set_interval_left (INTERVAL_PARENT (interval), B);
+ if (AM_LEFT_CHILD (A))
+ set_interval_left (INTERVAL_PARENT (A), B);
else
- set_interval_right (INTERVAL_PARENT (interval), B);
+ set_interval_right (INTERVAL_PARENT (A), B);
}
- copy_interval_parent (B, interval);
-
- /* Make B the parent of A */
- i = B->right;
- set_interval_right (B, interval);
- set_interval_parent (interval, B);
-
- /* Make A point to c */
- set_interval_left (interval, i);
- if (i)
- set_interval_parent (i, interval);
+ copy_interval_parent (B, A);
+
+ /* Make B the parent of A. */
+ set_interval_right (B, A);
+ set_interval_parent (A, B);
+
+ /* Make A point to c. */
+ set_interval_left (A, c);
+ if (c)
+ set_interval_parent (c, A);
/* A's total length is decreased by the length of B and its left child. */
- interval->total_length -= B->total_length - LEFT_TOTAL_LENGTH (interval);
- eassert (TOTAL_LENGTH (interval) >= 0);
+ A->total_length -= B->total_length - TOTAL_LENGTH (c);
+ eassert (TOTAL_LENGTH (A) > 0);
/* B must have the same total length of A. */
B->total_length = old_total;
- eassert (TOTAL_LENGTH (B) >= 0);
return B;
}
@@ -379,39 +383,43 @@
*/
static INTERVAL
-rotate_left (INTERVAL interval)
+rotate_left (INTERVAL A)
{
- INTERVAL i;
- INTERVAL B = interval->right;
- ptrdiff_t old_total = interval->total_length;
+ INTERVAL B = A->right;
+ INTERVAL c = B->left;
+ ptrdiff_t old_total = A->total_length;
+
+ eassert (old_total > 0);
+ eassert (old_total
+ > TOTAL_LENGTH (B) + TOTAL_LENGTH (A->left));
+ eassert (TOTAL_LENGTH (B)
+ > TOTAL_LENGTH (B->right) + TOTAL_LENGTH (c));
/* Deal with any parent of A; make it point to B. */
- if (! ROOT_INTERVAL_P (interval))
+ if (! ROOT_INTERVAL_P (A))
{
- if (AM_LEFT_CHILD (interval))
- set_interval_left (INTERVAL_PARENT (interval), B);
+ if (AM_LEFT_CHILD (A))
+ set_interval_left (INTERVAL_PARENT (A), B);
else
- set_interval_right (INTERVAL_PARENT (interval), B);
+ set_interval_right (INTERVAL_PARENT (A), B);
}
- copy_interval_parent (B, interval);
-
- /* Make B the parent of A */
- i = B->left;
- set_interval_left (B, interval);
- set_interval_parent (interval, B);
-
- /* Make A point to c */
- set_interval_right (interval, i);
- if (i)
- set_interval_parent (i, interval);
+ copy_interval_parent (B, A);
+
+ /* Make B the parent of A. */
+ set_interval_left (B, A);
+ set_interval_parent (A, B);
+
+ /* Make A point to c. */
+ set_interval_right (A, c);
+ if (c)
+ set_interval_parent (c, A);
/* A's total length is decreased by the length of B and its right child. */
- interval->total_length -= B->total_length - RIGHT_TOTAL_LENGTH (interval);
- eassert (TOTAL_LENGTH (interval) >= 0);
+ A->total_length -= B->total_length - TOTAL_LENGTH (c);
+ eassert (TOTAL_LENGTH (A) > 0);
/* B must have the same total length of A. */
B->total_length = old_total;
- eassert (TOTAL_LENGTH (B) >= 0);
return B;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r116985: * src/intervals.c (rotate_right, rotate_left): Fix up length computation.,
Stefan Monnier <=