Merged revisions 76982 via svnmerge from

mdickinson · mdickinson · commit 82ebc1fde782 · 2009-12-21T15:42:00.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76982 | mark.dickinson | 2009-12-21 15:40:33 +0000 (Mon, 21 Dec 2009) | 2 lines

  Inverse hyperbolic trigonometric functions should call m_log1p, not log1p.
........
diff --git a/Modules/_math.c b/Modules/_math.c
@@ -3,6 +3,7 @@
 
 #include "Python.h"
 #include <float.h>
+#include "_math.h"
 
 /* The following copyright notice applies to the original
    implementations of acosh, asinh and atanh. */
@@ -67,7 +68,7 @@ _Py_acosh(double x)
 	}
 	else {				/* 1 < x <= 2 */
 		double t = x - 1.0;
-		return log1p(t + sqrt(2.0*t + t*t));
+		return m_log1p(t + sqrt(2.0*t + t*t));
 	}
 }
 
@@ -103,7 +104,7 @@ _Py_asinh(double x)
 	}
 	else {				/* 2**-28 <= |x| < 2= */
 		double t = x*x;
-		w = log1p(absx + t / (1.0 + sqrt(1.0 + t)));
+		w = m_log1p(absx + t / (1.0 + sqrt(1.0 + t)));
 	}
 	return copysign(w, x);
 	
@@ -149,10 +150,10 @@ _Py_atanh(double x)
 	}
 	if (absx < 0.5) {		/* |x| < 0.5 */
 		t = absx+absx;
-		t = 0.5 * log1p(t + t*absx / (1.0 - absx));
+		t = 0.5 * m_log1p(t + t*absx / (1.0 - absx));
 	} 
 	else {				/* 0.5 <= |x| <= 1.0 */
-		t = 0.5 * log1p((absx + absx) / (1.0 - absx));
+		t = 0.5 * m_log1p((absx + absx) / (1.0 - absx));
 	}
 	return copysign(t, x);
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "Python.h"`
`5`	`5`	`#include <float.h>`
	`6`	`+#include "_math.h"`
`6`	`7`
`7`	`8`	`/* The following copyright notice applies to the original`
`8`	`9`	`implementations of acosh, asinh and atanh. */`
`@@ -67,7 +68,7 @@ _Py_acosh(double x)`
`67`	`68`	`}`
`68`	`69`	`else { /* 1 < x <= 2 */`
`69`	`70`	`double t = x - 1.0;`
`70`		`- return log1p(t + sqrt(2.0t + tt));`
	`71`	`+ return m_log1p(t + sqrt(2.0t + tt));`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`
`@@ -103,7 +104,7 @@ _Py_asinh(double x)`
`103`	`104`	`}`
`104`	`105`	`else { /* 2*-28 <= \|x\| < 2= /`
`105`	`106`	`double t = x*x;`
`106`		`- w = log1p(absx + t / (1.0 + sqrt(1.0 + t)));`
	`107`	`+ w = m_log1p(absx + t / (1.0 + sqrt(1.0 + t)));`
`107`	`108`	`}`
`108`	`109`	`return copysign(w, x);`
`109`	`110`
`@@ -149,10 +150,10 @@ _Py_atanh(double x)`
`149`	`150`	`}`
`150`	`151`	`if (absx < 0.5) { /* \|x\| < 0.5 */`
`151`	`152`	`t = absx+absx;`
`152`		`- t = 0.5 * log1p(t + t*absx / (1.0 - absx));`
	`153`	`+ t = 0.5 * m_log1p(t + t*absx / (1.0 - absx));`
`153`	`154`	`}`
`154`	`155`	`else { /* 0.5 <= \|x\| <= 1.0 */`
`155`		`- t = 0.5 * log1p((absx + absx) / (1.0 - absx));`
	`156`	`+ t = 0.5 * m_log1p((absx + absx) / (1.0 - absx));`
`156`	`157`	`}`
`157`	`158`	`return copysign(t, x);`
`158`	`159`	`}`