[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/regex.c
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/regex.c |
Date: |
Mon, 13 Oct 2003 14:48:16 -0400 |
Index: emacs/src/regex.c
diff -c emacs/src/regex.c:1.188 emacs/src/regex.c:1.189
*** emacs/src/regex.c:1.188 Tue Sep 30 08:36:17 2003
--- emacs/src/regex.c Mon Oct 13 14:48:14 2003
***************
*** 975,983 ****
int has_range_table = CHARSET_RANGE_TABLE_EXISTS_P (p - 1);
fprintf (stderr, "/charset [%s",
! (re_opcode_t) *(p - 1) == charset_not ? "^" : "");
! assert (p + *p < pend);
for (c = 0; c < 256; c++)
if (c / 8 < length
--- 975,984 ----
int has_range_table = CHARSET_RANGE_TABLE_EXISTS_P (p - 1);
fprintf (stderr, "/charset [%s",
! (re_opcode_t) *(p - 1) == charset_not ? "^" : "");
! if (p + *p >= pend)
! fprintf (stderr, " !extends past end of pattern! ");
for (c = 0; c < 256; c++)
if (c / 8 < length
***************
*** 1736,1743 ****
/* This is not an arbitrary limit: the arguments which represent offsets
! into the pattern are two bytes long. So if 2^16 bytes turns out to
be too small, many things would have to change. */
/* Any other compiler which, like MSC, has allocation limit below 2^16
bytes will have to use approach similar to what was done below for
MSC and drop MAX_BUF_SIZE a bit. Otherwise you may end up
--- 1737,1747 ----
/* This is not an arbitrary limit: the arguments which represent offsets
! into the pattern are two bytes long. So if 2^15 bytes turns out to
be too small, many things would have to change. */
+ # define MAX_BUF_SIZE (1L << 15)
+
+ #if 0 /* This is when we thought it could be 2^16 bytes. */
/* Any other compiler which, like MSC, has allocation limit below 2^16
bytes will have to use approach similar to what was done below for
MSC and drop MAX_BUF_SIZE a bit. Otherwise you may end up
***************
*** 1749,1754 ****
--- 1753,1759 ----
#else
# define MAX_BUF_SIZE (1L << 16)
#endif
+ #endif /* 0 */
/* Extend the buffer by twice its current size via realloc and
reset the pointers that pointed into the old block to point to the
***************
*** 4456,4464 ****
/* Jump over non-matching operations. */
! static unsigned char *
skip_noops (p, pend)
! unsigned char *p, *pend;
{
int mcnt;
while (p < pend)
--- 4461,4469 ----
/* Jump over non-matching operations. */
! static re_char *
skip_noops (p, pend)
! re_char *p, *pend;
{
int mcnt;
while (p < pend)
***************
*** 4487,4493 ****
static int
mutually_exclusive_p (bufp, p1, p2)
struct re_pattern_buffer *bufp;
! unsigned char *p1, *p2;
{
re_opcode_t op2;
const boolean multibyte = RE_MULTIBYTE_P (bufp);
--- 4492,4498 ----
static int
mutually_exclusive_p (bufp, p1, p2)
struct re_pattern_buffer *bufp;
! re_char *p1, *p2;
{
re_opcode_t op2;
const boolean multibyte = RE_MULTIBYTE_P (bufp);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/regex.c,
Richard M. Stallman <=