xemacs-beta: src/data.c comparison

comparison src/data.c @ 444:576fb035e263 r21-2-37

Import from CVS: tag r21-2-37

author	cvs
date	Mon, 13 Aug 2007 11:36:19 +0200
parents	abe6d1db359e
children	3d3049ae1304

comparison

equal deleted inserted replaced

-:a8296e22da4e
+:576fb035e263
 /* Data type predicates */
 DEFUN ("eq", Feq, 2, 2, 0, /*
 Return t if the two args are the same Lisp object.
 */
-(obj1, obj2))
+(object1, object2))
 {
-return EQ_WITH_EBOLA_NOTICE (obj1, obj2) ? Qt : Qnil;
+return EQ_WITH_EBOLA_NOTICE (object1, object2) ? Qt : Qnil;
 }
 DEFUN ("old-eq", Fold_eq, 2, 2, 0, /*
 Return t if the two args are (in most cases) the same Lisp object.
 \"char-int confoundance disease\" and appears in a number of other
 functions with `old-foo' equivalents.
 Do not use this function!
 */
-(obj1, obj2))
+(object1, object2))
 {
 /* #### blasphemy */
-return HACKEQ_UNSAFE (obj1, obj2) ? Qt : Qnil;
+return HACKEQ_UNSAFE (object1, object2) ? Qt : Qnil;
 }
 DEFUN ("null", Fnull, 1, 1, 0, /*
 Return t if OBJECT is nil.
 */
 else
 return make_int (nargs);
 }
 DEFUN ("subr-interactive", Fsubr_interactive, 1, 1, 0, /*
-Return the interactive spec of the subr object, or nil.
+Return the interactive spec of the subr object SUBR, or nil.
 If non-nil, the return value will be a list whose first element is
 `interactive' and whose second element is the interactive spec.
 */
 (subr))
 {
 {
 return CHARP (object) ? Qt : Qnil;
 }
 DEFUN ("char-to-int", Fchar_to_int, 1, 1, 0, /*
-Convert a character into an equivalent integer.
+Convert CHARACTER into an equivalent integer.
 The resulting integer will always be non-negative.  The integers in
 the range 0 - 255 map to characters as follows:
 0 - 31		Control set 0
 32 - 127	ASCII
 If support for Mule does not exist, these are the only valid character
 values.  When Mule support exists, the values assigned to other characters
 may vary depending on the particular version of XEmacs, the order in which
 character sets were loaded, etc., and you should not depend on them.
 */
-(ch))
+(character))
 {
-CHECK_CHAR (ch);
+CHECK_CHAR (character);
-return make_int (XCHAR (ch));
+return make_int (XCHAR (character));
 }
 DEFUN ("int-to-char", Fint_to_char, 1, 1, 0, /*
-Convert an integer into the equivalent character.
+Convert integer INTEGER into the equivalent character.
 Not all integers correspond to valid characters; use `char-int-p' to
 determine whether this is the case.  If the integer cannot be converted,
 nil is returned.
 */
 (integer))
 {
 return CONSP (object) ? XCDR (object) : Qnil;
 }
 DEFUN ("setcar", Fsetcar, 2, 2, 0, /*
-Set the car of CONSCELL to be NEWCAR.  Return NEWCAR.
+Set the car of CONS-CELL to be NEWCAR.  Return NEWCAR.
 */
-(conscell, newcar))
+(cons_cell, newcar))
 {
-if (!CONSP (conscell))
+if (!CONSP (cons_cell))
-conscell = wrong_type_argument (Qconsp, conscell);
+cons_cell = wrong_type_argument (Qconsp, cons_cell);
-XCAR (conscell) = newcar;
+XCAR (cons_cell) = newcar;
 return newcar;
 }
 DEFUN ("setcdr", Fsetcdr, 2, 2, 0, /*
-Set the cdr of CONSCELL to be NEWCDR.  Return NEWCDR.
+Set the cdr of CONS-CELL to be NEWCDR.  Return NEWCDR.
 */
-(conscell, newcdr))
+(cons_cell, newcdr))
 {
-if (!CONSP (conscell))
+if (!CONSP (cons_cell))
-conscell = wrong_type_argument (Qconsp, conscell);
+cons_cell = wrong_type_argument (Qconsp, cons_cell);
-XCDR (conscell) = newcdr;
+XCDR (cons_cell) = newcdr;
 return newcdr;
 }
 /* Find the function at the end of a chain of symbol function indirections.
 }
 }
 DEFUN ("number-to-string", Fnumber_to_string, 1, 1, 0, /*
-Convert NUM to a string by printing it in decimal.
+Convert NUMBER to a string by printing it in decimal.
 Uses a minus sign if negative.
-NUM may be an integer or a floating point number.
+NUMBER may be an integer or a floating point number.
 */
-(num))
+(number))
 {
 char buffer[VALBITS];
-CHECK_INT_OR_FLOAT (num);
+CHECK_INT_OR_FLOAT (number);
 #ifdef LISP_FLOAT_TYPE
-if (FLOATP (num))
+if (FLOATP (number))
 {
 char pigbuf[350];	/* see comments in float_to_string */
-float_to_string (pigbuf, XFLOAT_DATA (num));
+float_to_string (pigbuf, XFLOAT_DATA (number));
 return build_string (pigbuf);
 }
 #endif /* LISP_FLOAT_TYPE */
-long_to_string (buffer, XINT (num));
+long_to_string (buffer, XINT (number));
 return build_string (buffer);
 }
 static int
 digit_to_number (int character, int base)
 return digit >= base ? -1 : digit;
 }
 DEFUN ("string-to-number", Fstring_to_number, 1, 2, 0, /*
-Convert STRING to a number by parsing it as a decimal number.
+Convert STRING to a number by parsing it as a number in base BASE.
 This parses both integers and floating point numbers.
 It ignores leading spaces and tabs.
-If BASE, interpret STRING as a number in that base.  If BASE isn't
+If BASE is nil or omitted, base 10 is used.
-present, base 10 is used.  BASE must be between 2 and 16 (inclusive).
+BASE must be an integer between 2 and 16 (inclusive).
 Floating point numbers always use base 10.
 */
 (string, base))
 {
 char *p;
 return make_int (atoll (p));
 #endif
 }
 else
 {
-int digit, negative = 1;
+int negative = 1;
 EMACS_INT v = 0;
 if (*p == '-')
 	{
 	  negative = -1;
 	}
 else if (*p == '+')
 	p++;
 while (1)
 	{
-	  digit = digit_to_number (*p++, b);
+	  int digit = digit_to_number (*p++, b);
 	  if (digit < 0)
 	    break;
 	  v = v * b + digit;
 	}
 return make_int (negative * v);
 DEFUN ("%", Frem, 2, 2, 0, /*
 Return remainder of first arg divided by second.
 Both must be integers, characters or markers.
 */
-(num1, num2))
+(number1, number2))
 {
-EMACS_INT ival1 = integer_char_or_marker_to_int (num1);
+EMACS_INT ival1 = integer_char_or_marker_to_int (number1);
-EMACS_INT ival2 = integer_char_or_marker_to_int (num2);
+EMACS_INT ival2 = integer_char_or_marker_to_int (number2);
 if (ival2 == 0)
 Fsignal (Qarith_error, Qnil);
 return make_int (ival1 % ival2);

Mercurial > hg > xemacs-beta

comparison src/data.c @ 444:576fb035e263 r21-2-37