allow conditonal compilation keywords inside logical lines

Author: Andrin Meier

Rubberduck.Parsing/Grammar/VBALexer.cs

@@ -234,16 +234,16 @@ NEQ : '<>' | '><';
 PLUS : '+';
 POW : '^';
 RPAREN : ')';
-HASHCONST : WS* HASH CONST;
-HASHIF : WS* HASH I F;
-HASHELSEIF : WS* HASH E L S E I F;
-HASHELSE : WS* HASH E L S E;
-HASHENDIF : WS* HASH E N D WS* I F;
+HASHCONST : WS* HASH CONST WS+;
+HASHIF : WS* HASH I F WS+;
+HASHELSEIF : WS* HASH E L S E I F WS+;
+HASHELSE : WS* HASH E L S E WS* (SINGLEQUOTE (LINE_CONTINUATION | ~[\r\n\u2028\u2029])*)? (NEWLINE | EOF);
+HASHENDIF : WS* HASH E N D WS* I F WS* (SINGLEQUOTE (LINE_CONTINUATION | ~[\r\n\u2028\u2029])*)? (NEWLINE | EOF);
 L_SQUARE_BRACKET : '[';
 R_SQUARE_BRACKET : ']';
 STRINGLITERAL : '"' (~["\r\n] | '""')* '"';
-OCTLITERAL : '&O' [0-8]+ '&'?;
-HEXLITERAL : '&H' [0-9A-F]+ '&'?;
+OCTLITERAL : '&O' [0-8]+ INTEGERTYPESUFFIX?;
+HEXLITERAL : '&H' [0-9A-F]+ INTEGERTYPESUFFIX?;
 FLOATLITERAL :
     FLOATINGPOINTLITERAL FLOATINGPOINTTYPESUFFIX?
     | DECIMALLITERAL FLOATINGPOINTTYPESUFFIX;

Rubberduck.Parsing/Grammar/VBALexer.g4

@@ -14,7 +14,10 @@ public HexNumberLiteralExpression(IExpression tokenText)
         public override IValue Evaluate()
         {
             string literal = _tokenText.Evaluate().AsString;
-            literal = literal.Replace("&H", "").Replace("&", "");
+            literal = literal.Replace("&H", "")
+                .Replace("&", "")
+                .Replace("%", "")
+                .Replace("^", "");
             var number = (decimal)int.Parse(literal, NumberStyles.HexNumber);
             return new DecimalValue(number);
         }

Rubberduck.Parsing/Preprocessing/HexNumberLiteralExpression.cs

@@ -14,7 +14,14 @@ public NumberLiteralExpression(IExpression tokenText)
         public override IValue Evaluate()
         {
             string literal = _tokenText.Evaluate().AsString;
-            var number = decimal.Parse(literal.Replace("#", "").Replace("&", "").Replace("@", ""), NumberStyles.Float, CultureInfo.InvariantCulture);
+            var number = decimal.Parse(literal
+                .Replace("%", "")
+                .Replace("&", "")
+                .Replace("^", "")
+                .Replace("!", "")
+                .Replace("#", "")
+                .Replace("@", "")
+                , NumberStyles.Float, CultureInfo.InvariantCulture);
             return new DecimalValue(number);
         }
     }

Rubberduck.Parsing/Preprocessing/NumberLiteralExpression.cs

@@ -14,7 +14,10 @@ public OctNumberLiteralExpression(IExpression tokenText)
         public override IValue Evaluate()
         {
             string literal = _tokenText.Evaluate().AsString;
-            literal = literal.Replace("&O", "").Replace("&", "");
+            literal = literal.Replace("&O", "")
+                .Replace("&", "")
+                .Replace("%", "")
+                .Replace("^", "");
             var number = (decimal)Convert.ToInt32(literal, 8);
             return new DecimalValue(number);
         }