Merge pull request rubberduck-vba#1932 from Hosch250/Issue1917

Fix grammar to support line continuations inside a date literal, to match VBE's clunkiness

Author: retailcoder

Rubberduck.Parsing/Grammar/VBALexer.cs

@@ -259,7 +259,7 @@ fragment EXPONENT : EXPONENTLETTER EXPONENTSIGN? DIGIT+;
 fragment EXPONENTLETTER : [DEde];
 fragment EXPONENTSIGN : [+-];
 fragment DECIMALLITERAL : DIGIT+;
-DATELITERAL : '#' DATEORTIME '#';
+DATELITERAL : HASH ((WS | LINE_CONTINUATION)+)? DATEORTIME HASH;
 fragment DATEORTIME : DATEVALUE WS? TIMEVALUE | DATEVALUE | TIMEVALUE;
 fragment DATEVALUE : DATEVALUEPART DATESEPARATOR DATEVALUEPART (DATESEPARATOR DATEVALUEPART)?;
 fragment DATEVALUEPART : DIGIT+ | MONTHNAME;

Rubberduck.Parsing/Grammar/VBALexer.g4

@@ -1,5 +1,4 @@
-using Rubberduck.Parsing.Date;
-using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA;
 using System;
 using System.Globalization;
 

Rubberduck.Parsing/Preprocessing/DateLiteralExpression.cs

@@ -2,7 +2,7 @@ grammar VBADate;
 
 compilationUnit : dateLiteral EOF;
 
-dateLiteral : HASH dateOrTime HASH;
+dateLiteral : HASH ((WS | LINE_CONTINUATION)+)? dateOrTime HASH;
 dateOrTime :
     dateValue
     | timeValue
@@ -20,6 +20,8 @@ timeValuePart : DIGIT+;
 timeSeparator : WS* (COLON | DOT) WS*;
 AMPM : AM | PM | A | P;
 
+LINE_CONTINUATION : [ \t]* '_' [ \t]* '\r'? '\n';
+
 JANUARY : J A N U A R Y;
 FEBRUARY : F E B R U A R Y;
 MARCH : M A R C H;

Rubberduck.Parsing/Preprocessing/VBADate.g4

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\VBADate.g4 by ANTLR 4.3
+// Generated from C:\Users\hosch\Documents\Visual Studio 2015\Projects\Rubberduck\Rubberduck.Parsing\Preprocessing\VBADate.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
@@ -17,161 +17,159 @@
 // Missing XML comment for publicly visible type or member '...'
 #pragma warning disable 1591
 
