← Back to branch summary

~ubuntu-branches/ubuntu/utopic/monodevelop/utopic

« back to all changes in this revision

Viewing changes to contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2012-06-22 20:35:35 UTC
  • mfrom: (10.3.2)
  • Revision ID: package-import@ubuntu.com-20120622203535-zrozwvcf6kfk6l6i
Tags: 3.0.3.2+dfsg-1
* [3fd89ae] Imported Upstream version 3.0.3.2+dfsg
* [379a680] Remove old patches we haven't used for ages from git.
* [d71161d] Remove correct_paths_in_monodevelop-core-addins.pc.patch.
  Upstream claim to have fixed this by moving assembly install locations.
* [15dbfb9] Fix install location for MonoDevelop.Gettext.dll.config.
* [26eb434] Fix install location for MonoDevelop.SourceEditor2.dll.config.
* [4169974] Upstream commit 53282c9 which finally reconciles the 
  MonoDevelop.Gettext.dll install location with the 
  monodevelop-core-addins.pc location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/statement.cs
950
950
                                                async_return.EmitAssign (ec);
951
951
 
952
952
                                                ec.EmitEpilogue ();
953
 
 
954
 
                                                ec.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, async_body.BodyEnd);
955
953
                                        }
956
954
 
 
955
                                        ec.Emit (unwind_protect ? OpCodes.Leave : OpCodes.Br, async_body.BodyEnd);
957
956
                                        return;
958
957
                                }
959
958
 
2462
2461
                        if (ec.CurrentAnonymousMethod is StateMachineInitializer && ParametersBlock.Original == ec.CurrentAnonymousMethod.Block.Original)
2463
2462
                                return ec.CurrentAnonymousMethod.Storey;
2464
2463
 
2465
 
                        //
2466
 
                        // When referencing a variable inside iterator where all
2467
 
                        // variables will be captured anyway we don't need to create
2468
 
                        // another storey context
2469
 
                        //
2470
 
                        if (ParametersBlock.StateMachine is IteratorStorey) {
2471
 
                                return ParametersBlock.StateMachine;
2472
 
                        }
2473
 
 
2474
2464
                        if (am_storey == null) {
2475
2465
                                MemberBase mc = ec.MemberContext as MemberBase;
2476
2466
 
4539
4529
                        ec.MarkLabel (start_finally);
4540
4530
 
4541
4531
                        if (finally_host != null) {
 
4532
                                finally_host.Define ();
 
4533
                                finally_host.Emit ();
 
4534
 
 
4535
                                // Now it's safe to add, to close it properly and emit sequence points
 
4536
                                finally_host.Parent.AddMember (finally_host);
 
4537
 
4542
4538
                                var ce = new CallEmitter ();
4543
4539
                                ce.InstanceExpression = new CompilerGeneratedThis (ec.CurrentType, loc);
4544
4540
                                ce.EmitPredefined (ec, finally_host.Spec, new Arguments (0));