Skip to content

Commit 8437dfc

Browse files
author
Andrin Meier
committed
make preprocessor always use "option compare text" mode
1 parent 9e88a71 commit 8437dfc

17 files changed

+28
-161
lines changed

Rubberduck.Parsing/Preprocessing/LogicalEqualsExpression.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ public sealed class LogicalEqualsExpression : Expression
44
{
55
private readonly IExpression _left;
66
private readonly IExpression _right;
7-
private readonly VBAOptionCompare _optionCompare;
87

9-
public LogicalEqualsExpression(IExpression left, IExpression right, VBAOptionCompare optionCompare)
8+
public LogicalEqualsExpression(IExpression left, IExpression right)
109
{
1110
_left = left;
1211
_right = right;
13-
_optionCompare = optionCompare;
1412
}
1513

1614
public override IValue Evaluate()
@@ -27,14 +25,7 @@ public override IValue Evaluate()
2725
{
2826
var leftValue = left.AsString;
2927
var rightValue = right.AsString;
30-
if (_optionCompare == VBAOptionCompare.Binary)
31-
{
32-
return new BoolValue(string.CompareOrdinal(leftValue, rightValue) == 0);
33-
}
34-
else
35-
{
36-
return new BoolValue(leftValue.CompareTo(rightValue) == 0);
37-
}
28+
return new BoolValue(leftValue.CompareTo(rightValue) == 0);
3829
}
3930
else
4031
{

Rubberduck.Parsing/Preprocessing/LogicalGreaterOrEqualsExpression.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ public sealed class LogicalGreaterOrEqualsExpression : Expression
44
{
55
private readonly IExpression _left;
66
private readonly IExpression _right;
7-
private readonly VBAOptionCompare _optionCompare;
87

9-
public LogicalGreaterOrEqualsExpression(IExpression left, IExpression right, VBAOptionCompare optionCompare)
8+
public LogicalGreaterOrEqualsExpression(IExpression left, IExpression right)
109
{
1110
_left = left;
1211
_right = right;
13-
_optionCompare = optionCompare;
1412
}
1513

1614
public override IValue Evaluate()
1715
{
18-
var result = new LogicalLessThanExpression(_left, _right, _optionCompare).Evaluate();
16+
var result = new LogicalLessThanExpression(_left, _right).Evaluate();
1917
if (result == null)
2018
{
2119
return null;

Rubberduck.Parsing/Preprocessing/LogicalGreaterThanExpression.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ public sealed class LogicalGreaterThanExpression : Expression
44
{
55
private readonly IExpression _left;
66
private readonly IExpression _right;
7-
private readonly VBAOptionCompare _optionCompare;
87

9-
public LogicalGreaterThanExpression(IExpression left, IExpression right, VBAOptionCompare optionCompare)
8+
public LogicalGreaterThanExpression(IExpression left, IExpression right)
109
{
1110
_left = left;
1211
_right = right;
13-
_optionCompare = optionCompare;
1412
}
1513

1614
public override IValue Evaluate()
1715
{
18-
var lt = new LogicalLessThanExpression(_left, _right, _optionCompare).Evaluate();
19-
var eq = new LogicalEqualsExpression(_left, _right, _optionCompare).Evaluate();
16+
var lt = new LogicalLessThanExpression(_left, _right).Evaluate();
17+
var eq = new LogicalEqualsExpression(_left, _right).Evaluate();
2018
if (lt == null || eq == null)
2119
{
2220
return null;

Rubberduck.Parsing/Preprocessing/LogicalLessOrEqualsExpression.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ public sealed class LogicalLessOrEqualsExpression : Expression
44
{
55
private readonly IExpression _left;
66
private readonly IExpression _right;
7-
private readonly VBAOptionCompare _optionCompare;
87

9-
public LogicalLessOrEqualsExpression(IExpression left, IExpression right, VBAOptionCompare optionCompare)
8+
public LogicalLessOrEqualsExpression(IExpression left, IExpression right)
109
{
1110
_left = left;
1211
_right = right;
13-
_optionCompare = optionCompare;
1412
}
1513

1614
public override IValue Evaluate()
1715
{
18-
var lt = new LogicalLessThanExpression(_left, _right, _optionCompare).Evaluate();
19-
var eq = new LogicalEqualsExpression(_left, _right, _optionCompare).Evaluate();
16+
var lt = new LogicalLessThanExpression(_left, _right).Evaluate();
17+
var eq = new LogicalEqualsExpression(_left, _right).Evaluate();
2018
if (lt == null || eq == null)
2119
{
2220
return null;

Rubberduck.Parsing/Preprocessing/LogicalLessThanExpression.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ public sealed class LogicalLessThanExpression : Expression
44
{
55
private readonly IExpression _left;
66
private readonly IExpression _right;
7-
private readonly VBAOptionCompare _optionCompare;
87

9-
public LogicalLessThanExpression(IExpression left, IExpression right, VBAOptionCompare optionCompare)
8+
public LogicalLessThanExpression(IExpression left, IExpression right)
109
{
1110
_left = left;
1211
_right = right;
13-
_optionCompare = optionCompare;
1412
}
1513

1614
public override IValue Evaluate()
@@ -26,14 +24,7 @@ public override IValue Evaluate()
2624
{
2725
var leftValue = left.AsString;
2826
var rightValue = right.AsString;
29-
if (_optionCompare == VBAOptionCompare.Binary)
30-
{
31-
return new BoolValue(string.CompareOrdinal(leftValue, rightValue) < 0);
32-
}
33-
else
34-
{
35-
return new BoolValue(leftValue.CompareTo(rightValue) < 0);
36-
}
27+
return new BoolValue(leftValue.CompareTo(rightValue) < 0);
3728
}
3829
else
3930
{

Rubberduck.Parsing/Preprocessing/LogicalNotEqualsExpression.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ public sealed class LogicalNotEqualsExpression : Expression
44
{
55
private readonly IExpression _left;
66
private readonly IExpression _right;
7-
private readonly VBAOptionCompare _optionCompare;
87

9-
public LogicalNotEqualsExpression(IExpression left, IExpression right, VBAOptionCompare optionCompare)
8+
public LogicalNotEqualsExpression(IExpression left, IExpression right)
109
{
1110
_left = left;
1211
_right = right;
13-
_optionCompare = optionCompare;
1412
}
1513

1614
public override IValue Evaluate()
1715
{
18-
var eq = new LogicalEqualsExpression(_left, _right, _optionCompare).Evaluate();
16+
var eq = new LogicalEqualsExpression(_left, _right).Evaluate();
1917
if (eq == null)
2018
{
2119
return null;

Rubberduck.Parsing/Preprocessing/OptionCompareListener.cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

Rubberduck.Parsing/Preprocessing/OptionCompareParser.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

Rubberduck.Parsing/Preprocessing/VBAEnvironment.cs renamed to Rubberduck.Parsing/Preprocessing/VBALibrary.cs

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

44
namespace Rubberduck.Parsing.Preprocessing
55
{
6-
public static class VBAEnvironment
6+
public static class VBALibrary
77
{
88
private static readonly Dictionary<string, Func<IExpression, IExpression>> _libraryFunctions = new Dictionary<string, Func<IExpression, IExpression>>()
99
{

Rubberduck.Parsing/Preprocessing/VBAOptionCompare.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)