From 012cd7a5888913ae5efc0762a019ff1fd5e27551 Mon Sep 17 00:00:00 2001
From: Markus Mittendrein <git@maxmitti.tk>
Date: Mon, 29 Jul 2019 21:28:55 +0200
Subject: Use operators .. and ..= instead of Format where appropriate

---
 DTUtility.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'DTUtility.c')

diff --git a/DTUtility.c b/DTUtility.c
index d491567..2c1e952 100644
--- a/DTUtility.c
+++ b/DTUtility.c
@@ -31,11 +31,11 @@ global func Serialize(value)
 			}
 			else
 			{
-				ret = Format("%s,", ret);
+				ret ..= ",";
 			}
-			ret = Format("%s%s", ret, Serialize(val));
+			ret ..= Serialize(val);
 		}
-		return Format("%s]", ret);
+		return ret .. "]";
 	}
 	else if(GetType(value) == C4V_Bool) if(value) return "true"; else return "false";
 	else if(GetType(value) == C4V_C4ID) return Format("%i", value);
@@ -52,11 +52,11 @@ global func EscapeString(string value)
 		var c = GetChar(value, i);
 		if(c == 34) // "
 		{
-			ret = Format("%s\\\"", ret);
+			ret ..= "\\\"";
 		}
 		else if(c == 92) // \
 		{
-			ret = Format("%s\\\\", ret);
+			ret ..= "\\\\";
 		}
 		else
 		{
@@ -73,7 +73,7 @@ global func CreateEnum(string prefix, array enum)
 
 	for(var i = 0; i < GetLength(enum); ++i)
 	{
-		log = Format("%s%cstatic const %s%s = %d;", log, 10, prefix, enum[i], i);
+		log ..= Format("%cstatic const %s%s = %d;", 10, prefix, enum[i], i);
 
 		if(switch == "")
 		{
@@ -81,7 +81,7 @@ global func CreateEnum(string prefix, array enum)
 		}
 		else
 		{
-			switch = Format("%selse if(switchval == %s%s)%c{%c%c}%c", switch, prefix, enum[i], 10, 10, 10, 10);
+			switch ..= Format("else if(switchval == %s%s)%c{%c%c}%c", prefix, enum[i], 10, 10, 10, 10);
 		}
 	}
 
@@ -100,7 +100,7 @@ global func CreateBitField(string prefix, array flags)
 
 	for(var i = 0, j = 1; i < GetLength(flags); ++i)
 	{
-		log = Format("%s%cstatic const %s%s = %d;", log, 10, prefix, flags[i], j);
+		log ..= Format("%cstatic const %s%s = %d;", 10, prefix, flags[i], j);
 		j = j << 1;
 	}
 
@@ -148,7 +148,7 @@ global func StringConcatenate(array strings)
 
 	for(var i = 1; i < GetLength(strings); ++i)
 	{
-		ret = Format("%s%s", ret, strings[i]);
+		ret ..= strings[i];
 	}
 
 	return ret;
@@ -318,7 +318,7 @@ global func SetPlrExtraDataString(int plr, string name, string data)
 
 		if((i % 4) == 0 && i != 0)
 		{
-			SetPlrExtraData(plr, Format("%s%d", name, i/4 - 1), part);
+			SetPlrExtraData(plr, name .. i/4 - 1, part);
 			part = 0;
 		}
 
@@ -327,13 +327,13 @@ global func SetPlrExtraDataString(int plr, string name, string data)
 
 	if(part != 0)
 	{
-		SetPlrExtraData(plr, Format("%s%d", name, i/4), part);
+		SetPlrExtraData(plr, name .. i/4, part);
 	}
 
 	i = i/4 + 1;
-	while(GetPlrExtraData(plr, Format("%s%d", name, i)))
+	while(GetPlrExtraData(plr, name .. i))
 	{
-		SetPlrExtraData(plr, Format("%s%d", name, i++), 0);
+		SetPlrExtraData(plr, name .. i++, 0);
 	}
 }
 
@@ -343,7 +343,7 @@ global func GetPlrExtraDataString(int plr, string name)
 	var part = true;
 	for(var i = 0; part != 0; ++i)
 	{
-		part = CastInt(GetPlrExtraData(plr, Format("%s%d", name, i)));
+		part = CastInt(GetPlrExtraData(plr, name .. i));
 		for(var j = 0; j < 4; ++j)
 		{
 			var c = (part >> (j * 8)) & 0xFF;
@@ -377,7 +377,7 @@ global func GetPlrExtraDataArray(int plr, string name)
 
 global func SetPlrExtraDataIntArray(int plr, string name, array arr)
 {
-	var lengthName = Format("%sL", name);
+	var lengthName = name .. "L";
 
 	var oldLength = CastInt(GetPlrExtraData(plr, lengthName));
 
@@ -385,7 +385,7 @@ global func SetPlrExtraDataIntArray(int plr, string name, array arr)
 
 	for(var i = 0; i < length; ++i)
 	{
-		var partName = Format("%s%d", name, i);
+		var partName = name .. i;
 		if(arr[i] != 0)
 		{
 			SetPlrExtraData(plr, partName, arr[i]);
@@ -400,7 +400,7 @@ global func SetPlrExtraDataIntArray(int plr, string name, array arr)
 
 	for(var i = length; i < oldLength; ++i)
 	{
-		var partName = Format("%s%d", name, i);
+		var partName = name .. i;
 		if(GetPlrExtraData(plr, partName) != 0)
 		{
 			SetPlrExtraData(plr, partName, 0);
@@ -410,13 +410,13 @@ global func SetPlrExtraDataIntArray(int plr, string name, array arr)
 
 global func GetPlrExtraDataIntArray(int plr, string name)
 {
-	var length = CastInt(GetPlrExtraData(plr, Format("%sL", name)));
+	var length = CastInt(GetPlrExtraData(plr, name .. "L"));
 
 	var ret = CreateArray(length);
 
 	for(var i = 0; i < length; ++i)
 	{
-		ret[i] = CastInt(GetPlrExtraData(plr, Format("%s%d", name, i)));
+		ret[i] = CastInt(GetPlrExtraData(plr, name .. i));
 	}
 
 	return ret;
-- 
cgit v1.2.3-54-g00ecf