[swift] Transpile int collections to Int32.

Author: pfusik

GenPySwift.fu

@@ -1,6 +1,6 @@
 // GenPySwift.fu - Python/Swift code generator
 //
-// Copyright (C) 2020-2023  Piotr Fusik
+// Copyright (C) 2020-2025  Piotr Fusik
 //
 // This file is part of Fusion Transpiler,
 // see https://github.com/fusionlanguage/fut
@@ -123,14 +123,19 @@ public abstract class GenPySwift : GenBase
 		expr.Accept(this, parent);
 	}
 
+	protected virtual void WriteElementCoerced!(FuType type, FuExpr value)
+	{
+		WriteCoerced(type, value, FuPriority.Argument);
+	}
+
 	protected void WriteListAppend!(FuExpr obj, List<FuExpr#> args)
 	{
 		WritePostfix(obj, ".append(");
 		FuType elementType = obj.Type.AsClassType().GetElementType();
 		if (args.Count == 0)
 			WriteNewStorage(elementType);
 		else
-			WriteCoerced(elementType, args[0], FuPriority.Argument);
+			WriteElementCoerced(elementType, args[0]);
 		WriteChar(')');
 	}
 

GenSwift.fu

@@ -171,13 +171,23 @@ public class GenSwift : GenPySwift
 
 	protected override void WriteLocalName!(FuSymbol symbol, FuPriority parent)
 	{
-		if (symbol.Parent is FuForeach forEach && forEach.Collection.Type is FuStringType) {
-			Write("Int(");
-			WriteCamelCaseNotKeyword(symbol.Name);
-			Write(".value)");
+		if (symbol.Parent is FuForeach loop) {
+			assert loop.Collection.Type is FuClassType klass;
+			if (klass.Class.Id == FuId.StringClass) {
+				Write("Int(");
+				WriteCamelCaseNotKeyword(symbol.Name);
+				Write(".value)");
+				return;
+			}
+			FuType elementType = symbol == loop.First ? klass.GetElementType() : klass.GetValueType();
+			if (elementType.Id == FuId.IntType) {
+				Write("Int(");
+				WriteCamelCaseNotKeyword(symbol.Name);
+				WriteChar(')');
+				return;
+			}
 		}
-		else
-			base.WriteLocalName(symbol, parent);
+		base.WriteLocalName(symbol, parent);
 	}
 
 	protected override void WriteMemberOp!(FuExpr left, FuSymbolReference? symbol)
@@ -272,6 +282,8 @@ public class GenSwift : GenPySwift
 				Write("UInt16");
 				break;
 			case FuId.IntType:
+				Write("Int32");
+				break;
 			case FuId.NIntType:
 				Write("Int");
 				break;
@@ -310,12 +322,20 @@ public class GenSwift : GenPySwift
 		}
 	}
 
+	void WritePromotedType!(FuType type)
+	{
+		if (type.Id == FuId.IntType)
+			Write("Int");
+		else
+			WriteType(type);
+	}
+
 	protected override void WriteTypeAndName!(FuNamedValue value)
 	{
 		WriteName(value);
 		if (!value.Type.IsFinal() || value.IsAssignableStorage()) {
 			Write(" : ");
-			WriteType(value.Type);
+			WritePromotedType(value.Type);
 		}
 	}
 
@@ -356,11 +376,21 @@ public class GenSwift : GenPySwift
 		}
 	}
 
