[Bug 14678] com.livecode.math: Generate domain errors from log10() and ln()

peter-b · peter-b · commit c060890f51a9 · 2015-03-12T11:35:34.000Z
diff --git a/libscript/src/module-math.cpp b/libscript/src/module-math.cpp
@@ -58,7 +58,13 @@ extern "C" MC_DLLEXPORT void MCMathEvalNumberToPowerOfNumber(MCNumberRef p_left,
 
 extern "C" MC_DLLEXPORT void MCMathEvalBase10LogReal(double p_operand, double& r_output)
 {
+	errno = 0;
     r_output = log10(p_operand);
+
+	if (errno == EDOM)
+	{
+		MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);
+	}
 }
 
 extern "C" MC_DLLEXPORT void MCMathEvalBase10LogNumber(MCNumberRef p_operand, MCNumberRef& r_output)
@@ -75,7 +81,13 @@ extern "C" MC_DLLEXPORT void MCMathEvalBase10LogNumber(MCNumberRef p_operand, MC
 
 extern "C" MC_DLLEXPORT void MCMathEvalNaturalLogReal(double p_operand, double& r_output)
 {
+	errno = 0;
     r_output = log(p_operand);
+
+	if (errno == EDOM)
+	{
+		MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);
+	}
 }
 
 extern "C" MC_DLLEXPORT void MCMathEvalNaturalLogNumber(MCNumberRef p_operand, MCNumberRef& r_output)
diff --git a/tests/lcb/stdlib/math.lcb b/tests/lcb/stdlib/math.lcb
@@ -83,7 +83,9 @@ handler TestLog10Domain_Zero() as undefined
 	put the log of 0 into tVar
 end handler
 public handler TestLog10Domain()
-	MCUnitTestHandlerThrowsBroken(TestLog10Domain_Negative, "log10 (syntax, -ve)", "bug 14678")
+	-- bug 14678
+	MCUnitTestHandlerThrows(TestLog10Domain_Negative, "log10 (syntax, -ve)")
+
 	MCUnitTestHandlerThrowsBroken(TestLog10Domain_Zero, "log10 (syntax, 0)", "bug 14678")
 end handler
 
@@ -159,7 +161,8 @@ handler TestLnDomain_Zero() as undefined
 	put the natural log of 0 into tVar
 end handler
 public handler TestLnDomain()
-	MCUnitTestHandlerThrowsBroken(TestLnDomain_Negative, "ln (syntax, -ve)", "bug 14678")
+	-- bug 14678
+	MCUnitTestHandlerThrows(TestLnDomain_Negative, "ln (syntax, -ve)")
 	MCUnitTestHandlerThrowsBroken(TestLnDomain_Zero, "ln (syntax, 0)", "bug 14678")
 end handler
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,13 @@ extern "C" MC_DLLEXPORT void MCMathEvalNumberToPowerOfNumber(MCNumberRef p_left,`
`58`	`58`
`59`	`59`	`extern "C" MC_DLLEXPORT void MCMathEvalBase10LogReal(double p_operand, double& r_output)`
`60`	`60`	`{`
	`61`	`+ errno = 0;`
`61`	`62`	`r_output = log10(p_operand);`
	`63`	`+`
	`64`	`+ if (errno == EDOM)`
	`65`	`+ {`
	`66`	`+ MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);`
	`67`	`+ }`
`62`	`68`	`}`
`63`	`69`
`64`	`70`	`extern "C" MC_DLLEXPORT void MCMathEvalBase10LogNumber(MCNumberRef p_operand, MCNumberRef& r_output)`
`@@ -75,7 +81,13 @@ extern "C" MC_DLLEXPORT void MCMathEvalBase10LogNumber(MCNumberRef p_operand, MC`
`75`	`81`
`76`	`82`	`extern "C" MC_DLLEXPORT void MCMathEvalNaturalLogReal(double p_operand, double& r_output)`
`77`	`83`	`{`
	`84`	`+ errno = 0;`
`78`	`85`	`r_output = log(p_operand);`
	`86`	`+`
	`87`	`+ if (errno == EDOM)`
	`88`	`+ {`
	`89`	`+ MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);`
	`90`	`+ }`
`79`	`91`	`}`
`80`	`92`
`81`	`93`	`extern "C" MC_DLLEXPORT void MCMathEvalNaturalLogNumber(MCNumberRef p_operand, MCNumberRef& r_output)`