[[ RefactorSyntax ]] Fix various issues with values and reference counts

Ali Lloyd · Ali Lloyd · commit 2ac77159df9a · 2013-12-17T17:05:14.000Z
diff --git a/engine/src/cmdsm.cpp b/engine/src/cmdsm.cpp
@@ -1369,12 +1369,14 @@ void MCSetOp::exec_ctxt(MCExecContext &ctxt)
     if (!ctxt . EvalExprAsValueRef(source, EE_ARRAYOP_BADEXP, &t_src_value))
         return;
 
+    MCValueRef t_source;
+    
     if (!MCValueIsArray(*t_src_value))
-    {
-        MCValueRelease(*t_src_value);
-        MCValueCopy((MCValueRef)kMCEmptyString, &t_src_value);
-    }
-
+        t_source = kMCEmptyString;
+    else
+        t_source = *t_src_value;
+    
+    
 	MCAutoPointer<MCContainer> t_container;
     if (!destvar -> evalcontainer(ctxt, &t_container))
 	{
@@ -1393,7 +1395,7 @@ void MCSetOp::exec_ctxt(MCExecContext &ctxt)
         return;
 
 	MCAutoArrayRef t_src_array;
-    if (!ctxt . ConvertToArray(*t_src_value, &t_src_array))
+    if (!ctxt . ConvertToArray(t_source, &t_src_array))
         return;
 
 	if (intersect)
diff --git a/engine/src/exec-array.cpp b/engine/src/exec-array.cpp
@@ -228,7 +228,7 @@ void MCArraysDoUnion(MCExecContext& ctxt, MCArrayRef p_dst_array, MCArrayRef p_s
 			continue;
         }
         
-		if (!MCArrayStoreValue(p_dst_array, ctxt . GetCaseSensitive(), t_key, t_src_value))
+		if (!MCArrayStoreValue(p_dst_array, ctxt . GetCaseSensitive(), t_key, MCValueRetain(t_src_value)))
 		{
 			ctxt . Throw();
 			return;
diff --git a/engine/src/exec.cpp b/engine/src/exec.cpp
@@ -2493,13 +2493,10 @@ void MCExecStoreProperty(MCExecContext& ctxt, const MCPropertyInfo *prop, void *
         {
             MCExecEnumTypeInfo *t_enum_info;
             t_enum_info = (MCExecEnumTypeInfo *)prop -> type_info;
-            
-            MCAutoStringRef t_string;
-            MCExecTypeConvertAndReleaseAlways(ctxt, p_value . type, &p_value, kMCExecValueTypeStringRef, &(&t_string));
-            
+
             intenum_t t_value;
             intenum_t* t_value_ptr;
-            if (MCStringIsEmpty(*t_string))
+            if (p_value . type == kMCExecValueTypeValueRef && MCValueIsEmpty(p_value . valueref_value))
                 t_value_ptr = nil;
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ void MCArraysDoUnion(MCExecContext& ctxt, MCArrayRef p_dst_array, MCArrayRef p_s`
`228`	`228`	`continue;`
`229`	`229`	`}`
`230`	`230`
`231`		`- if (!MCArrayStoreValue(p_dst_array, ctxt . GetCaseSensitive(), t_key, t_src_value))`
	`231`	`+ if (!MCArrayStoreValue(p_dst_array, ctxt . GetCaseSensitive(), t_key, MCValueRetain(t_src_value)))`
`232`	`232`	`{`
`233`	`233`	`ctxt . Throw();`
`234`	`234`	`return;`