Merge branch 'next' into Issue1867

Author: Hosch250

Rubberduck.Parsing/Grammar/VBALexer.cs

@@ -156,6 +156,7 @@ LSET : L S E T;
 ME : M E;
 MID : M I D;
 MOD : M O D;
+NAME : N A M E;
 NEXT : N E X T;
 NEW : N E W;
 NOT : N O T;

Rubberduck.Parsing/Grammar/VBALexer.g4

@@ -129,6 +129,7 @@ blockStmt :
     | circleSpecialForm
     | scaleSpecialForm
     | callStmt
+	| nameStmt
 ;
 
 
@@ -443,6 +444,8 @@ rsetStmt : RSET whiteSpace expression whiteSpace? EQ whiteSpace? expression;
 // 5.4.2.11 Stop Statement
 stopStmt : STOP;
 
+nameStmt : NAME whiteSpace expression whiteSpace AS whiteSpace expression;
+
 // 5.4.2.10 Select Case Statement
 selectCaseStmt :
     SELECT whiteSpace? CASE whiteSpace? selectExpression endOfStatement
@@ -756,6 +759,7 @@ keyword :
      | SEEK
      | UNLOCK
      | WRITE
+	 | NAME
 ;
 
 markerKeyword : AS;

Rubberduck.Parsing/Grammar/VBAParser.cs

@@ -2139,6 +2139,19 @@ public virtual void EnterDefDirective([NotNull] VBAParser.DefDirectiveContext co
 	/// <param name="context">The parse tree.</param>
 	public virtual void ExitDefDirective([NotNull] VBAParser.DefDirectiveContext context) { }
 
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBAParser.nameStmt"/>.
+	/// <para>The default implementation does nothing.</para>
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	public virtual void EnterNameStmt([NotNull] VBAParser.NameStmtContext context) { }
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBAParser.nameStmt"/>.
+	/// <para>The default implementation does nothing.</para>
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	public virtual void ExitNameStmt([NotNull] VBAParser.NameStmtContext context) { }
+
 	/// <summary>
 	/// Enter a parse tree produced by <see cref="VBAParser.typeHint"/>.
 	/// <para>The default implementation does nothing.</para>

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -1814,6 +1814,17 @@ public partial class VBAParserBaseVisitor<Result> : AbstractParseTreeVisitor<Res
 	/// <return>The visitor result.</return>
 	public virtual Result VisitDefDirective([NotNull] VBAParser.DefDirectiveContext context) { return VisitChildren(context); }
 
+	/// <summary>
+	/// Visit a parse tree produced by <see cref="VBAParser.nameStmt"/>.
+	/// <para>
+	/// The default implementation returns the result of calling <see cref="AbstractParseTreeVisitor{Result}.VisitChildren(IRuleNode)"/>
+	/// on <paramref name="context"/>.
+	/// </para>
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	/// <return>The visitor result.</return>
+	public virtual Result VisitNameStmt([NotNull] VBAParser.NameStmtContext context) { return VisitChildren(context); }
+
 	/// <summary>
 	/// Visit a parse tree produced by <see cref="VBAParser.typeHint"/>.
 	/// <para>

Rubberduck.Parsing/Grammar/VBAParserBaseListener.cs

@@ -1869,6 +1869,17 @@ public interface IVBAParserListener : IParseTreeListener {
 	/// <param name="context">The parse tree.</param>
 	void ExitDefDirective([NotNull] VBAParser.DefDirectiveContext context);
 
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBAParser.nameStmt"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterNameStmt([NotNull] VBAParser.NameStmtContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBAParser.nameStmt"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitNameStmt([NotNull] VBAParser.NameStmtContext context);
+
 	/// <summary>
 	/// Enter a parse tree produced by <see cref="VBAParser.typeHint"/>.
 	/// </summary>

Rubberduck.Parsing/Grammar/VBAParserBaseVisitor.cs

@@ -1193,6 +1193,13 @@ public interface IVBAParserVisitor<Result> : IParseTreeVisitor<Result> {
 	/// <return>The visitor result.</return>
 	Result VisitDefDirective([NotNull] VBAParser.DefDirectiveContext context);
 
+	/// <summary>
+	/// Visit a parse tree produced by <see cref="VBAParser.nameStmt"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	/// <return>The visitor result.</return>
+	Result VisitNameStmt([NotNull] VBAParser.NameStmtContext context);
+
 	/// <summary>
 	/// Visit a parse tree produced by <see cref="VBAParser.typeHint"/>.
 	/// </summary>

Rubberduck.Parsing/Grammar/VBAParserListener.cs

@@ -207,6 +207,7 @@ keyword :
      | SEEK
      | UNLOCK
      | WRITE
+	 | NAME
 ;
 
 markerKeyword : AS;