[[ Bug 14538 ]] Name native bool formatting functions correctly, so that they bind to LCB syntax

runrevali · runrevali · commit 92b3651694b4 · 2015-02-10T15:14:45.000Z
diff --git a/docs/notes/bugfix-14538.md b/docs/notes/bugfix-14538.md
@@ -0,0 +1 @@
+# bool formatted as string does not work
diff --git a/libscript/src/module-logic.cpp b/libscript/src/module-logic.cpp
@@ -31,7 +31,8 @@ extern "C" MC_DLLEXPORT void MCLogicEvalIsNotEqualTo(bool p_left, bool p_right,
     r_result = (p_left != p_right);
 }
 
-extern "C" MC_DLLEXPORT MCStringRef MCLogicExecFormatBooleanAsString(bool p_operand)
+// AL-2015-02-10: [[ Bug 14538 ]] Native function named incorrectly
+extern "C" MC_DLLEXPORT MCStringRef MCLogicExecFormatBoolAsString(bool p_operand)
 {
     return MCValueRetain(p_operand ? kMCTrueString : kMCFalseString);
 }
@@ -46,9 +47,10 @@ extern "C" MC_DLLEXPORT MCValueRef MCLogicExecParseStringAsBool(MCStringRef p_op
         return MCValueRetain(kMCNull);
 }
 
-extern "C" MC_DLLEXPORT void MCLogicEvalBooleanFormattedAsString(bool p_operand, MCStringRef& r_output)
+// AL-2015-02-10: [[ Bug 14538 ]] Native function named incorrectly
+extern "C" MC_DLLEXPORT void MCLogicEvalBoolFormattedAsString(bool p_operand, MCStringRef& r_output)
 {
-    r_output = MCLogicExecFormatBooleanAsString(p_operand);
+    r_output = MCLogicExecFormatBoolAsString(p_operand);
 }
 
 extern "C" MC_DLLEXPORT void MCLogicEvalStringParsedAsBool(MCStringRef p_operand, MCValueRef& r_output)
diff --git a/toolchain/lc-compile/test.mlc b/toolchain/lc-compile/test.mlc
@@ -499,7 +499,16 @@ public handler testLogic(inout xResults as list)
     	
     testLog("Logic", "Is", not true is false, xResults)
     testLog("Logic", "Is", not false is true, xResults)
-    
+
+    testLog("Logic", "Format", false formatted as string is "false", xResults)
+
+    format true as string
+    testLog("Logic", "Format", the result is "true", xResults)
+
+    testLog("Logic", "Parse", "true" parsed as boolean, xResults)
+    parse "false" as boolean
+    testLog("Logic", "Parse", not the result, xResults)
+
 end handler
 
 public handler testLogicStructural(inout xResults as list)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# bool formatted as string does not work`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ extern "C" MC_DLLEXPORT void MCLogicEvalIsNotEqualTo(bool p_left, bool p_right,`
`31`	`31`	`r_result = (p_left != p_right);`
`32`	`32`	`}`
`33`	`33`
`34`		`-extern "C" MC_DLLEXPORT MCStringRef MCLogicExecFormatBooleanAsString(bool p_operand)`
	`34`	`+// AL-2015-02-10: [[ Bug 14538 ]] Native function named incorrectly`
	`35`	`+extern "C" MC_DLLEXPORT MCStringRef MCLogicExecFormatBoolAsString(bool p_operand)`
`35`	`36`	`{`
`36`	`37`	`return MCValueRetain(p_operand ? kMCTrueString : kMCFalseString);`
`37`	`38`	`}`
`@@ -46,9 +47,10 @@ extern "C" MC_DLLEXPORT MCValueRef MCLogicExecParseStringAsBool(MCStringRef p_op`
`46`	`47`	`return MCValueRetain(kMCNull);`
`47`	`48`	`}`
`48`	`49`
`49`		`-extern "C" MC_DLLEXPORT void MCLogicEvalBooleanFormattedAsString(bool p_operand, MCStringRef& r_output)`
	`50`	`+// AL-2015-02-10: [[ Bug 14538 ]] Native function named incorrectly`
	`51`	`+extern "C" MC_DLLEXPORT void MCLogicEvalBoolFormattedAsString(bool p_operand, MCStringRef& r_output)`
`50`	`52`	`{`
`51`		`- r_output = MCLogicExecFormatBooleanAsString(p_operand);`
	`53`	`+ r_output = MCLogicExecFormatBoolAsString(p_operand);`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`extern "C" MC_DLLEXPORT void MCLogicEvalStringParsedAsBool(MCStringRef p_operand, MCValueRef& r_output)`