alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make all python code compatible with Python 2.x and Python 3.x.

Browse source 
* wrap/python/buddy.i (__le__, __lt__, __eq__, __ne__, __ge__
__gt__): New operators for bdd.
* wrap/python/spot.i (__le__, __lt__, __eq__, __ne__, __ge__
__gt__, __hash__): New operators for formula.
(nl_cout, nl_cerr): New functions.
* wrap/python/tests/bddnqueen.py,
wrap/python/tests/interdep.py, wrap/python/tests/ltl2tgba.py,
wrap/python/tests/ltlparse.py, wrap/python/tests/ltlsimple.py,
wrap/python/tests/minato.py, wrap/python/tests/modgray.py: Adjust
to the new print syntax by using sys.output.write() or nl_cout()
instead.
* wrap/python/tests/optionmap.py: Remove all print calls.
* wrap/python/ajax/spot.in: Massive adjustments in order to work
with both Python 2 and 3.  In python 3, reopening stdout as
unbuffered requires it to be open as binary, which in turns
requires any string output to be encoded manually.  BaseHTTPServer
and CGIHTTPServer have been merged into http.server, so we have
to try two different import syntaxes.  execfile no longer exists,
so it has to be emulated.
This also fixes two bugs where the script would segfault on
empty input, or when calling Tau03 on automata with less then
one acceptance conditions.
This commit is contained in:
Alexandre Duret-Lutz 2012-02-25 13:36:29 +01:00
parent 5e77b2498a
commit 61127a3fd5
12 changed files with 262 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

22
wrap/python/buddy.i
View file

@ -1,6 +1,8 @@
// Copyright (C) 2010, 2011 Laboratoire de Recherche et Développement de l'EPITA.
// -*- coding: utf-8 -*-
// Copyright (C) 2010, 2011, 2012 Laboratoire de Recherche et
// Développement de l'EPITA.
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
//
// This file is part of Spot, a model checking library.
@ -224,11 +226,17 @@ extern const bdd bddtrue;
#define BDD_REORDER_RANDOM 7
%extend bdd {
int
__cmp__(bdd* b)
{
return b->id() - self->id();
}
// For Python 2.0
int __cmp__(bdd* b) { return b->id() - self->id(); }
// For Python 2.1+ and Python 3
bool __le__(bdd* b) { return self->id() <= b->id(); }
bool __lt__(bdd* b) { return self->id() < b->id(); }
bool __eq__(bdd* b) { return self->id() == b->id(); }
bool __ne__(bdd* b) { return self->id() != b->id(); }
bool __ge__(bdd* b) { return self->id() >= b->id(); }
bool __gt__(bdd* b) { return self->id() > b->id(); }
std::string
__str__(void)