[Bug 14679] com.livecode.math: Generate domain errors from pow().

peter-b · peter-b · commit 4ec2b8831c65 · 2015-03-12T11:33:49.000Z
diff --git a/engine/src/modules.cpp b/engine/src/modules.cpp
@@ -134,12 +134,15 @@ extern "C"
 }
 
 extern bool MCForeignModuleInitialize(void);
+extern bool MCMathModuleInitialize(void);
 extern bool MCCanvasModuleInitialize(void);
 extern bool MCEngineModuleInitialize(void);
 bool MCModulesInitialize(void)
 {
     if (!MCForeignModuleInitialize())
         return false;
+	if (!MCMathModuleInitialize())
+		return false;
     if (!MCCanvasModuleInitialize())
         return false;
     if (!MCEngineModuleInitialize())
@@ -148,11 +151,13 @@ bool MCModulesInitialize(void)
 }
 
 extern void MCForeignModuleFinalize(void);
+extern void MCMathModuleFinalize(void);
 extern void MCCanvasModuleFinalize(void);
 extern void MCEngineModuleFinalize(void);
 void MCModulesFinalize(void)
 {
     MCEngineModuleFinalize();
     MCCanvasModuleFinalize();
+    MCMathModuleFinalize();
     MCForeignModuleFinalize();
 }
diff --git a/libscript/src/module-math.cpp b/libscript/src/module-math.cpp
@@ -19,21 +19,28 @@
 #include <foundation-system.h>
 
 #include <float.h>
+#include <errno.h>
 
 // Older versions of MSVC don't supply "trunc"
 #ifdef _WIN32
 double trunc(double f) { return f < 0 ? ceil(f) : floor(f); }
 #endif
 
+////////////////////////////////////////////////////////////////
+
+MCTypeInfoRef kMCMathDomainErrorTypeInfo;
+
+////////////////////////////////////////////////////////////////
+
 extern "C" MC_DLLEXPORT void MCMathEvalRealToPowerOfReal(double p_left, double p_right, double& r_output)
 {
-    if (p_right == 0)
-    {
-        r_output = 1.0;
-        return;
-    }
-
+	errno = 0;
     r_output = pow(p_left, p_right);
+
+	if (errno == EDOM)
+	{
+		MCErrorCreateAndThrow (kMCMathDomainErrorTypeInfo, nil);
+	}
 }
 
 extern "C" MC_DLLEXPORT void MCMathEvalNumberToPowerOfNumber(MCNumberRef p_left, MCNumberRef p_right, MCNumberRef& r_output)
@@ -413,4 +420,21 @@ extern "C" MC_DLLEXPORT void MCMathEvalConvertBase(MCStringRef p_operand, intege
         MCErrorCreateAndThrow(kMCGenericErrorTypeInfo, "reason", MCSTR("integer overflow, or invalid character in source"), nil);
 }
 
+////////////////////////////////////////////////////////////////
+
+bool
+MCMathModuleInitialize (void)
+{
+	if (!MCNamedErrorTypeInfoCreate (MCNAME("com.livecode.math.DomainError"), MCNAME("math"), MCSTR("mathematical function domain error"), kMCMathDomainErrorTypeInfo))
+		return false;
+
+	return true;
+}
+
+void
+MCMathModuleFinalize (void)
+{
+	MCValueRelease (kMCMathDomainErrorTypeInfo);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/tests/lcb/stdlib/math.lcb b/tests/lcb/stdlib/math.lcb
@@ -56,12 +56,12 @@ public handler TestPow()
 	test "pow (-ve, 0)" when (-2) ^ 0 is 1
 end handler
 
-handler TestPowDomain_Imag() as undefined
-	variable tVar
-	put (-1) ^ 0.5 into tVar
+handler TestPowDomain_Imag()
+	return (-1) ^ 0.5
 end handler
 public handler TestPowDomain()
-	MCUnitTestHandlerThrowsBroken(TestPowDomain_Imag, "pow (imaginary)", "bug 14679")
+	-- bug 14679
+	MCUnitTestHandlerThrows(TestPowDomain_Imag, "pow (imaginary)")
 end handler
 
 public handler TestPowPrecedence()
diff --git a/toolchain/lc-compile/src/module-helper.cpp b/toolchain/lc-compile/src/module-helper.cpp
@@ -130,15 +130,22 @@ void *g_builtin_ptrs[] =
 }
 
 extern bool MCForeignModuleInitialize(void);
+extern bool MCMathModuleInitialize(void);
+
 bool MCModulesInitialize(void)
 {
     if (!MCForeignModuleInitialize())
         return false;
+	if (!MCMathModuleInitialize())
+		return false;
     return true;
 }
 
 extern void MCForeignModuleFinalize(void);
+extern void MCMathModuleFinalize(void);
+
 void MCModulesFinalize(void)
 {
+	MCMathModuleFinalize();
     MCForeignModuleFinalize();
 }

Original file line number	Diff line number	Diff line change
`@@ -134,12 +134,15 @@ extern "C"`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`extern bool MCForeignModuleInitialize(void);`
	`137`	`+extern bool MCMathModuleInitialize(void);`
`137`	`138`	`extern bool MCCanvasModuleInitialize(void);`
`138`	`139`	`extern bool MCEngineModuleInitialize(void);`
`139`	`140`	`bool MCModulesInitialize(void)`
`140`	`141`	`{`
`141`	`142`	`if (!MCForeignModuleInitialize())`
`142`	`143`	`return false;`
	`144`	`+ if (!MCMathModuleInitialize())`
	`145`	`+ return false;`
`143`	`146`	`if (!MCCanvasModuleInitialize())`
`144`	`147`	`return false;`
`145`	`148`	`if (!MCEngineModuleInitialize())`
`@@ -148,11 +151,13 @@ bool MCModulesInitialize(void)`
`148`	`151`	`}`
`149`	`152`
`150`	`153`	`extern void MCForeignModuleFinalize(void);`
	`154`	`+extern void MCMathModuleFinalize(void);`
`151`	`155`	`extern void MCCanvasModuleFinalize(void);`
`152`	`156`	`extern void MCEngineModuleFinalize(void);`
`153`	`157`	`void MCModulesFinalize(void)`
`154`	`158`	`{`
`155`	`159`	`MCEngineModuleFinalize();`
`156`	`160`	`MCCanvasModuleFinalize();`
	`161`	`+ MCMathModuleFinalize();`
`157`	`162`	`MCForeignModuleFinalize();`
`158`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,15 +130,22 @@ void *g_builtin_ptrs[] =`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`extern bool MCForeignModuleInitialize(void);`
	`133`	`+extern bool MCMathModuleInitialize(void);`
	`134`	`+`
`133`	`135`	`bool MCModulesInitialize(void)`
`134`	`136`	`{`
`135`	`137`	`if (!MCForeignModuleInitialize())`
`136`	`138`	`return false;`
	`139`	`+ if (!MCMathModuleInitialize())`
	`140`	`+ return false;`
`137`	`141`	`return true;`
`138`	`142`	`}`
`139`	`143`
`140`	`144`	`extern void MCForeignModuleFinalize(void);`
	`145`	`+extern void MCMathModuleFinalize(void);`
	`146`	`+`
`141`	`147`	`void MCModulesFinalize(void)`
`142`	`148`	`{`
	`149`	`+ MCMathModuleFinalize();`
`143`	`150`	`MCForeignModuleFinalize();`
`144`	`151`	`}`