summaryrefslogtreecommitdiff
path: root/src/syntax.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-09-24 11:24:47 -0400
committerEli Zaretskii <eliz@gnu.org>2010-09-24 11:24:47 -0400
commit4f3a2f8d41f3a1e2be27921e8271c5fdb78e6d98 (patch)
tree9afa3e5cda7d3f8505ca39f25d5004797b78c6f2 /src/syntax.c
parentf0812d352e22fb610d5002a50827278fd271938c (diff)
downloademacs-4f3a2f8d41f3a1e2be27921e8271c5fdb78e6d98.tar.gz
Fix int/EMACS_INT use in casefiddle.c and syntax.c.
syntax.c (scan_words, update_syntax_table) (prev_char_comend_first, back_comment, skip_chars) (skip_syntaxes, Fforward_comment, Fbackward_prefix_chars): Use EMACS_INT for buffer and string positions. syntax.h (scan_words, update_syntax_table): Adjust prototypes. casefiddle.c (operate_on_word): Use EMACS_INT for buffer positions.
Diffstat (limited to 'src/syntax.c')
-rw-r--r--src/syntax.c55
1 files changed, 29 insertions, 26 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 5f836b0e8cf..2f4f5236a40 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -185,7 +185,8 @@ INTERVAL interval_of (int, Lisp_Object);
start/end of OBJECT. */
void
-update_syntax_table (int charpos, int count, int init, Lisp_Object object)
+update_syntax_table (EMACS_INT charpos, int count, int init,
+ Lisp_Object object)
{
Lisp_Object tmp_table;
int cnt = 0, invalidate = 1;
@@ -475,7 +476,7 @@ find_defun_start (EMACS_INT pos, EMACS_INT pos_byte)
/* Return the SYNTAX_COMEND_FIRST of the character before POS, POS_BYTE. */
static int
-prev_char_comend_first (int pos, int pos_byte)
+prev_char_comend_first (EMACS_INT pos, EMACS_INT pos_byte)
{
int c, val;
@@ -557,8 +558,8 @@ back_comment (EMACS_INT from, EMACS_INT from_byte, EMACS_INT stop, int comnested
that determines quote parity to the comment-end. */
while (from != stop)
{
- int temp_byte, prev_syntax;
- int com2start, com2end;
+ EMACS_INT temp_byte;
+ int prev_syntax, com2start, com2end;
int comstart;
/* Move back and examine a character. */
@@ -595,7 +596,8 @@ back_comment (EMACS_INT from, EMACS_INT from_byte, EMACS_INT stop, int comnested
have %..\n and %{..}%. */
if (from > stop && (com2end || comstart))
{
- int next = from, next_byte = from_byte, next_c, next_syntax;
+ EMACS_INT next = from, next_byte = from_byte;
+ int next_c, next_syntax;
DEC_BOTH (next, next_byte);
UPDATE_SYNTAX_TABLE_BACKWARD (next);
next_c = FETCH_CHAR_AS_MULTIBYTE (next_byte);
@@ -1242,12 +1244,12 @@ Lisp_Object Vfind_word_boundary_function_table;
If that many words cannot be found before the end of the buffer, return 0.
COUNT negative means scan backward and stop at word beginning. */
-int
-scan_words (register int from, register int count)
+EMACS_INT
+scan_words (register EMACS_INT from, register EMACS_INT count)
{
- register int beg = BEGV;
- register int end = ZV;
- register int from_byte = CHAR_TO_BYTE (from);
+ register EMACS_INT beg = BEGV;
+ register EMACS_INT end = ZV;
+ register EMACS_INT from_byte = CHAR_TO_BYTE (from);
register enum syntaxcode code;
int ch0, ch1;
Lisp_Object func, script, pos;
@@ -1455,14 +1457,14 @@ skip_chars (int forwardp, Lisp_Object string, Lisp_Object lim, int handle_iso_cl
int *char_ranges;
int n_char_ranges = 0;
int negate = 0;
- register int i, i_byte;
+ register EMACS_INT i, i_byte;
/* Set to 1 if the current buffer is multibyte and the region
contains non-ASCII chars. */
int multibyte;
/* Set to 1 if STRING is multibyte and it contains non-ASCII
chars. */
int string_multibyte;
- int size_byte;
+ EMACS_INT size_byte;
const unsigned char *str;
int len;
Lisp_Object iso_classes;
@@ -1774,9 +1776,9 @@ skip_chars (int forwardp, Lisp_Object string, Lisp_Object lim, int handle_iso_cl
}
{
- int start_point = PT;
- int pos = PT;
- int pos_byte = PT_BYTE;
+ EMACS_INT start_point = PT;
+ EMACS_INT pos = PT;
+ EMACS_INT pos_byte = PT_BYTE;
unsigned char *p = PT_ADDR, *endp, *stop;
if (forwardp)
@@ -1946,9 +1948,9 @@ skip_syntaxes (int forwardp, Lisp_Object string, Lisp_Object lim)
register unsigned int c;
unsigned char fastmap[0400];
int negate = 0;
- register int i, i_byte;
+ register EMACS_INT i, i_byte;
int multibyte;
- int size_byte;
+ EMACS_INT size_byte;
unsigned char *str;
CHECK_STRING (string);
@@ -2001,9 +2003,9 @@ skip_syntaxes (int forwardp, Lisp_Object string, Lisp_Object lim)
fastmap[i] ^= 1;
{
- int start_point = PT;
- int pos = PT;
- int pos_byte = PT_BYTE;
+ EMACS_INT start_point = PT;
+ EMACS_INT pos = PT;
+ EMACS_INT pos_byte = PT_BYTE;
unsigned char *p = PT_ADDR, *endp, *stop;
if (forwardp)
@@ -2394,7 +2396,8 @@ between them, return t; otherwise return nil. */)
if (code == Scomment_fence)
{
/* Skip until first preceding unquoted comment_fence. */
- int found = 0, ini = from, ini_byte = from_byte;
+ int found = 0;
+ EMACS_INT ini = from, ini_byte = from_byte;
while (1)
{
@@ -2910,11 +2913,11 @@ DEFUN ("backward-prefix-chars", Fbackward_prefix_chars, Sbackward_prefix_chars,
This includes chars with "quote" or "prefix" syntax (' or p). */)
(void)
{
- int beg = BEGV;
- int opoint = PT;
- int opoint_byte = PT_BYTE;
- int pos = PT;
- int pos_byte = PT_BYTE;
+ EMACS_INT beg = BEGV;
+ EMACS_INT opoint = PT;
+ EMACS_INT opoint_byte = PT_BYTE;
+ EMACS_INT pos = PT;
+ EMACS_INT pos_byte = PT_BYTE;
int c;
if (pos <= beg)