bitset: fix implementation of operator-()

This fixes #469.

* spot/misc/bitset.hh (bitset::operator-): Rewrite.
I cannot follow the logic of the old implementation.
* tests/python/setacc.py: Add a test case, inspired from #469.
This commit is contained in:
Alexandre Duret-Lutz 2021-07-05 14:12:58 +02:00
parent 3d79022abb
commit b01bc62f52
2 changed files with 19 additions and 8 deletions

View file

@ -319,15 +319,12 @@ namespace spot
bitset operator-() const
{
bitset res = *this;
unsigned carry = 0;
unsigned carry = 1;
for (auto& v : res.data)
{
v += carry;
if (v < carry)
carry = 2;
else
carry = 1;
v = -v;
word_t old = v;
v = ~v + carry;
carry = old == 0;
}
return res;
}

View file

@ -1,6 +1,6 @@
#!/usr/bin/python3
# -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2016, 2018 Laboratoire de Recherche et Développement de
# Copyright (C) 2016, 2018, 2021 Laboratoire de Recherche et Développement de
# l'EPITA.
#
# This file is part of Spot, a model checking library.
@ -82,3 +82,17 @@ assert v == ()
# FIXME: We should have a way to disable the following output, as it is not
# part of HOA v1.
assert acc.name() == "generalized-Streett 1 2"
# issue #469. This test is meaningful only if Spot is compiled with
# --enable-max-accsets=64 or more.
try:
m = spot.mark_t([33])
assert m.lowest() == m
n = spot.mark_t([33,34])
assert n.lowest() == m
except RuntimeError as e:
if "Too many acceptance sets used." in str(e):
pass
else:
raise e