mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00
Code Issues Projects Releases Wiki Activity

(min, max): Make these macros, not functions.

Browse source 
(scan_buffer, boyer_moore): Simplify args to those macros.
This commit is contained in:
Karl Heuer 1998-04-09 18:50:53 +00:00
parent 03887dd388
commit 67ce527d26
1 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/search.c
View file

@ -33,6 +33,9 @@ Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#include "regex.h"
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))
#define REGEXP_CACHE_SIZE 20
/* If the regexp is non-nil, then the buffer contains the compiled form
@ -463,23 +466,6 @@ fast_c_string_match_ignore_case (regexp, string)
immediate_quit = 0;
return val;
}
/* max and min. */
static int
max (a, b)
int a, b;
{
return ((a > b) ? a : b);
}
static int
min (a, b)
int a, b;
{
return ((a < b) ? a : b);
}
/* The newline cache: remembering which sections of text have no newlines. */
@ -568,6 +554,7 @@ scan_buffer (target, start, end, count, shortage, allow_quit)
examine. */
int ceiling_byte = CHAR_TO_BYTE (end) - 1;
int start_byte = CHAR_TO_BYTE (start);
int tem;
/* If we're looking for a newline, consult the newline cache
to see where we can avoid some scanning. */
@ -593,7 +580,8 @@ scan_buffer (target, start, end, count, shortage, allow_quit)
bytes. BUFFER_CEILING_OF returns the last character
position that is contiguous, so the ceiling is the
position after that. */
ceiling_byte = min (BUFFER_CEILING_OF (start_byte), ceiling_byte);
tem = BUFFER_CEILING_OF (start_byte);
ceiling_byte = min (tem, ceiling_byte);
{
/* The termination address of the dumb loop. */
@ -639,6 +627,7 @@ scan_buffer (target, start, end, count, shortage, allow_quit)
/* The last character to check before the next obstacle. */
int ceiling_byte = CHAR_TO_BYTE (end);
int start_byte = CHAR_TO_BYTE (start);
int tem;
/* Consult the newline cache, if appropriate. */
if (target == '\n' && newline_cache)
@ -660,7 +649,8 @@ scan_buffer (target, start, end, count, shortage, allow_quit)
}
/* Stop scanning before the gap. */
ceiling_byte = max (BUFFER_FLOOR_OF (start_byte - 1), ceiling_byte);
tem = BUFFER_FLOOR_OF (start_byte - 1);
ceiling_byte = max (tem, ceiling_byte);
{
/* The termination address of the dumb loop. */
@ -1701,14 +1691,22 @@ boyer_moore (n, base_pat, len, len_byte, trt, inverse_trt,
QUIT;
pat = base_pat;
limit = pos_byte - dirlen + direction;
limit = ((direction > 0)
? BUFFER_CEILING_OF (limit)
: BUFFER_FLOOR_OF (limit));
/* LIMIT is now the last (not beyond-last!) value POS_BYTE
can take on without hitting edge of buffer or the gap. */
limit = ((direction > 0)
? min (lim_byte - 1, min (limit, pos_byte + 20000))
: max (lim_byte, max (limit, pos_byte - 20000)));
if (direction > 0)
{
limit = BUFFER_CEILING_OF (limit);
/* LIMIT is now the last (not beyond-last!) value POS_BYTE
can take on without hitting edge of buffer or the gap. */
limit = min (limit, pos_byte + 20000);
limit = min (limit, lim_byte - 1);
}
else
{
limit = BUFFER_FLOOR_OF (limit);
/* LIMIT is now the last (not beyond-last!) value POS_BYTE
can take on without hitting edge of buffer or the gap. */
limit = max (limit, pos_byte - 20000);
limit = max (limit, lim_byte);
}
tail_end = BUFFER_CEILING_OF (pos_byte) + 1;
tail_end_ptr = BYTE_POS_ADDR (tail_end);