emacs: src/data.c comparison

comparison src/data.c @ 40656:cdfd4d09b79a

Update usage of CHECK_ macros (remove unused second argument).

author	Pavel Jan?k <Pavel@Janik.cz>
date	Fri, 02 Nov 2001 20:46:55 +0000
parents	208e240d599a
children	204630ee6402

comparison

equal deleted inserted replaced

-:45453187feeb
+:cdfd4d09b79a
 doc: /* Return t if SYMBOL's value is not void.  */)
 (symbol)
 register Lisp_Object symbol;
 {
 Lisp_Object valcontents;
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 valcontents = SYMBOL_VALUE (symbol);
 if (BUFFER_LOCAL_VALUEP (valcontents)
 || SOME_BUFFER_LOCAL_VALUEP (valcontents))
 DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0,
 doc: /* Return t if SYMBOL's function definition is not void.  */)
 (symbol)
 register Lisp_Object symbol;
 {
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 return (EQ (XSYMBOL (symbol)->function, Qunbound) ? Qnil : Qt);
 }
 DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0,
 doc: /* Make SYMBOL's value be void.  */)
 (symbol)
 register Lisp_Object symbol;
 {
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 if (XSYMBOL (symbol)->constant)
 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
 Fset (symbol, Qunbound);
 return symbol;
 }
 DEFUN ("fmakunbound", Ffmakunbound, Sfmakunbound, 1, 1, 0,
 doc: /* Make SYMBOL's function definition be void.  */)
 (symbol)
 register Lisp_Object symbol;
 {
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 if (NILP (symbol) || EQ (symbol, Qt))
 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
 XSYMBOL (symbol)->function = Qunbound;
 return symbol;
 }
 DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0,
 doc: /* Return SYMBOL's function definition.  Error if that is void.  */)
 (symbol)
 register Lisp_Object symbol;
 {
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 if (EQ (XSYMBOL (symbol)->function, Qunbound))
 return Fsignal (Qvoid_function, Fcons (symbol, Qnil));
 return XSYMBOL (symbol)->function;
 }
 DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0,
 doc: /* Return SYMBOL's property list.  */)
 (symbol)
 register Lisp_Object symbol;
 {
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 return XSYMBOL (symbol)->plist;
 }
 DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0,
 doc: /* Return SYMBOL's name, a string.  */)
 (symbol)
 register Lisp_Object symbol;
 {
 register Lisp_Object name;
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 XSETSTRING (name, XSYMBOL (symbol)->name);
 return name;
 }
 DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
 doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION.  */)
 (symbol, definition)
 register Lisp_Object symbol, definition;
 {
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 if (NILP (symbol) || EQ (symbol, Qt))
 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
 if (!NILP (Vautoload_queue) && !EQ (XSYMBOL (symbol)->function, Qunbound))
 Vautoload_queue = Fcons (Fcons (symbol, XSYMBOL (symbol)->function),
 			     Vautoload_queue);
 DEFUN ("setplist", Fsetplist, Ssetplist, 2, 2, 0,
 doc: /* Set SYMBOL's property list to NEWVAL, and return NEWVAL.  */)
 (symbol, newplist)
 register Lisp_Object symbol, newplist;
 {
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 XSYMBOL (symbol)->plist = newplist;
 return newplist;
 }
 DEFUN ("subr-arity", Fsubr_arity, Ssubr_arity, 1, 1, 0,
 {
 case Lisp_Misc:
 switch (XMISCTYPE (valcontents))
 	{
 	case Lisp_Misc_Intfwd:
-	  CHECK_NUMBER (newval, 1);
+	  CHECK_NUMBER (newval);
 	  *XINTFWD (valcontents)->intvar = XINT (newval);
 	  if (*XINTFWD (valcontents)->intvar != XINT (newval))
 	    error ("Value out of range for variable `%s'",
 		   XSYMBOL (symbol)->name->data);
 	  break;
 Lisp_Object symbol;
 {
 register Lisp_Object valcontents;
 register Lisp_Object val;
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 valcontents = SYMBOL_VALUE (symbol);
 if (BUFFER_LOCAL_VALUEP (valcontents)
 || SOME_BUFFER_LOCAL_VALUEP (valcontents))
 valcontents = swap_in_symval_forwarding (symbol, valcontents);
 /* If restoring in a dead buffer, do nothing.  */
 if (NILP (buf->name))
 return newval;
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 if (SYMBOL_CONSTANT_P (symbol)
 && (NILP (Fkeywordp (symbol))
 	  || !EQ (newval, SYMBOL_VALUE (symbol))))
 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
 default_value (symbol)
 Lisp_Object symbol;
 {
 register Lisp_Object valcontents;
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 valcontents = SYMBOL_VALUE (symbol);
 /* For a built-in buffer-local variable, get the default value
 rather than letting do_symval_forwarding get the current value.  */
 if (BUFFER_OBJFWDP (valcontents))
 (symbol, value)
 Lisp_Object symbol, value;
 {
 register Lisp_Object valcontents, current_alist_element, alist_element_buffer;
-CHECK_SYMBOL (symbol, 0);
+CHECK_SYMBOL (symbol);
 valcontents = SYMBOL_VALUE (symbol);
 /* Handle variables like case-fold-search that have special slots
 in the buffer.  Make them work apparently like Lisp_Buffer_Local_Value
 variables.  */
 (variable)
 register Lisp_Object variable;
 {
 register Lisp_Object tem, valcontents, newval;
-CHECK_SYMBOL (variable, 0);
+CHECK_SYMBOL (variable);
 valcontents = SYMBOL_VALUE (variable);
 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
 error ("Symbol %s may not be buffer-local", XSYMBOL (variable)->name->data);
 (variable)
 register Lisp_Object variable;
 {
 register Lisp_Object tem, valcontents;
-CHECK_SYMBOL (variable, 0);
+CHECK_SYMBOL (variable);
 valcontents = SYMBOL_VALUE (variable);
 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
 error ("Symbol %s may not be buffer-local", XSYMBOL (variable)->name->data);
 (variable)
 register Lisp_Object variable;
 {
 register Lisp_Object tem, valcontents;
-CHECK_SYMBOL (variable, 0);
+CHECK_SYMBOL (variable);
 valcontents = SYMBOL_VALUE (variable);
 if (BUFFER_OBJFWDP (valcontents))
 {
 (variable)
 register Lisp_Object variable;
 {
 register Lisp_Object tem, valcontents, newval;
-CHECK_SYMBOL (variable, 0);
+CHECK_SYMBOL (variable);
 valcontents = SYMBOL_VALUE (variable);
 if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)
 || BUFFER_OBJFWDP (valcontents))
 error ("Symbol %s may not be frame-local", XSYMBOL (variable)->name->data);
 if (NILP (buffer))
 buf = current_buffer;
 else
 {
-CHECK_BUFFER (buffer, 0);
+CHECK_BUFFER (buffer);
 buf = XBUFFER (buffer);
 }
-CHECK_SYMBOL (variable, 0);
+CHECK_SYMBOL (variable);
 valcontents = SYMBOL_VALUE (variable);
 if (BUFFER_LOCAL_VALUEP (valcontents)
 || SOME_BUFFER_LOCAL_VALUEP (valcontents))
 {
 if (NILP (buffer))
 buf = current_buffer;
 else
 {
-CHECK_BUFFER (buffer, 0);
+CHECK_BUFFER (buffer);
 buf = XBUFFER (buffer);
 }
-CHECK_SYMBOL (variable, 0);
+CHECK_SYMBOL (variable);
 valcontents = SYMBOL_VALUE (variable);
 /* This means that make-variable-buffer-local was done.  */
 if (BUFFER_LOCAL_VALUEP (valcontents))
 register Lisp_Object array;
 Lisp_Object idx;
 {
 register int idxval;
-CHECK_NUMBER (idx, 1);
+CHECK_NUMBER (idx);
 idxval = XINT (idx);
 if (STRINGP (array))
 {
 int c, idxval_byte;
 register Lisp_Object array;
 Lisp_Object idx, newelt;
 {
 register int idxval;
-CHECK_NUMBER (idx, 1);
+CHECK_NUMBER (idx);
 idxval = XINT (idx);
 if (!VECTORP (array) && !STRINGP (array) && !BOOL_VECTOR_P (array)
 && ! CHAR_TABLE_P (array))
 array = wrong_type_argument (Qarrayp, array);
 CHECK_IMPURE (array);
 int idxval_byte, prev_bytes, new_bytes;
 unsigned char workbuf[MAX_MULTIBYTE_LENGTH], *p0 = workbuf, *p1;
 if (idxval < 0 || idxval >= XSTRING (array)->size)
 	args_out_of_range (array, idx);
-CHECK_NUMBER (newelt, 2);
+CHECK_NUMBER (newelt);
 idxval_byte = string_char_to_byte (array, idxval);
 p1 = &XSTRING (array)->data[idxval_byte];
 PARSE_MULTIBYTE_SEQ (p1, nbytes - idxval_byte, prev_bytes);
 new_bytes = CHAR_STRING (XINT (newelt), p0);
 }
 else
 {
 if (idxval < 0 || idxval >= XSTRING (array)->size)
 	args_out_of_range (array, idx);
-CHECK_NUMBER (newelt, 2);
+CHECK_NUMBER (newelt);
 if (XINT (newelt) < 0 || SINGLE_BYTE_CHAR_P (XINT (newelt)))
 	XSTRING (array)->data[idxval] = XINT (newelt);
 else
 	{
 enum comparison comparison;
 {
 double f1 = 0, f2 = 0;
 int floatp = 0;
-CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1, 0);
+CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1);
-CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2, 0);
+CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2);
 if (FLOATP (num1) || FLOATP (num2))
 {
 floatp = 1;
 f1 = (FLOATP (num1)) ? XFLOAT_DATA (num1) : XINT (num1);
 DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0,
 doc: /* Return t if NUMBER is zero.  */)
 (number)
 register Lisp_Object number;
 {
-CHECK_NUMBER_OR_FLOAT (number, 0);
+CHECK_NUMBER_OR_FLOAT (number);
 if (FLOATP (number))
 {
 if (XFLOAT_DATA (number) == 0.0)
 	return Qt;
 (number)
 Lisp_Object number;
 {
 char buffer[VALBITS];
-CHECK_NUMBER_OR_FLOAT (number, 0);
+CHECK_NUMBER_OR_FLOAT (number);
 if (FLOATP (number))
 {
 char pigbuf[350];	/* see comments in float_to_string */
 register unsigned char *p;
 register int b;
 int sign = 1;
 Lisp_Object val;
-CHECK_STRING (string, 0);
+CHECK_STRING (string);
 if (NILP (base))
 b = 10;
 else
 {
-CHECK_NUMBER (base, 1);
+CHECK_NUMBER (base);
 b = XINT (base);
 if (b < 2 || b > 16)
 	Fsignal (Qargs_out_of_range, Fcons (base, Qnil));
 }
 for (argnum = 0; argnum < nargs; argnum++)
 {
 /* Using args[argnum] as argument to CHECK_NUMBER_... */
 val = args[argnum];
-CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val, argnum);
+CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val);
 if (FLOATP (val))
 	return float_arith_driver ((double) accum, argnum, code,
 				   nargs, args);
 args[argnum] = val;
 double next;
 for (; argnum < nargs; argnum++)
 {
 val = args[argnum];    /* using args[argnum] as argument to CHECK_NUMBER_... */
-CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val, argnum);
+CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val);
 if (FLOATP (val))
 	{
 	  next = XFLOAT_DATA (val);
 	}
 (x, y)
 register Lisp_Object x, y;
 {
 Lisp_Object val;
-CHECK_NUMBER_COERCE_MARKER (x, 0);
+CHECK_NUMBER_COERCE_MARKER (x);
-CHECK_NUMBER_COERCE_MARKER (y, 1);
+CHECK_NUMBER_COERCE_MARKER (y);
 if (XFASTINT (y) == 0)
 Fsignal (Qarith_error, Qnil);
 XSETINT (val, XINT (x) % XINT (y));
 register Lisp_Object x, y;
 {
 Lisp_Object val;
 EMACS_INT i1, i2;
-CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (x, 0);
+CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (x);
-CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (y, 1);
+CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (y);
 if (FLOATP (x) || FLOATP (y))
 return fmod_float (x, y);
 i1 = XINT (x);
 (value, count)
 register Lisp_Object value, count;
 {
 register Lisp_Object val;
-CHECK_NUMBER (value, 0);
+CHECK_NUMBER (value);
-CHECK_NUMBER (count, 1);
+CHECK_NUMBER (count);
 if (XINT (count) >= BITS_PER_EMACS_INT)
 XSETINT (val, 0);
 else if (XINT (count) > 0)
 XSETINT (val, XINT (value) << XFASTINT (count));
 (value, count)
 register Lisp_Object value, count;
 {
 register Lisp_Object val;
-CHECK_NUMBER (value, 0);
+CHECK_NUMBER (value);
-CHECK_NUMBER (count, 1);
+CHECK_NUMBER (count);
 if (XINT (count) >= BITS_PER_EMACS_INT)
 XSETINT (val, 0);
 else if (XINT (count) > 0)
 XSETINT (val, (EMACS_UINT) XUINT (value) << XFASTINT (count));
 doc: /* Return NUMBER plus one.  NUMBER may be a number or a marker.
 Markers are converted to integers.  */)
 (number)
 register Lisp_Object number;
 {
-CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number, 0);
+CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number);
 if (FLOATP (number))
 return (make_float (1.0 + XFLOAT_DATA (number)));
 XSETINT (number, XINT (number) + 1);
 doc: /* Return NUMBER minus one.  NUMBER may be a number or a marker.
 Markers are converted to integers.  */)
 (number)
 register Lisp_Object number;
 {
-CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number, 0);
+CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number);
 if (FLOATP (number))
 return (make_float (-1.0 + XFLOAT_DATA (number)));
 XSETINT (number, XINT (number) - 1);
 DEFUN ("lognot", Flognot, Slognot, 1, 1, 0,
 doc: /* Return the bitwise complement of NUMBER.  NUMBER must be an integer.  */)
 (number)
 register Lisp_Object number;
 {
-CHECK_NUMBER (number, 0);
+CHECK_NUMBER (number);
 XSETINT (number, ~XINT (number));
 return number;
 }
 void

Mercurial > emacs

comparison src/data.c @ 40656:cdfd4d09b79a