Commit 3488bf45 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

Better types for instance maps.

* src/ltlast/unop.hh (map): Use unop* as values.
* src/ltlast/binop.hh (map): Use binop* as values.
* src/ltlast/multop.hh (map): Use multop* as values.
* src/ltlast/automatop.hh (paircmp): Rename as tripletcmp.
(map): Use automaton* as values, not formula*.
parent f2e941cd
2009-11-07 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Better types for instance maps.
* src/ltlast/unop.hh (map): Use unop* as values.
* src/ltlast/binop.hh (map): Use binop* as values.
* src/ltlast/multop.hh (map): Use multop* as values.
* src/ltlast/automatop.hh (paircmp): Rename as tripletcmp.
(map): Use automaton* as values, not formula*.
2009-11-07 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Add missing instance_count() in automatop and eltl2tgba.
......
......@@ -75,7 +75,7 @@ namespace spot
protected:
typedef std::pair<std::pair<nfa::ptr, bool>, vec*> triplet;
/// Comparison functor used internally by ltl::automatop.
struct paircmp
struct tripletcmp
{
bool
operator () (const triplet& p1, const triplet& p2) const
......@@ -87,7 +87,7 @@ namespace spot
return *p1.second < *p2.second;
}
};
typedef std::map<triplet, formula*, paircmp> map;
typedef std::map<triplet, automatop*, tripletcmp> map;
static map instances;
automatop(const nfa::ptr, vec* v, bool negated);
......
......@@ -73,7 +73,7 @@ namespace spot
protected:
typedef std::pair<formula*, formula*> pairf;
typedef std::pair<type, pairf> pair;
typedef std::map<pair, formula*> map;
typedef std::map<pair, binop*> map;
static map instances;
binop(type op, formula* first, formula* second);
......
......@@ -108,7 +108,7 @@ namespace spot
return *p1.second < *p2.second;
}
};
typedef std::map<pair, formula*, paircmp> map;
typedef std::map<pair, multop*, paircmp> map;
static map instances;
multop(type op, vec* v);
......
......@@ -61,7 +61,7 @@ namespace spot
protected:
typedef std::pair<type, formula*> pair;
typedef std::map<pair, formula*> map;
typedef std::map<pair, unop*> map;
static map instances;
unop(type op, formula* child);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment