Merge pull request #1349 from autoboosh/shortliteralfix

retailcoder · retailcoder · commit ee0fdab517ad · 2016-04-22T16:45:11.000-04:00
shortliteral + neq/geq/leq cleanup (#1345 and #1346)
diff --git a/RetailCoder.VBE/Inspections/OptionBaseInspection.cs b/RetailCoder.VBE/Inspections/OptionBaseInspection.cs
@@ -29,7 +29,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 return new List<InspectionResultBase>();
             }
 
-            var issues = options.Where(option => ((VBAParser.OptionBaseStmtContext)option.Context).SHORTLITERAL().GetText() == "1")
+            var issues = options.Where(option => ((VBAParser.OptionBaseStmtContext)option.Context).numberLiteral().GetText() == "1")
                                 .Select(issue => new OptionBaseInspectionResult(this, issue.QualifiedName.QualifiedModuleName));
 
             return issues;
diff --git a/Rubberduck.Parsing/Grammar/VBALexer.cs b/Rubberduck.Parsing/Grammar/VBALexer.cs
diff --git a/Rubberduck.Parsing/Grammar/VBALexer.g4 b/Rubberduck.Parsing/Grammar/VBALexer.g4
@@ -204,14 +204,14 @@ ASSIGN : ':=';
 DIV : '/';
 INTDIV : '\\';
 EQ : '=';
-GEQ : '>=';
+GEQ : '>=' | '=>';
 GT : '>';
-LEQ : '<=';
+LEQ : '<=' | '=<';
 LPAREN : '(';
 LT : '<';
 MINUS : '-';
 MULT : '*';
-NEQ : '<>';
+NEQ : '<>' | '><';
 PLUS : '+';
 POW : '^';
 RPAREN : ')';
