Commit 0a12b942 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

Import of lbtt 1.2.0

parent e4befcec
Heikki Tauriainen <heikki.tauriainen@hut.fi>
Heikki Tauriainen <heikki.tauriainen@tkk.fi>
2005-08-30 Heikki Tauriainen <heikki.tauriainen@tkk.fi>
* src/main.cc: [HAVE_ISATTY && HAVE_UNISTD_H]: Include the
unistd.h header.
(testLoop): Add support for reading LTL formulas from standard
input using the new variable `round_info.formula_input_stream'.
(main) [HAVE_ISATTY]: If formulas are to be read from the
standard input which is not a terminal, force lbtt to work in
non-interactive mode.
* src/TestOperations.cc (generateFormula):
Use `round_info.formula_input_stream' instead of
`round_info.formula_input_file'.
* src/TestRoundInfo.h (TestRoundInfo::formula_input_stream): New
variable.
* src/Configuration.cc (Configuration::showCommandLineHelp):
Update description of the --formulafile command line option.
(Configuration::print): Do not display a file name when reading
formulas from standard input.
* src/SpotWrapper.h, src/SpotWrapper.cc: Merge files from
Spot 0.2 (contributed by Alexandre Duret-Lutz); remove #pragma
definitions.
* src/ExternalTranslator.h, src/Makefile.in, src/translate.cc:
Merge changes from Spot 0.2 (contributed by Alexandre Duret-Lutz).
* doc/lbtt.texi: Fix typo in URL of the FormulaOptions block
generator. Update version, add documentation and references about
support for Spot. Describe the new semantics of the --formulafile
command line option.
* NEWS, README, configure.ac: Update.
* Version 1.2.0 released.
2005-08-18 Heikki Tauriainen <heikki.tauriainen@tkk.fi>
* NEWS, README: Update to next version.
* Version 1.1.3 released.
2005-08-18 Heikki Tauriainen <heikki.tauriainen@tkk.fi>
* src/TestOperations.cc (generateBuchiAutomaton): Do not
block interrupt signals while running a child process; if lbtt
is currently in the foreground, transfer the controlling terminal
to the child instead.
* configure.ac: Add tests for the getpgrp, tcgetpgrp and
tcsetpgrp functions.
2005-08-17 Heikki Tauriainen <heikki.tauriainen@tkk.fi>
* src/BitArray.h (BitArray::set, BitArray::clear): Do not
set/clear more bits than specified.
* src/main.cc (main): Add a space before error message.
2005-08-16 Heikki Tauriainen <heikki.tauriainen@tkk.fi>
* src/main.cc: Include the sys/types.h header.
(translator_process): New global variable.
(abortHandler): If a translator process is still active when
aborting, terminate it.
* src/TestOperations.cc: Declare the external translator_process
variable.
(generateBuchiAutomaton): Replace the pid variable with the
translator_process variable.
Use setpgid instead of setsid. Always try to terminate the
subprocess if waitpid fails (not only in case of timeouts).
* configure.ac: Replace test for setsid with test for
setpgid.
2005-08-15 Heikki Tauriainen <heikki.tauriainen@tkk.fi>
* configure.ac: Update version and e-mail address.
Remove test for the slist header.
* AUTHORS, doc/lbtt.texi: Update e-mail address.
* src/LbttAlloc.h: Remove definition for the ALLOC macro.
Update copyright information.
* src/BuchiAutomaton.cc, src/BuchiProduct.cc, src/BuchiProduct.h,
src/Configuration.cc, src/Configuration.h, src/DispUtil.cc,
src/ExternalTranslator.h, src/FormulaRandomizer.cc,
src/FormulaRandomizer.h, src/Graph.h.in, src/IntervalList.cc,
src/IntervalList.h, src/Ltl-parse.yy, src/LtlFormula.cc,
src/LtlFormula.h, src/main.cc, src/NeverClaimAutomaton.cc,
src/NeverClaimAutomaton.h, src/PathEvaluator.cc,
src/PathEvaluator.h, src/Product.h, src/SccCollection.h,
src/SharedTestData.h, src/StatDisplay.cc, src/StatDisplay.h,
src/StateSpace.cc, src/StateSpaceRandomizer.cc,
src/StringUtil.cc, src/StringUtil.h, src/TestOperations.cc,
src/TestOperations.h, src/TestRoundInfo.h, src/TestStatistics.cc,
src/TestStatistics.h, src/UserCommandReader.cc,
src/UserCommandReader.h, src/UserCommands.cc,
src/UserCommands.h:
Remove uses of the ALLOC macro.
Update copyright information.
* src/BitArray.cc, src/BitArray.h, src/Bitset.h,
src/BuchiAutomaton.h, src/Config-lex.ll, src/Config-parse.yy,
src/DispUtil.h, src/EdgeContainer.h, src/Exception.h,
src/ExternalTranslator.cc, src/FormulaWriter.h, src/LbtWrapper.h,
src/NeverClaim-lex.ll, src/NeverClaim-parse.yy,
src/PathIterator.cc, src/PathIterator.h, src/Random.h,
src/SpinWrapper.cc, src/SpinWrapper.h, src/StateSpace.h,
src/StateSpaceProduct.h, src/StateSpaceRandomizer.h,
src/TempFsysName.cc, src/TempFsysName.h, src/translate.cc,
src/translate.h, src/TranslatorInterface.h:
Update copyright information.
* src/Configuration.cc (Configuration::showCommandLineHelp):
Use the PACKAGE_BUGREPORT macro instead of a hard-coded
e-mail address.
2004-08-02 Heikki Tauriainen <heikki.tauriainen@hut.fi>
* Version 1.1.2 released.
......
lbtt NEWS -- history of user-visible changes. 02 Aug 2004
Copyright (C) 2004 Heikki Tauriainen
lbtt NEWS -- history of user-visible changes. 30 Aug 2005
Copyright (C) 2005 Heikki Tauriainen
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
......@@ -10,7 +10,23 @@ Copyright (C) 2004 Heikki Tauriainen
provided also that they carry prominent notices stating who last
changed them.
Please send bug reports to <heikki.tauriainen@hut.fi>.
Please send bug reports to <heikki.tauriainen@tkk.fi>.
Version 1.2.0
* This release adds direct support (contributed by Alexandre Duret-Lutz)
for the LTL-to-Büchi translator distributed with the Spot model
checking library (available at <http://spot.lip6.fr/>).
lbtt 1.2.0 also supports reading input formulas from standard input
(by using the command-line option `--formulafile=-'; when reading input
formulas from an actual file, the filename needs to be different from
"-").
Version 1.1.3
* This release fixes build problems with GCC 4 and more job control
problems.
Version 1.1.2
......
lbtt version 1.1.2
lbtt version 1.2.0
------------------
lbtt is a tool for testing programs that translate formulas
......
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
AC_INIT([lbtt], [1.1.2], [heikki.tauriainen@hut.fi])
AC_REVISION([Revision: 1.6])
AC_INIT([lbtt], [1.2.0], [heikki.tauriainen@tkk.fi])
AC_REVISION([Revision: 1.8])
AC_CONFIG_SRCDIR([src/main.cc])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
......@@ -124,52 +124,6 @@ AC_CHECK_HEADERS(
# Checks for typedefs, structures, and compiler characteristics.
# Check for the availability of the slist header (an extension to the C++
# Standard Template Library). (In GCC 3.x the header is in the ext/
# subdirectory of the directory containing the standard C++ headers.)
AC_MSG_CHECKING([for slist])
for slist_header in slist ext/slist no; do
if test "${slist_header}" != no; then
AC_PREPROC_IFELSE(
[AC_LANG_SOURCE([[#include <${slist_header}>]])],
[break])
fi
done
# Try to determine the C++ namespace in which the class slist resides.
# (For example, GCC versions >= 3.1 put slist into the __gnu_cxx namespace.)
if test "${slist_header}" != no; then
for slist_namespace in std __gnu_cxx error; do
if test "${slist_namespace}" != error; then
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <${slist_header}>]],
[[${slist_namespace}::slist<int> s;]])],
[break])
fi
done
if test "${slist_namespace}" != error; then
AC_MSG_RESULT([header <${slist_header}>, typename ${slist_namespace}::slist])
AC_DEFINE(
[HAVE_SLIST],
[1],
[Define to 1 if you have the <slist> or <ext/slist> header file.])
AC_DEFINE_UNQUOTED(
[SLIST_NAMESPACE],
[${slist_namespace}],
[Define as the name of the C++ namespace containing slist.])
AC_SUBST([INCLUDE_SLIST_HEADER], ["#include <${slist_header}>"])
else
slist_header=no
fi
fi
if test "${slist_header}" = no; then
AC_MSG_RESULT([no])
fi
AC_LANG(C)
AC_CHECK_TYPES(
......@@ -191,7 +145,7 @@ AC_C_INLINE
# Checks for library functions.
AC_CHECK_FUNCS(
[strchr strtod strtol strtoul strerror mkdir mkstemp open read write close popen pclose pipe fork execvp setsid getpid waitpid alarm sigaction sigprocmask sigemptyset sigaddset times sysconf],
[strchr strtod strtol strtoul strerror mkdir mkstemp open read write close popen pclose pipe fork execvp getpgrp setpgid tcgetpgrp tcsetpgrp getpid waitpid alarm sigaction sigprocmask sigemptyset sigaddset times sysconf],
[],
[AC_MSG_ERROR([missing one of the library functions required for compilation])])
AC_CHECK_FUNCS([strsignal isatty getopt_long])
......
......@@ -14,13 +14,13 @@
This file documents how to use the LTL-to-B@"uchi
translator testbench @command{lbtt}.
Copyright @copyright{} 2004 Heikki Tauriainen
Copyright @copyright{} 2005 Heikki Tauriainen
@ifinfo
@email{heikki.tauriainen@@hut.fi}
@email{heikki.tauriainen@@tkk.fi}
@end ifinfo
@ifnotinfo
@ifnothtml
<@email{heikki.tauriainen@@hut.fi}>
<@email{heikki.tauriainen@@tkk.fi}>
@end ifnothtml
@end ifnotinfo
......@@ -64,12 +64,12 @@ under the above conditions for modified versions.
@title @command{lbtt}
@subtitle LTL-to-B@"uchi Translator Testbench
@subtitle @today, @command{lbtt} Versions 1.1.x
@author Heikki Tauriainen <@email{heikki.tauriainen@@hut.fi}>
@subtitle @today, @command{lbtt} Versions 1.2.x
@author Heikki Tauriainen <@email{heikki.tauriainen@@tkk.fi}>
@page
@vskip 0pt plus 1filll
Copyright @copyright{} 2004 Heikki Tauriainen
<@email{heikki.tauriainen@@hut.fi}>
Copyright @copyright{} 2005 Heikki Tauriainen
<@email{heikki.tauriainen@@tkk.fi}>
The latest version of this manual can be obtained from@*
<@url{http://www.tcs.hut.fi/Software/lbtt/}>.
......@@ -103,8 +103,8 @@ under the above conditions for modified versions.
for translating propositional linear temporal logic formulas into
B@"uchi automata.
This is edition 1.1.0 of the @command{lbtt} documentation. This edition
applies to @command{lbtt} versions 1.1.x.
This is edition 1.2.0 of the @command{lbtt} documentation. This edition
applies to @command{lbtt} versions 1.2.x.
@command{lbtt} is free software, you may change and redistribute it
under the terms of the GNU General Public License. @command{lbtt}
......@@ -299,7 +299,7 @@ for more information.
By default, all tests @command{lbtt} makes are based on randomly generated
input. However, the LTL formulas used as input for the LTL-to-B@"uchi
translators can be optionally given by the user by telling @command{lbtt} to
read LTL formulas from a file
read LTL formulas from a file or from standard input
(@pxref{--formulafile,,@samp{--formulafile} command line option}).
@cindex state space
......@@ -899,7 +899,7 @@ See also the web page@*
@url{http://www.tcs.hut.fi/Software/lbtt/formulaoptions.php}
@end ifinfo
@ifnotinfo
<@uref{http://www.tcs.hut.fi/Software/lbtt/formulaoptions.php>}
<@uref{http://www.tcs.hut.fi/Software/lbtt/formulaoptions.php}>
@end ifnotinfo
for an interface to a small database for adjusting the operator priorities
towards certain simple distributions.
......@@ -2121,12 +2121,13 @@ file @samp{config} in the current working directory.
@item @anchor{--formulafile}--formulafile=@var{FILE-NAME}
@vindex --formulafile
@cindex LTL formula, reading from a file
@cindex LTL formula, reading from a file or standard input
@cindex file formats, formula input file for @command{lbtt}
This option instructs @command{lbtt} to read the LTL formulas used in the tests
from a file instead of generating them randomly. The file should contain a
list of formulas, each on its own line in the file. The formulas can be
specified either in @command{lbtt}'s own prefix notation
from a file (or standard input) instead of generating them randomly. The
special filename @samp{-} refers to standard input. Each
input formula should be followed by a newline. The formulas can be specified
either in @command{lbtt}'s own prefix notation
(@pxref{Format for LTL formulas}; also the infix notation used in output
messages is supported) or in a variety of formats found in
some LTL-to-B@"uchi translator implementations (Spin, LTL2BA, LTL2AUT,
......@@ -2522,8 +2523,8 @@ This option sets the priority for the logical ``exclusive or'' operator.
Note also the @samp{--formulafile=@var{FILE-NAME}} option
(@pxref{--formulafile,,@samp{--formulafile} option}), which can be used to
instruct @command{lbtt} to read LTL formulas from a file instead of generating
them randomly.
instruct @command{lbtt} to read LTL formulas from a file (or standard input)
instead of generating them randomly.
......@@ -2665,9 +2666,9 @@ Random state space generation parameters.
@item
Random LTL formula generation parameters (unless reading LTL formulas from
a file; @pxref{--formulafile,,@samp{--formulafile} command line option}).
This includes information about all enabled formula operators and their
priorities. When using the command line option
an external source; @pxref{--formulafile,,@samp{--formulafile} command line
option}). This includes information about all enabled formula operators and
their priorities. When using the command line option
@samp{--showoperatordistribution}
(@pxref{--showoperatordistribution,,@samp{--showoperatordistribution} option}),
@command{lbtt} shows also the expected number of occurrence of each
......@@ -4025,6 +4026,25 @@ See
<@uref{http://spinroot.com/spin/whatispin.html}>
@end ifnotinfo
for more information.
@item
@cindex Spot
@ifnottex
Spot @ref{[DP04]}
@end ifnottex
@iftex
Spot [DP04]
@end iftex
--- a model checking library that includes a module for translating LTL
formulas into B@"uchi automata incorporating optimization techniques from
several different sources. See
@ifinfo
@url{http://spot.lip6.fr/}
@end ifinfo
@ifnotinfo
<@uref{http://spot.lip6.fr/}>
@end ifnotinfo
for more information.
@end itemize
To use @command{lbtt} for testing the LTL-to-B@"uchi translators included in
......@@ -4056,7 +4076,7 @@ LTL formula operators available for generating random LTL formulas with
about which operators are supported, and then change the parameters in
@command{lbtt}'s configuration file accordingly to disable the unsupported
operators (or instruct @command{lbtt} to read the formulas from an external
file by invoking @command{lbtt} with the
source by invoking @command{lbtt} with the
@ref{--formulafile,,@samp{--formulafile} command line option}).
The @command{lbtt-translate} utility can also be invoked directly from the
......@@ -4087,6 +4107,13 @@ International Conference on Computer Aided Verification (CAV'99)}, volume 1633
of @i{Lecture Notes in Computer Science}, pages 249---260. Springer-Verlag,
1999.
@item @anchor{[DP04]} [DP04]
A.@: Duret-Lutz and D.@: Poitrenaud. SPOT: An Extensible Model Checking Library
Using Transition-Based Generalized B@"uchi Automata. In
@i{Proceedings of the 12th IEEE/ACM International Symposium on Modeling,
Analysis, and Simulation of Computer and Telecommunication Systems
(MASCOTS 2004)}, pages 76--83. IEEE Computer Society Press, 2004.
@item @anchor{[EH00]} [EH00]
K.@: Etessami and G.@: Holzmann. Optimizing B@"uchi automata. In
@i{Proceedings of the 11th International Conference on Concurrency Theory
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......@@ -359,7 +359,10 @@ inline void BitArray::set(const unsigned long int bit_count)
*
* ------------------------------------------------------------------------- */
{
memset(static_cast<void*>(bits), 0xFF, (bit_count + 7) >> 3);
unsigned long int bsize = bit_count >> 3;
memset(static_cast<void*>(bits), 0xFF, bsize);
if ((bit_count & 0x07) != 0)
bits[bsize] |= (1 << (bit_count & 7)) - 1;
}
/* ========================================================================= */
......@@ -390,7 +393,10 @@ inline void BitArray::clear(const unsigned long int bit_count)
*
* ------------------------------------------------------------------------- */
{
memset(static_cast<void*>(bits), 0, (bit_count + 7) >> 3);
unsigned long int bsize = bit_count >> 3;
memset(static_cast<void*>(bits), 0, bsize);
if ((bit_count & 0x07) != 0)
bits[bsize] &= ~((1 << (bit_count & 7)) - 1);
}
/* ========================================================================= */
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......@@ -288,27 +288,20 @@ void BuchiAutomaton::read(istream& input_stream)
* to the interval [0...(number of states - 1)].
*/
map<long int, size_type, less<long int>, ALLOC(size_type) >
state_number_map;
map<long int, size_type> state_number_map;
pair<long int, size_type> state_mapping(0, 0);
pair<map<long int, size_type, less<long int>, ALLOC(size_type) >
::const_iterator,
bool>
state_finder;
pair<map<long int, size_type>::const_iterator, bool> state_finder;
/*
* Also the acceptance set numbers will be mapped to the interval
* [0...(number of acceptance sets - 1)].
*/
map<long int, unsigned long int, less<long int>, ALLOC(unsigned long int) >
acceptance_set_map;
map<long int, unsigned long int> acceptance_set_map;
pair<long int, unsigned long int> acceptance_set_mapping(0, 0);
pair<map<long int, unsigned long int, less<long int>,
ALLOC(unsigned long int) >::const_iterator,
bool>
pair<map<long int, unsigned long int>::const_iterator, bool>
acceptance_set_finder;
/*
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......@@ -28,8 +28,7 @@ namespace Graph
*
*****************************************************************************/
map< ::Ltl::LtlFormula*, BuchiProduct::SatisfiabilityMapping,
less< ::Ltl::LtlFormula*>, ALLOC(BuchiProduct::SatisfiabilityMapping) >
map< ::Ltl::LtlFormula*, BuchiProduct::SatisfiabilityMapping>
BuchiProduct::sat_cache;
......@@ -73,8 +72,7 @@ bool BuchiProduct::synchronizable
guard_1 = swap_guard;
}
map<LtlFormula*, SatisfiabilityMapping, less<LtlFormula*>,
ALLOC(SatisfiabilityMapping) >::iterator
map<LtlFormula*, SatisfiabilityMapping>::iterator
sat_cache_element = sat_cache.find(guard_1);
if (sat_cache_element == sat_cache.end())
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......@@ -142,18 +142,16 @@ private:
* automata.
*/
typedef map< ::Ltl::LtlFormula*, bool, /* Type definition for */
less< ::Ltl::LtlFormula*>, /* storing information */
ALLOC(bool) > /* about the */
SatisfiabilityMapping; /* satisfiability of the
typedef map< ::Ltl::LtlFormula*, bool> /* Type definition for */
SatisfiabilityMapping; /* storing information
* about the
* satisfiability of the
* guards of product
* transitions.
*/
static map< ::Ltl::LtlFormula*, /* Result cache for */
SatisfiabilityMapping, /* satisfiability tests. */
less< ::Ltl::LtlFormula*>,
ALLOC(SatisfiabilityMapping) >
SatisfiabilityMapping> /* satisfiability tests. */
sat_cache;
};
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
......@@ -96,8 +96,7 @@ Configuration::~Configuration()
*
* ------------------------------------------------------------------------- */
{
for (vector<AlgorithmInformation, ALLOC(AlgorithmInformation) >
::const_iterator it = algorithms.begin();
for (vector<AlgorithmInformation>::const_iterator it = algorithms.begin();
it != algorithms.end(); ++it)
{
for (vector<string>::size_type p = 0; p <= it->num_parameters; ++p)
......@@ -223,7 +222,7 @@ void Configuration::read(int argc, char* argv[])
config_file_line_number = -1;
typedef pair<const OPTIONSTRUCT*, const char*> Parameter;
vector<Parameter, ALLOC(Parameter) > parameters;
vector<Parameter> parameters;
/*
* Preprocess the command line parameters. At this point only those special
......@@ -351,7 +350,7 @@ void Configuration::read(int argc, char* argv[])
* configuration file.
*/
vector<Parameter, ALLOC(Parameter) >::const_iterator parameter;
vector<Parameter>::const_iterator parameter;
try
{
......@@ -655,7 +654,7 @@ void Configuration::read(int argc, char* argv[])
try
{
IntervalList algorithm_ids;
vector<string, ALLOC(string) > nonnumeric_algorithm_ids;
vector<string> nonnumeric_algorithm_ids;
string id_string
= substituteInQuotedString(parameter->second, ",", "\n",
INSIDE_QUOTES);
......@@ -664,14 +663,13 @@ void Configuration::read(int argc, char* argv[])
algorithms.size() - 1,
&nonnumeric_algorithm_ids);
for (vector<string, ALLOC(string) >::iterator
for (vector<string>::iterator
id = nonnumeric_algorithm_ids.begin();
id != nonnumeric_algorithm_ids.end();
++id)
{
*id = unquoteString(substituteInQuotedString(*id, "\n", ","));
map<string, unsigned long int, less<string>,
ALLOC(unsigned long int) >::const_iterator id_finder
map<string, unsigned long int>::const_iterator id_finder
= algorithm_names.find(*id);
if (id_finder == algorithm_names.end())
throw ConfigurationException
......@@ -777,8 +775,7 @@ void Configuration::read(int argc, char* argv[])
bool unary_operator_allowed = false;
for (map<int, int, less<int>, ALLOC(int) >::iterator
it = formula_options.symbol_priority.begin();
for (map<int, int>::iterator it = formula_options.symbol_priority.begin();
it != formula_options.symbol_priority.end(); ++it)