aboutsummaryrefslogtreecommitdiffstats
path: root/src/floatfns.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/floatfns.c')
-rw-r--r--src/floatfns.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/floatfns.c b/src/floatfns.c
index 737fb22091e..dda03698093 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -67,10 +67,7 @@ double
67extract_float (Lisp_Object num) 67extract_float (Lisp_Object num)
68{ 68{
69 CHECK_NUMBER_OR_FLOAT (num); 69 CHECK_NUMBER_OR_FLOAT (num);
70 70 return XFLOATINT (num);
71 if (FLOATP (num))
72 return XFLOAT_DATA (num);
73 return (double) XINT (num);
74} 71}
75 72
76/* Trig functions. */ 73/* Trig functions. */
@@ -207,8 +204,6 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
207 doc: /* Return the exponential ARG1 ** ARG2. */) 204 doc: /* Return the exponential ARG1 ** ARG2. */)
208 (Lisp_Object arg1, Lisp_Object arg2) 205 (Lisp_Object arg1, Lisp_Object arg2)
209{ 206{
210 double f1, f2, f3;
211
212 CHECK_NUMBER_OR_FLOAT (arg1); 207 CHECK_NUMBER_OR_FLOAT (arg1);
213 CHECK_NUMBER_OR_FLOAT (arg2); 208 CHECK_NUMBER_OR_FLOAT (arg2);
214 if (INTEGERP (arg1) /* common lisp spec */ 209 if (INTEGERP (arg1) /* common lisp spec */
@@ -232,10 +227,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
232 XSETINT (val, acc); 227 XSETINT (val, acc);
233 return val; 228 return val;
234 } 229 }
235 f1 = FLOATP (arg1) ? XFLOAT_DATA (arg1) : XINT (arg1); 230 return make_float (pow (XFLOATINT (arg1), XFLOATINT (arg2)));
236 f2 = FLOATP (arg2) ? XFLOAT_DATA (arg2) : XINT (arg2);
237 f3 = pow (f1, f2);
238 return make_float (f3);
239} 231}
240 232
241DEFUN ("log", Flog, Slog, 1, 2, 0, 233DEFUN ("log", Flog, Slog, 1, 2, 0,