@@ -225,9 +225,20 @@ R_SQUARE_BRACKET : ']';
 STRINGLITERAL : '"' (~["\r\n] | '""')* '"';
 OCTLITERAL : '&O' [0-8]+ '&'?;
 HEXLITERAL : '&H' [0-9A-F]+ '&'?;
-SHORTLITERAL : (PLUS|MINUS)? DIGIT+ ('#' | '&' | '@')?;
-INTEGERLITERAL : SHORTLITERAL (E SHORTLITERAL)?;
-DOUBLELITERAL : (PLUS|MINUS)? DIGIT* '.' DIGIT+ (E SHORTLITERAL)?;
+FLOATLITERAL :
+    FLOATINGPOINTLITERAL FLOATINGPOINTTYPESUFFIX?
+    | DECIMALLITERAL FLOATINGPOINTTYPESUFFIX;
+fragment FLOATINGPOINTLITERAL :
+    DECIMALLITERAL EXPONENT
+    | DECIMALLITERAL '.' DECIMALLITERAL?  EXPONENT?
+    | '.' DECIMALLITERAL EXPONENT?;
+INTEGERLITERAL : DECIMALLITERAL INTEGERTYPESUFFIX?;
+fragment INTEGERTYPESUFFIX : [%&^];
+fragment FLOATINGPOINTTYPESUFFIX : [!#@];
+fragment EXPONENT : EXPONENTLETTER EXPONENTSIGN? DIGIT+;
+fragment EXPONENTLETTER : [DEde];
+fragment EXPONENTSIGN : [+-];
+fragment DECIMALLITERAL : DIGIT+;
 DATELITERAL : '#' DATEORTIME '#';
 fragment DATEORTIME : DATEVALUE WS? TIMEVALUE | DATEVALUE | TIMEVALUE;
 fragment DATEVALUE : DATEVALUEPART DATESEPARATOR DATEVALUEPART (DATESEPARATOR DATEVALUEPART)?;
diff --git a/Rubberduck.Parsing/Grammar/VBAParser.cs b/Rubberduck.Parsing/Grammar/VBAParser.cs
diff --git a/Rubberduck.Parsing/Grammar/VBAParser.g4 b/Rubberduck.Parsing/Grammar/VBAParser.g4
@@ -34,7 +34,7 @@ module :
 	whiteSpace?
 ;
 
-moduleHeader : VERSION whiteSpace DOUBLELITERAL whiteSpace? CLASS? endOfStatement;
+moduleHeader : VERSION whiteSpace numberLiteral whiteSpace? CLASS? endOfStatement;
 
 moduleConfig :
 	BEGIN (whiteSpace GUIDLITERAL whiteSpace ambiguousIdentifier whiteSpace?)? endOfStatement
@@ -43,18 +43,18 @@ moduleConfig :
 ;
 
 moduleConfigElement :
-	ambiguousIdentifier whiteSpace* EQ whiteSpace* literal (COLON SHORTLITERAL)? endOfStatement
+	ambiguousIdentifier whiteSpace* EQ whiteSpace* literal (COLON numberLiteral)? endOfStatement
 ;
 
 moduleAttributes : (attributeStmt endOfStatement)+;
 
 moduleDeclarations : moduleDeclarationsElement (endOfStatement moduleDeclarationsElement)* endOfStatement;
 
 moduleOption : 
-	OPTION_BASE whiteSpace SHORTLITERAL 					# optionBaseStmt
+	OPTION_BASE whiteSpace numberLiteral 					# optionBaseStmt
 	| OPTION_COMPARE whiteSpace (BINARY | TEXT | DATABASE) 	# optionCompareStmt
-	| OPTION_EXPLICIT 								# optionExplicitStmt
-	| OPTION_PRIVATE_MODULE 						# optionPrivateModuleStmt
+	| OPTION_EXPLICIT 								        # optionExplicitStmt
+	| OPTION_PRIVATE_MODULE 						        # optionPrivateModuleStmt
 ;
 
 moduleDeclarationsElement :
@@ -365,7 +365,7 @@ selectCaseStmt :
 sC_Selection :
     IS whiteSpace? comparisonOperator whiteSpace? valueStmt                       # caseCondIs
     | valueStmt whiteSpace TO whiteSpace valueStmt                                # caseCondTo
-    | valueStmt                                                   # caseCondValue
+    | valueStmt                                                                   # caseCondValue
 ;
 
 sC_Case : 
@@ -374,8 +374,8 @@ sC_Case :
 ;
 
 sC_Cond :
-    ELSE                                                            # caseCondElse
-    | sC_Selection (whiteSpace? COMMA whiteSpace? sC_Selection)*                      # caseCondSelection
+    ELSE                                                                           # caseCondElse
+    | sC_Selection (whiteSpace? COMMA whiteSpace? sC_Selection)*                   # caseCondSelection
 ;
 
 sendkeysStmt : SENDKEYS whiteSpace valueStmt (whiteSpace? COMMA whiteSpace? valueStmt)?;
@@ -533,7 +533,7 @@ lineLabel : (ambiguousIdentifier | numberLiteral) COLON;
 
 literal : numberLiteral | DATELITERAL | STRINGLITERAL | TRUE | FALSE | NOTHING | NULL | EMPTY;
 
-numberLiteral : HEXLITERAL | OCTLITERAL | DOUBLELITERAL | INTEGERLITERAL | SHORTLITERAL;
+numberLiteral : HEXLITERAL | OCTLITERAL | FLOATLITERAL | INTEGERLITERAL;
 
 type : (baseType | complexType) (whiteSpace? LPAREN whiteSpace? RPAREN)?;
 
diff --git a/Rubberduck.Parsing/Grammar/VBAParserBaseListener.cs b/Rubberduck.Parsing/Grammar/VBAParserBaseListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\RubberduckParserTest\RubberduckParserTest\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\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\RubberduckParserTest\RubberduckParserTest\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\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\RubberduckParserTest\RubberduckParserTest\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\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Grammar\VBAParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\RubberduckParserTest\RubberduckParserTest\VBAParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParser.cs b/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParser.cs
diff --git a/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParser.g4 b/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParser.g4
@@ -58,4 +58,4 @@ name : IDENTIFIER typeHint?;
 
 typeHint : PERCENT | AMPERSAND | POW | EXCLAMATIONPOINT | HASH | AT | DOLLAR;
 
-literal : HEXLITERAL | OCTLITERAL | DATELITERAL | DOUBLELITERAL | INTEGERLITERAL | SHORTLITERAL | STRINGLITERAL | TRUE | FALSE | NOTHING | NULL | EMPTY;
+literal : DATELITERAL | HEXLITERAL | OCTLITERAL | FLOATLITERAL | INTEGERLITERAL | STRINGLITERAL | TRUE | FALSE | NOTHING | NULL | EMPTY;
diff --git a/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParserBaseListener.cs b/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParserBaseListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Preprocessing\VBAConditionalCompilationParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\RubberduckParserTest\RubberduckParserTest\VBAConditionalCompilationParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParserBaseVisitor.cs b/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParserBaseVisitor.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Preprocessing\VBAConditionalCompilationParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\RubberduckParserTest\RubberduckParserTest\VBAConditionalCompilationParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParserListener.cs b/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParserListener.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Preprocessing\VBAConditionalCompilationParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\RubberduckParserTest\RubberduckParserTest\VBAConditionalCompilationParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParserVisitor.cs b/Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParserVisitor.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\TestProj\TestProj\Preprocessing\VBAConditionalCompilationParser.g4 by ANTLR 4.3
+// Generated from C:\Users\Splinter\Documents\Visual Studio 2015\Projects\RubberduckParserTest\RubberduckParserTest\VBAConditionalCompilationParser.g4 by ANTLR 4.3
 
 // Unreachable code detected
 #pragma warning disable 0162
diff --git a/Rubberduck.Parsing/Preprocessing/VBAPreprocessorVisitor.cs b/Rubberduck.Parsing/Preprocessing/VBAPreprocessorVisitor.cs
@@ -375,18 +375,14 @@ private IExpression Visit(VBAConditionalCompilationParser.LiteralContext context
             {
                 return VisitDateLiteral(context);
             }
-            else if (context.DOUBLELITERAL() != null)
+            else if (context.FLOATLITERAL() != null)
             {
-                return VisitDoubleLiteral(context);
+                return VisitFloatLiteral(context);
             }
             else if (context.INTEGERLITERAL() != null)
             {
                 return VisitIntegerLiteral(context);
             }
-            else if (context.SHORTLITERAL() != null)
-            {
-                return VisitShortLiteral(context);
-            }
             else if (context.STRINGLITERAL() != null)
             {
                 return VisitStringLiteral(context);
@@ -415,19 +411,14 @@ private IExpression VisitStringLiteral(VBAConditionalCompilationParser.LiteralCo
             return new StringLiteralExpression(new ConstantExpression(new StringValue(context.STRINGLITERAL().GetText())));
         }
 
-        private IExpression VisitShortLiteral(VBAConditionalCompilationParser.LiteralContext context)
-        {
-            return new NumberLiteralExpression(new ConstantExpression(new StringValue(context.SHORTLITERAL().GetText())));
-        }
-
         private IExpression VisitIntegerLiteral(VBAConditionalCompilationParser.LiteralContext context)
         {
             return new NumberLiteralExpression(new ConstantExpression(new StringValue(context.INTEGERLITERAL().GetText())));
         }
 
-        private IExpression VisitDoubleLiteral(VBAConditionalCompilationParser.LiteralContext context)
+        private IExpression VisitFloatLiteral(VBAConditionalCompilationParser.LiteralContext context)
         {
-            return new NumberLiteralExpression(new ConstantExpression(new StringValue(context.DOUBLELITERAL().GetText())));
+            return new NumberLiteralExpression(new ConstantExpression(new StringValue(context.FLOATLITERAL().GetText())));
         }
 
         private IExpression VisitDateLiteral(VBAConditionalCompilationParser.LiteralContext context)

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()`
`29`	`29`	`return new List<InspectionResultBase>();`
`30`	`30`	`}`
`31`	`31`
`32`		`- var issues = options.Where(option => ((VBAParser.OptionBaseStmtContext)option.Context).SHORTLITERAL().GetText() == "1")`
	`32`	`+ var issues = options.Where(option => ((VBAParser.OptionBaseStmtContext)option.Context).numberLiteral().GetText() == "1")`
`33`	`33`	`.Select(issue => new OptionBaseInspectionResult(this, issue.QualifiedName.QualifiedModuleName));`
`34`	`34`
`35`	`35`	`return issues;`