Rename BooleanExpression => ConditionExpression

This commit is contained in:
atlimit8
2017-02-05 20:25:34 -06:00
parent 0f3250f9b0
commit d83dae5587
7 changed files with 15 additions and 15 deletions

View File

@@ -398,13 +398,13 @@ namespace OpenRA
return InvalidValueAction(value, fieldType, fieldName);
}
else if (fieldType == typeof(BooleanExpression))
else if (fieldType == typeof(ConditionExpression))
{
if (value != null)
{
try
{
return new BooleanExpression(value);
return new ConditionExpression(value);
}
catch (InvalidDataException e)
{

View File

@@ -241,7 +241,7 @@
<Compile Include="Primitives\float3.cs" />
<Compile Include="InstalledMods.cs" />
<Compile Include="CryptoUtil.cs" />
<Compile Include="Support\BooleanExpression.cs" />
<Compile Include="Support\ConditionExpression.cs" />
<Compile Include="ExternalMods.cs" />
</ItemGroup>
<ItemGroup>

View File

@@ -16,7 +16,7 @@ using System.Linq;
namespace OpenRA.Support
{
public class BooleanExpression
public class ConditionExpression
{
public readonly string Expression;
readonly HashSet<string> variables = new HashSet<string>();
@@ -67,7 +67,7 @@ namespace OpenRA.Support
class NotEqualsToken : BinaryOperationToken { public NotEqualsToken(int index) : base("!=", index) { } }
class NotToken : UnaryOperationToken { public NotToken(int index) : base("!", index) { } }
public BooleanExpression(string expression)
public ConditionExpression(string expression)
{
Expression = expression;
var openParens = 0;