[[ Bug 16033 ]] Throw when value is kMCExecValueTypeNone while evaling strict number

livecodeali · livecodeali · commit 91eb3cf75fd4 · 2016-01-20T22:31:29.000Z
diff --git a/docs/notes/bugfix-16033.md b/docs/notes/bugfix-16033.md
@@ -1 +1 @@
-# Empty converted to 0 in object id chunk expression
+# Ensure various forms of empty are not converted to 0 in object id expression
diff --git a/engine/src/exec.cpp b/engine/src/exec.cpp
@@ -965,7 +965,8 @@ static bool EvalExprAsStrictNumber(MCExecContext* self, MCExpression *p_expr, Ex
     
 	p_expr -> eval_ctxt(*self, t_value);
     
-    if (MCExecTypeIsValueRef(t_value . type) && MCValueIsEmpty(t_value . valueref_value))
+    if (t_value . type == kMCExecValueTypeNone
+        || (MCExecTypeIsValueRef(t_value . type) && MCValueIsEmpty(t_value . valueref_value)))
     {
         self -> LegacyThrow(p_error);
         
diff --git a/tests/lcs/core/execution/type-conversion.livecodescript b/tests/lcs/core/execution/type-conversion.livecodescript
@@ -26,4 +26,10 @@ on TestDoubleToUInt
    create button
    relayer it before layer 0.5
    TestAssert "round up positive reals in unsigned integer expressions", the layer of it is 1
-end TestDoubleToUInt
+end TestDoubleToUInt
+
+on TestStrictUInt
+   create button
+   local tEmpty
+   TestAssert "empty variable does not convert to 0 in object ID", not exists(button id tEmpty)
+end TestStrictUInt

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# Empty converted to 0 in object id chunk expression`
	`1`	`+# Ensure various forms of empty are not converted to 0 in object id expression`
Original file line number	Diff line number	Diff line change
`@@ -965,7 +965,8 @@ static bool EvalExprAsStrictNumber(MCExecContext* self, MCExpression *p_expr, Ex`
`965`	`965`
`966`	`966`	`p_expr -> eval_ctxt(*self, t_value);`
`967`	`967`
`968`		`- if (MCExecTypeIsValueRef(t_value . type) && MCValueIsEmpty(t_value . valueref_value))`
	`968`	`+ if (t_value . type == kMCExecValueTypeNone`
	`969`	`+ \|\| (MCExecTypeIsValueRef(t_value . type) && MCValueIsEmpty(t_value . valueref_value)))`
`969`	`970`	`{`
`970`	`971`	`self -> LegacyThrow(p_error);`
`971`	`972`