[cpp] Fix collectionWithStringStgKeys.Remove(stringRef).

Fix #223

Author: pfusik

GenCpp.fu

@@ -1061,7 +1061,10 @@ public class GenCpp : GenCCpp
 		case FuId.SortedSetRemove:
 		case FuId.DictionaryRemove:
 		case FuId.SortedDictionaryRemove:
-			WriteMethodCall(obj, "erase", args[0]);
+			StartMethodCall(obj);
+			Write("erase(");
+			WriteStronglyCoerced(obj.Type.AsClassType().GetKeyType(), args[0]);
+			WriteChar(')');
 			break;
 		case FuId.DictionaryAdd:
 			WriteIndexing(obj, args[0]);

libfut.cpp

@@ -14959,7 +14959,10 @@ void GenCpp::writeCallExpr(const FuType * type, const FuExpr * obj, const FuMeth
 	case FuId::sortedSetRemove:
 	case FuId::dictionaryRemove:
 	case FuId::sortedDictionaryRemove:
-		writeMethodCall(obj, "erase", (*args)[0].get());
+		startMethodCall(obj);
+		write("erase(");
+		writeStronglyCoerced(obj->type->asClassType()->getKeyType(), (*args)[0].get());
+		writeChar(')');
 		break;
 	case FuId::dictionaryAdd:
 		writeIndexing(obj, (*args)[0].get());

libfut.cs

@@ -15293,7 +15293,10 @@ protected override void WriteCallExpr(FuType type, FuExpr obj, FuMethod method,
 			case FuId.SortedSetRemove:
 			case FuId.DictionaryRemove:
 			case FuId.SortedDictionaryRemove:
-				WriteMethodCall(obj, "erase", args[0]);
+				StartMethodCall(obj);
+				Write("erase(");
+				WriteStronglyCoerced(obj.Type.AsClassType().GetKeyType(), args[0]);
+				WriteChar(')');
 				break;
 			case FuId.DictionaryAdd:
 				WriteIndexing(obj, args[0]);

libfut.js

@@ -15800,7 +15800,10 @@ export class GenCpp extends GenCCpp
 		case FuId.SORTED_SET_REMOVE:
 		case FuId.DICTIONARY_REMOVE:
 		case FuId.SORTED_DICTIONARY_REMOVE:
-			this.writeMethodCall(obj, "erase", args[0]);
+			this.#startMethodCall(obj);
+			this.write("erase(");
+			this.writeStronglyCoerced(obj.type.asClassType().getKeyType(), args[0]);
+			this.writeChar(41);
 			break;
 		case FuId.DICTIONARY_ADD:
 			this.writeIndexing(obj, args[0]);

test/DictionaryString.fu

@@ -17,8 +17,9 @@ public static class Test
 		dict2.Clear();
 		dict2[one] = "jeden";
 		dict2[two] = "dwa";
-		dict2["three"] = "trzy";
-		dict2.Remove("three");
+		string three = "three";
+		dict2[three] = "trzy";
+		dict2.Remove(three);
 
 		Dictionary<string, string()>() dict3;
 		dict3["only"] = "test";

test/SortedDictionary.fu

@@ -2,13 +2,16 @@ public static class Test
 {
 	public static bool Run()
 	{
-		SortedDictionary<int, int>() dict; //FAIL: cl
-		dict[1] = 10;
+		SortedDictionary<string(), int>() dict; //FAIL: cl
+		dict["one"] = 10;
 		dict.Clear();
-		dict[2] = 12;
-		dict[2] = 20;
-		dict[3] = 30;
-		dict.Remove(1);
-		return dict.Count == 2 && dict[2] == 20 && dict[3] == 30 && dict.ContainsKey(2);
+		dict["two"] = 12;
+		string two = "two";
+		dict[two] = 20;
+		dict["three"] = 30;
+		dict.Remove("one");
+		string one = "one";
+		dict.Remove(one);
+		return dict.Count == 2 && dict["two"] == 20 && dict["three"] == 30 && dict.ContainsKey("two");
 	}
 }