From 2ee57b3e6d063fe7c675429a10e06720459b08fe Mon Sep 17 00:00:00 2001
From: zerbina <100542850+zerbina@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:40:57 +0000
Subject: [PATCH] sem: fix error propagation for tuple construction

Summary
=======

* fix errors in anonymous tuple constructions not being propagated
* fix the error for colon expressions in anonymous tuple constructions
  being "invalid expression" instead of "named expression not allowed
  here"

Details
=======

* properly propagate errors from element expressions
* don't analyze `nkExprColonExpr` as a normal expression
* don't modify input AST
* skip tuple type constructor analysis if any of the element
  expressions is erroneous
---
 compiler/sem/semexprs.nim      | 54 ++++++++++++++++++++--------------
 tests/errmsgs/tmixed_tuple.nim |  7 +++++
 2 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100644 tests/errmsgs/tmixed_tuple.nim

diff --git a/compiler/sem/semexprs.nim b/compiler/sem/semexprs.nim
index e98531714e9..66dbc8bac7e 100644
--- a/compiler/sem/semexprs.nim
+++ b/compiler/sem/semexprs.nim
@@ -3148,39 +3148,49 @@ proc semTuplePositionsConstr(c: PContext, n: PNode, flags: TExprFlags): PNode =
                           "expected nkTupleConstr, got: " & $n.kind)
   
   let
-    tupExp = n                  # we don't modify n, but compute the type:
+    tupExp = shallowCopy(n)
     typ = newTypeS(tyTuple, c)  # leave typ.n nil!
-  for i in 0..<tupExp.len:
-    tupExp[i] = semExprWithType(c, tupExp[i], {}) # xxx: claim of not modifying
-                                                  #      n is dubious
-    addSonSkipIntLit(typ, tupExp[i].typ, c.idgen)
+
+  var hasError = false
+
+  for i, it in n.pairs:
+    var etyp: PType
+    if it.kind == nkExprColonExpr:
+      # can happen for ``(a, b: c)``. Analyze the expression for the sake of
+      # error correction (check/nimsuggest)
+      let elem = copyNodeWithKids(it)
+      elem[1] = semExprWithType(c, it[1], {})
+      etyp = elem[1].typ
+
+      tupExp[i] = c.config.newError(elem):
+        PAstDiag(kind: adSemNamedExprNotAllowed)
+    else:
+      tupExp[i] = semExprWithType(c, it, {})
+      etyp = tupExp[i].typ
+
+    hasError = hasError or tupExp[i].isError
+    addSonSkipIntLit(typ, etyp, c.idgen)
+
   tupExp.typ = typ
 
-  var
-    isTupleType: bool
-    hasError = false
+  if hasError:
+    # don't analyze any further
+    return c.config.wrapError(tupExp)
+
   if tupExp.len > 0: # don't interpret () as type
-    isTupleType = tupExp[0].typ.kind == tyTypeDesc
+    let isTupleType = tupExp[0].typ.kind == tyTypeDesc
     # check if either everything or nothing is tyTypeDesc
     for i in 1..<tupExp.len:
-      if tupExp[i].kind == nkExprColonExpr:
-        hasError = true
-        # xxx: not sure if this modification is safe
-        tupExp[i] = c.config.newError(tupExp[i],
-                                      PAstDiag(kind: adSemNamedExprNotAllowed))
-      elif isTupleType != (tupExp[i].typ.kind == tyTypeDesc):
+      if isTupleType != (tupExp[i].typ.kind == tyTypeDesc):
         # xxx: maybe capture the field instead of the info?
         return c.config.newError(n,
                           PAstDiag(kind: adSemCannotMixTypesAndValuesInTuple,
                                    wrongFldInfo: tupExp[i].info))
 
-  if hasError:
-    result = c.config.wrapError(tupExp)
-  elif isTupleType: # reinterpret `(int, string)` as type expressions
-    result = n
-    result.typ = makeTypeDesc(c, semTypeNode(c, n, nil).skipTypes({tyTypeDesc}))
-  else:
-    result = tupExp
+    if isTupleType: # reinterpret `(int, string)` as a type expression
+      tupExp.typ = makeTypeDesc(c, semTypeNode(c, tupExp, nil))
+
+  result = tupExp
 
 proc semTupleConstr(c: PContext, n: PNode, flags: TExprFlags): PNode =
   ## analyse tuple construction based on position of fields or return errors
diff --git a/tests/errmsgs/tmixed_tuple.nim b/tests/errmsgs/tmixed_tuple.nim
new file mode 100644
index 00000000000..8e75c03142b
--- /dev/null
+++ b/tests/errmsgs/tmixed_tuple.nim
@@ -0,0 +1,7 @@
+discard """
+  errormsg: "named expression not allowed here"
+  line: 7
+"""
+
+var x = 0
+discard (x, a: x)