HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Variadic C functions now count arguments with size_t, not int.
[bpt/emacs.git]
/
src
/
data.c
diff --git
a/src/data.c
b/src/data.c
index
927bc7c
..
0a5ce52
100644
(file)
--- a/
src/data.c
+++ b/
src/data.c
@@
-805,7
+805,10
@@
variable chain of symbols. */)
(Lisp_Object object)
{
if (SYMBOLP (object))
(Lisp_Object object)
{
if (SYMBOLP (object))
- XSETSYMBOL (object, indirect_variable (XSYMBOL (object)));
+ {
+ struct Lisp_Symbol *sym = indirect_variable (XSYMBOL (object));
+ XSETSYMBOL (object, sym);
+ }
return object;
}
return object;
}
@@
-815,9
+818,6
@@
variable chain of symbols. */)
This does not handle buffer-local variables; use
swap_in_symval_forwarding for that. */
This does not handle buffer-local variables; use
swap_in_symval_forwarding for that. */
-#define do_blv_forwarding(blv) \
- ((blv)->forwarded ? do_symval_forwarding (BLV_FWD (blv)) : BLV_VALUE (blv))
-
Lisp_Object
do_symval_forwarding (register union Lisp_Fwd *valcontents)
{
Lisp_Object
do_symval_forwarding (register union Lisp_Fwd *valcontents)
{
@@
-864,14
+864,6
@@
do_symval_forwarding (register union Lisp_Fwd *valcontents)
BUF non-zero means set the value in buffer BUF instead of the
current buffer. This only plays a role for per-buffer variables. */
BUF non-zero means set the value in buffer BUF instead of the
current buffer. This only plays a role for per-buffer variables. */
-#define store_blv_forwarding(blv, newval, buf) \
- do { \
- if ((blv)->forwarded) \
- store_symval_forwarding (BLV_FWD (blv), (newval), (buf)); \
- else \
- SET_BLV_VALUE (blv, newval); \
- } while (0)
-
static void
store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf)
{
static void
store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newval, struct buffer *buf)
{
@@
-907,12
+899,12
@@
store_symval_forwarding (union Lisp_Fwd *valcontents, register Lisp_Object newva
for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
{
for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
{
- Lisp_Object buf;
+ Lisp_Object
l
buf;
struct buffer *b;
struct buffer *b;
- buf = Fcdr (XCAR (tail));
- if (!BUFFERP (buf)) continue;
- b = XBUFFER (buf);
+
l
buf = Fcdr (XCAR (tail));
+ if (!BUFFERP (
l
buf)) continue;
+ b = XBUFFER (
l
buf);
if (! PER_BUFFER_VALUE_P (b, idx))
PER_BUFFER_VALUE (b, offset) = newval;
if (! PER_BUFFER_VALUE_P (b, idx))
PER_BUFFER_VALUE (b, offset) = newval;
@@
-1009,7
+1001,7
@@
swap_in_symval_forwarding (struct Lisp_Symbol *symbol, struct Lisp_Buffer_Local_
}
else
{
}
else
{
- tem1 = assq_no_quit (var,
current_buffer->local_var_alist
);
+ tem1 = assq_no_quit (var,
BVAR (current_buffer, local_var_alist)
);
XSETBUFFER (blv->where, current_buffer);
}
}
XSETBUFFER (blv->where, current_buffer);
}
}
@@
-1178,7
+1170,7
@@
set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
tem1 = Fassq (symbol,
(blv->frame_local
? XFRAME (where)->param_alist
tem1 = Fassq (symbol,
(blv->frame_local
? XFRAME (where)->param_alist
- :
XBUFFER (where)->local_var_alist
));
+ :
BVAR (XBUFFER (where), local_var_alist)
));
blv->where = where;
blv->found = 1;
blv->where = where;
blv->found = 1;
@@
-1209,8
+1201,8
@@
set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
bindings, not for frame-local bindings. */
eassert (!blv->frame_local);
tem1 = Fcons (symbol, XCDR (blv->defcell));
bindings, not for frame-local bindings. */
eassert (!blv->frame_local);
tem1 = Fcons (symbol, XCDR (blv->defcell));
- XBUFFER (where)->local_var_alist
- = Fcons (tem1,
XBUFFER (where)->local_var_alist
);
+ BVAR (XBUFFER (where), local_var_alist)
+ = Fcons (tem1,
BVAR (XBUFFER (where), local_var_alist)
);
}
}
}
}
@@
-1269,7
+1261,7
@@
set_internal (register Lisp_Object symbol, register Lisp_Object newval, register
/* Return the default value of SYMBOL, but don't check for voidness.
Return Qunbound if it is void. */
/* Return the default value of SYMBOL, but don't check for voidness.
Return Qunbound if it is void. */
-Lisp_Object
+
static
Lisp_Object
default_value (Lisp_Object symbol)
{
struct Lisp_Symbol *sym;
default_value (Lisp_Object symbol)
{
struct Lisp_Symbol *sym;
@@
-1503,8
+1495,8
@@
The function `default-value' gets the default value and `set-default' sets it.
{
struct Lisp_Symbol *sym;
struct Lisp_Buffer_Local_Value *blv = NULL;
{
struct Lisp_Symbol *sym;
struct Lisp_Buffer_Local_Value *blv = NULL;
- union Lisp_Val_Fwd valcontents;
- int forwarded;
+ union Lisp_Val_Fwd valcontents
IF_LINT (= {0})
;
+ int forwarded
IF_LINT (= 0)
;
CHECK_SYMBOL (variable);
sym = XSYMBOL (variable);
CHECK_SYMBOL (variable);
sym = XSYMBOL (variable);
@@
-1579,8
+1571,8
@@
Instead, use `add-hook' and specify t for the LOCAL argument. */)
(register Lisp_Object variable)
{
register Lisp_Object tem;
(register Lisp_Object variable)
{
register Lisp_Object tem;
- int forwarded;
- union Lisp_Val_Fwd valcontents;
+ int forwarded
IF_LINT (= 0)
;
+ union Lisp_Val_Fwd valcontents
IF_LINT (= {0})
;
struct Lisp_Symbol *sym;
struct Lisp_Buffer_Local_Value *blv = NULL;
struct Lisp_Symbol *sym;
struct Lisp_Buffer_Local_Value *blv = NULL;
@@
-1632,13
+1624,13
@@
Instead, use `add-hook' and specify t for the LOCAL argument. */)
if (let_shadows_global_binding_p (symbol))
message ("Making %s local to %s while let-bound!",
SDATA (SYMBOL_NAME (variable)),
if (let_shadows_global_binding_p (symbol))
message ("Making %s local to %s while let-bound!",
SDATA (SYMBOL_NAME (variable)),
- SDATA (
current_buffer->name
));
+ SDATA (
BVAR (current_buffer, name)
));
}
}
/* Make sure this buffer has its own value of symbol. */
XSETSYMBOL (variable, sym); /* Update in case of aliasing. */
}
}
/* Make sure this buffer has its own value of symbol. */
XSETSYMBOL (variable, sym); /* Update in case of aliasing. */
- tem = Fassq (variable,
current_buffer->local_var_alist
);
+ tem = Fassq (variable,
BVAR (current_buffer, local_var_alist)
);
if (NILP (tem))
{
if (let_shadows_buffer_binding_p (sym))
if (NILP (tem))
{
if (let_shadows_buffer_binding_p (sym))
@@
-1650,9
+1642,9
@@
Instead, use `add-hook' and specify t for the LOCAL argument. */)
default value. */
find_symbol_value (variable);
default value. */
find_symbol_value (variable);
- current_buffer->local_var_alist
+ BVAR (current_buffer, local_var_alist)
= Fcons (Fcons (variable, XCDR (blv->defcell)),
= Fcons (Fcons (variable, XCDR (blv->defcell)),
-
current_buffer->local_var_alist
);
+
BVAR (current_buffer, local_var_alist)
);
/* Make sure symbol does not think it is set up for this buffer;
force it to look once again for this buffer's value. */
/* Make sure symbol does not think it is set up for this buffer;
force it to look once again for this buffer's value. */
@@
-1718,10
+1710,10
@@
From now on the default value will apply in this buffer. Return VARIABLE. */)
/* Get rid of this buffer's alist element, if any. */
XSETSYMBOL (variable, sym); /* Propagate variable indirection. */
/* Get rid of this buffer's alist element, if any. */
XSETSYMBOL (variable, sym); /* Propagate variable indirection. */
- tem = Fassq (variable,
current_buffer->local_var_alist
);
+ tem = Fassq (variable,
BVAR (current_buffer, local_var_alist)
);
if (!NILP (tem))
if (!NILP (tem))
- current_buffer->local_var_alist
- = Fdelq (tem,
current_buffer->local_var_alist
);
+ BVAR (current_buffer, local_var_alist)
+ = Fdelq (tem,
BVAR (current_buffer, local_var_alist)
);
/* If the symbol is set up with the current buffer's binding
loaded, recompute its value. We have to do it now, or else
/* If the symbol is set up with the current buffer's binding
loaded, recompute its value. We have to do it now, or else
@@
-1848,7
+1840,7
@@
BUFFER defaults to the current buffer. */)
XSETBUFFER (tmp, buf);
XSETSYMBOL (variable, sym); /* Update in case of aliasing. */
XSETBUFFER (tmp, buf);
XSETSYMBOL (variable, sym); /* Update in case of aliasing. */
- for (tail =
buf->local_var_alist
; CONSP (tail); tail = XCDR (tail))
+ for (tail =
BVAR (buf, local_var_alist)
; CONSP (tail); tail = XCDR (tail))
{
elt = XCAR (tail);
if (EQ (variable, XCAR (elt)))
{
elt = XCAR (tail);
if (EQ (variable, XCAR (elt)))
@@
-2216,7
+2208,7
@@
bool-vector. IDX starts at 0. */)
enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal };
enum comparison { equal, notequal, less, grtr, less_or_equal, grtr_or_equal };
-Lisp_Object
+
static
Lisp_Object
arithcompare (Lisp_Object num1, Lisp_Object num2, enum comparison comparison)
{
double f1 = 0, f2 = 0;
arithcompare (Lisp_Object num1, Lisp_Object num2, enum comparison comparison)
{
double f1 = 0, f2 = 0;
@@
-2417,7
+2409,7
@@
present, base 10 is used. BASE must be between 2 and 16 (inclusive).
If the base used is not 10, STRING is always parsed as integer. */)
(register Lisp_Object string, Lisp_Object base)
{
If the base used is not 10, STRING is always parsed as integer. */)
(register Lisp_Object string, Lisp_Object base)
{
- register
unsigned
char *p;
+ register char *p;
register int b;
int sign = 1;
Lisp_Object val;
register int b;
int sign = 1;
Lisp_Object val;
@@
-2436,7
+2428,7
@@
If the base used is not 10, STRING is always parsed as integer. */)
/* Skip any whitespace at the front of the number. Some versions of
atoi do this anyway, so we might as well make Emacs lisp consistent. */
/* Skip any whitespace at the front of the number. Some versions of
atoi do this anyway, so we might as well make Emacs lisp consistent. */
- p = SDATA (string);
+ p = S
S
DATA (string);
while (*p == ' ' || *p == '\t')
p++;
while (*p == ' ' || *p == '\t')
p++;
@@
-2482,13
+2474,13
@@
enum arithop
Amin
};
Amin
};
-static Lisp_Object float_arith_driver (double,
in
t, enum arithop,
-
in
t, Lisp_Object *);
-Lisp_Object
-arith_driver (enum arithop code,
in
t nargs, register Lisp_Object *args)
+static Lisp_Object float_arith_driver (double,
size_
t, enum arithop,
+
size_
t, Lisp_Object *);
+
static
Lisp_Object
+arith_driver (enum arithop code,
size_
t nargs, register Lisp_Object *args)
{
register Lisp_Object val;
{
register Lisp_Object val;
- register
in
t argnum;
+ register
size_
t argnum;
register EMACS_INT accum = 0;
register EMACS_INT next;
register EMACS_INT accum = 0;
register EMACS_INT next;
@@
-2570,7
+2562,8
@@
arith_driver (enum arithop code, int nargs, register Lisp_Object *args)
#define isnan(x) ((x) != (x))
static Lisp_Object
#define isnan(x) ((x) != (x))
static Lisp_Object
-float_arith_driver (double accum, register int argnum, enum arithop code, int nargs, register Lisp_Object *args)
+float_arith_driver (double accum, register size_t argnum, enum arithop code,
+ size_t nargs, register Lisp_Object *args)
{
register Lisp_Object val;
double next;
{
register Lisp_Object val;
double next;
@@
-2632,7
+2625,7
@@
float_arith_driver (double accum, register int argnum, enum arithop code, int na
DEFUN ("+", Fplus, Splus, 0, MANY, 0,
doc: /* Return sum of any number of arguments, which are numbers or markers.
usage: (+ &rest NUMBERS-OR-MARKERS) */)
DEFUN ("+", Fplus, Splus, 0, MANY, 0,
doc: /* Return sum of any number of arguments, which are numbers or markers.
usage: (+ &rest NUMBERS-OR-MARKERS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
return arith_driver (Aadd, nargs, args);
}
{
return arith_driver (Aadd, nargs, args);
}
@@
-2642,7
+2635,7
@@
DEFUN ("-", Fminus, Sminus, 0, MANY, 0,
With one arg, negates it. With more than one arg,
subtracts all but the first from the first.
usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS) */)
With one arg, negates it. With more than one arg,
subtracts all but the first from the first.
usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
return arith_driver (Asub, nargs, args);
}
{
return arith_driver (Asub, nargs, args);
}
@@
-2650,7
+2643,7
@@
usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS) */)
DEFUN ("*", Ftimes, Stimes, 0, MANY, 0,
doc: /* Return product of any number of arguments, which are numbers or markers.
usage: (* &rest NUMBERS-OR-MARKERS) */)
DEFUN ("*", Ftimes, Stimes, 0, MANY, 0,
doc: /* Return product of any number of arguments, which are numbers or markers.
usage: (* &rest NUMBERS-OR-MARKERS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
return arith_driver (Amult, nargs, args);
}
{
return arith_driver (Amult, nargs, args);
}
@@
-2659,9
+2652,9
@@
DEFUN ("/", Fquo, Squo, 2, MANY, 0,
doc: /* Return first argument divided by all the remaining arguments.
The arguments must be numbers or markers.
usage: (/ DIVIDEND DIVISOR &rest DIVISORS) */)
doc: /* Return first argument divided by all the remaining arguments.
The arguments must be numbers or markers.
usage: (/ DIVIDEND DIVISOR &rest DIVISORS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
{
-
in
t argnum;
+
size_
t argnum;
for (argnum = 2; argnum < nargs; argnum++)
if (FLOATP (args[argnum]))
return float_arith_driver (0, 0, Adiv, nargs, args);
for (argnum = 2; argnum < nargs; argnum++)
if (FLOATP (args[argnum]))
return float_arith_driver (0, 0, Adiv, nargs, args);
@@
-2743,7
+2736,7
@@
DEFUN ("max", Fmax, Smax, 1, MANY, 0,
doc: /* Return largest of all the arguments (which must be numbers or markers).
The value is always a number; markers are converted to numbers.
usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
doc: /* Return largest of all the arguments (which must be numbers or markers).
The value is always a number; markers are converted to numbers.
usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
return arith_driver (Amax, nargs, args);
}
{
return arith_driver (Amax, nargs, args);
}
@@
-2752,7
+2745,7
@@
DEFUN ("min", Fmin, Smin, 1, MANY, 0,
doc: /* Return smallest of all the arguments (which must be numbers or markers).
The value is always a number; markers are converted to numbers.
usage: (min NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
doc: /* Return smallest of all the arguments (which must be numbers or markers).
The value is always a number; markers are converted to numbers.
usage: (min NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
return arith_driver (Amin, nargs, args);
}
{
return arith_driver (Amin, nargs, args);
}
@@
-2761,7
+2754,7
@@
DEFUN ("logand", Flogand, Slogand, 0, MANY, 0,
doc: /* Return bitwise-and of all the arguments.
Arguments may be integers, or markers converted to integers.
usage: (logand &rest INTS-OR-MARKERS) */)
doc: /* Return bitwise-and of all the arguments.
Arguments may be integers, or markers converted to integers.
usage: (logand &rest INTS-OR-MARKERS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
return arith_driver (Alogand, nargs, args);
}
{
return arith_driver (Alogand, nargs, args);
}
@@
-2770,7
+2763,7
@@
DEFUN ("logior", Flogior, Slogior, 0, MANY, 0,
doc: /* Return bitwise-or of all the arguments.
Arguments may be integers, or markers converted to integers.
usage: (logior &rest INTS-OR-MARKERS) */)
doc: /* Return bitwise-or of all the arguments.
Arguments may be integers, or markers converted to integers.
usage: (logior &rest INTS-OR-MARKERS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
return arith_driver (Alogior, nargs, args);
}
{
return arith_driver (Alogior, nargs, args);
}
@@
-2779,7
+2772,7
@@
DEFUN ("logxor", Flogxor, Slogxor, 0, MANY, 0,
doc: /* Return bitwise-exclusive-or of all the arguments.
Arguments may be integers, or markers converted to integers.
usage: (logxor &rest INTS-OR-MARKERS) */)
doc: /* Return bitwise-exclusive-or of all the arguments.
Arguments may be integers, or markers converted to integers.
usage: (logxor &rest INTS-OR-MARKERS) */)
- (
in
t nargs, Lisp_Object *args)
+ (
size_
t nargs, Lisp_Object *args)
{
return arith_driver (Alogxor, nargs, args);
}
{
return arith_driver (Alogxor, nargs, args);
}
@@
-3308,7
+3301,7
@@
syms_of_data (void)
XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1;
}
XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1;
}
-SIGTYPE
+
static
SIGTYPE
arith_error (int signo)
{
sigsetmask (SIGEMPTYMASK);
arith_error (int signo)
{
sigsetmask (SIGEMPTYMASK);
@@
-3334,4
+3327,3
@@
init_data (void)
signal (SIGEMT, arith_error);
#endif /* uts */
}
signal (SIGEMT, arith_error);
#endif /* uts */
}
-