livecode
diff --git a/‎engine/src/cmds.cpp‎
Lines changed: 30 additions & 53 deletions b/‎engine/src/cmds.cpp‎
Lines changed: 30 additions & 53 deletions
diff --git a/‎engine/src/cmds.h‎
Lines changed: 1 addition & 1 deletion b/‎engine/src/cmds.h‎
Lines changed: 1 addition & 1 deletion
@@ -2432,77 +2432,54 @@ Exec_stat MCSort::sort_container(MCExecPoint &p_exec_point, Chunk_term p_type, S
 }
 #endif /* MCSort::sort_container */
 
-void MCSort::additem(MCExecPoint &ep, MCSortnode *&items, uint4 &nitems, Sort_type form, MCString &s, MCExpression *by)
+void MCSort::additem(MCExecContext &ctxt, MCSortnode *items, uint4 &nitems, Sort_type form, MCValueRef p_value, MCExpression *by)
 {
+	MCAutoValueRef t_value;
 	if (by != NULL)
 	{
 		MCerrorlock++;
-		ep.setsvalue(s);
-		MCeach->set(ep);
-		if (by->eval(ep) == ES_NORMAL)
-			s = ep.getsvalue();
+		ctxt.GetEP().setvalueref(p_value);
+		MCeach->set(ctxt.GetEP());
+		if (by->eval(ctxt.GetEP()) == ES_NORMAL)
+			t_value = ctxt.GetEP().getvalueref();
 		else
-			s = MCnullmcstring;
+			t_value = MCValueRetain(kMCEmptyString);
 		MCerrorlock--;
 	}
+	else
+		t_value = MCValueRetain(p_value);
+		
 	switch (form)
 	{
 	case ST_DATETIME:
-		ep.setsvalue(s);
-		if (MCD_convert(ep, CF_UNDEFINED, CF_UNDEFINED, CF_SECONDS, CF_UNDEFINED))
 		{
-			if (!MCU_stor8(ep.getsvalue(), items[nitems].nvalue))
-				items[nitems].nvalue = -MAXREAL8;
+			MCAutoStringRef t_out;
+			if (MCD_convert(ctxt, *t_value, CF_UNDEFINED, CF_UNDEFINED, CF_SECONDS, CF_UNDEFINED, &t_out))
+			{
+				if (ctxt.ConvertToNumber(*t_out, items[nitems].nvalue))
+					break;
+			}
+
+			/* UNCHECKED */ MCNumberCreateWithReal(-MAXREAL8, items[nitems].nvalue);
+			break;
 		}
-		else
-			items[nitems].nvalue = -MAXREAL8;
-		break;
 	case ST_NUMERIC:
 		{
-			const char *sptr = s.getstring();
-			uint4 length = s.getlength();
-			
-			// MW-2013-03-21: [[ Bug ]] Make sure we skip any whitespace before the
-			//   number starts - making it consistent with string->number conversions
-			//   elsewhere.
-			MCU_skip_spaces(sptr, length);
-			
-		    // REVIEW - at the moment the numeric prefix of the string is used to
-			//   derive the sort key e.g. 1000abc would get processed as 1000.
-			while (length && (isdigit((uint1)*sptr) ||
-			                  *sptr == '.' || *sptr == '-' || *sptr == '+'))
-			{
-				sptr++;
-				length--;
-			}
-			s.setlength(s.getlength() - length);
-			if (!MCU_stor8(s, items[nitems].nvalue))
-				items[nitems].nvalue = -MAXREAL8;
+			if (!ctxt.ConvertToNumber(*t_value, items[nitems].nvalue))
+				/* UNCHECKED */ MCNumberCreateWithReal(-MAXREAL8, items[nitems].nvalue);
 		}
 		break;
 	default:
-		if (ep.getcasesensitive() && by == NULL)
-			items[nitems].svalue = (char *)s.getstring();
+		if (ctxt.GetCaseSensitive())
+			/* UNCHECKED */ ctxt.ConvertToString(*t_value, items[nitems].svalue);
 		else
-			if (ep.getcasesensitive())
-				items[nitems].svalue = s.clone();
-			else
-			{
-#if defined(_MAC_DESKTOP) || defined(_IOS_MOBILE)
-				if (form == ST_INTERNATIONAL)
-				{
-					extern char *MCSystemLowercaseInternational(const MCString& s);
-					items[nitems].svalue = MCSystemLowercaseInternational(s);
-				}
-				else
-#endif
-
-				{
-					items[nitems].svalue = new char[s.getlength() + 1];
-					MCU_lower(items[nitems].svalue, s);
-					items[nitems].svalue[s.getlength()] = '\0';
-				}
-			}
+		{
+			MCStringRef t_fixed, t_mutable;
+			/* UNCHECKED */ ctxt.ConvertToString(*t_value, t_fixed);
+			/* UNCHECKED */ MCStringMutableCopyAndRelease(t_fixed, t_mutable);
+			/* UNCHECKED */ MCStringLowercase(t_mutable);
+			/* UNCHECKED */ MCStringCopyAndRelease(t_fixed, items[nitems].svalue);
+		}
 		break;
 	}
 	nitems++;
 
@@ -398,7 +398,7 @@ class MCSort : public MCStatement
 	virtual Parse_stat parse(MCScriptPoint &);
 	virtual Exec_stat exec(MCExecPoint &);
 	static Exec_stat sort_container(MCExecPoint &p_exec_point, Chunk_term p_type, Sort_type p_direction, Sort_type p_form, MCExpression *p_by);
-	static void additem(MCExecPoint &ep, MCSortnode *&items, uint4 &nitems, Sort_type form, MCString &s, MCExpression *by);
+	static void additem(MCExecContext &ctxt, MCSortnode *items, uint4 &nitems, Sort_type form, MCValueRef p_value, MCExpression *by);
 	virtual void compile(MCSyntaxFactoryRef);
 };