[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fns.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/fns.c [lexbind] |
Date: |
Thu, 20 Nov 2003 19:36:58 -0500 |
Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.314.2.2 emacs/src/fns.c:1.314.2.3
*** emacs/src/fns.c:1.314.2.2 Tue Oct 14 19:16:45 2003
--- emacs/src/fns.c Thu Nov 20 19:36:18 2003
***************
*** 1186,1192 ****
Otherwise it is a newly created string, with no text properties.
Characters 0200 through 0237 are converted to eight-bit-control
characters of the same character code. Characters 0240 through 0377
! are converted to eight-bit-control characters of the same character
codes. */)
(string)
Lisp_Object string;
--- 1186,1192 ----
Otherwise it is a newly created string, with no text properties.
Characters 0200 through 0237 are converted to eight-bit-control
characters of the same character code. Characters 0240 through 0377
! are converted to eight-bit-graphic characters of the same character
codes. */)
(string)
Lisp_Object string;
***************
*** 4274,4280 ****
Lisp_Object key;
{
unsigned hash = XUINT (key) ^ XGCTYPE (key);
! xassert ((hash & ~VALMASK) == 0);
return hash;
}
--- 4274,4280 ----
Lisp_Object key;
{
unsigned hash = XUINT (key) ^ XGCTYPE (key);
! xassert ((hash & ~INTMASK) == 0);
return hash;
}
***************
*** 4293,4299 ****
hash = sxhash (key, 0);
else
hash = XUINT (key) ^ XGCTYPE (key);
! xassert ((hash & ~VALMASK) == 0);
return hash;
}
--- 4293,4299 ----
hash = sxhash (key, 0);
else
hash = XUINT (key) ^ XGCTYPE (key);
! xassert ((hash & ~INTMASK) == 0);
return hash;
}
***************
*** 4308,4314 ****
Lisp_Object key;
{
unsigned hash = sxhash (key, 0);
! xassert ((hash & ~VALMASK) == 0);
return hash;
}
--- 4308,4314 ----
Lisp_Object key;
{
unsigned hash = sxhash (key, 0);
! xassert ((hash & ~INTMASK) == 0);
return hash;
}
***************
*** 4495,4501 ****
index_size = next_almost_prime ((int)
(new_size
/ XFLOATINT (h->rehash_threshold)));
! if (max (index_size, 2 * new_size) & ~VALMASK)
error ("Hash table too large to resize");
h->key_and_value = larger_vector (h->key_and_value, 2 * new_size, Qnil);
--- 4495,4501 ----
index_size = next_almost_prime ((int)
(new_size
/ XFLOATINT (h->rehash_threshold)));
! if (max (index_size, 2 * new_size) > MOST_POSITIVE_FIXNUM)
error ("Hash table too large to resize");
h->key_and_value = larger_vector (h->key_and_value, 2 * new_size, Qnil);
***************
*** 4585,4591 ****
{
int start_of_bucket, i;
! xassert ((hash & ~VALMASK) == 0);
/* Increment count after resizing because resizing may fail. */
maybe_resize_hash_table (h);
--- 4585,4591 ----
{
int start_of_bucket, i;
! xassert ((hash & ~INTMASK) == 0);
/* Increment count after resizing because resizing may fail. */
maybe_resize_hash_table (h);
***************
*** 4870,4876 ****
hash = ((hash << 3) + (hash >> 28) + c);
}
! return hash & VALMASK;
}
--- 4870,4876 ----
hash = ((hash << 3) + (hash >> 28) + c);
}
! return hash & INTMASK;
}
***************
*** 4938,4944 ****
/* Return a hash code for OBJ. DEPTH is the current depth in the Lisp
! structure. Value is an unsigned integer clipped to VALMASK. */
unsigned
sxhash (obj, depth)
--- 4938,4944 ----
/* Return a hash code for OBJ. DEPTH is the current depth in the Lisp
! structure. Value is an unsigned integer clipped to INTMASK. */
unsigned
sxhash (obj, depth)
***************
*** 5002,5008 ****
abort ();
}
! return hash & VALMASK;
}
--- 5002,5008 ----
abort ();
}
! return hash & INTMASK;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/fns.c [lexbind],
Miles Bader <=