Merge pull request #2516 from comintern/next

retailcoder · web-flow · commit bc2ca8be300a · 2017-01-11T16:17:27.000-05:00
Grammer tweak for idiotic Case syntax.
diff --git a/Rubberduck.Parsing/Grammar/VBAParser.cs b/Rubberduck.Parsing/Grammar/VBAParser.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\hosch\Documents\Visual Studio 2015\Projects\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
@@ -10715,10 +10715,10 @@ public CaseElseClauseContext caseElseClause() {
 	}
 
 	public partial class RangeClauseContext : ParserRuleContext {
+		public ITerminalNode IS() { return GetToken(VBAParser.IS, 0); }
 		public WhiteSpaceContext whiteSpace(int i) {
 			return GetRuleContext<WhiteSpaceContext>(i);
 		}
-		public ITerminalNode IS() { return GetToken(VBAParser.IS, 0); }
 		public SelectEndValueContext selectEndValue() {
 			return GetRuleContext<SelectEndValueContext>(0);
 		}
@@ -10766,50 +10766,50 @@ public RangeClauseContext rangeClause() {
 			case 1:
 				EnterOuterAlt(_localctx, 1);
 				{
-				State = 1826; expression(0);
-				}
-				break;
-
-			case 2:
-				EnterOuterAlt(_localctx, 2);
-				{
-				State = 1827; selectStartValue();
-				State = 1828; whiteSpace();
-				State = 1829; Match(TO);
-				State = 1830; whiteSpace();
-				State = 1831; selectEndValue();
-				}
-				break;
-
-			case 3:
-				EnterOuterAlt(_localctx, 3);
-				{
-				State = 1837;
+				State = 1830;
 				switch ( Interpreter.AdaptivePredict(_input,225,_ctx) ) {
 				case 1:
 					{
-					State = 1833; Match(IS);
-					State = 1835;
+					State = 1826; Match(IS);
+					State = 1828;
 					_la = _input.La(1);
 					if (_la==WS || _la==LINE_CONTINUATION) {
 						{
-						State = 1834; whiteSpace();
+						State = 1827; whiteSpace();
 						}
 					}
 
 					}
 					break;
 				}
-				State = 1839; comparisonOperator();
-				State = 1841;
+				State = 1832; comparisonOperator();
+				State = 1834;
 				_la = _input.La(1);
 				if (_la==WS || _la==LINE_CONTINUATION) {
 					{
-					State = 1840; whiteSpace();
+					State = 1833; whiteSpace();
 					}
 				}
 
-				State = 1843; expression(0);
+				State = 1836; expression(0);
+				}
+				break;
+
+			case 2:
+				EnterOuterAlt(_localctx, 2);
+				{
+				State = 1838; selectStartValue();
+				State = 1839; whiteSpace();
+				State = 1840; Match(TO);
+				State = 1841; whiteSpace();
+				State = 1842; selectEndValue();
+				}
+				break;
+
+			case 3:
+				EnterOuterAlt(_localctx, 3);
+				{
+				State = 1844; expression(0);
 				}
 				break;
 			}
@@ -19759,8 +19759,8 @@ private bool upperCaseA_sempred(UpperCaseAContext _localctx, int predIndex) {
 		"\x3\x84\x3\x85\x3\x85\x3\x85\x3\x85\x5\x85\x70E\n\x85\x3\x85\x3\x85\x5"+
 		"\x85\x712\n\x85\x3\x85\a\x85\x715\n\x85\f\x85\xE\x85\x718\v\x85\x3\x85"+
 		"\x3\x85\x3\x85\x3\x86\x3\x86\x5\x86\x71F\n\x86\x3\x86\x3\x86\x3\x86\x3"+
-		"\x86\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87\x5"+
-		"\x87\x72E\n\x87\x5\x87\x730\n\x87\x3\x87\x3\x87\x5\x87\x734\n\x87\x3\x87"+
+		"\x86\x3\x87\x3\x87\x5\x87\x727\n\x87\x5\x87\x729\n\x87\x3\x87\x3\x87\x5"+
+		"\x87\x72D\n\x87\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87\x3\x87"+
 		"\x3\x87\x5\x87\x738\n\x87\x3\x88\x3\x88\x3\x89\x3\x89\x3\x8A\x3\x8A\x3"+
 		"\x8A\x3\x8A\x5\x8A\x742\n\x8A\x3\x8A\x3\x8A\x5\x8A\x746\n\x8A\x3\x8A\x3"+
 		"\x8A\x3\x8B\x3\x8B\x3\x8B\x5\x8B\x74D\n\x8B\x3\x8B\x3\x8B\x5\x8B\x751"+
@@ -20498,19 +20498,19 @@ private bool upperCaseA_sempred(UpperCaseAContext _localctx, int predIndex) {
 		"\x2\x71A\x71B\x5\x1E\x10\x2\x71B\x109\x3\x2\x2\x2\x71C\x71E\a\x43\x2\x2"+
 		"\x71D\x71F\x5\x1B6\xDC\x2\x71E\x71D\x3\x2\x2\x2\x71E\x71F\x3\x2\x2\x2"+
 		"\x71F\x720\x3\x2\x2\x2\x720\x721\a[\x2\x2\x721\x722\x5\x1A0\xD1\x2\x722"+
-		"\x723\x5\x1E\x10\x2\x723\x10B\x3\x2\x2\x2\x724\x738\x5\x172\xBA\x2\x725"+
-		"\x726\x5\x10E\x88\x2\x726\x727\x5\x1B6\xDC\x2\x727\x728\a\xC2\x2\x2\x728"+
-		"\x729\x5\x1B6\xDC\x2\x729\x72A\x5\x110\x89\x2\x72A\x738\x3\x2\x2\x2\x72B"+
-		"\x72D\a~\x2\x2\x72C\x72E\x5\x1B6\xDC\x2\x72D\x72C\x3\x2\x2\x2\x72D\x72E"+
-		"\x3\x2\x2\x2\x72E\x730\x3\x2\x2\x2\x72F\x72B\x3\x2\x2\x2\x72F\x730\x3"+
-		"\x2\x2\x2\x730\x731\x3\x2\x2\x2\x731\x733\x5\x15E\xB0\x2\x732\x734\x5"+
-		"\x1B6\xDC\x2\x733\x732\x3\x2\x2\x2\x733\x734\x3\x2\x2\x2\x734\x735\x3"+
-		"\x2\x2\x2\x735\x736\x5\x172\xBA\x2\x736\x738\x3\x2\x2\x2\x737\x724\x3"+
-		"\x2\x2\x2\x737\x725\x3\x2\x2\x2\x737\x72F\x3\x2\x2\x2\x738\x10D\x3\x2"+
-		"\x2\x2\x739\x73A\x5\x172\xBA\x2\x73A\x10F\x3\x2\x2\x2\x73B\x73C\x5\x172"+
-		"\xBA\x2\x73C\x111\x3\x2\x2\x2\x73D\x73E\a\xB6\x2\x2\x73E\x73F\x5\x1B6"+
-		"\xDC\x2\x73F\x741\x5\x17E\xC0\x2\x740\x742\x5\x1B6\xDC\x2\x741\x740\x3"+
-		"\x2\x2\x2\x741\x742\x3\x2\x2\x2\x742\x743\x3\x2\x2\x2\x743\x745\a\xD4"+
+		"\x723\x5\x1E\x10\x2\x723\x10B\x3\x2\x2\x2\x724\x726\a~\x2\x2\x725\x727"+
+		"\x5\x1B6\xDC\x2\x726\x725\x3\x2\x2\x2\x726\x727\x3\x2\x2\x2\x727\x729"+
+		"\x3\x2\x2\x2\x728\x724\x3\x2\x2\x2\x728\x729\x3\x2\x2\x2\x729\x72A\x3"+
+		"\x2\x2\x2\x72A\x72C\x5\x15E\xB0\x2\x72B\x72D\x5\x1B6\xDC\x2\x72C\x72B"+
+		"\x3\x2\x2\x2\x72C\x72D\x3\x2\x2\x2\x72D\x72E\x3\x2\x2\x2\x72E\x72F\x5"+
+		"\x172\xBA\x2\x72F\x738\x3\x2\x2\x2\x730\x731\x5\x10E\x88\x2\x731\x732"+
+		"\x5\x1B6\xDC\x2\x732\x733\a\xC2\x2\x2\x733\x734\x5\x1B6\xDC\x2\x734\x735"+
+		"\x5\x110\x89\x2\x735\x738\x3\x2\x2\x2\x736\x738\x5\x172\xBA\x2\x737\x728"+
+		"\x3\x2\x2\x2\x737\x730\x3\x2\x2\x2\x737\x736\x3\x2\x2\x2\x738\x10D\x3"+
+		"\x2\x2\x2\x739\x73A\x5\x172\xBA\x2\x73A\x10F\x3\x2\x2\x2\x73B\x73C\x5"+
+		"\x172\xBA\x2\x73C\x111\x3\x2\x2\x2\x73D\x73E\a\xB6\x2\x2\x73E\x73F\x5"+
+		"\x1B6\xDC\x2\x73F\x741\x5\x17E\xC0\x2\x740\x742\x5\x1B6\xDC\x2\x741\x740"+
+		"\x3\x2\x2\x2\x741\x742\x3\x2\x2\x2\x742\x743\x3\x2\x2\x2\x743\x745\a\xD4"+
 		"\x2\x2\x744\x746\x5\x1B6\xDC\x2\x745\x744\x3\x2\x2\x2\x745\x746\x3\x2"+
 		"\x2\x2\x746\x747\x3\x2\x2\x2\x747\x748\x5\x172\xBA\x2\x748\x113\x3\x2"+
 		"\x2\x2\x749\x74A\x5\x170\xB9\x2\x74A\x74B\x5\x1B6\xDC\x2\x74B\x74D\x3"+
@@ -20897,7 +20897,7 @@ private bool upperCaseA_sempred(UpperCaseAContext _localctx, int predIndex) {
 		"\x5F2\x5F6\x5FA\x602\x606\x614\x61E\x622\x627\x632\x636\x63B\x641\x645"+
 		"\x64B\x64E\x653\x65C\x660\x666\x669\x672\x676\x67C\x67F\x689\x68D\x690"+
 		"\x693\x696\x69A\x69E\x6A3\x6AC\x6B2\x6B6\x6BB\x6C2\x6CE\x6D0\x6D6\x6D8"+
-		"\x6E0\x6E4\x6F4\x6F8\x6FF\x703\x70D\x711\x716\x71E\x72D\x72F\x733\x737"+
+		"\x6E0\x6E4\x6F4\x6F8\x6FF\x703\x70D\x711\x716\x71E\x726\x728\x72C\x737"+
 		"\x741\x745\x74C\x750\x754\x758\x75B\x765\x77B\x780\x784\x78F\x795\x798"+
 		"\x79B\x7A1\x7A5\x7AA\x7AF\x7B1\x7B7\x7C2\x7C7\x7CD\x7D1\x7D6\x7DB\x7DF"+
 		"\x7E3\x7E5\x7E9\x7EB\x7F0\x804\x806\x80C\x80E\x812\x816\x819\x81C\x820"+
diff --git a/Rubberduck.Parsing/Grammar/VBAParser.g4 b/Rubberduck.Parsing/Grammar/VBAParser.g4
@@ -459,9 +459,9 @@ caseClause :
 ;
 caseElseClause : CASE whiteSpace? ELSE endOfStatement block;
 rangeClause :
-    expression
-    | selectStartValue whiteSpace TO whiteSpace selectEndValue   
-    | (IS whiteSpace?)? comparisonOperator whiteSpace? expression
+    (IS whiteSpace?)? comparisonOperator whiteSpace? expression
+	| selectStartValue whiteSpace TO whiteSpace selectEndValue 
+    | expression
 ;
 selectStartValue : expression;
 selectEndValue : expression;
@@ -562,28 +562,28 @@ visibility : PRIVATE | PUBLIC | FRIEND | GLOBAL;
 
 // 5.6 Expressions
 expression :
-    // Literal Expression has to come before lExpression, otherwise it'll be classified as simple name expression instead.
-    literalExpression                                                                               # literalExpr
-    | lExpression                                                                                   # lExpr
-    | builtInType                                                                                   # builtInTypeExpr
-    | LPAREN whiteSpace? expression whiteSpace? RPAREN                                              # parenthesizedExpr
-    | TYPEOF whiteSpace expression                                                                  # typeofexpr        // To make the grammar SLL, the type-of-is-expression is actually the child of an IS relational op.
-    | NEW whiteSpace expression                                                                     # newExpr
-    | expression whiteSpace? POW whiteSpace? expression                                             # powOp
-    | MINUS whiteSpace? expression                                                                  # unaryMinusOp
-    | expression whiteSpace? (MULT | DIV) whiteSpace? expression                                    # multOp
-    | expression whiteSpace? INTDIV whiteSpace? expression                                          # intDivOp
-    | expression whiteSpace? MOD whiteSpace? expression                                             # modOp
-    | expression whiteSpace? (PLUS | MINUS) whiteSpace? expression                                  # addOp
-    | expression whiteSpace? AMPERSAND whiteSpace? expression                                       # concatOp
-    | expression whiteSpace? (EQ | NEQ | LT | GT | LEQ | GEQ | LIKE | IS) whiteSpace? expression    # relationalOp
-    | NOT whiteSpace? expression                                                                    # logicalNotOp
-    | expression whiteSpace? AND whiteSpace? expression                                             # logicalAndOp
-    | expression whiteSpace? OR whiteSpace? expression                                              # logicalOrOp
-    | expression whiteSpace? XOR whiteSpace? expression                                             # logicalXorOp
-    | expression whiteSpace? EQV whiteSpace? expression                                             # logicalEqvOp
-    | expression whiteSpace? IMP whiteSpace? expression                                             # logicalImpOp
-    | HASH expression                                                                               # markedFileNumberExpr // Added to support special forms such as Input(file1, #file1)
+    // Literal Expression has to come before lExpression, otherwise it'll be classified as simple name expression instead.	
+	literalExpression                                                                               # literalExpr
+	| lExpression                                                                                   # lExpr
+	| builtInType                                                                                   # builtInTypeExpr
+	| LPAREN whiteSpace? expression whiteSpace? RPAREN                                              # parenthesizedExpr
+	| TYPEOF whiteSpace expression                                                                  # typeofexpr        // To make the grammar SLL, the type-of-is-expression is actually the child of an IS relational op.
+	| NEW whiteSpace expression                                                                     # newExpr
+	| expression whiteSpace? POW whiteSpace? expression                                             # powOp
+	| MINUS whiteSpace? expression                                                                  # unaryMinusOp
+	| expression whiteSpace? (MULT | DIV) whiteSpace? expression                                    # multOp
+	| expression whiteSpace? INTDIV whiteSpace? expression                                          # intDivOp
+	| expression whiteSpace? MOD whiteSpace? expression                                             # modOp
+	| expression whiteSpace? (PLUS | MINUS) whiteSpace? expression                                  # addOp
+	| expression whiteSpace? AMPERSAND whiteSpace? expression                                       # concatOp
+	| expression whiteSpace? (EQ | NEQ | LT | GT | LEQ | GEQ | LIKE | IS) whiteSpace? expression    # relationalOp
+	| NOT whiteSpace? expression                                                                    # logicalNotOp
+	| expression whiteSpace? AND whiteSpace? expression                                             # logicalAndOp
+	| expression whiteSpace? OR whiteSpace? expression                                              # logicalOrOp
+	| expression whiteSpace? XOR whiteSpace? expression                                             # logicalXorOp
+	| expression whiteSpace? EQV whiteSpace? expression                                             # logicalEqvOp
+	| expression whiteSpace? IMP whiteSpace? expression                                             # logicalImpOp
+	| HASH expression                                                                               # markedFileNumberExpr // Added to support special forms such as Input(file1, #file1)
 ;
 
 // 5.6.5 Literal Expressions
diff --git a/Rubberduck.Parsing/Grammar/VBAParserBaseListener.cs b/Rubberduck.Parsing/Grammar/VBAParserBaseListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\hosch\Documents\Visual Studio 2015\Projects\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Grammar/VBAParserBaseVisitor.cs b/Rubberduck.Parsing/Grammar/VBAParserBaseVisitor.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\hosch\Documents\Visual Studio 2015\Projects\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Grammar/VBAParserListener.cs b/Rubberduck.Parsing/Grammar/VBAParserListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\hosch\Documents\Visual Studio 2015\Projects\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Grammar/VBAParserVisitor.cs b/Rubberduck.Parsing/Grammar/VBAParserVisitor.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\hosch\Documents\Visual Studio 2015\Projects\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Work\Rubberduck\Rubberduck.Parsing\Grammar\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
