[Bug 14681] com.livecode.math: Generate domain errors for arcsin and arcos

peter-b · peter-b · commit 04d9c23ac78d · 2015-03-12T11:45:57.000Z
diff --git a/libscript/src/module-math.cpp b/libscript/src/module-math.cpp
@@ -172,7 +172,13 @@ extern "C" MC_DLLEXPORT void MCMathEvalTanNumber(MCNumberRef p_operand, MCNumber
 
 extern "C" MC_DLLEXPORT void MCMathEvalAsinReal(double p_operand, double& r_output)
 {
+	errno = 0;
     r_output = asin(p_operand);
+
+	if (errno == EDOM)
+	{
+		MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);
+	}
 }
 
 extern "C" MC_DLLEXPORT void MCMathEvalAsinNumber(MCNumberRef p_operand, MCNumberRef& r_output)
@@ -189,7 +195,13 @@ extern "C" MC_DLLEXPORT void MCMathEvalAsinNumber(MCNumberRef p_operand, MCNumbe
 
 extern "C" MC_DLLEXPORT void MCMathEvalAcosReal(double p_operand, double& r_output)
 {
+	errno = 0;
     r_output = acos(p_operand);
+
+	if (errno == EDOM)
+	{
+		MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);
+	}
 }
 
 extern "C" MC_DLLEXPORT void MCMathEvalAcosNumber(MCNumberRef p_operand, MCNumberRef& r_output)
diff --git a/tests/lcb/stdlib/math.lcb b/tests/lcb/stdlib/math.lcb
@@ -121,17 +121,15 @@ public handler TestArctan()
 	test "arctan2 (function)" when the binary arctangent of -1 and -1 is -3 * pi / 4
 end handler
 
-handler TestTrigonometricDomain_Arcsin() as undefined
-	variable t
-	put asin((1 + any number) / any number) into t
+handler TestTrigonometricDomain_Arcsin()
+	return asin((1 + any number) / any number)
 end handler
 handler TestTrigonometricDomain_Arccos() as undefined
-	variable t
-	put acos((1 + any number) / any number) into t
+	return acos((1 + any number) / any number)
 end handler
 public handler TestTrigonometricDomain()
-	MCUnitTestHandlerThrowsBroken(TestTrigonometricDomain_Arcsin, "arcsin (> 1)", "bug 14681")
-	MCUnitTestHandlerThrowsBroken(TestTrigonometricDomain_Arccos, "arccos (> 1)", "bug 14681")
+	MCUnitTestHandlerThrows(TestTrigonometricDomain_Arcsin, "arcsin (> 1)")
+	MCUnitTestHandlerThrows(TestTrigonometricDomain_Arccos, "arccos (> 1)")
 end handler
 
 public handler TestExp()

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,13 @@ extern "C" MC_DLLEXPORT void MCMathEvalTanNumber(MCNumberRef p_operand, MCNumber`
`172`	`172`
`173`	`173`	`extern "C" MC_DLLEXPORT void MCMathEvalAsinReal(double p_operand, double& r_output)`
`174`	`174`	`{`
	`175`	`+ errno = 0;`
`175`	`176`	`r_output = asin(p_operand);`
	`177`	`+`
	`178`	`+ if (errno == EDOM)`
	`179`	`+ {`
	`180`	`+ MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);`
	`181`	`+ }`
`176`	`182`	`}`
`177`	`183`
`178`	`184`	`extern "C" MC_DLLEXPORT void MCMathEvalAsinNumber(MCNumberRef p_operand, MCNumberRef& r_output)`
`@@ -189,7 +195,13 @@ extern "C" MC_DLLEXPORT void MCMathEvalAsinNumber(MCNumberRef p_operand, MCNumbe`
`189`	`195`
`190`	`196`	`extern "C" MC_DLLEXPORT void MCMathEvalAcosReal(double p_operand, double& r_output)`
`191`	`197`	`{`
	`198`	`+ errno = 0;`
`192`	`199`	`r_output = acos(p_operand);`
	`200`	`+`
	`201`	`+ if (errno == EDOM)`
	`202`	`+ {`
	`203`	`+ MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);`
	`204`	`+ }`
`193`	`205`	`}`
`194`	`206`
`195`	`207`	`extern "C" MC_DLLEXPORT void MCMathEvalAcosNumber(MCNumberRef p_operand, MCNumberRef& r_output)`