From 554343328681ec8996833bd8c7082329f93c3d95 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sun, 7 Nov 2010 22:27:07 +0100 Subject: [PATCH] NRefactory.VB: fixed ResumeStatement --- .../Parser/Statements/ResumeStatement.cs | 6 +++--- ICSharpCode.NRefactory.VB/Parser/Parser.cs | 2 +- ICSharpCode.NRefactory.VB/Parser/vb.atg | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ResumeStatement.cs b/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ResumeStatement.cs index b11595c177..34729c06bb 100644 --- a/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ResumeStatement.cs +++ b/ICSharpCode.NRefactory.VB.Tests/Parser/Statements/ResumeStatement.cs @@ -12,12 +12,12 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ResumeStatementTests { - #region VB.NET [Test] - public void VBNetResumeStatementTest() + public void ResumeStatementTest() { ResumeStatement resumeStatement = ParseUtil.ParseStatement("Resume"); } - #endregion + + // TODO : write some more } } diff --git a/ICSharpCode.NRefactory.VB/Parser/Parser.cs b/ICSharpCode.NRefactory.VB/Parser/Parser.cs index a1060aa027..69594899e4 100644 --- a/ICSharpCode.NRefactory.VB/Parser/Parser.cs +++ b/ICSharpCode.NRefactory.VB/Parser/Parser.cs @@ -4830,9 +4830,9 @@ partial class VBParser resumeStatement = new ResumeStatement(true); } else { LabelName(out label); - resumeStatement = new ResumeStatement(label); } } + resumeStatement = new ResumeStatement(label); } void ExpressionStatement(out Statement statement) { diff --git a/ICSharpCode.NRefactory.VB/Parser/vb.atg b/ICSharpCode.NRefactory.VB/Parser/vb.atg index 83bfebe3e7..8499ca3d7f 100644 --- a/ICSharpCode.NRefactory.VB/Parser/vb.atg +++ b/ICSharpCode.NRefactory.VB/Parser/vb.atg @@ -3574,8 +3574,9 @@ ResumeStatement .) = "Resume" - [ "Next" (. resumeStatement = new ResumeStatement(true); .) - | LabelName (. resumeStatement = new ResumeStatement(label); .) ] + [ "Next" (. resumeStatement = new ResumeStatement(true); .) | LabelName ] + // if only "Resume" is present label is "" + (. resumeStatement = new ResumeStatement(label); .) . /* 18.8.2 */