xemacs-beta: src/fns.c comparison

comparison src/fns.c @ 149:538048ae2ab8 r20-3b1

Import from CVS: tag r20-3b1

author	cvs
date	Mon, 13 Aug 2007 09:36:16 +0200
parents	585fb297b004
children	0132846995bd

comparison

equal deleted inserted replaced

-:f659db2a1f73
+:538048ae2ab8
 				     struct Lisp_Bit_Vector);
 static Lisp_Object
 mark_bit_vector (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
-return (Qnil);
+return Qnil;
 }
 static void
 print_bit_vector (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
 with Bytecounts in strings */
 static Charcount
 length_with_bytecode_hack (Lisp_Object seq)
 {
 if (!COMPILED_FUNCTIONP (seq))
-return (XINT (Flength (seq)));
+return XINT (Flength (seq));
 else
 {
 struct Lisp_Compiled_Function *b = XCOMPILED_FUNCTION (seq);
-int intp = b->flags.interactivep;
-int domainp = b->flags.domainp;
-if (intp)
+return (b->flags.interactivep ? COMPILED_INTERACTIVE :
-	return (COMPILED_INTERACTIVE + 1);
+	      b->flags.domainp      ? COMPILED_DOMAIN :
-else if (domainp)
+	      COMPILED_DOC_STRING)
-	return (COMPILED_DOMAIN + 1);
+	+ 1;
-else
-	return (COMPILED_DOC_STRING + 1);
 }
 }
 #endif /* LOSING_BYTECODE */
 Lisp_Object tail;
 int i;
 retry:
 if (STRINGP (obj))
-return (make_int (string_char_length (XSTRING (obj))));
+return make_int (string_char_length (XSTRING (obj)));
 else if (VECTORP (obj))
-return (make_int (vector_length (XVECTOR (obj))));
+return make_int (vector_length (XVECTOR (obj)));
 else if (BIT_VECTORP (obj))
-return (make_int (bit_vector_length (XBIT_VECTOR (obj))));
+return make_int (bit_vector_length (XBIT_VECTOR (obj)));
 else if (CONSP (obj))
 {
 for (i = 0, tail = obj; !NILP (tail); i++)
 	{
 	  QUIT;
 Lisp_Object
 assoc_no_quit (Lisp_Object key, Lisp_Object list)
 {
 int speccount = specpdl_depth ();
 specbind (Qinhibit_quit, Qt);
-return (unbind_to (speccount, Fassoc (key, list)));
+return unbind_to (speccount, Fassoc (key, list));
 }
 DEFUN ("assq", Fassq, 2, 2, 0, /*
 Return non-nil if KEY is `eq' to the car of an element of LIST.
 The value is actually the element of LIST whose car is KEY.
 Lisp_Object
 remassoc_no_quit (Lisp_Object key, Lisp_Object list)
 {
 int speccount = specpdl_depth ();
 specbind (Qinhibit_quit, Qt);
-return (unbind_to (speccount, Fremassoc (key, list)));
+return unbind_to (speccount, Fremassoc (key, list));
 }
 DEFUN ("remassq", Fremassq, 2, 2, 0, /*
 Delete by side effect any elements of LIST whose car is `eq' to KEY.
 The modified LIST is returned.  If the first member of LIST has a car
 if (depth > 200)
 error ("Stack overflow in equal");
 do_cdr:
 QUIT;
 if (EQ_WITH_EBOLA_NOTICE (o1, o2))
-return (1);
+return 1;
 /* Note that (equal 20 20.0) should be nil */
 else if (XTYPE (o1) != XTYPE (o2))
-return (0);
+return 0;
 else if (CONSP (o1))
 {
 if (!internal_equal (Fcar (o1), Fcar (o2), depth + 1))
-return (0);
+return 0;
 o1 = Fcdr (o1);
 o2 = Fcdr (o2);
 goto do_cdr;
 }
 else if (VECTORP (o1))
 {
 int indecks;
 int len = vector_length (XVECTOR (o1));
 if (len != vector_length (XVECTOR (o2)))
-	return (0);
+	return 0;
 for (indecks = 0; indecks < len; indecks++)
 	{
 	  Lisp_Object v1, v2;
 	  v1 = vector_data (XVECTOR (o1)) [indecks];
 	  v2 = vector_data (XVECTOR (o2)) [indecks];
 	  if (!internal_equal (v1, v2, depth + 1))
-return (0);
+return 0;
 	}
-return (1);
+return 1;
 }
 #endif /* !LRECORD_VECTOR */
 else if (STRINGP (o1))
 {
 Bytecount len = XSTRING_LENGTH (o1);
 if (len != XSTRING_LENGTH (o2))
-	return (0);
+	return 0;
 if (memcmp (XSTRING_DATA (o1), XSTRING_DATA (o2), len))
-	return (0);
+	return 0;
-return (1);
+return 1;
 }
 else if (LRECORDP (o1))
 {
 CONST struct lrecord_implementation
 	*imp1 = XRECORD_LHEADER (o1)->implementation,
 	*imp2 = XRECORD_LHEADER (o2)->implementation;
 if (imp1 != imp2)
-	return (0);
+	return 0;
 else if (imp1->equal == 0)
 	/* EQ-ness of the objects was noticed above */
-	return (0);
+	return 0;
 else
-	return ((imp1->equal) (o1, o2, depth));
+	return (imp1->equal) (o1, o2, depth);
 }
-return (0);
+return 0;
 }
 /* Note that we may be calling sub-objects that will use
 internal_equal() (instead of internal_old_equal()).  Oh well.
 We will get an Ebola note if there's any possibility of confusion,
 if (depth > 200)
 error ("Stack overflow in equal");
 do_cdr:
 QUIT;
 if (HACKEQ_UNSAFE (o1, o2))
-return (1);
+return 1;
 /* Note that (equal 20 20.0) should be nil */
 else if (XTYPE (o1) != XTYPE (o2))
-return (0);
+return 0;
 else if (CONSP (o1))
 {
 if (!internal_old_equal (Fcar (o1), Fcar (o2), depth + 1))
-return (0);
+return 0;
 o1 = Fcdr (o1);
 o2 = Fcdr (o2);
 goto do_cdr;
 }
 else if (VECTORP (o1))
 {
 int indecks;
 int len = vector_length (XVECTOR (o1));
 if (len != vector_length (XVECTOR (o2)))
-	return (0);
+	return 0;
 for (indecks = 0; indecks < len; indecks++)
 	{
 	  Lisp_Object v1, v2;
 	  v1 = vector_data (XVECTOR (o1)) [indecks];
 	  v2 = vector_data (XVECTOR (o2)) [indecks];
 	  if (!internal_old_equal (v1, v2, depth + 1))
-return (0);
+return 0;
 	}
-return (1);
+return 1;
 }
 #endif /* !LRECORD_VECTOR */
 else if (STRINGP (o1))
 {
 Bytecount len = XSTRING_LENGTH (o1);
 if (len != XSTRING_LENGTH (o2))
-	return (0);
+	return 0;
 if (memcmp (XSTRING_DATA (o1), XSTRING_DATA (o2), len))
-	return (0);
+	return 0;
-return (1);
+return 1;
 }
 else if (LRECORDP (o1))
 {
 CONST struct lrecord_implementation
 	*imp1 = XRECORD_LHEADER (o1)->implementation,
 	*imp2 = XRECORD_LHEADER (o2)->implementation;
 if (imp1 != imp2)
-	return (0);
+	return 0;
 else if (imp1->equal == 0)
 	/* EQ-ness of the objects was noticed above */
-	return (0);
+	return 0;
 else
 	return ((imp1->equal) (o1, o2, depth));
 }
-return (0);
+return 0;
 }
 DEFUN ("equal", Fequal, 2, 2, 0, /*
 T if two Lisp objects have similar structure and contents.
 They must have the same data type.
 Vectors and strings are compared element by element.
 Numbers are compared by value.  Symbols must match exactly.
 */
 (o1, o2))
 {
-return ((internal_equal (o1, o2, 0)) ? Qt : Qnil);
+return internal_equal (o1, o2, 0) ? Qt : Qnil;
 }
 DEFUN ("old-equal", Fold_equal, 2, 2, 0, /*
 T if two Lisp objects have similar structure and contents.
 They must have the same data type.
 This function is provided only for byte-code compatibility with v19.
 Do not use it.
 */
 (o1, o2))
 {
-return (internal_old_equal (o1, o2, 0) ? Qt : Qnil);
+return internal_old_equal (o1, o2, 0) ? Qt : Qnil;
 }
 DEFUN ("fillarray", Ffillarray, 2, 2, 0, /*
 Store each element of ARRAY with ITEM.
 Lisp_Object tem;
 CHECK_SYMBOL (feature);
 tem = Fmemq (feature, Vfeatures);
 LOADHIST_ATTACH (Fcons (Qrequire, feature));
 if (!NILP (tem))
-return (feature);
+return feature;
 else
 {
 int speccount = specpdl_depth ();
 /* Value saved here is to be restored into Vautoload_queue */
 	error ("Required feature %s was not provided",
 	       string_data (XSYMBOL (feature)->name));
 /* Once loading finishes, don't undo it.  */
 Vautoload_queue = Qt;
-return (unbind_to (speccount, feature));
+return unbind_to (speccount, feature);
 }
 }
 Lisp_Object Qyes_or_no_p;

Mercurial > hg > xemacs-beta

comparison src/fns.c @ 149:538048ae2ab8 r20-3b1