Fix ShString.FillString

modules/ShString/ShString.c

@@ -109,8 +109,8 @@ static void FillString() {
 	int i;
 	
 	for (i = 0; i < cnt; i++) {
-		if (st != src)
-			svar_set(st, svar_get(src));
+		if (st + i != src)
+			svar_set(st + i, svar_get(src));
 	}
 	
 	DEBUG_COMMAND("ShString.FillString: %d,%d,%d,%d:\n", st, cnt, src, p4);

test/ShString.HEL

@@ -1,7 +1,10 @@
+void FillString(int arg1, int arg2, IString arg3, ISys3xStringTable arg4)
 void ExchangeString(IString arg1, IString arg2, IString arg3)
 void SetNum16String(pword arg1, IString arg2)
 void SetNum16HalfString(pword arg1, IString arg2)
 void SetNum32String(pword arg1, IString arg2)
 void SetNum32HalfString(pword arg1, IString arg2)
+void SetStringNum16(IString arg1, pword arg2)
+void SetStringNum32(IString arg1, pword arg2)
 void GetArrayString(pword arg1, int arg2, IString arg3)
 void SetWindowTitle(IString arg1, ISys3xSystem arg2)

test/strvar.adv

@@ -7,6 +7,7 @@ const word str1 = 10:
 const word str2 = 11:
 const word str3 = 12:
 const word str4 = 13:
+const word str5 = 14:
 
 	MS str1,"０１２３４５６７８９":
 	ML len,str1:
@@ -161,6 +162,18 @@ const word str4 = 13:
 	ShString.ExchangeString str1,str2,str3:
 	MS str4,"いいいいいいあ":
 	~AssertStrEquals str1,str4,__LINE__:
+
+	MS str1,"a":
+	MS str2,"b":
+	MS str3,"c":
+	MS str4,"d":
+	ShString.FillString str1,3,str2:
+	MS str5,"b":
+	~AssertStrEquals str1,str5,__LINE__:
+	~AssertStrEquals str2,str5,__LINE__:
+	~AssertStrEquals str3,str5,__LINE__:
+	MS str5,"d":
+	~AssertStrEquals str4,str5,__LINE__:
 	\0:
 
 **MPtoString dst,src,len: