Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ internal static void EnsureHasMeasuredRequirement(List<Requirement> requirements
}
}

last.Type = RequirementType.Measured;
if (last != null)
last.Type = RequirementType.Measured;
}
}
}
6 changes: 6 additions & 0 deletions Source/Parser/ValueBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ public static Value BuildValue(ExpressionBase expression, SerializationContext s
// ensure there's a Measured condition
MeasuredRequirementExpression.EnsureHasMeasuredRequirement(requirements);

if (!requirements.Any(r => r.IsMeasured))
{
error = InconvertibleError(expression);
return null;
}

return new Value(new[] { requirements });
}

Expand Down
12 changes: 12 additions & 0 deletions Tests/Parser/ValueBuilderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -175,5 +175,17 @@ public void TestMergeBits()
var serialized = value.Serialize(new SerializationContext { MinimumVersion = Version._1_0 });
Assert.That(serialized, Is.EqualTo("M:0xK000001"));
}

[Test]
public void TestPauseWithoutMeasured()
{
string input = "disable_when(byte(0x1234) == 1)";
var clause = TriggerExpressionTests.Parse(input);

ErrorExpression error;
var value = ValueBuilder.BuildValue(clause, out error);
Assert.That(value, Is.Null);
ExpressionTests.AssertError(error, "Cannot create value from requirement");
}
}
}
Loading