+	static bool IsIntIndexing(FuExpr expr)
+	{
+		if (expr.Type.Id != FuId.IntType)
+			return false;
+		if (expr is FuUnaryExpr unary && (unary.Op == FuToken.Increment || unary.Op == FuToken.Decrement))
+			expr = unary.Inner;
+		return expr.IsIndexing();
+	}
+
 	protected override void WriteCoercedInternal!(FuType type, FuExpr expr, FuPriority parent)
 	{
 		if (type is FuNumericType && !(expr is FuLiteral)
-		 && GetTypeId(type, false) != GetTypeId(expr.Type, expr is FuBinaryExpr binary && binary.Op != FuToken.LeftBracket)) {
-			WriteType(type);
+		 && (GetTypeId(type, false) != GetTypeId(expr.Type, expr is FuBinaryExpr && !expr.IsIndexing()))
+				|| IsIntIndexing(expr)) {
+			WritePromotedType(type);
 			WriteChar('(');
 			if (type is FuIntegerType && expr is FuCallExpr call && call.Method.Symbol.Id == FuId.MathTruncate)
 				call.Arguments[0].Accept(this, FuPriority.Argument);
@@ -432,6 +462,17 @@ public class GenSwift : GenPySwift
 		WriteAdd(startIndex, length); // FIXME: side effect
 	}
 
+	protected override void WriteElementCoerced!(FuType type, FuExpr value)
+	{
+		if (type.Id == FuId.IntType && !IsIntIndexing(value)) {
+			Write("Int32(");
+			value.Accept(this, FuPriority.Argument);
+			WriteChar(')');
+		}
+		else
+			WriteCoerced(type, value, FuPriority.Argument);
+	}
+
 	bool AddVar!(string name)
 	{
 		HashSet<string>! vars = this.VarsAtIndent[this.Indent];
@@ -574,8 +615,9 @@ public class GenSwift : GenPySwift
 				WriteChar(')');
 			}
 			else {
-				Write(".fill");
-				WriteCoercedArgsInParentheses(method, args);
+				Write(".fill(");
+				WriteElementCoerced(obj.Type.AsClassType().GetElementType(), args[0]);
+				WriteChar(')');
 			}
 			break;
 		case FuId.ArrayFillPart:
@@ -591,8 +633,13 @@ public class GenSwift : GenPySwift
 			else {
 				obj.Accept(this, FuPriority.Primary);
 				WriteMemberOp(obj, null);
-				Write("fill");
-				WriteCoercedArgsInParentheses(method, args);
+				Write("fill(");
+				WriteElementCoerced(obj.Type.AsClassType().GetElementType(), args[0]);
+				Write(", ");
+				WriteCoerced(this.System.IntType, args[1], FuPriority.Argument);
+				Write(", ");
+				WriteCoerced(this.System.IntType, args[2], FuPriority.Argument);
+				WriteChar(')');
 			}
 			break;
 		case FuId.ArraySortAll:
@@ -960,7 +1007,7 @@ public class GenSwift : GenPySwift
 			case FuToken.ShiftRight when expr == binary.Left:
 				if (!(expr is FuLiteral)) {
 					FuType type = this.System.PromoteNumericTypes(binary.Left.Type, binary.Right.Type);
-					if (type != expr.Type) {
+					if (type != expr.Type || IsIntIndexing(expr)) {
 						WriteCoerced(type, expr, parent);
 						return;
 					}
@@ -1009,7 +1056,16 @@ public class GenSwift : GenPySwift
 		WriteChar(' ');
 		Write(expr.GetOpString());
 		WriteChar(' ');
-		if (right is FuLiteralNull
+		if (IsIntIndexing(expr.Left)) {
+			if (IsIntIndexing(right))
+				right.Accept(this, FuPriority.Argument);
+			else {
+				Write("Int32(");
+				right.Accept(this, FuPriority.Argument);
+				WriteChar(')');
+			}
+		}
+		else if (right is FuLiteralNull
 		 && expr.Left is FuBinaryExpr leftBinary
 		 && leftBinary.Op == FuToken.LeftBracket
 		 && leftBinary.Left.Type is FuClassType dict
@@ -1418,7 +1474,7 @@ public class GenSwift : GenPySwift
 	protected override void WriteResultVar!()
 	{
 		Write("let result : ");
-		WriteType(this.CurrentMethod.Type);
+		WritePromotedType(this.CurrentMethod.Type);
 	}
 
 	void WriteSwiftCaseValue!(FuSwitch statement, FuExpr value)
@@ -1432,7 +1488,7 @@ public class GenSwift : GenPySwift
 			Write("let ");
 			WriteCamelCaseNotKeyword(def.Name);
 			Write(" as ");
-			WriteType(def.Type);
+			WritePromotedType(def.Type);
 			break;
 		case FuBinaryExpr when1 when when1.Op == FuToken.When:
 			WriteSwiftCaseValue(statement, when1.Left);
@@ -1516,7 +1572,7 @@ public class GenSwift : GenPySwift
 		else
 			WriteName(param);
 		Write(" : ");
-		WriteType(param.Type);
+		WritePromotedType(param.Type);
 	}
 
 	internal override void VisitEnumValue!(FuConst konst, FuConst? previous)
@@ -1695,7 +1751,7 @@ public class GenSwift : GenPySwift
 				Write(" throws");
 			if (method.Type.Id != FuId.VoidType) {
 				Write(" -> ");
-				WriteType(method.Type);
+				WritePromotedType(method.Type);
 			}
 		}
 		WriteNewLine();