From ece714773491de1757d9afbda6d499de9b610b31 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Wed, 31 Mar 2021 13:26:44 +0200
Subject: better error messages for .raise effect analysis (#17595)

---
 compiler/sempass2.nim | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'compiler')

diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index a1572c85e..87d196fad 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -304,8 +304,8 @@ proc addToIntersection(inter: var TIntersection, s: int) =
 proc throws(tracked, n, orig: PNode) =
   if n.typ == nil or n.typ.kind != tyError:
     if orig != nil:
-      let x = copyNode(n)
-      x.info = orig.info
+      let x = copyTree(orig)
+      x.typ = n.typ
       tracked.add x
     else:
       tracked.add n
@@ -329,7 +329,7 @@ proc createTag(g: ModuleGraph; n: PNode): PNode =
   if not n.isNil: result.info = n.info
 
 proc addRaiseEffect(a: PEffects, e, comesFrom: PNode) =
-  assert e.kind != nkRaiseStmt
+  #assert e.kind != nkRaiseStmt
   var aa = a.exc
   for i in a.bottom..<aa.len:
     # we only track the first node that can have the effect E in order
@@ -917,7 +917,7 @@ proc track(tracked: PEffects, n: PNode) =
     if n[0].kind != nkEmpty:
       n[0].info = n.info
       #throws(tracked.exc, n[0])
-      addRaiseEffect(tracked, n[0], nil)
+      addRaiseEffect(tracked, n[0], n)
       for i in 0..<n.safeLen:
         track(tracked, n[i])
       createTypeBoundOps(tracked, n[0].typ, n.info)
@@ -1163,7 +1163,9 @@ proc checkRaisesSpec(g: ModuleGraph; spec, real: PNode, msg: string, hints: bool
           break search
       # XXX call graph analysis would be nice here!
       pushInfoContext(g.config, spec.info)
-      localError(g.config, r.info, errGenerated, msg & typeToString(r.typ))
+      var rr = if r.kind == nkRaiseStmt: r[0] else: r
+      while rr.kind in {nkStmtList, nkStmtListExpr} and rr.len > 0: rr = rr.lastSon
+      localError(g.config, r.info, errGenerated, renderTree(rr) & " " & msg & typeToString(r.typ))
       popInfoContext(g.config)
   # hint about unnecessarily listed exception types:
   if hints:
-- 
cgit 1.4.1-2-gfad0


</form>
</td></tr></table>
<div class='path'>path: <a href='/ahoang/chawan/blame/?id=ddbf590d57f60e4e6243cefc176b103e78674f88'>root</a>/<a href='/ahoang/chawan/blame/res?id=ddbf590d57f60e4e6243cefc176b103e78674f88'>res</a>/<a href='/ahoang/chawan/blame/res/quirk.css?id=ddbf590d57f60e4e6243cefc176b103e78674f88'>quirk.css</a></div><div class='content'>blob: 0515f028ad0f2a9b2da5c00d5ee10a6df3551c85 (<a href='/ahoang/chawan/plain/res/quirk.css?id=ddbf590d57f60e4e6243cefc176b103e78674f88'>plain</a>) (<a href='/ahoang/chawan/tree/res/quirk.css?id=ddbf590d57f60e4e6243cefc176b103e78674f88'>tree</a>)
<table class='blame blob'>
<tr>
<td class='hashes'><div class='alt'><pre><span class='oid'><a title='author  bptato &lt;nincsnevem662@gmail.com&gt;  2022-11-25 18:42:27 +0100
committer  bptato &lt;nincsnevem662@gmail.com&gt;  2022-11-25 18:42:27 +0100

Add some quirks mode rules + presentational hints' href='/ahoang/chawan/commit/res/quirk.css?id=7ab7f28fdefe503fdde53ba9e253e308cb06b44f'>7ab7f28f</a></span> <a title='Blame the previous revision' href='/ahoang/chawan/blame/res/quirk.css?id=d205ef228866cad35891ca96cacae547c02fd4ae'>^</a>









</pre></div></td>
<td class='linenumbers'><div class='alt'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
</pre></div></td>
<td class='lines'><div><div><div class='alt'><pre>









                              </pre></div></div><pre><code>