From 0a57f662fa6f15916caa564312a162ddb3c04883 Mon Sep 17 00:00:00 2001 From: Araq <rumpf_a@web.de> Date: Mon, 20 Sep 2010 22:33:23 +0200 Subject: bugfix: finally sections are executed before return/break --- tests/accept/run/spec.csv | 4 +++- tests/accept/run/tfinally.nim | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'tests/accept/run') diff --git a/tests/accept/run/spec.csv b/tests/accept/run/spec.csv index ec98fa70e..66eb7eb6a 100755 --- a/tests/accept/run/spec.csv +++ b/tests/accept/run/spec.csv @@ -19,7 +19,9 @@ tconstr2.nim;69 tcopy.nim;TEMP=C:\Programs\xyz\bin tcurrncy.nim;25 texplicitgeneric1.nim;Key: 12 value: 12Key: 13 value: 13 Key: A value: 12 Key: B value: 13 -tfinally.nim;came here +tfinally.nim;came here 3 +tfinally2.nim;ABCD +tfinally3.nim;false tfloat1.nim;Error: unhandled exception: FPU operation caused an overflow [EFloatOverflow] tfloat2.nim;Error: unhandled exception: FPU operation caused a NaN result [EFloatInvalidOp] tformat.nim;Hi Andreas! How do you feel, Rumpf? diff --git a/tests/accept/run/tfinally.nim b/tests/accept/run/tfinally.nim index df6397125..034653b2b 100755 --- a/tests/accept/run/tfinally.nim +++ b/tests/accept/run/tfinally.nim @@ -2,9 +2,14 @@ proc main: int = try: - return 1 + try: + return 1 + finally: + stdout.write("came ") + return 2 finally: - echo "came here" + stdout.write("here ") + return 3 -discard main() #OUT came here +echo main() #OUT came here 1 -- cgit 1.4.1-2-gfad0 53c585f16da7ca868d5e0e748065c415648e8'>tree</a> <a href='/ahoang/Nim/commit/tests/objects/tobjpragma.nim?h=devel&id=44353c585f16da7ca868d5e0e748065c415648e8'>commit</a> <a href='/ahoang/Nim/diff/tests/objects/tobjpragma.nim?h=devel&id=44353c585f16da7ca868d5e0e748065c415648e8'>diff</a> <a href='/ahoang/Nim/stats/tests/objects/tobjpragma.nim?h=devel'>stats</a></td><td class='form'><form class='right' method='get' action='/ahoang/Nim/log/tests/objects/tobjpragma.nim'> <input type='hidden' name='h' value='devel'/><input type='hidden' name='id' value='44353c585f16da7ca868d5e0e748065c415648e8'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='path'>path: <a href='/ahoang/Nim/tree/?h=devel&id=44353c585f16da7ca868d5e0e748065c415648e8'>root</a>/<a href='/ahoang/Nim/tree/tests?h=devel&id=44353c585f16da7ca868d5e0e748065c415648e8'>tests</a>/<a href='/ahoang/Nim/tree/tests/objects?h=devel&id=44353c585f16da7ca868d5e0e748065c415648e8'>objects</a>/<a href='/ahoang/Nim/tree/tests/objects/tobjpragma.nim?h=devel&id=44353c585f16da7ca868d5e0e748065c415648e8'>tobjpragma.nim</a></div><div class='content'>blob: f9fbd5e40cd963a620c15180d1828c1ed3b69416 (<a href='/ahoang/Nim/plain/tests/objects/tobjpragma.nim?h=devel&id=44353c585f16da7ca868d5e0e748065c415648e8'>plain</a>) (<a href='/ahoang/Nim/blame/tests/objects/tobjpragma.nim?h=devel&id=44353c585f16da7ca868d5e0e748065c415648e8'>blame</a>) <table summary='blob content' class='blob'> <tr><td class='linenumbers'><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> <a id='n11' href='#n11'>11</a> <a id='n12' href='#n12'>12</a> <a id='n13' href='#n13'>13</a> <a id='n14' href='#n14'>14</a> <a id='n15' href='#n15'>15</a> <a id='n16' href='#n16'>16</a> <a id='n17' href='#n17'>17</a> <a id='n18' href='#n18'>18</a> <a id='n19' href='#n19'>19</a> <a id='n20' href='#n20'>20</a> <a id='n21' href='#n21'>21</a> <a id='n22' href='#n22'>22</a> <a id='n23' href='#n23'>23</a> <a id='n24' href='#n24'>24</a> <a id='n25' href='#n25'>25</a> <a id='n26' href='#n26'>26</a> <a id='n27' href='#n27'>27</a> <a id='n28' href='#n28'>28</a> <a id='n29' href='#n29'>29</a> <a id='n30' href='#n30'>30</a> <a id='n31' href='#n31'>31</a> <a id='n32' href='#n32'>32</a> <a id='n33' href='#n33'>33</a> <a id='n34' href='#n34'>34</a> <a id='n35' href='#n35'>35</a> <a id='n36' href='#n36'>36</a> <a id='n37' href='#n37'>37</a> <a id='n38' href='#n38'>38</a> <a id='n39' href='#n39'>39</a> <a id='n40' href='#n40'>40</a> <a id='n41' href='#n41'>41</a> <a id='n42' href='#n42'>42</a> <a id='n43' href='#n43'>43</a> <a id='n44' href='#n44'>44</a> <a id='n45' href='#n45'>45</a> <a id='n46' href='#n46'>46</a> <a id='n47' href='#n47'>47</a> <a id='n48' href='#n48'>48</a> <a id='n49' href='#n49'>49</a> </pre></td> <td class='lines'><pre><code>