Kill B_CHAR, BF and RESTRICTED_LETTER.

Author: Vogel612

Rubberduck.Parsing/Grammar/VBALexer.g4

@@ -21,8 +21,6 @@ lexer grammar VBALexer;
 ABS : A B S;
 ANY : A N Y;
 ARRAY : A R R A Y;
-B_CHAR : B;        // When trying to define the token `B` for use in the parser, it was being picked up as an IDENTIFIER
-BF : B F;
 CBOOL : C B O O L;
 CBYTE : C B Y T E;
 CCUR : C C U R;
@@ -297,6 +295,7 @@ SINGLEQUOTE : '\'';
 UNDERSCORE : '_';
 WS : [ \t];
 GUIDLITERAL : '{' [0-9A-F]+ '-' [0-9A-F]+ '-' [0-9A-F]+ '-' [0-9A-F]+ '-' [0-9A-F]+ '}';
+LETTER_RANGE : LETTER WS? MINUS WS? LETTER;
 IDENTIFIER :  ~[[\]()\r\n\t.,'"|!@#$%^&*\-+:=; 0-9-/\\] ~[[\]()\r\n\t.,'"|!@#$%^&*\-+:=; ]*;
 LINE_CONTINUATION : [ \t]* UNDERSCORE [ \t]* '\r'? '\n';
 fragment LETTER : [a-zA-Z_äöüÄÖÜ];

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -286,19 +286,19 @@ defType :
         DEFSTR | DEFOBJ | DEFVAR
 ;
 // universalLetterRange must appear before letterRange because they both match the same amount in the case of A-Z but we prefer the universalLetterRange.
-letterSpec : singleLetter | universalLetterRange | letterRange;
-singleLetter : unrestrictedIdentifier;
+// singleLetter must appear at the end to prevent premature bailout
+letterSpec : universalLetterRange | letterRange | singleLetter;
+
+// we're purpusefully not actually making sure this is an ASCII letter
+// that'd be too much of a hassle with the lexer to get working
+singleLetter : {_input.Lt(1).Text.Length == 1}? IDENTIFIER;
 // We make a separate universalLetterRange rule because it is treated specially in VBA. This makes it easy for users of the parser
 // to identify this case. Quoting MS VBAL:
 // "A <universal-letter-range> defines a single implicit declared type for every <IDENTIFIER> within 
 // a module, even those with a first character that would otherwise fall outside this range if it was 
 // interpreted as a <letter-range> from A-Z.""
-universalLetterRange : upperCaseA whiteSpace? MINUS whiteSpace? upperCaseZ;
-upperCaseA : {_input.Lt(1).Text.Equals("A")}? unrestrictedIdentifier;
-upperCaseZ : {_input.Lt(1).Text.Equals("Z")}? unrestrictedIdentifier;
-letterRange : firstLetter whiteSpace? MINUS whiteSpace? lastLetter;
-firstLetter : unrestrictedIdentifier;
-lastLetter : unrestrictedIdentifier;
+universalLetterRange : {_input.Lt(1).Text.StartsWith("A") && _input.Lt(1).Text.EndsWith("Z")}? LETTER_RANGE;
+letterRange : LETTER_RANGE;
 
 doLoopStmt :
     DO endOfStatement 
@@ -534,7 +534,7 @@ lineSpecialForm : expression whiteSpace (STEP whiteSpace?)? tuple MINUS (STEP wh
 circleSpecialForm : (expression whiteSpace? DOT whiteSpace?)? CIRCLE whiteSpace (STEP whiteSpace?)? tuple (whiteSpace? COMMA whiteSpace? expression)+;
 scaleSpecialForm : (expression whiteSpace? DOT whiteSpace?)? SCALE whiteSpace tuple whiteSpace? MINUS whiteSpace? tuple;
 tuple : LPAREN whiteSpace? expression whiteSpace? COMMA whiteSpace? expression whiteSpace? RPAREN;
-lineSpecialFormOption: (B_CHAR | BF);
+lineSpecialFormOption : {_input.Lt(1).Text.ToLower().Equals("b") || _input.Lt(1).Text.ToLower().Equals("bf")}? unrestrictedIdentifier;
 
 subscripts : subscript (whiteSpace? COMMA whiteSpace? subscript)*;
 
@@ -544,7 +544,7 @@ unrestrictedIdentifier : identifier | statementKeyword | markerKeyword;
 identifier : typedIdentifier | untypedIdentifier;
 untypedIdentifier : identifierValue;
 typedIdentifier : untypedIdentifier typeHint;
-identifierValue : IDENTIFIER | keyword | foreignName | BF;
+identifierValue : IDENTIFIER | keyword | foreignName;
 foreignName : L_SQUARE_BRACKET foreignIdentifier* R_SQUARE_BRACKET;
 foreignIdentifier : ~(L_SQUARE_BRACKET | R_SQUARE_BRACKET) | foreignName;
 
@@ -679,7 +679,6 @@ keyword :
      | ANY
      | ARRAY
      | ATTRIBUTE
-	 | B_CHAR
      | BEGIN
      | BOOLEAN
      | BYREF

Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParser.g4

@@ -93,7 +93,6 @@ keyword :
      | ANY
      | ARRAY
      | ATTRIBUTE
-	 | B_CHAR
      | BEGIN
      | BOOLEAN
      | BYREF

RubberduckTests/Grammar/VBAParserTests.cs

@@ -4,6 +4,7 @@
 using Antlr4.Runtime.Tree.Xpath;
 using NUnit.Framework;
 using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Symbols.ParsingExceptions;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -382,7 +383,7 @@ public void TestDefDirectiveSameDefDirectiveMultipleLetterSpec()
         [Test]
         public void TestDefDirectiveLetterRange()
         {
-            string code = @"DefBool B-C: DefByte Y-X: DefInt I-J: DefLng L-M: DefLngLng N-O: DefLngPtr P-Q: DefCur C-D: DefSng G-H: DefDbl D-E: DefDate T-U: DefStr E-F: DefObj O-P: DefVar V-W";
+            string code = @"DefBool A-C: DefByte Y-X: DefInt I-J: DefLng L-M: DefLngLng N-O: DefLngPtr P-Q: DefCur C-D: DefSng G-H: DefDbl D-E: DefDate T-U: DefStr E-F: DefObj O-P: DefVar V-W";
             var parseResult = Parse(code, PredictionMode.Sll);
             AssertTree(parseResult.Item1, parseResult.Item2, "//letterRange", matches => matches.Count == 13);
         }