{
if (!EQ (Vmocklisp_arguments, Qt))
{
- if (XTYPE (value) == Lisp_String &&
+ if (STRINGP (value) &&
(EQ (predicate, Qintegerp) || EQ (predicate, Qinteger_or_marker_p)))
return Fstring_to_number (value);
- if (XTYPE (value) == Lisp_Int && EQ (predicate, Qstringp))
+ if (INTEGERP (value) && EQ (predicate, Qstringp))
return Fnumber_to_string (value);
}
value = Fsignal (Qwrong_type_argument, Fcons (predicate, Fcons (value, Qnil)));
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Cons)
+ if (CONSP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Cons)
+ if (CONSP (obj))
return Qnil;
return Qt;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Cons || NILP (obj))
+ if (CONSP (obj) || NILP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Cons || NILP (obj))
+ if (CONSP (obj) || NILP (obj))
return Qnil;
return Qt;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Symbol)
+ if (SYMBOLP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Vector)
+ if (VECTORP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_String)
+ if (STRINGP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Vector || XTYPE (obj) == Lisp_String)
+ if (VECTORP (obj) || STRINGP (obj))
return Qt;
return Qnil;
}
(obj)
register Lisp_Object obj;
{
- if (CONSP (obj) || NILP (obj) ||
- XTYPE (obj) == Lisp_Vector || XTYPE (obj) == Lisp_String)
+ if (CONSP (obj) || NILP (obj) || VECTORP (obj) || STRINGP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Buffer)
+ if (BUFFERP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Marker)
+ if (MARKERP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Subr)
+ if (SUBRP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Compiled)
+ if (COMPILEDP (obj))
return Qt;
return Qnil;
}
(obj)
register Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Int || XTYPE (obj) == Lisp_String)
+ if (INTEGERP (obj) || STRINGP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Int)
+ if (INTEGERP (obj))
return Qt;
return Qnil;
}
(obj)
register Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Marker || XTYPE (obj) == Lisp_Int)
+ if (MARKERP (obj) || INTEGERP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Int && XINT (obj) >= 0)
+ if (INTEGERP (obj) && XINT (obj) >= 0)
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (NUMBERP (obj)
- || XTYPE (obj) == Lisp_Marker)
+ if (NUMBERP (obj) || MARKERP (obj))
return Qt;
return Qnil;
}
(obj)
Lisp_Object obj;
{
- if (XTYPE (obj) == Lisp_Float)
+ if (FLOATP (obj))
return Qt;
return Qnil;
}
{
while (1)
{
- if (XTYPE (list) == Lisp_Cons)
+ if (CONSP (list))
return XCONS (list)->car;
else if (EQ (list, Qnil))
return Qnil;
(object)
Lisp_Object object;
{
- if (XTYPE (object) == Lisp_Cons)
+ if (CONSP (object))
return XCONS (object)->car;
else
return Qnil;
{
while (1)
{
- if (XTYPE (list) == Lisp_Cons)
+ if (CONSP (list))
return XCONS (list)->cdr;
else if (EQ (list, Qnil))
return Qnil;
(object)
Lisp_Object object;
{
- if (XTYPE (object) == Lisp_Cons)
+ if (CONSP (object))
return XCONS (object)->cdr;
else
return Qnil;
(cell, newcar)
register Lisp_Object cell, newcar;
{
- if (XTYPE (cell) != Lisp_Cons)
+ if (!CONSP (cell))
cell = wrong_type_argument (Qconsp, cell);
CHECK_IMPURE (cell);
(cell, newcdr)
register Lisp_Object cell, newcdr;
{
- if (XTYPE (cell) != Lisp_Cons)
+ if (!CONSP (cell))
cell = wrong_type_argument (Qconsp, cell);
CHECK_IMPURE (cell);
valcontents = swap_in_symval_forwarding (sym, valcontents);
}
- return (XTYPE (valcontents) == Lisp_Void || EQ (valcontents, Qunbound)
+ return (VOIDP (valcontents) || EQ (valcontents, Qunbound)
? Qnil : Qt);
}
register Lisp_Object sym;
{
CHECK_SYMBOL (sym, 0);
- return (XTYPE (XSYMBOL (sym)->function) == Lisp_Void
- || EQ (XSYMBOL (sym)->function, Qunbound))
- ? Qnil : Qt;
+ return ((VOIDP (XSYMBOL (sym)->function)
+ || EQ (XSYMBOL (sym)->function, Qunbound))
+ ? Qnil : Qt);
}
DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, "Make SYMBOL's value be void.")
default:
valcontents = XSYMBOL (sym)->value;
- if (XTYPE (valcontents) == Lisp_Buffer_Local_Value
- || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value)
+ if (BUFFER_LOCAL_VALUEP (valcontents)
+ || SOME_BUFFER_LOCAL_VALUEP (valcontents))
XCONS (XSYMBOL (sym)->value)->car = newval;
else
XSYMBOL (sym)->value = newval;
(sym, newval)
register Lisp_Object sym, newval;
{
- int voide = (XTYPE (newval) == Lisp_Void || EQ (newval, Qunbound));
+ int voide = (VOIDP (newval) || EQ (newval, Qunbound));
register Lisp_Object valcontents, tem1, current_alist_element;
return Fsignal (Qsetting_constant, Fcons (sym, Qnil));
valcontents = XSYMBOL (sym)->value;
- if (XTYPE (valcontents) == Lisp_Buffer_Objfwd)
+ if (BUFFER_OBJFWDP (valcontents))
{
register int idx = XUINT (valcontents);
register int mask = *(int *)(idx + (char *) &buffer_local_flags);
current_buffer->local_var_flags |= mask;
}
- else if (XTYPE (valcontents) == Lisp_Buffer_Local_Value
- || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value)
+ else if (BUFFER_LOCAL_VALUEP (valcontents)
+ || SOME_BUFFER_LOCAL_VALUEP (valcontents))
{
/* valcontents is actually a pointer to a cons heading something like:
(REALVALUE BUFFER CURRENT-ALIST-ELEMENT . DEFAULT-VALUE).
need to write it out, and find the new CURRENT-ALIST-ELEMENT. */
if ((current_buffer
!= XBUFFER (XCONS (XCONS (valcontents)->cdr)->car))
- || (XTYPE (valcontents) == Lisp_Buffer_Local_Value
+ || (BUFFER_LOCAL_VALUEP (valcontents)
&& EQ (XCONS (current_alist_element)->car,
current_alist_element)))
{
/* If the variable is a Lisp_Some_Buffer_Local_Value,
make CURRENT-ALIST-ELEMENT point to itself,
indicating that we're seeing the default value. */
- if (XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value)
+ if (SOME_BUFFER_LOCAL_VALUEP (valcontents))
tem1 = XCONS (XCONS (valcontents)->cdr)->cdr;
/* If it's a Lisp_Buffer_Local_Value, give this buffer a
/* For a built-in buffer-local variable, get the default value
rather than letting do_symval_forwarding get the current value. */
- if (XTYPE (valcontents) == Lisp_Buffer_Objfwd)
+ if (BUFFER_OBJFWDP (valcontents))
{
register int idx = XUINT (valcontents);
}
/* Handle user-created local variables. */
- if (XTYPE (valcontents) == Lisp_Buffer_Local_Value
- || XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value)
+ if (BUFFER_LOCAL_VALUEP (valcontents)
+ || SOME_BUFFER_LOCAL_VALUEP (valcontents))
{
/* If var is set up for a buffer that lacks a local value for it,
the current value is nominally the default value.
register Lisp_Object value;
value = default_value (sym);
- return (XTYPE (value) == Lisp_Void || EQ (value, Qunbound)
+ return (VOIDP (value) || EQ (value, Qunbound)
? Qnil : Qt);
}
register Lisp_Object value;
value = default_value (sym);
- if (XTYPE (value) == Lisp_Void || EQ (value, Qunbound))
+ if (VOIDP (value) || EQ (value, Qunbound))
return Fsignal (Qvoid_variable, Fcons (sym, Qnil));
return value;
}
/* Handle variables like case-fold-search that have special slots
in the buffer. Make them work apparently like Lisp_Buffer_Local_Value
variables. */
- if (XTYPE (valcontents) == Lisp_Buffer_Objfwd)
+ if (BUFFER_OBJFWDP (valcontents))
{
register int idx = XUINT (valcontents);
register struct buffer *b;
return value;
}
- if (XTYPE (valcontents) != Lisp_Buffer_Local_Value &&
- XTYPE (valcontents) != Lisp_Some_Buffer_Local_Value)
+ if (!BUFFER_LOCAL_VALUEP (valcontents)
+ && !SOME_BUFFER_LOCAL_VALUEP (valcontents))
return Fset (sym, value);
/* Store new value into the DEFAULT-VALUE slot */
error ("Symbol %s may not be buffer-local", XSYMBOL (sym)->name->data);
valcontents = XSYMBOL (sym)->value;
- if ((XTYPE (valcontents) == Lisp_Buffer_Local_Value) ||
- (XTYPE (valcontents) == Lisp_Buffer_Objfwd))
+ if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
return sym;
- if (XTYPE (valcontents) == Lisp_Some_Buffer_Local_Value)
+ if (SOME_BUFFER_LOCAL_VALUEP (valcontents))
{
XSETTYPE (XSYMBOL (sym)->value, Lisp_Buffer_Local_Value);
return sym;
error ("Symbol %s may not be buffer-local", XSYMBOL (sym)->name->data);
valcontents = XSYMBOL (sym)->value;
- if (XTYPE (valcontents) == Lisp_Buffer_Local_Value
- || XTYPE (valcontents) == Lisp_Buffer_Objfwd)
+ if (BUFFER_LOCAL_VALUEP (valcontents) || BUFFER_OBJFWDP (valcontents))
{
tem = Fboundp (sym);
return sym;
}
/* Make sure sym is set up to hold per-buffer values */
- if (XTYPE (valcontents) != Lisp_Some_Buffer_Local_Value)
+ if (!SOME_BUFFER_LOCAL_VALUEP (valcontents))
{
tem = Fcons (Qnil, do_symval_forwarding (valcontents));
XCONS (tem)->car = tem;
variable before we swap in, then that new value will clobber the
default value the next time we swap. */
valcontents = XCONS (XSYMBOL (sym)->value)->car;
- if (XTYPE (valcontents) == Lisp_Intfwd
- || XTYPE (valcontents) == Lisp_Boolfwd
- || XTYPE (valcontents) == Lisp_Objfwd)
+ if (INTFWDP (valcontents) || BOOLFWDP (valcontents) || OBJFWDP (valcontents))
swap_in_symval_forwarding (sym, XSYMBOL (sym)->value);
return sym;
valcontents = XSYMBOL (sym)->value;
- if (XTYPE (valcontents) == Lisp_Buffer_Objfwd)
+ if (BUFFER_OBJFWDP (valcontents))
{
register int idx = XUINT (valcontents);
register int mask = *(int *) (idx + (char *) &buffer_local_flags);
return sym;
}
- if (XTYPE (valcontents) != Lisp_Buffer_Local_Value &&
- XTYPE (valcontents) != Lisp_Some_Buffer_Local_Value)
+ if (!BUFFER_LOCAL_VALUEP (valcontents)
+ && !SOME_BUFFER_LOCAL_VALUEP (valcontents))
return sym;
/* Get rid of this buffer's alist element, if any */
for (;;)
{
- if (XTYPE (hare) != Lisp_Symbol || EQ (hare, Qunbound))
+ if (!SYMBOLP (hare) || EQ (hare, Qunbound))
break;
hare = XSYMBOL (hare)->function;
- if (XTYPE (hare) != Lisp_Symbol || EQ (hare, Qunbound))
+ if (!SYMBOLP (hare) || EQ (hare, Qunbound))
break;
hare = XSYMBOL (hare)->function;
CHECK_NUMBER (idx, 1);
idxval = XINT (idx);
- if (XTYPE (array) != Lisp_Vector && XTYPE (array) != Lisp_String
- && XTYPE (array) != Lisp_Compiled)
+ if (!VECTORP (array) && !STRINGP (array) && !COMPILEDP (array))
array = wrong_type_argument (Qarrayp, array);
if (idxval < 0 || idxval >= XVECTOR (array)->size)
args_out_of_range (array, idx);
- if (XTYPE (array) == Lisp_String)
+ if (STRINGP (array))
{
Lisp_Object val;
XFASTINT (val) = (unsigned char) XSTRING (array)->data[idxval];
CHECK_NUMBER (idx, 1);
idxval = XINT (idx);
- if (XTYPE (array) != Lisp_Vector && XTYPE (array) != Lisp_String)
+ if (!VECTORP (array) && !STRINGP (array))
array = wrong_type_argument (Qarrayp, array);
if (idxval < 0 || idxval >= XVECTOR (array)->size)
args_out_of_range (array, idx);
CHECK_IMPURE (array);
- if (XTYPE (array) == Lisp_Vector)
+ if (VECTORP (array))
XVECTOR (array)->contents[idxval] = newelt;
else
{
register Lisp_Object array;
{
register Lisp_Object size;
- if (XTYPE (array) != Lisp_Vector && XTYPE (array) != Lisp_String
- && XTYPE (array) != Lisp_Compiled)
+ if (!VECTORP (array) && !STRINGP (array) && !COMPILEDP (array))
array = wrong_type_argument (Qarrayp, array);
XFASTINT (size) = XVECTOR (array)->size;
return size;
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1, 0);
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2, 0);
- if (XTYPE (num1) == Lisp_Float || XTYPE (num2) == Lisp_Float)
+ if (FLOATP (num1) || FLOATP (num2))
{
floatp = 1;
- f1 = (XTYPE (num1) == Lisp_Float) ? XFLOAT (num1)->data : XINT (num1);
- f2 = (XTYPE (num2) == Lisp_Float) ? XFLOAT (num2)->data : XINT (num2);
+ f1 = (FLOATP (num1)) ? XFLOAT (num1)->data : XINT (num1);
+ f2 = (FLOATP (num2)) ? XFLOAT (num2)->data : XINT (num2);
}
#else
CHECK_NUMBER_COERCE_MARKER (num1, 0);
#ifdef LISP_FLOAT_TYPE
CHECK_NUMBER_OR_FLOAT (num, 0);
- if (XTYPE(num) == Lisp_Float)
+ if (FLOATP (num))
{
if (XFLOAT(num)->data == 0.0)
return Qt;
#else
CHECK_NUMBER_OR_FLOAT (num, 0);
- if (XTYPE(num) == Lisp_Float)
+ if (FLOATP (num))
{
char pigbuf[350]; /* see comments in float_to_string */
#ifdef LISP_FLOAT_TYPE
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val, argnum);
- if (XTYPE (val) == Lisp_Float) /* time to do serious math */
+ if (FLOATP (val)) /* time to do serious math */
return (float_arith_driver ((double) accum, argnum, code,
nargs, args));
#else
val = args[argnum]; /* using args[argnum] as argument to CHECK_NUMBER_... */
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val, argnum);
- if (XTYPE (val) == Lisp_Float)
+ if (FLOATP (val))
{
next = XFLOAT (val)->data;
}
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1, 0);
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2, 1);
- if (XTYPE (num1) == Lisp_Float || XTYPE (num2) == Lisp_Float)
+ if (FLOATP (num1) || FLOATP (num2))
{
double f1, f2;
- f1 = XTYPE (num1) == Lisp_Float ? XFLOAT (num1)->data : XINT (num1);
- f2 = XTYPE (num2) == Lisp_Float ? XFLOAT (num2)->data : XINT (num2);
+ f1 = FLOATP (num1) ? XFLOAT (num1)->data : XINT (num1);
+ f2 = FLOATP (num2) ? XFLOAT (num2)->data : XINT (num2);
if (f2 == 0)
Fsignal (Qarith_error, Qnil);
#ifdef LISP_FLOAT_TYPE
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num, 0);
- if (XTYPE (num) == Lisp_Float)
+ if (FLOATP (num))
return (make_float (1.0 + XFLOAT (num)->data));
#else
CHECK_NUMBER_COERCE_MARKER (num, 0);
#ifdef LISP_FLOAT_TYPE
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num, 0);
- if (XTYPE (num) == Lisp_Float)
+ if (FLOATP (num))
return (make_float (-1.0 + XFLOAT (num)->data));
#else
CHECK_NUMBER_COERCE_MARKER (num, 0);