Handle tuples with unnamed fields, symbols, and more. Less duplication.

1 files changed, 2 insertions, 5 deletions

diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 3208403d4..96c80c64e 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -198,11 +198,8 @@ proc semConv(c: PContext, n: PNode): PNode =
       # separate proc from fitNode?
       if op.kind == nkSym and op.sym.isGenericRoutine:
         result.sons[1] = fitNode(c, result.typ, result.sons[1])
-      elif op.kind == nkPar and targetType.kind == tyTuple and
-                op.sons.len > 0 and op.sons[0].kind == nkExprColonExpr:
-        # Tuple conversion: set field types in case any are tyEmpty (eg. `@[]`)
-        for i in 0..<op.sons.len:
-          op.sons[i][1].typ = targetType.sons[i]
+      elif op.kind == nkPar and targetType.kind == tyTuple:
+        op = fitNode(c, targetType, op)
     of convNotNeedeed:
       message(n.info, hintConvFromXtoItselfNotNeeded, result.typ.typeToString)
     of convNotLegal: