Skip to content

Commit eef75d5

Browse files
committed
Address comments from @fabiomadge
1 parent 5aee94f commit eef75d5

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

Source/Core/CoverageAnnotator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ private void AddIdIfMissing(ICarriesAttributes node, bool isGoal)
3030
}
3131
var idStr = node.FindStringAttribute("id");
3232
if (idStr == null) {
33-
idCount++;
3433
idStr = $"id_l{absy.tok.line}_c{absy.tok.col}_{NodeType(node)}_{idCount}";
34+
idCount++;
3535
}
3636
idMap.Add(idStr, absy);
3737
if (isGoal) {

Source/ExecutionEngine/CommandLineOptions.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -317,19 +317,13 @@ public bool UseUnsatCoreForContractInfer {
317317

318318
public bool PrintAssignment { get; set; }
319319

320-
public bool TrackVerificationCoverage {
321-
get => trackVerificationCoverage;
320+
public bool TrackVerificationCoverage
321+
{
322+
get => trackVerificationCoverage || WarnVacuousProofs;
322323
set => trackVerificationCoverage = value;
323324
}
324325

325-
public bool WarnVacuousProofs
326-
{
327-
get => warnVacuousProofs;
328-
set {
329-
warnVacuousProofs = value;
330-
if (warnVacuousProofs) { trackVerificationCoverage = true; }
331-
}
332-
}
326+
public bool WarnVacuousProofs { get; set; }
333327

334328
public int InlineDepth { get; set; } = -1;
335329

@@ -614,7 +608,6 @@ void ObjectInvariant5()
614608
private bool normalizeNames;
615609
private bool normalizeDeclarationOrder = true;
616610
private bool keepQuantifier = false;
617-
private bool warnVacuousProofs;
618611

619612
public List<CoreOptions.ConcurrentHoudiniOptions> Cho { get; set; } = new();
620613

@@ -2017,8 +2010,8 @@ Track and report which program elements labeled with an
20172010
report. This generalizes and replaces the previous
20182011
(undocumented) `/printNecessaryAssertions` option.
20192012
/warnVacuousProofs
2020-
Automatically add `{:id ...}` attributes to assumptions, assertions,
2021-
requires clauses, ensures clauses, and calls; enable the
2013+
Automatically add missing `{:id ...}` attributes to assumptions,
2014+
assertions, requires clauses, ensures clauses, and calls; enable the
20222015
`/trackVerificationCoverage` option; and warn when proof goals are
20232016
not covered by a proof.
20242017
/keepQuantifier

0 commit comments

Comments
 (0)