Skip to content

Commit 8755a77

Browse files
committed
renamed RubberduckParser to ParseCoordinator to better reflect purpose
1 parent 2395914 commit 8755a77

File tree

8 files changed

+23
-17
lines changed

8 files changed

+23
-17
lines changed

RetailCoder.VBE/API/ParserState.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public sealed class ParserState : IParserState, IDisposable
4949

5050
private RubberduckParserState _state;
5151
private AttributeParser _attributeParser;
52-
private RubberduckParser _parser;
52+
private ParseCoordinator _parser;
5353
private VBE _vbe;
5454

5555
public ParserState()
@@ -70,7 +70,7 @@ public void Initialize(VBE vbe)
7070

7171
Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
7272
_attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
73-
_parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory,
73+
_parser = new ParseCoordinator(vbe, _state, _attributeParser, preprocessorFactory,
7474
new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new SpecialFormDeclarations(_state), new FormEventDeclarations(_state), new AliasDeclarations(_state) });
7575
}
7676

RetailCoder.VBE/App.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public sealed class App : IDisposable
2323
{
2424
private readonly IVBE _vbe;
2525
private readonly IMessageBox _messageBox;
26-
private readonly IRubberduckParser _parser;
26+
private readonly IParseCoordinator _parser;
2727
private readonly AutoSave.AutoSave _autoSave;
2828
private readonly IGeneralConfigService _configService;
2929
private readonly IAppMenu _appMenus;
@@ -36,7 +36,7 @@ public sealed class App : IDisposable
3636

3737
public App(IVBE vbe,
3838
IMessageBox messageBox,
39-
IRubberduckParser parser,
39+
IParseCoordinator parser,
4040
IGeneralConfigService configService,
4141
IAppMenu appMenus,
4242
RubberduckCommandBar stateBar,

RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplace.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ namespace Rubberduck.Navigation.RegexSearchReplace
1414
public class RegexSearchReplace : IRegexSearchReplace
1515
{
1616
private readonly IVBE _vbe;
17-
private readonly IRubberduckParser _parser;
17+
private readonly IParseCoordinator _parser;
1818

19-
public RegexSearchReplace(IVBE vbe, IRubberduckParser parser)
19+
public RegexSearchReplace(IVBE vbe, IParseCoordinator parser)
2020
{
2121
_vbe = vbe;
2222
_parser = parser;

RetailCoder.VBE/Root/RubberduckModule.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public override void Load()
7575
{
7676
Assembly.GetExecutingAssembly(),
7777
Assembly.GetAssembly(typeof(IHostApplication)),
78-
Assembly.GetAssembly(typeof(IRubberduckParser)),
78+
Assembly.GetAssembly(typeof(IParseCoordinator)),
7979
Assembly.GetAssembly(typeof(IIndenter))
8080
};
8181

@@ -91,7 +91,7 @@ public override void Load()
9191
Bind<Func<IIndenterSettings>>().ToMethod(t => () => KernelInstance.Get<IGeneralConfigService>().LoadConfiguration().UserSettings.IndenterSettings);
9292

9393
BindCustomDeclarationLoadersToParser();
94-
Rebind<IRubberduckParser>().To<RubberduckParser>().InSingletonScope();
94+
Rebind<IParseCoordinator>().To<ParseCoordinator>().InSingletonScope();
9595
Bind<Func<IVBAPreprocessor>>().ToMethod(p => () => new VBAPreprocessor(double.Parse(_vbe.Version, CultureInfo.InvariantCulture)));
9696

9797
Rebind<ISearchResultsWindowViewModel>().To<SearchResultsWindowViewModel>().InSingletonScope();

Rubberduck.Parsing/IRubberduckParser.cs renamed to Rubberduck.Parsing/IParseCoordinator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Rubberduck.Parsing
55
{
6-
public interface IRubberduckParser : IDisposable
6+
public interface IParseCoordinator : IDisposable
77
{
88
RubberduckParserState State { get; }
99
}

Rubberduck.Parsing/Rubberduck.Parsing.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<Compile Include="Binding\SimpleNameTypeBinding.cs" />
159159
<Compile Include="ComHelper.cs" />
160160
<Compile Include="IParseResultProvider.cs" />
161-
<Compile Include="IRubberduckParser.cs" />
161+
<Compile Include="IParseCoordinator.cs" />
162162
<Compile Include="ParsingText.Designer.cs">
163163
<AutoGen>True</AutoGen>
164164
<DesignTime>True</DesignTime>
@@ -296,7 +296,7 @@
296296
<Compile Include="VBA\ParseErrorEventArgs.cs" />
297297
<Compile Include="VBA\ParserState.cs" />
298298
<Compile Include="VBA\ReferencePriorityMap.cs" />
299-
<Compile Include="VBA\RubberduckParser.cs" />
299+
<Compile Include="VBA\ParseCoordinator.cs" />
300300
<Compile Include="VBA\RubberduckParserState.cs" />
301301
<Compile Include="VBA\StringExtensions.cs" />
302302
<Compile Include="VBA\VBALikePatternParser.cs" />

Rubberduck.Parsing/VBA/RubberduckParser.cs renamed to Rubberduck.Parsing/VBA/ParseCoordinator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
namespace Rubberduck.Parsing.VBA
2020
{
21-
public class RubberduckParser : IRubberduckParser
21+
public class ParseCoordinator : IParseCoordinator
2222
{
2323
public RubberduckParserState State { get { return _state; } }
2424

@@ -37,7 +37,7 @@ private readonly IDictionary<IVBComponent, IDictionary<Tuple<string, Declaration
3737

3838
private readonly bool _isTestScope;
3939

40-
public RubberduckParser(
40+
public ParseCoordinator(
4141
IVBE vbe,
4242
RubberduckParserState state,
4343
IAttributeParser attributeParser,

RubberduckTests/Mocks/MockParser.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,25 @@ public static void ParseString(string inputCode, out QualifiedModuleName qualifi
3131

3232
}
3333

34-
public static RubberduckParser Create(IVBE vbe, RubberduckParserState state)
34+
public static ParseCoordinator Create(IVBE vbe, RubberduckParserState state)
3535
{
3636
var attributeParser = new Mock<IAttributeParser>();
3737
attributeParser.Setup(m => m.Parse(It.IsAny<IVBComponent>()))
3838
.Returns(() => new Dictionary<Tuple<string, DeclarationType>, Attributes>());
3939
return Create(vbe, state, attributeParser.Object);
4040
}
4141

42-
public static RubberduckParser Create(IVBE vbe, RubberduckParserState state, IAttributeParser attributeParser)
42+
public static ParseCoordinator Create(IVBE vbe, RubberduckParserState state, IAttributeParser attributeParser)
4343
{
44-
return new RubberduckParser(vbe, state, attributeParser,
44+
return new ParseCoordinator(vbe, state, attributeParser,
4545
() => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture)),
46-
new List<ICustomDeclarationLoader> {new DebugDeclarations(state), new SpecialFormDeclarations(state), new FormEventDeclarations(state), new AliasDeclarations(state)}, true);
46+
new List<ICustomDeclarationLoader>
47+
{
48+
new DebugDeclarations(state),
49+
new SpecialFormDeclarations(state),
50+
new FormEventDeclarations(state),
51+
new AliasDeclarations(state),
52+
}, true);
4753
}
4854
}
4955
}

0 commit comments

Comments
 (0)