-namespace Rubberduck.Parsing.Date
-{
-    using Antlr4.Runtime.Misc;
-    using IParseTreeListener = Antlr4.Runtime.Tree.IParseTreeListener;
-    using IToken = Antlr4.Runtime.IToken;
-
-    /// <summary>
-    /// This interface defines a complete listener for a parse tree produced by
-    /// <see cref="VBADateParser"/>.
-    /// </summary>
-    [System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.3")]
-    [System.CLSCompliant(false)]
-    public interface IVBADateListener : IParseTreeListener
-    {
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.dateValue"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterDateValue([NotNull] VBADateParser.DateValueContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.dateValue"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitDateValue([NotNull] VBADateParser.DateValueContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.dateSeparator"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterDateSeparator([NotNull] VBADateParser.DateSeparatorContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.dateSeparator"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitDateSeparator([NotNull] VBADateParser.DateSeparatorContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.englishMonthAbbreviation"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterEnglishMonthAbbreviation([NotNull] VBADateParser.EnglishMonthAbbreviationContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.englishMonthAbbreviation"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitEnglishMonthAbbreviation([NotNull] VBADateParser.EnglishMonthAbbreviationContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.dateOrTime"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterDateOrTime([NotNull] VBADateParser.DateOrTimeContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.dateOrTime"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitDateOrTime([NotNull] VBADateParser.DateOrTimeContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.englishMonthName"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterEnglishMonthName([NotNull] VBADateParser.EnglishMonthNameContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.englishMonthName"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitEnglishMonthName([NotNull] VBADateParser.EnglishMonthNameContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.monthName"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterMonthName([NotNull] VBADateParser.MonthNameContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.monthName"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitMonthName([NotNull] VBADateParser.MonthNameContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.timeSeparator"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterTimeSeparator([NotNull] VBADateParser.TimeSeparatorContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.timeSeparator"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitTimeSeparator([NotNull] VBADateParser.TimeSeparatorContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.timeValue"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterTimeValue([NotNull] VBADateParser.TimeValueContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.timeValue"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitTimeValue([NotNull] VBADateParser.TimeValueContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.compilationUnit"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterCompilationUnit([NotNull] VBADateParser.CompilationUnitContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.compilationUnit"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitCompilationUnit([NotNull] VBADateParser.CompilationUnitContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.dateValuePart"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterDateValuePart([NotNull] VBADateParser.DateValuePartContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.dateValuePart"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitDateValuePart([NotNull] VBADateParser.DateValuePartContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.timeValuePart"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterTimeValuePart([NotNull] VBADateParser.TimeValuePartContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.timeValuePart"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitTimeValuePart([NotNull] VBADateParser.TimeValuePartContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.dateLiteral"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterDateLiteral([NotNull] VBADateParser.DateLiteralContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.dateLiteral"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitDateLiteral([NotNull] VBADateParser.DateLiteralContext context);
-
-        /// <summary>
-        /// Enter a parse tree produced by <see cref="VBADateParser.dateValueNumber"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void EnterDateValueNumber([NotNull] VBADateParser.DateValueNumberContext context);
-        /// <summary>
-        /// Exit a parse tree produced by <see cref="VBADateParser.dateValueNumber"/>.
-        /// </summary>
-        /// <param name="context">The parse tree.</param>
-        void ExitDateValueNumber([NotNull] VBADateParser.DateValueNumberContext context);
-    }
-} // namespace Rubberduck.Parsing.Date
+namespace Rubberduck.Parsing {
+using Antlr4.Runtime.Misc;
+using IParseTreeListener = Antlr4.Runtime.Tree.IParseTreeListener;
+using IToken = Antlr4.Runtime.IToken;
+
+/// <summary>
+/// This interface defines a complete listener for a parse tree produced by
+/// <see cref="VBADateParser"/>.
+/// </summary>
+[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.3")]
+[System.CLSCompliant(false)]
+public interface IVBADateListener : IParseTreeListener {
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.dateValue"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterDateValue([NotNull] VBADateParser.DateValueContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.dateValue"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitDateValue([NotNull] VBADateParser.DateValueContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.dateSeparator"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterDateSeparator([NotNull] VBADateParser.DateSeparatorContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.dateSeparator"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitDateSeparator([NotNull] VBADateParser.DateSeparatorContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.englishMonthAbbreviation"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterEnglishMonthAbbreviation([NotNull] VBADateParser.EnglishMonthAbbreviationContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.englishMonthAbbreviation"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitEnglishMonthAbbreviation([NotNull] VBADateParser.EnglishMonthAbbreviationContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.dateOrTime"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterDateOrTime([NotNull] VBADateParser.DateOrTimeContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.dateOrTime"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitDateOrTime([NotNull] VBADateParser.DateOrTimeContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.englishMonthName"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterEnglishMonthName([NotNull] VBADateParser.EnglishMonthNameContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.englishMonthName"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitEnglishMonthName([NotNull] VBADateParser.EnglishMonthNameContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.monthName"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterMonthName([NotNull] VBADateParser.MonthNameContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.monthName"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitMonthName([NotNull] VBADateParser.MonthNameContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.timeSeparator"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterTimeSeparator([NotNull] VBADateParser.TimeSeparatorContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.timeSeparator"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitTimeSeparator([NotNull] VBADateParser.TimeSeparatorContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.timeValue"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterTimeValue([NotNull] VBADateParser.TimeValueContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.timeValue"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitTimeValue([NotNull] VBADateParser.TimeValueContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.compilationUnit"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterCompilationUnit([NotNull] VBADateParser.CompilationUnitContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.compilationUnit"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitCompilationUnit([NotNull] VBADateParser.CompilationUnitContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.dateValuePart"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterDateValuePart([NotNull] VBADateParser.DateValuePartContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.dateValuePart"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitDateValuePart([NotNull] VBADateParser.DateValuePartContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.timeValuePart"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterTimeValuePart([NotNull] VBADateParser.TimeValuePartContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.timeValuePart"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitTimeValuePart([NotNull] VBADateParser.TimeValuePartContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.dateLiteral"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterDateLiteral([NotNull] VBADateParser.DateLiteralContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.dateLiteral"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitDateLiteral([NotNull] VBADateParser.DateLiteralContext context);
+
+	/// <summary>
+	/// Enter a parse tree produced by <see cref="VBADateParser.dateValueNumber"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void EnterDateValueNumber([NotNull] VBADateParser.DateValueNumberContext context);
+	/// <summary>
+	/// Exit a parse tree produced by <see cref="VBADateParser.dateValueNumber"/>.
+	/// </summary>
+	/// <param name="context">The parse tree.</param>
+	void ExitDateValueNumber([NotNull] VBADateParser.DateValueNumberContext context);
+}
+} // namespace Rubberduck.Parsing