Pull with conflicts

Author: Hosch250

RetailCoder.VBE/API/ParserState.cs

@@ -6,6 +6,8 @@
 using Rubberduck.Common;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command.MenuItems;
+using Rubberduck.Parsing.Preprocessing;
+using System.Globalization;
 
 namespace Rubberduck.API
 {
@@ -44,15 +46,13 @@ public sealed class ParserState : IParserState, IDisposable
         private const string ProgId = "Rubberduck.ParserState";
 
         private readonly RubberduckParserState _state;
-        private readonly AttributeParser _attributeParser;
-
+        private AttributeParser _attributeParser;
         private RubberduckParser _parser;
 
         public ParserState()
         {
             UiDispatcher.Initialize();
             _state = new RubberduckParserState();
-            _attributeParser = new AttributeParser(new ModuleExporter());
 
             _state.StateChanged += _state_StateChanged;
         }
@@ -63,8 +63,9 @@ public void Initialize(VBE vbe)
             {
                 throw new InvalidOperationException("ParserState is already initialized.");
             }
-
-            _parser = new RubberduckParser(vbe, _state, _attributeParser);
+            Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
+            _attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
+            _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory);
         }
 
         /// <summary>

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -33,6 +33,8 @@
 using Rubberduck.UnitTesting;
 using Rubberduck.VBEditor.VBEHost;
 using NLog;
+using Rubberduck.Parsing.Preprocessing;
+using System.Globalization;
 
 namespace Rubberduck.Root
 {
@@ -94,6 +96,7 @@ public override void Load()
 
             //Bind<TestExplorerModel>().To<StandardModuleTestExplorerModel>().InSingletonScope();
             Rebind<IRubberduckParser>().To<RubberduckParser>().InSingletonScope();
+            Bind<Func<IVBAPreprocessor>>().ToMethod(p => () => new VBAPreprocessor(double.Parse(_vbe.Version, CultureInfo.InvariantCulture)));
 
             _kernel.Rebind<ISearchResultsWindowViewModel>().To<SearchResultsWindowViewModel>().InSingletonScope();
             _kernel.Bind<SearchResultPresenterInstanceManager>().ToSelf().InSingletonScope();

Rubberduck.Parsing/Grammar/VBAParser.cs

@@ -831,8 +831,8 @@ public AttributeStmtContext attributeStmt() {
 	}
 
 	public partial class AttributeNameContext : ParserRuleContext {
-		public UnrestrictedIdentifierContext unrestrictedIdentifier() {
-			return GetRuleContext<UnrestrictedIdentifierContext>(0);
+		public LExpressionContext lExpression() {
+			return GetRuleContext<LExpressionContext>(0);
 		}
 		public AttributeNameContext(ParserRuleContext parent, int invokingState)
 			: base(parent, invokingState)
@@ -861,7 +861,7 @@ public AttributeNameContext attributeName() {
 		try {
 			EnterOuterAlt(_localctx, 1);
 			{
-			State = 499; unrestrictedIdentifier();
+			State = 499; lExpression(0);
 			}
 		}
 		catch (RecognitionException re) {
@@ -876,8 +876,8 @@ public AttributeNameContext attributeName() {
 	}
 
 	public partial class AttributeValueContext : ParserRuleContext {
-		public LiteralExpressionContext literalExpression() {
-			return GetRuleContext<LiteralExpressionContext>(0);
+		public ExpressionContext expression() {
+			return GetRuleContext<ExpressionContext>(0);
 		}
 		public AttributeValueContext(ParserRuleContext parent, int invokingState)
 			: base(parent, invokingState)
@@ -906,7 +906,7 @@ public AttributeValueContext attributeValue() {
 		try {
 			EnterOuterAlt(_localctx, 1);
 			{
-			State = 501; literalExpression();
+			State = 501; expression(0);
 			}
 		}
 		catch (RecognitionException re) {
@@ -18325,7 +18325,7 @@ private bool upperCaseA_sempred(UpperCaseAContext _localctx, int predIndex) {
 		"\x3\x2\x2\x2\x1ED\x1EE\x3\x2\x2\x2\x1EE\x1EF\x3\x2\x2\x2\x1EF\x1F1\x5"+
 		"\x12\n\x2\x1F0\x1E9\x3\x2\x2\x2\x1F1\x1F4\x3\x2\x2\x2\x1F2\x1F0\x3\x2"+
 		"\x2\x2\x1F2\x1F3\x3\x2\x2\x2\x1F3\xF\x3\x2\x2\x2\x1F4\x1F2\x3\x2\x2\x2"+
-		"\x1F5\x1F6\x5\x126\x94\x2\x1F6\x11\x3\x2\x2\x2\x1F7\x1F8\x5\x150\xA9\x2"+
+		"\x1F5\x1F6\x5\x15A\xAE\x2\x1F6\x11\x3\x2\x2\x2\x1F7\x1F8\x5\x14E\xA8\x2"+
 		"\x1F8\x13\x3\x2\x2\x2\x1F9\x1FA\x5\x18\r\x2\x1FA\x1FB\x5\x17C\xBF\x2\x1FB"+
 		"\x1FD\x3\x2\x2\x2\x1FC\x1F9\x3\x2\x2\x2\x1FD\x200\x3\x2\x2\x2\x1FE\x1FC"+
 		"\x3\x2\x2\x2\x1FE\x1FF\x3\x2\x2\x2\x1FF\x15\x3\x2\x2\x2\x200\x1FE\x3\x2"+

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -47,8 +47,8 @@ moduleConfigElement :
 
 moduleAttributes : (attributeStmt endOfStatement)*;
 attributeStmt : ATTRIBUTE whiteSpace attributeName whiteSpace? EQ whiteSpace? attributeValue (whiteSpace? COMMA whiteSpace? attributeValue)*;
-attributeName : unrestrictedIdentifier;
-attributeValue : literalExpression;
+attributeName : lExpression;
+attributeValue : expression;
 
 moduleDeclarations : (moduleDeclarationsElement endOfStatement)*;
 

Rubberduck.Parsing/Preprocessing/IVBAPreprocessor.cs

@@ -0,0 +1,7 @@
+namespace Rubberduck.Parsing.Preprocessing
+{
+    public interface IVBAPreprocessor
+    {
+        string Execute(string moduleName, string unprocessedCode);
+    }
+}

Rubberduck.Parsing/Preprocessing/VBAPreprocessor.cs

@@ -2,7 +2,7 @@
 
 namespace Rubberduck.Parsing.Preprocessing
 {
-    public sealed class VBAPreprocessor
+    public sealed class VBAPreprocessor : IVBAPreprocessor
     {
         private readonly double _vbaVersion;
         private readonly VBAPrecompilationParser _parser;

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -120,6 +120,7 @@
     <Compile Include="Grammar\VBAParserBaseVisitor.cs" />
     <Compile Include="Grammar\VBAParserListener.cs" />
     <Compile Include="Grammar\VBAParserVisitor.cs" />
+    <Compile Include="Preprocessing\IVBAPreprocessor.cs" />
     <Compile Include="Preprocessing\VBAConditionalCompilationParser.cs" />
     <Compile Include="Preprocessing\VBAConditionalCompilationParserBaseListener.cs" />
     <Compile Include="Preprocessing\VBAConditionalCompilationParserBaseVisitor.cs" />

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -4,7 +4,6 @@
 using Rubberduck.VBEditor;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 
 namespace Rubberduck.Parsing.Symbols