Deprecate ltl::clone(f) in favor of f->clone().
* src/ltlvisit/clone.hh (clone): Document and declare as deprecated. * src/ltlast/formula_tree.cc, src/ltlvisit/basicreduce.cc, src/ltlvisit/clone.cc, src/ltlvisit/contain.cc, src/ltlvisit/lunabbrev.cc, src/ltlvisit/reduce.cc, src/ltlvisit/syntimpl.cc, src/tgba/bdddict.cc, src/tgba/formula2bdd.cc, src/tgba/tgbabddconcretefactory.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbatest/complementation.cc, wrap/python/tests/ltlsimple.py: Adjust clone() usage, and remove the #include "clone.hh" when appropriate.
This commit is contained in:
parent
e44f1b8997
commit
48fb19ea44
16 changed files with 103 additions and 91 deletions
|
|
@ -1,5 +1,5 @@
|
|||
# -*- mode: python; coding: iso-8859-1 -*-
|
||||
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# Copyright (C) 2003, 2004, 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
# et Marie Curie.
|
||||
#
|
||||
|
|
@ -23,8 +23,6 @@
|
|||
import ltihooks
|
||||
import spot
|
||||
|
||||
clone = spot.clone
|
||||
|
||||
e = spot.default_environment.instance()
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
|
@ -36,7 +34,7 @@ c2 = e.require('c')
|
|||
assert c == c2
|
||||
assert spot.atomic_prop.instance_count() == 3
|
||||
|
||||
op = spot.multop.instance(spot.multop.And, clone(a), clone(b))
|
||||
op = spot.multop.instance(spot.multop.And, a.clone(), b.clone())
|
||||
op2 = spot.multop.instance(spot.multop.And, op, c)
|
||||
|
||||
# The symbol for a subformula which hasn't been cloned is better
|
||||
|
|
@ -75,9 +73,9 @@ c = e.require('c')
|
|||
T = spot.constant.true_instance()
|
||||
F = spot.constant.false_instance()
|
||||
|
||||
f1 = spot.binop.instance(spot.binop.Equiv, T, clone(a))
|
||||
f2 = spot.binop.instance(spot.binop.Implies, F, clone(b))
|
||||
f3 = spot.binop.instance(spot.binop.Xor, F, clone(c))
|
||||
f1 = spot.binop.instance(spot.binop.Equiv, T, a.clone())
|
||||
f2 = spot.binop.instance(spot.binop.Implies, F, b.clone())
|
||||
f3 = spot.binop.instance(spot.binop.Xor, F, c.clone())
|
||||
f4 = spot.unop.instance(spot.unop.Not, f3); del f3
|
||||
|
||||
assert spot.atomic_prop.instance_count() == 3
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue